Merge branch 'Developer'

Author: dani0105

src/main/java/com/dani/blacksmithmod/blocks/Anvil.java

@@ -2,35 +2,38 @@
 
 import com.dani.blacksmithmod.BlacksmithMod;
 import com.dani.blacksmithmod.items.Hammer;
-import com.dani.blacksmithmod.tiles.anviltileentity.AnvilTileEntity;
+import com.dani.blacksmithmod.setup.TileEntityRegister;
+import com.dani.blacksmithmod.tiles.AnvilTileEntity;
 import net.minecraft.block.*;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.inventory.container.INamedContainerProvider;
-import net.minecraft.state.DirectionProperty;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.shapes.ISelectionContext;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
-import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ToolType;
 import net.minecraftforge.fml.network.NetworkHooks;
 
 import javax.annotation.Nullable;
 
+
+/**
+ * Anvil block, this blocks is used to craft items from blacksmith mod and minecraft vanilla
+ */
 public class Anvil extends Block {
 
+    //VoxelShape for the anvil block.
     private static final VoxelShape PART_BASE = Block.makeCuboidShape(1.0D, 0.0D, 1.0D, 15.0D, 4.0D, 15.0D);
     private static final VoxelShape PART_LOWER_X = Block.makeCuboidShape(3.0D, 4.0D, 3.0D, 13.0D, 5.0D, 13.0D);
     private static final VoxelShape PART_MID_X = Block.makeCuboidShape(4.0D, 5.0D, 4.0D, 12.0D, 10.0D, 12.0D);
     private static final VoxelShape PART_UPPER_X = Block.makeCuboidShape(1.0D, 10.0D, 1.0D, 15.0D, 15.0D, 15.0D);
-
     private static final VoxelShape X_AXIS_AABB = VoxelShapes.or(PART_BASE, PART_LOWER_X, PART_MID_X, PART_UPPER_X);
 
 
@@ -41,67 +44,83 @@ public Anvil() {
                 .harvestLevel(1)
                 .harvestTool(ToolType.PICKAXE));
         this.setRegistryName(BlacksmithMod.MODID,"anvil");
-
     }
 
     /**
-     * Verifica si este blqoue tiene un TileEntity
-     * @param state Estado del bloque
-     * @return Retorna TRUE, porque posee un tileEntity
+     * Verify if this block has TileEntity
+     * @param state Block state
+     * @return True, it has TileEntity
      */
     @Override
     public boolean hasTileEntity(BlockState state) {
         return true;
     }
 
     /**
-     * Este metodo crea el tileEntity al bloque
-     * @param state Estado del bloque
-     * @param world Mundo donde esta el bloque
-     * @return retorna un AnvilTileEntity
+     * This method make a TileEntity to Anvil Block
+     * @param state Block state
+     * @param world World where it's.
+     * @return new AnvilTileEntity object.
      */
     @Nullable
     @Override
     public TileEntity createTileEntity(BlockState state, IBlockReader world) {
-        return new AnvilTileEntity();
+        return TileEntityRegister.ANVIL_TILE_ENTITY.create();
     }
 
+    /**
+     * Create a custom VoxelShape
+     * @param state Block state
+     * @param worldIn World Render
+     * @param pos Block position
+     * @param context Context
+     * @return Custom VoxelShape
+     */
     @Override
     public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
-
         return X_AXIS_AABB;
     }
 
+    /**
+     * When the player use right click in it
+     * @param state Block State
+     * @param worldIn World where player and block stay
+     * @param pos Block position
+     * @param player Player who interact
+     * @param handIn what had use
+     * @param hit where the player hit the block
+     * @return interaction result
+     */
     @Override
     public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit){
-        if(worldIn.isRemote)
-            return ActionResultType.PASS;
-
-        TileEntity tileEntity = worldIn.getTileEntity(pos);
-        if (tileEntity instanceof INamedContainerProvider) {
-            NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tileEntity, tileEntity.getPos());
+        if(!worldIn.isRemote()){ //when is True is Client side, and if is false es serve side
+            TileEntity tileEntity = worldIn.getTileEntity(pos);
+            if( tileEntity instanceof INamedContainerProvider)
+                NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tileEntity, tileEntity.getPos());
+            return ActionResultType.SUCCESS;
         }
