diff --git a/src/main/java/net/brokenmoon/afloydironchest/IronChestMain.java b/src/main/java/net/brokenmoon/afloydironchest/IronChestMain.java index 9f6c339..7306436 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/IronChestMain.java +++ b/src/main/java/net/brokenmoon/afloydironchest/IronChestMain.java @@ -6,24 +6,74 @@ import net.brokenmoon.afloydironchest.blocks.GoldChest; import net.brokenmoon.afloydironchest.blocks.SteelChest; import net.fabricmc.api.ModInitializer; import net.minecraft.src.Block; +import net.minecraft.src.BlockChest; +import net.minecraft.src.Item; import net.minecraft.src.Material; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import turniplabs.halplibe.helper.BlockHelper; +import turniplabs.halplibe.helper.RecipeHelper; public class IronChestMain implements ModInitializer { public static final String MOD_ID = "ironchest"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); - public static Block IronChest = BlockHelper.createBlock(MOD_ID, new IronChest(900, Material.iron), "ironchest", "ironchest.png", Block.soundMetalFootstep, 5, 6, 0); - public static Block GoldChest = BlockHelper.createBlock(MOD_ID, new GoldChest(901, Material.iron), "goldchest", "ironchest.png", Block.soundMetalFootstep, 5, 6, 0); - public static Block DiamondChest = BlockHelper.createBlock(MOD_ID, new DiamondChest(902, Material.iron), "diamondchest", "ironchest.png", Block.soundMetalFootstep, 5, 6, 0); - public static Block SteelChest = BlockHelper.createBlock(MOD_ID, new SteelChest(903, Material.iron), "steelchest", "ironchest.png", Block.soundMetalFootstep, 5, 6, 0); + public static Block IronChest = BlockHelper.createBlock(MOD_ID, new IronChest(900, Material.iron), "ironchest", + "ironchesttop.png", "ironchestbottom.png", + "ironchestfront.png", "ironchestside.png", "ironchestside.png", "ironchestside.png", + Block.soundMetalFootstep, 5, 6, 0); + public static Block GoldChest = BlockHelper.createBlock(MOD_ID, new GoldChest(901, Material.iron), "goldchest", + "goldchesttop.png", "goldchestbottom.png", + "goldchestfront.png", "goldchestside.png", "goldchestside.png", "goldchestside.png", + Block.soundMetalFootstep, 5, 6, 0); + public static Block DiamondChest = BlockHelper.createBlock(MOD_ID, new DiamondChest(902, Material.iron), "diamondchest", + "diamondchesttop.png", "diamondchestbottom.png", + "diamondchestfront.png", "diamondchestside.png", "diamondchestside.png", "diamondchestside.png", + Block.soundMetalFootstep, 5, 6, 0); + public static Block SteelChest = BlockHelper.createBlock(MOD_ID, new SteelChest(903, Material.iron), "steelchest", + "steelchesttop.png", "steelchestbottom.png", + "steelchestfront.png", "steelchestside.png", "steelchestside.png", "steelchestside.png", + Block.soundMetalFootstep, 5, 6, 0); @Override public void onInitialize() { LOGGER.info("AFloydIronChest initialized."); - System.out.println("e"); + + RecipeHelper.Crafting.createRecipe(IronChest, 1, new Object[]{ + "AAA", + "ABA", + "AAA", + 'A', Item.ingotIron, + 'B', Block.chestPlanksOak + }); + RecipeHelper.Crafting.createRecipe(IronChest, 1, new Object[]{ + "AAA", + "ABA", + "AAA", + 'A', Item.ingotIron, + 'B', Block.chestPlanksOakPainted + }); + RecipeHelper.Crafting.createRecipe(GoldChest, 1, new Object[]{ + "AAA", + "ABA", + "AAA", + 'A', Item.ingotGold, + 'B', IronChest + }); + RecipeHelper.Crafting.createRecipe(DiamondChest, 1, new Object[]{ + "AAA", + "ABA", + "AAA", + 'A', Item.diamond, + 'B', GoldChest + }); + RecipeHelper.Crafting.createRecipe(SteelChest, 1, new Object[]{ + "AAA", + "ABA", + "AAA", + 'A', Item.ingotSteel, + 'B', GoldChest + }); } } diff --git a/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java b/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java index f82f2d2..b218f1e 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java +++ b/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java @@ -7,7 +7,7 @@ import net.minecraft.src.*; import java.util.Random; -public class DiamondChest extends BlockContainer{ +public class DiamondChest extends BlockContainerRotatable{ Random random = new Random(); public DiamondChest(int id, Material blockMaterial){ diff --git a/src/main/java/net/brokenmoon/afloydironchest/blocks/GoldChest.java b/src/main/java/net/brokenmoon/afloydironchest/blocks/GoldChest.java index c4ea0fd..2720a98 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/blocks/GoldChest.java +++ b/src/main/java/net/brokenmoon/afloydironchest/blocks/GoldChest.java @@ -7,7 +7,7 @@ import net.minecraft.src.*; import java.util.Random; -public class GoldChest extends BlockContainer{ +public class GoldChest extends BlockContainerRotatable{ Random random = new Random(); public GoldChest(int id, Material blockMaterial){ diff --git a/src/main/java/net/brokenmoon/afloydironchest/blocks/IronChest.java b/src/main/java/net/brokenmoon/afloydironchest/blocks/IronChest.java index fda66ff..fdd0a16 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/blocks/IronChest.java +++ b/src/main/java/net/brokenmoon/afloydironchest/blocks/IronChest.java @@ -7,13 +7,19 @@ import net.minecraft.src.*; import java.util.Random; -public class IronChest extends BlockContainer { +public class IronChest extends BlockContainerRotatable { Random random = new Random(); public IronChest(int id, Material blockMaterial){ super(id, blockMaterial); } + @Override + public void onBlockAdded(World world, int i, int j, int k) { + super.onBlockAdded(world, i, j, k); + this.setDefaultDirection(world, i, j, k); + } + @Override public void onBlockRemoval(World world, int i, int j, int k) { TileEntityIronChest te = (TileEntityIronChest)world.getBlockTileEntity(i, j, k); diff --git a/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java b/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java index a69ce89..866a70c 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java +++ b/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java @@ -7,7 +7,7 @@ import net.minecraft.src.*; import java.util.Random; -public class SteelChest extends BlockContainer{ +public class SteelChest extends BlockContainerRotatable{ Random random = new Random(); public SteelChest(int id, Material blockMaterial){ diff --git a/src/main/resources/assets/ironchest/block/diamondchestbottom.png b/src/main/resources/assets/ironchest/block/diamondchestbottom.png new file mode 100644 index 0000000..28f7b07 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/diamondchestbottom.png differ diff --git a/src/main/resources/assets/ironchest/block/diamondchestfront.png b/src/main/resources/assets/ironchest/block/diamondchestfront.png new file mode 100644 index 0000000..a41e4dc Binary files /dev/null and b/src/main/resources/assets/ironchest/block/diamondchestfront.png differ diff --git a/src/main/resources/assets/ironchest/block/diamondchestside.png b/src/main/resources/assets/ironchest/block/diamondchestside.png new file mode 100644 index 0000000..79b18e1 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/diamondchestside.png differ diff --git a/src/main/resources/assets/ironchest/block/diamondchesttop.png b/src/main/resources/assets/ironchest/block/diamondchesttop.png new file mode 100644 index 0000000..27126ae Binary files /dev/null and b/src/main/resources/assets/ironchest/block/diamondchesttop.png differ diff --git a/src/main/resources/assets/ironchest/block/goldchestbottom.png b/src/main/resources/assets/ironchest/block/goldchestbottom.png new file mode 100644 index 0000000..fd5b205 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/goldchestbottom.png differ diff --git a/src/main/resources/assets/ironchest/block/goldchestfront.png b/src/main/resources/assets/ironchest/block/goldchestfront.png new file mode 100644 index 0000000..e1cab8e Binary files /dev/null and b/src/main/resources/assets/ironchest/block/goldchestfront.png differ diff --git a/src/main/resources/assets/ironchest/block/goldchestside.png b/src/main/resources/assets/ironchest/block/goldchestside.png new file mode 100644 index 0000000..6d3bb75 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/goldchestside.png differ diff --git a/src/main/resources/assets/ironchest/block/goldchesttop.png b/src/main/resources/assets/ironchest/block/goldchesttop.png new file mode 100644 index 0000000..00ba341 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/goldchesttop.png differ diff --git a/src/main/resources/assets/ironchest/block/ironchest.png b/src/main/resources/assets/ironchest/block/ironchest.png deleted file mode 100644 index e803cd4..0000000 Binary files a/src/main/resources/assets/ironchest/block/ironchest.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/block/ironchestbottom.png b/src/main/resources/assets/ironchest/block/ironchestbottom.png new file mode 100644 index 0000000..af2cd3f Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchestbottom.png differ diff --git a/src/main/resources/assets/ironchest/block/ironchestbottom.xcf b/src/main/resources/assets/ironchest/block/ironchestbottom.xcf new file mode 100644 index 0000000..56f51f6 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchestbottom.xcf differ diff --git a/src/main/resources/assets/ironchest/block/ironchestfront.png b/src/main/resources/assets/ironchest/block/ironchestfront.png new file mode 100644 index 0000000..a3936ee Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchestfront.png differ diff --git a/src/main/resources/assets/ironchest/block/ironchestfront.xcf b/src/main/resources/assets/ironchest/block/ironchestfront.xcf new file mode 100644 index 0000000..0ea6151 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchestfront.xcf differ diff --git a/src/main/resources/assets/ironchest/block/ironchestside.png b/src/main/resources/assets/ironchest/block/ironchestside.png new file mode 100644 index 0000000..8d6ee23 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchestside.png differ diff --git a/src/main/resources/assets/ironchest/block/ironchestside.xcf b/src/main/resources/assets/ironchest/block/ironchestside.xcf new file mode 100644 index 0000000..b235833 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchestside.xcf differ diff --git a/src/main/resources/assets/ironchest/block/ironchesttop.png b/src/main/resources/assets/ironchest/block/ironchesttop.png new file mode 100644 index 0000000..5bd2e5d Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchesttop.png differ diff --git a/src/main/resources/assets/ironchest/block/ironchesttop.xcf b/src/main/resources/assets/ironchest/block/ironchesttop.xcf new file mode 100644 index 0000000..631798a Binary files /dev/null and b/src/main/resources/assets/ironchest/block/ironchesttop.xcf differ diff --git a/src/main/resources/assets/ironchest/block/steelchestbottom.png b/src/main/resources/assets/ironchest/block/steelchestbottom.png new file mode 100644 index 0000000..970103c Binary files /dev/null and b/src/main/resources/assets/ironchest/block/steelchestbottom.png differ diff --git a/src/main/resources/assets/ironchest/block/steelchestfront.png b/src/main/resources/assets/ironchest/block/steelchestfront.png new file mode 100644 index 0000000..11df12b Binary files /dev/null and b/src/main/resources/assets/ironchest/block/steelchestfront.png differ diff --git a/src/main/resources/assets/ironchest/block/steelchestside.png b/src/main/resources/assets/ironchest/block/steelchestside.png new file mode 100644 index 0000000..3b6009c Binary files /dev/null and b/src/main/resources/assets/ironchest/block/steelchestside.png differ diff --git a/src/main/resources/assets/ironchest/block/steelchesttop.png b/src/main/resources/assets/ironchest/block/steelchesttop.png new file mode 100644 index 0000000..8281a90 Binary files /dev/null and b/src/main/resources/assets/ironchest/block/steelchesttop.png differ