From c1363bc2f3014c5df87a1de018efb6fca4f7f551 Mon Sep 17 00:00:00 2001 From: cp Date: Mon, 21 Apr 2014 23:52:33 +0800 Subject: [PATCH] Tweaks to chest drops and updated release notes. --- ReleaseNotes.txt | 6 ++-- src/main/java/crazypants/enderio/EnderIO.java | 33 ++++++++++++------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 85ecef00..c262dafa 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -5,8 +5,10 @@ - Added Dark Steel powered pickaxe - Stirling Generator now gets more efficient and faster with upgrades. - Added 'The Vat' to produce liquid fuels (see VatRecipes_Core.xml for recipes) - - Added liquids: Hooch, Fire Water and Rocket Fuel - - Added 'Combustion Generator' +- Added liquid fuels: Hooch, Fire Water and Rocket Fuel +- Added 'Combustion Generator' +- Added per side auto 'push/push' of items/fluids to all machines +- Overhaul of machine UI's, adding more information 1.0.1 - #567 Improved server startup times when using large EnderIO power networks diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 7c1824e7..d86485d7 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -174,8 +174,6 @@ public class EnderIO { public static BlockFarmStation blockFarmStation; - - // public static ITrigger triggerNoEnergy; // public static ITrigger triggerHasEnergy; // public static ITrigger triggerFullEnergy; @@ -299,27 +297,40 @@ public class EnderIO { //Register Custom Dungeon Loot here ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 1, 3, 60)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 1, 3, 60)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) .addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemYetaWench, 1, 0), 1, 1, 15)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemConduitProbe, 1, 0), 1, 1, 1)); - ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, 0); - itemTravelStaff.setFull(staff); - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 30)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Items.quartz), 3, 16, 40)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Items.nether_wart), 1, 4, 30)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Items.ender_pearl), 1, 2, 30)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 5, 20, 50)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 4, 10, 50)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()), 3, 14, 35)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()), 3, 6, 35)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()), 2, 6, 20)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 3, 12, 35)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()), 2, 6, 10)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()), 1, 4, 20)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()), 1, 4, 10)); + + ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, 0); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(staff, 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 20)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 5)); + + ItemStack sword = new ItemStack(EnderIO.itemDarkSteelSword, 1, 0); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(sword, 1, 1, 10)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); + + ItemStack boots = new ItemStack(EnderIO.itemDarkSteelBoots, 1, 0); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); EnderfaceRecipes.addRecipes(); MaterialRecipes.addRecipes();