-        return ActionResultType.SUCCESS;
+        return ActionResultType.PASS;
     }
 
-    // Cuando es True isremote() es el Cliente y si es False es El servidor
+    /**
+     * When the player use left click in it
+     * @param state Block State
+     * @param worldIn World where player and block stay
+     * @param pos lock position
+     * @param player  Player who interact
+     */
     @Override
     public void onBlockClicked(BlockState state, World worldIn, BlockPos pos, PlayerEntity player) {
-        if(!worldIn.isRemote()){
-            if(player.inventory.getCurrentItem().getItem() instanceof Hammer){
+        if (player.inventory.getCurrentItem().getItem() instanceof Hammer){
+            if(!worldIn.isRemote()){ //server Side
                 player.inventory.getCurrentItem().getItem().setDamage(player.inventory.getCurrentItem(),1);
                 TileEntity tileEntity = worldIn.getTileEntity(pos);
-                if(tileEntity instanceof AnvilTileEntity){
-
+                if(tileEntity instanceof AnvilTileEntity)
                     ((AnvilTileEntity) tileEntity).addHit();
-                }
-            }
-        }
 
-        if(player.inventory.getCurrentItem().getItem() instanceof Hammer && worldIn.isRemote()){
-            worldIn.playSound(player.getPosX(),player.getPosY(),player.getPosZ(),SoundType.ANVIL.getPlaceSound(), SoundCategory.BLOCKS,1.0f,1.0f,true);
+            }else  //client side
+                worldIn.playSound(player.getPosX(),player.getPosY(),player.getPosZ(),SoundType.ANVIL.getPlaceSound(), SoundCategory.BLOCKS,1.0f,1.0f,true);
         }
-
-
     }
+
 }

src/main/java/com/dani/blacksmithmod/containers/anvil/AnvilContainer.java renamed to src/main/java/com/dani/blacksmithmod/containers/AnvilContainer.java

@@ -1,44 +1,30 @@
-package com.dani.blacksmithmod.containers.anvil;
+package com.dani.blacksmithmod.containers;
 
-import com.dani.blacksmithmod.containers.anvil.slot.IngredientSlot;
-import com.dani.blacksmithmod.containers.anvil.slot.OutputSlot;
+import com.dani.blacksmithmod.objects.IngredientSlot;
 import com.dani.blacksmithmod.setup.BlockRegister;
 import com.dani.blacksmithmod.setup.ContainerRegister;
