1.0.5.1

jtrent238 · Jul 18, 2016 · f708b26 · f708b26
1 parent e633685
commit f708b26
Show file tree

Hide file tree

Showing 14 changed files with 3,746 additions and 4,538 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,14 @@
 Epic Proportions Mod ChangeLog
 
+1.0.5.1
+- Added TNT Home Structure
+- Added Bomby Structure
+- Added Gold Nugget to Birthday Present
+- Added Gold Apple to Birthday Present
+- Can Now Get Jen Ingots In BlackSmith Chest
+- Can Now Get Pat Ingots In BlackSmith Chest
+- Fixed Clown Texture and Model
+
 1.0.4.1
 - Added Birthday Present
 - Added FuriousDestroyer's Chest

diff --git a/Mod ShowCase & Testing World.zip b/Mod ShowCase & Testing World.zip
diff --git a/src/main/java/com/jtrent238/epicproportions/EntityLoader.java b/src/main/java/com/jtrent238/epicproportions/EntityLoader.java
@@ -87,7 +87,7 @@ public static void LoadEntitys() {
 
 	  //Clown Registry
 	    EntityRegistry.registerGlobalEntityID(EntityClown.class, "EntityClown",EntityRegistry.findGlobalUniqueEntityId());
-	    RenderingRegistry.registerEntityRenderingHandler(EntityClown.class, new RenderLiving(new ModelZombie(), 0){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:EntityClown.png");}});//jtrent238 Texture
+	    RenderingRegistry.registerEntityRenderingHandler(EntityClown.class, new RenderLiving(new ModelBiped(), 0){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:EntityClown.png");}});//jtrent238 Texture
 	    EntityRegistry.addSpawn(EntityClown.class, 1, 4, 6, EnumCreatureType.creature, BiomeGenBase.forest, BiomeGenBase.forestHills, BiomeGenBase.jungle, BiomeGenBase.forest, BiomeGenBase.plains, BiomeGenBase.beach, BiomeGenBase.mesa, BiomeGenBase.savanna);
 
 	}

diff --git a/src/main/java/com/jtrent238/epicproportions/EpicProportionsMod.java b/src/main/java/com/jtrent238/epicproportions/EpicProportionsMod.java
@@ -35,7 +35,7 @@ public class EpicProportionsMod
 
 	@Instance(MODID)
     public static EpicProportionsMod instance;
-	public static final String MODVERSION = "1.0.4.1";
+	public static final String MODVERSION = "1.0.5.1";
 
 	@ForgeSubscribe(priority = EventPriority.NORMAL)
     public void eventHandler(RenderGameOverlayEvent event) {
@@ -85,6 +85,8 @@ public void init(FMLInitializationEvent event)
 	ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemLoader.itemJenIngot), 2, 5, 20));
 	ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemLoader.itemPatIngot), 2, 5, 20));
 	ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemLoader.itemBirthdayPresent), 1, 3, 10));
+	ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(new ItemStack(ItemLoader.itemJenIngot), 2, 4, 2));
+	ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(new ItemStack(ItemLoader.itemPatIngot), 2, 4, 2));
 	//MinecraftForge.addGrassSeed(new ItemStack(FoodModItems.StrawberrySeeds), 5);
 	//NetworkRegistry.instance().registerGuiHandler(instance, guiHandler);
 	//Not Implemented Yet//NetworkRegistry.INSTANCE.registerGuiHandler(FridgeGUI.instance, new GuiHandler());

diff --git a/src/main/java/com/jtrent238/epicproportions/ItemLoader.java b/src/main/java/com/jtrent238/epicproportions/ItemLoader.java
@@ -26,6 +26,7 @@
 import com.jtrent238.epicproportions.items.spawners.itemSpawnNinjaMaster;
 import com.jtrent238.epicproportions.items.spawners.itemSpawnPat;
 import com.jtrent238.epicproportions.items.spawners.itemSpawnjtrent238;
+import com.jtrent238.epicproportions.items.structureplacers.itemBombyStructurePlacer;
 import com.jtrent238.epicproportions.items.structureplacers.itemHouseOfEpicProportionsPlacer;
 import com.jtrent238.epicproportions.items.structureplacers.itemTNTSwordPlacer;
 import com.jtrent238.epicproportions.items.tools.itemJenAxe;
