Crafting

Infer4Y · Aug 13, 2019 · 51fa3a2 · 51fa3a2
1 parent def4650
commit 51fa3a2
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 3 deletions.
diff --git a/src/main/java/client/renderables/Background.java b/src/main/java/client/renderables/Background.java
@@ -63,8 +63,8 @@ public void tick() {
 
     @Override
     public void second() {
-        if (count >= 0.d) {
-            count = -180;
+        if (count >= -10.d) {
+            count = -170;
             day = !day;
         } else {
             count+=360.00000000d/2400.000000000d;

diff --git a/src/main/java/client/renderables/BlockRender.java b/src/main/java/client/renderables/BlockRender.java
@@ -9,6 +9,7 @@
 import common.item.ItemBlock;
 import common.registries.Blocks;
 import common.registries.Items;
+import common.world.World;
 import utils.FileUtils;
 
 import javax.imageio.ImageIO;
@@ -84,6 +85,8 @@ public void mousePressed(MouseEvent e) {
                     Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount() - 1);
                     texture = Game.textures.getTexture4(block.getName());
                 }
+            } else {
+                block.onBlockRightClick(Game.world, null);
             }
         }
     }

diff --git a/src/main/java/common/block/Block.java b/src/main/java/common/block/Block.java
@@ -1,5 +1,6 @@
 package common.block;
 
+import client.Game;
 import client.renderables.EntityRenderer;
 import common.world.World;
 
@@ -11,6 +12,8 @@ public Block(String name){
         this.name = name;
     }
 
+    public void onBlockRightClick(World world, EntityRenderer entity){ }
+
     public void onBlockCollision(World world, EntityRenderer entity){ }
 
     public void onTick(World world, int x, int y){ }