-import com.dani.blacksmithmod.tiles.anviltileentity.AnvilTileEntity;
+import com.dani.blacksmithmod.tiles.AnvilTileEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.container.Container;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IWorldPosCallable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
-import net.minecraftforge.items.wrapper.InvWrapper;
 
 public class AnvilContainer extends Container {
 
     private AnvilTileEntity tileEntity;
     private PlayerEntity playerEntity;
-    private IItemHandler playerInventory;
-
     private ItemStackHandler ingredients;
-    private ItemStackHandler output;
 
     public AnvilContainer(int windowId, World world, BlockPos pos, PlayerInventory playerInventory, PlayerEntity player) {
         super(ContainerRegister.ANVIL_CONTAINER, windowId);
-
         tileEntity = (AnvilTileEntity) world.getTileEntity(pos);
-
-        this.ingredients = tileEntity.materials;
-        this.output = tileEntity.output;
-
-
+        this.ingredients = tileEntity.getMaterials();
         this.playerEntity = player;
-        this.playerInventory = new InvWrapper(playerInventory);
-
         this.addPlayerSlots(playerInventory);
         this.anvilSlots();
 
@@ -94,12 +80,10 @@ private void addPlayerSlots(final PlayerInventory playerInventory) {
      * Agrega los Slots de la interfaz
      */
     private void anvilSlots(){
-        this.addSlot(new OutputSlot(this.output, 0, 136, 33));
-
         int index = 0;
         for (int row = 0; row < 3; ++row) {
             for (int col = 0; col < 3; ++col) {
-                this.addSlot(new IngredientSlot(this.ingredients, index, 15 + col  * 18, 16+ row * 18));
+                this.addSlot(new IngredientSlot(this.ingredients, index, 62 + col  * 18, 14 + row * 18));
                 ++index;
             }
         }

src/main/java/com/dani/blacksmithmod/containers/anvil/slot/OutputSlot.java

@@ -8,47 +8,30 @@
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
+import net.minecraftforge.items.ItemStackHandler;
 
-public abstract class Recipe implements IRecipe {
+public abstract class Recipe{
     protected final Item[] recipe;
 
     public Recipe(Item[] recipe){
         this.recipe = recipe;
     }
 
-    @Override
-    public boolean matches(IInventory inv, World worldIn) {
-        for(int i = 0;i < inv.getSizeInventory();i++)
-            if(inv.getStackInSlot(i).getItem() != recipe[i])
+
+    public boolean matches(ItemStackHandler handler, World worldIn) {
+        System.out.println("hello matches!!");
+        for(int i = 0;i < handler.getSlots();i++)
+            if(handler.getStackInSlot(i).getItem() != recipe[i])
                 return false;
         return true;
     }
 
-    @Override
-    public abstract ItemStack getCraftingResult(IInventory inv);
-
-    @Override
-    public boolean canFit(int width, int height) {
-        return false;
+    public ItemStack decrStackSize(ItemStack stack,int count){
+        if(stack.getCount() < count)
+            return stack;
+        stack.setCount(stack.getCount()-count);
+        return stack;
     }
 
-    @Override
-    public ItemStack getRecipeOutput() {
-        return null;
-    }
-
-    @Override
-    public ResourceLocation getId() {
-        return null;
-    }
-
-    @Override
-    public IRecipeSerializer<?> getSerializer() {
-        return null;
-    }
-
-    @Override
-    public IRecipeType<?> getType() {
-        return null;
-    }
+    public abstract ItemStack getCraftingResult(ItemStackHandler inv);
 }

src/main/java/com/dani/blacksmithmod/containers/anvilcrafting/AnvilCrafting.java

@@ -6,6 +6,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraftforge.items.ItemStackHandler;
 
 public class DiamondHorseArmorRecipe extends Recipe {
 
@@ -19,15 +20,15 @@ public DiamondHorseArmorRecipe() {
     }
 
     @Override
-    public ItemStack getCraftingResult(IInventory inv) {
-        inv.decrStackSize(0,1);
-        inv.decrStackSize(2,1);
-        inv.decrStackSize(3,1);
-        inv.decrStackSize(4,1);
-        inv.decrStackSize(5,1);
-        inv.decrStackSize(6,1);
-        inv.decrStackSize(8,1);
-        return new ItemStack(Items.DIAMOND_HORSE_ARMOR);
+    public ItemStack getCraftingResult(ItemStackHandler inv) {
+        inv.extractItem(0,1,false);
+        inv.extractItem(2,1,false);
+        inv.extractItem(3,1,false);
+        inv.extractItem(4,1,false);
+        inv.extractItem(5,1,false);
+        inv.extractItem(6,1,false);
+        inv.extractItem(8,1,false);
+        return new ItemStack(Items.DIAMOND_HORSE_ARMOR,1);
     }
 
 }

src/main/java/com/dani/blacksmithmod/items/itemabstract/Recipe.java

@@ -6,6 +6,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraftforge.items.ItemStackHandler;
 
 public class DiamondShieldRecipe extends Recipe {
 
@@ -18,13 +19,13 @@ public DiamondShieldRecipe() {
         });
     }
 
+
     @Override
-    public ItemStack getCraftingResult(IInventory inv) {
-        inv.decrStackSize(1,1);
-        inv.decrStackSize(3,1);
-        inv.decrStackSize(5,1);
-        inv.decrStackSize(7,1);
-        return new ItemStack(ItemRegister.GOLD_SHIELD);
+    public ItemStack getCraftingResult(ItemStackHandler inv) {
+        inv.extractItem(1,1,false);
+        inv.extractItem(3,1,false);
+        inv.extractItem(5,1,false);
+        inv.extractItem(7,1,false);
+        return new ItemStack(ItemRegister.DIAMOND_SHIELD,1);
     }
-
 }