@@ -107,6 +108,7 @@ public class ItemLoader {
 
 	public static Item itemTNTSwordPlacer;
 	public static Item itemHouseOfEpicProportionsPlacer;
+	public static Item itemBombyStructurePlacer;
 
 	//Weapons & Tools
 	public static Item itemPatSword;
@@ -186,7 +188,8 @@ public static void LoadItems() {
 	itemPatArrow = new itemPatArrow().setUnlocalizedName("itemPatArrow").setTextureName("epicproportionsmod:itemPatArrow").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
 	itemJenArrow = new itemJenArrow().setUnlocalizedName("itemJenArrow").setTextureName("epicproportionsmod:itemJenArrow").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
 	itemBirthdayPresent = new itemBirthdayPresent().setUnlocalizedName("itemBirthdayPresent").setTextureName("epicproportionsmod:itemBirthdayPresent").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
-	itemHouseOfEpicProportionsPlacer = new itemHouseOfEpicProportionsPlacer(0).setUnlocalizedName("itemHouseOfEpicProportionsPlacer").setTextureName("epicproportionsmod:itemHouseOfEpicProportionsPlacer")/*/.setCreativeTab(EpicProportionsMod.EpicProportionsMod)/*/;
+	itemHouseOfEpicProportionsPlacer = new itemHouseOfEpicProportionsPlacer(0).setUnlocalizedName("itemHouseOfEpicProportionsPlacer").setTextureName("epicproportionsmod:itemHouseOfEpicProportionsPlacer").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
+	itemBombyStructurePlacer = new itemBombyStructurePlacer(0).setUnlocalizedName("itemBombyStructurePlacer").setTextureName("epicproportionsmod:itemBombyStructurePlacer").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
 
 	//Weapons & Tools
 	itemPatSword = new itemPatSword(ToolMaterial.EMERALD).setUnlocalizedName("itemPatSword").setTextureName("epicproportionsmod:itemPatSword").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
@@ -263,6 +266,7 @@ private static void registerItems(){
 	GameRegistry.registerItem(itemJenArrow, itemJenArrow.getUnlocalizedName().substring(5));
 	GameRegistry.registerItem(itemBirthdayPresent, itemBirthdayPresent.getUnlocalizedName().substring(5));
 	GameRegistry.registerItem(itemHouseOfEpicProportionsPlacer, itemHouseOfEpicProportionsPlacer.getUnlocalizedName().substring(5));
+	GameRegistry.registerItem(itemBombyStructurePlacer, itemBombyStructurePlacer.getUnlocalizedName().substring(5));
 
 	//Weapons & Tools
 	GameRegistry.registerItem(itemPatSword, itemPatSword.getUnlocalizedName().substring(5));

diff --git a/src/main/java/com/jtrent238/epicproportions/blocks/blockBirthdayPresent.java b/src/main/java/com/jtrent238/epicproportions/blocks/blockBirthdayPresent.java
@@ -78,15 +78,18 @@ public void PresentDrops( Item drop, int meta, int least_quantity, int most_quan
     @Override
     public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
         ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
+        drops.add(new ItemStack(Items.gold_nugget, world.rand.nextInt(4) + 1));
         drops.add(new ItemStack(Items.coal, world.rand.nextInt(3) + 1));
         drops.add(new ItemStack(Items.iron_ingot, world.rand.nextInt(2) + 1));
         drops.add(new ItemStack(Items.gold_ingot, world.rand.nextInt(2) + 1));
         drops.add(new ItemStack(Items.dye, world.rand.nextInt(3) + 2, 4));
         drops.add(new ItemStack(Items.redstone, world.rand.nextInt(2) + 2));
-        drops.add(new ItemStack(ItemLoader.itemPatIngot, world.rand.nextInt(2) + 1));
-        drops.add(new ItemStack(ItemLoader.itemJenIngot, world.rand.nextInt(2) + 4));
+        drops.add(new ItemStack(ItemLoader.itemPatIngot, world.rand.nextInt(1) + 1));
+        drops.add(new ItemStack(ItemLoader.itemJenIngot, world.rand.nextInt(1) + 1));
         if (world.rand.nextFloat() < 0.5F)
             drops.add(new ItemStack(Items.diamond));
+        if (world.rand.nextFloat() < 0.3F)
+            drops.add(new ItemStack(Items.golden_apple));
         return drops;
     }