diff --git a/src/main/java/common/block/BlockCrafter.java b/src/main/java/common/block/BlockCrafter.java
@@ -0,0 +1,60 @@
+package common.block;
+
+import client.Game;
+import client.renderables.EntityRenderer;
+import common.item.ItemBlock;
+import common.registries.Blocks;
+import common.registries.Items;
+import common.world.World;
+
+public class BlockCrafter extends Block {
+    public BlockCrafter(String name) {
+        super(name);
+    }
+
+    @Override
+    public void onBlockRightClick(World world, EntityRenderer entity) {
+        super.onBlockRightClick(world, entity);
+        if (Blocks.stone.getName().equals(Game.headsUpDisplay.getSelected().getItemStack().getItem().getName())){
+            for (int i = 0; i < Game.headsUpDisplay.getSlots().length; i++) {
+                if (Game.headsUpDisplay.getSlots()[i].getItemStack().getItem() instanceof ItemBlock) {
+                    if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock() == Blocks.wood_producer) {
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(Game.headsUpDisplay.getSlots()[i].getItemStack().getAmount() + 1);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    } else if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock().isAir()){
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setItem(Items.getItem(Blocks.wood_producer.getName()));
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(1);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    }
+                }
+            }
+        } else if (Blocks.log.getName().equals(Game.headsUpDisplay.getSelected().getItemStack().getItem().getName())){
+            for (int i = 0; i < Game.headsUpDisplay.getSlots().length; i++) {
+                if (Game.headsUpDisplay.getSlots()[i].getItemStack().getItem() instanceof ItemBlock) {
+                    if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock() == Blocks.planks) {
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(Game.headsUpDisplay.getSlots()[i].getItemStack().getAmount() + 4);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    } else if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock().isAir()){
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setItem(Items.getItem(Blocks.planks.getName()));
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(4);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onTick(World world, int x, int y) {
+        super.onTick(world, x, y);
+    }
+
+    @Override
+    public boolean isSolid() {
+        return super.isSolid();
+    }
+}
diff --git a/src/main/java/common/block/BlockLog.java b/src/main/java/common/block/BlockLog.java
@@ -1,10 +1,38 @@
 package common.block;
 
+import client.Game;
+import client.renderables.EntityRenderer;
+import common.item.ItemBlock;
+import common.registries.Blocks;
+import common.registries.Items;
+import common.world.World;
+
 public class BlockLog extends Block {
     public BlockLog(String name) {
         super(name);
     }
 
+    @Override
+    public void onBlockRightClick(World world, EntityRenderer entity) {
+        super.onBlockRightClick(world, entity);
+        if (Blocks.stone.getName().equals(Game.headsUpDisplay.getSelected().getItemStack().getItem().getName())){
+            for (int i = 0; i < Game.headsUpDisplay.getSlots().length; i++) {
+                if (Game.headsUpDisplay.getSlots()[i].getItemStack().getItem() instanceof ItemBlock) {
+                    if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock() == Blocks.crafter) {
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(Game.headsUpDisplay.getSlots()[i].getItemStack().getAmount() + 1);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    } else if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock().isAir()){
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setItem(Items.getItem(Blocks.crafter.getName()));
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(1);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public boolean isSolid() {
         return false;

diff --git a/src/main/java/common/block/BlockWoodProducer.java b/src/main/java/common/block/BlockWoodProducer.java
@@ -0,0 +1,45 @@
+package common.block;
+
+import client.Game;
+import client.renderables.EntityRenderer;
+import common.item.ItemBlock;
+import common.registries.Blocks;
+import common.registries.Items;
+import common.world.World;
+
+public class BlockWoodProducer extends Block {
+    public BlockWoodProducer(String name) {
+        super(name);
+    }
+
+    @Override
+    public void onBlockRightClick(World world, EntityRenderer entity) {
+        super.onBlockRightClick(world, entity);
+        if (Blocks.sapling.getName().equals(Game.headsUpDisplay.getSelected().getItemStack().getItem().getName())&& Game.headsUpDisplay.getSelected().getItemStack().getAmount() >= 1){
+            for (int i = 0; i < Game.headsUpDisplay.getSlots().length; i++) {
+                if (Game.headsUpDisplay.getSlots()[i].getItemStack().getItem() instanceof ItemBlock) {
+                    if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock() == Blocks.log) {
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(Game.headsUpDisplay.getSlots()[i].getItemStack().getAmount() + 4);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    } else if (((ItemBlock) Game.headsUpDisplay.getSlots()[i].getItemStack().getItem()).getBlock().isAir()){
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setItem(Items.getItem(Blocks.log.getName()));
+                        Game.headsUpDisplay.getSlots()[i].getItemStack().setAmount(4);
+                        Game.headsUpDisplay.getSelected().getItemStack().setAmount(Game.headsUpDisplay.getSelected().getItemStack().getAmount()-1);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onTick(World world, int x, int y) {
+        super.onTick(world, x, y);
+    }
+
+    @Override
+    public boolean isSolid() {
+        return false;
+    }
+}
diff --git a/src/main/java/common/registries/Blocks.java b/src/main/java/common/registries/Blocks.java
@@ -15,9 +15,11 @@ public class Blocks {
     public static BlockLeaf leaf = new BlockLeaf("leaves");
     public static Block planks = new Block("planks");
     public static Block sapling = new BlockSapling("sapling");
+    public static BlockWoodProducer wood_producer = new BlockWoodProducer("wood_producer");
+    public static BlockCrafter crafter = new BlockCrafter("crafter");
 
     public static void init(){
-        register(grass, dirt, stone, air, launcher, log, leaf, planks, sapling);
+        register(grass, dirt, stone, air, launcher, log, leaf, planks, sapling, wood_producer, crafter);
     }
 
     private static void register(Block block){

diff --git a/src/main/resources/tex/blocks/crafter.png b/src/main/resources/tex/blocks/crafter.png
diff --git a/src/main/resources/tex/blocks/wood_producer.png b/src/main/resources/tex/blocks/wood_producer.png