diff --git a/src/main/java/tconstruct/plugins/PluginController.java b/returning_eventually/plugins/PluginController.java similarity index 91% rename from src/main/java/tconstruct/plugins/PluginController.java rename to returning_eventually/plugins/PluginController.java index f4f6b7af..42750d3e 100644 --- a/src/main/java/tconstruct/plugins/PluginController.java +++ b/returning_eventually/plugins/PluginController.java @@ -1,7 +1,6 @@ package tconstruct.plugins; import static tconstruct.TConstruct.moduleLoader; -import tconstruct.plugins.fmp.ForgeMultiPart; import tconstruct.plugins.ic2.IC2; import tconstruct.plugins.imc.AppEng; import tconstruct.plugins.imc.BuildcraftTransport; @@ -24,7 +23,6 @@ public class PluginController // Register the remaining plugin classes normally moduleLoader.registerModule(AppEng.class); moduleLoader.registerModule(BuildcraftTransport.class); - moduleLoader.registerModule(ForgeMultiPart.class); moduleLoader.registerModule(IC2.class); moduleLoader.registerModule(Thaumcraft.class); moduleLoader.registerModule(NotEnoughItems.class); diff --git a/src/main/java/tconstruct/plugins/ic2/IC2.java b/returning_eventually/plugins/ic2/IC2.java similarity index 100% rename from src/main/java/tconstruct/plugins/ic2/IC2.java rename to returning_eventually/plugins/ic2/IC2.java diff --git a/src/main/java/tconstruct/plugins/imc/AppEng.java b/returning_eventually/plugins/imc/AppEng.java similarity index 100% rename from src/main/java/tconstruct/plugins/imc/AppEng.java rename to returning_eventually/plugins/imc/AppEng.java diff --git a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java b/returning_eventually/plugins/imc/BuildcraftTransport.java similarity index 100% rename from src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java rename to returning_eventually/plugins/imc/BuildcraftTransport.java diff --git a/src/main/java/tconstruct/plugins/imc/Mystcraft.java b/returning_eventually/plugins/imc/Mystcraft.java similarity index 100% rename from src/main/java/tconstruct/plugins/imc/Mystcraft.java rename to returning_eventually/plugins/imc/Mystcraft.java diff --git a/src/main/java/tconstruct/plugins/imc/Thaumcraft.java b/returning_eventually/plugins/imc/Thaumcraft.java similarity index 100% rename from src/main/java/tconstruct/plugins/imc/Thaumcraft.java rename to returning_eventually/plugins/imc/Thaumcraft.java diff --git a/returning_eventually/minefactoryreloaded/Drinkables.java b/returning_eventually/plugins/minefactoryreloaded/Drinkables.java similarity index 100% rename from returning_eventually/minefactoryreloaded/Drinkables.java rename to returning_eventually/plugins/minefactoryreloaded/Drinkables.java diff --git a/returning_eventually/minefactoryreloaded/GrindableHorse.java b/returning_eventually/plugins/minefactoryreloaded/GrindableHorse.java similarity index 100% rename from returning_eventually/minefactoryreloaded/GrindableHorse.java rename to returning_eventually/plugins/minefactoryreloaded/GrindableHorse.java diff --git a/returning_eventually/minefactoryreloaded/HarvestableOreBerry.java b/returning_eventually/plugins/minefactoryreloaded/HarvestableOreBerry.java similarity index 100% rename from returning_eventually/minefactoryreloaded/HarvestableOreBerry.java rename to returning_eventually/plugins/minefactoryreloaded/HarvestableOreBerry.java diff --git a/returning_eventually/minefactoryreloaded/MFRRegister.java b/returning_eventually/plugins/minefactoryreloaded/MFRRegister.java similarity index 100% rename from returning_eventually/minefactoryreloaded/MFRRegister.java rename to returning_eventually/plugins/minefactoryreloaded/MFRRegister.java diff --git a/returning_eventually/minefactoryreloaded/MineFactoryReloaded.java b/returning_eventually/plugins/minefactoryreloaded/MineFactoryReloaded.java similarity index 100% rename from returning_eventually/minefactoryreloaded/MineFactoryReloaded.java rename to returning_eventually/plugins/minefactoryreloaded/MineFactoryReloaded.java diff --git a/src/main/java/tconstruct/plugins/nei/NotEnoughItems.java b/returning_eventually/plugins/nei/NotEnoughItems.java similarity index 100% rename from src/main/java/tconstruct/plugins/nei/NotEnoughItems.java rename to returning_eventually/plugins/nei/NotEnoughItems.java diff --git a/src/main/java/tconstruct/plugins/te3/TE3Helper.java b/returning_eventually/plugins/te3/TE3Helper.java similarity index 100% rename from src/main/java/tconstruct/plugins/te3/TE3Helper.java rename to returning_eventually/plugins/te3/TE3Helper.java diff --git a/src/main/java/tconstruct/plugins/te3/ThermalExpansion.java b/returning_eventually/plugins/te3/ThermalExpansion.java similarity index 100% rename from src/main/java/tconstruct/plugins/te3/ThermalExpansion.java rename to returning_eventually/plugins/te3/ThermalExpansion.java diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/returning_eventually/plugins/waila/BasinDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/BasinDataProvider.java rename to returning_eventually/plugins/waila/BasinDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/returning_eventually/plugins/waila/CastingChannelDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java rename to returning_eventually/plugins/waila/CastingChannelDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/returning_eventually/plugins/waila/SearedTankDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java rename to returning_eventually/plugins/waila/SearedTankDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/returning_eventually/plugins/waila/SmelteryDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java rename to returning_eventually/plugins/waila/SmelteryDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/returning_eventually/plugins/waila/TableDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/TableDataProvider.java rename to returning_eventually/plugins/waila/TableDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/Waila.java b/returning_eventually/plugins/waila/Waila.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/Waila.java rename to returning_eventually/plugins/waila/Waila.java diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/returning_eventually/plugins/waila/WailaRegistrar.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/WailaRegistrar.java rename to returning_eventually/plugins/waila/WailaRegistrar.java diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index a1e0f9c2..02bbed51 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -11,32 +11,29 @@ import org.apache.logging.log4j.Logger; import tconstruct.achievements.TAchievements; import tconstruct.client.TControls; import tconstruct.client.event.EventCloakRender; -import tconstruct.common.TContent; import tconstruct.common.TProxyCommon; -import tconstruct.common.TRecipes; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.Detailing; import tconstruct.library.crafting.LiquidCasting; -import tconstruct.plugins.PluginController; +import tconstruct.mechworks.landmine.behavior.Behavior; +import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; import tconstruct.util.EnvironmentChecks; import tconstruct.util.TCraftingHandler; import tconstruct.util.TEventHandler; import tconstruct.util.TEventHandlerAchievement; import tconstruct.util.config.DimensionBlacklist; import tconstruct.util.config.PHConstruct; -import tconstruct.util.landmine.behavior.Behavior; -import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; import tconstruct.util.network.packet.PacketPipeline; import tconstruct.util.player.TPlayerHandler; -import tconstruct.worldgen.SlimeIslandGen; -import tconstruct.worldgen.TBaseWorldGenerator; -import tconstruct.worldgen.TerrainGenEventHandler; -import tconstruct.worldgen.village.ComponentSmeltery; -import tconstruct.worldgen.village.ComponentToolWorkshop; -import tconstruct.worldgen.village.TVillageTrades; -import tconstruct.worldgen.village.VillageSmelteryHandler; -import tconstruct.worldgen.village.VillageToolStationHandler; +import tconstruct.world.TinkerWorld; +import tconstruct.world.gen.SlimeIslandGen; +import tconstruct.world.gen.TBaseWorldGenerator; +import tconstruct.world.gen.TerrainGenEventHandler; +import tconstruct.world.village.ComponentSmeltery; +import tconstruct.world.village.ComponentToolWorkshop; +import tconstruct.world.village.TVillageTrades; +import tconstruct.world.village.VillageSmelteryHandler; +import tconstruct.world.village.VillageToolStationHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -103,7 +100,7 @@ public class TConstruct EnvironmentChecks.verifyEnvironmentSanity(); MinecraftForge.EVENT_BUS.register(events = new TEventHandler()); - PluginController.registerModules(); + //PluginController.registerModules(); } @EventHandler @@ -120,14 +117,9 @@ public class TConstruct basinCasting = new LiquidCasting(); chiselDetailing = new Detailing(); - content = new TContent(); - - recipes = new TRecipes(); - events = new TEventHandler(); MinecraftForge.EVENT_BUS.register(events); MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement()); - recipes.oreRegistry(); proxy.registerRenderer(); proxy.addNames(); @@ -137,7 +129,7 @@ public class TConstruct GameRegistry.registerWorldGenerator(new TBaseWorldGenerator(), 0); MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler()); - GameRegistry.registerFuelHandler(content); + //GameRegistry.registerFuelHandler(content); FMLCommonHandler.instance().bus().register(new TCraftingHandler()); NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy); @@ -183,7 +175,7 @@ public class TConstruct } DimensionBlacklist.getBadBimensions(); - GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool, 2), 2); + GameRegistry.registerWorldGenerator(new SlimeIslandGen(TinkerWorld.slimePool, 2), 2); if (PHConstruct.achievementsEnabled) { @@ -200,10 +192,6 @@ public class TConstruct packetPipeline.postInitialise(); Behavior.registerBuiltInBehaviors(); SpecialStackHandler.registerBuiltInStackHandlers(); - recipes.modIntegration(); - recipes.addOreDictionarySmelteryRecipes(); - content.createEntities(); - recipes.modRecipes(); moduleLoader.postInit(); } @@ -223,8 +211,6 @@ public class TConstruct return chiselDetailing; } - public static TContent content; - public static TRecipes recipes; public static TEventHandler events; public static TPlayerHandler playerTracker; public static LiquidCasting tableCasting; diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java new file mode 100644 index 00000000..8039d951 --- /dev/null +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -0,0 +1,209 @@ +package tconstruct.armor; + +import tconstruct.TConstruct; +import tconstruct.armor.blocks.DryingRack; +import tconstruct.armor.items.ArmorBasic; +import tconstruct.armor.items.DiamondApple; +import tconstruct.armor.items.ExoArmor; +import tconstruct.armor.items.HeartCanister; +import tconstruct.armor.items.Jerky; +import tconstruct.armor.items.Knapsack; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.armor.EnumArmorPart; +import tconstruct.library.crafting.DryingRackRecipes; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.tools.TinkerTools; +import tconstruct.util.config.PHConstruct; +import tconstruct.world.TinkerWorld; +import tconstruct.world.items.GoldenHead; +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.potion.Potion; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; + +@Mod(modid = "TinkerArmor", name = "TinkerArmor", version = "${tinkerarmorversion}") +public class TinkerArmor +{ + @Instance("TinkerArmor") + public static TinkerArmor instance; + public static Item diamondApple; + public static Item jerky; + // public static Item stonePattern; + // public static Item netherPattern; + public static Block dryingRack; + // Wearables + public static Item heavyHelmet; + public static Item heavyChestplate; + public static Item heavyPants; + public static Item heavyBoots; + public static Item glove; + public static Item knapsack; + public static Item heartCanister; + // Armor - basic + public static Item helmetWood; + public static Item chestplateWood; + public static Item leggingsWood; + // Armor - exosuit + public static Item exoGoggles; + public static Item exoChest; + public static Item exoPants; + public static Item exoShoes; + public static Item bootsWood; + public static ArmorMaterial materialWood; + + @EventHandler + public void preInit (FMLPreInitializationEvent event) + { + + + TinkerArmor.dryingRack = new DryingRack().setBlockName("Armor.DryingRack"); + TinkerArmor.diamondApple = new DiamondApple().setUnlocalizedName("tconstruct.apple.diamond"); + GameRegistry.registerItem(TinkerArmor.diamondApple, "diamondApple"); + boolean foodOverhaul = false; + if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food")) + { + foodOverhaul = true; + } + + TinkerArmor.jerky = new Jerky(foodOverhaul).setUnlocalizedName("tconstruct.jerky"); + GameRegistry.registerItem(TinkerArmor.jerky, "jerky"); + + // Wearables + // heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, + // 0).setUnlocalizedName("tconstruct.HeavyHelmet"); + TinkerArmor.heartCanister = new HeartCanister().setUnlocalizedName("tconstruct.canister"); + // heavyBoots = new TArmorBase(PHConstruct.heavyBoots, + // 3).setUnlocalizedName("tconstruct.HeavyBoots"); + // glove = new + // Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); + TinkerArmor.knapsack = new Knapsack().setUnlocalizedName("tconstruct.storage"); + TinkerTools.goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); + // GameRegistry.registerItem(TRepo.heavyHelmet, "heavyHelmet"); + GameRegistry.registerItem(TinkerArmor.heartCanister, "heartCanister"); + // GameRegistry.registerItem(TRepo.heavyBoots, "heavyBoots"); + // GameRegistry.registerItem(TRepo.glove, "glove"); + GameRegistry.registerItem(TinkerArmor.knapsack, "knapsack"); + + LiquidCasting basinCasting = TConstruct.getBasinCasting(); + TinkerArmor.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); + TinkerArmor.helmetWood = new ArmorBasic(TinkerArmor.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); + TinkerArmor.chestplateWood = new ArmorBasic(TinkerArmor.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); + TinkerArmor.leggingsWood = new ArmorBasic(TinkerArmor.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); + TinkerArmor.bootsWood = new ArmorBasic(TinkerArmor.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); + GameRegistry.registerItem(TinkerArmor.helmetWood, "helmetWood"); + GameRegistry.registerItem(TinkerArmor.chestplateWood, "chestplateWood"); + GameRegistry.registerItem(TinkerArmor.leggingsWood, "leggingsWood"); + GameRegistry.registerItem(TinkerArmor.bootsWood, "bootsWood"); + + TinkerArmor.exoGoggles = new ExoArmor(EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles"); + TinkerArmor.exoChest = new ExoArmor(EnumArmorPart.CHEST, "exosuit").setUnlocalizedName("tconstruct.exoChest"); + TinkerArmor.exoPants = new ExoArmor(EnumArmorPart.PANTS, "exosuit").setUnlocalizedName("tconstruct.exoPants"); + TinkerArmor.exoShoes = new ExoArmor(EnumArmorPart.SHOES, "exosuit").setUnlocalizedName("tconstruct.exoShoes"); + + GameRegistry.registerItem(TinkerArmor.exoGoggles, "helmetExo"); + GameRegistry.registerItem(TinkerArmor.exoChest, "chestplateExo"); + GameRegistry.registerItem(TinkerArmor.exoPants, "leggingsExo"); + GameRegistry.registerItem(TinkerArmor.exoShoes, "bootsExo"); + + TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(TinkerArmor.diamondApple, 1, 0)); + + TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(TinkerArmor.heartCanister, 1, 0)); + TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(TinkerArmor.heartCanister, 1, 1)); + TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(TinkerArmor.heartCanister, 1, 2)); + } + + @EventHandler + public void init (FMLInitializationEvent event) + { + craftingTableRecipes(); + addRecipesForDryingRack(); + } + + @EventHandler + public void postInit (FMLPostInitializationEvent evt) + { + + } + + private void craftingTableRecipes () + { + + // Armor Recipes + Object[] helm = new String[] { "www", "w w" }; + Object[] chest = new String[] { "w w", "www", "www" }; + Object[] pants = new String[] { "www", "w w", "w w" }; + Object[] shoes = new String[] { "w w", "w w" }; + GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.helmetWood, helm, 'w', "logWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.chestplateWood, chest, 'w', "logWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.leggingsWood, pants, 'w', "logWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.bootsWood, shoes, 'w', "logWood")); + + ItemStack exoGoggleStack = new ItemStack(TinkerArmor.exoGoggles); + ItemStack exoChestStack = new ItemStack(TinkerArmor.exoChest); + ItemStack exoPantsStack = new ItemStack(TinkerArmor.exoPants); + ItemStack exoShoesStack = new ItemStack(TinkerArmor.exoShoes); + if (PHConstruct.exoCraftingEnabled) + { + ToolBuilder.instance.addArmorTag(exoGoggleStack); + ToolBuilder.instance.addArmorTag(exoChestStack); + ToolBuilder.instance.addArmorTag(exoPantsStack); + ToolBuilder.instance.addArmorTag(exoShoesStack); + GameRegistry.addShapedRecipe(exoGoggleStack, helm, 'w', new ItemStack(TinkerTools.largePlate, 1, 14)); + GameRegistry.addShapedRecipe(exoChestStack, chest, 'w', new ItemStack(TinkerTools.largePlate, 1, 14)); + GameRegistry.addShapedRecipe(exoPantsStack, pants, 'w', new ItemStack(TinkerTools.largePlate, 1, 14)); + GameRegistry.addShapedRecipe(exoShoesStack, shoes, 'w', new ItemStack(TinkerTools.largePlate, 1, 14)); + } + + // Accessories + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); + // GameRegistry.addRecipe(new ShapedOreRecipe(new + // ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', + // "ingotNaturalAluminum")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone)); + + GameRegistry.addRecipe(new ItemStack(TinkerArmor.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Items.diamond), '#', new ItemStack(Items.apple)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.diamondApple), new ItemStack(TinkerTools.materials, 1, 8), new ItemStack( + TinkerArmor.heartCanister, 1, 0), new ItemStack(TinkerArmor.heartCanister, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 4), new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.heartCanister, 1, 3), new ItemStack( + Items.golden_apple, 1, 1)); + //GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5)); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), + 'm', "ingotGold")); + ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14); + GameRegistry.addRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), 'm', aluBrass); + // Drying Rack Recipes + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.dryingRack, 1, 0), "bbb", 'b', "slabWood")); + } + + protected static void addRecipesForDryingRack () + { + // Drying rack + DryingRackRecipes.addDryingRecipe(Items.beef, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 0)); + DryingRackRecipes.addDryingRecipe(Items.chicken, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 1)); + DryingRackRecipes.addDryingRecipe(Items.porkchop, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 2)); + // DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new + // ItemStack(TRepo.jerky, 1, 3)); + DryingRackRecipes.addDryingRecipe(Items.fish, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 4)); + DryingRackRecipes.addDryingRecipe(Items.rotten_flesh, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 5)); + DryingRackRecipes.addDryingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 0), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 6)); + DryingRackRecipes.addDryingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 1), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 7)); + + // DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.jerky, 1, 5), + // 20 * 60 * 10, Item.leather); + } +} diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java similarity index 99% rename from src/main/java/tconstruct/blocks/DryingRack.java rename to src/main/java/tconstruct/armor/blocks/DryingRack.java index a80aef6d..e741903c 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.armor.blocks; import java.util.List; @@ -16,8 +16,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; +import tconstruct.armor.modelblock.DryingRackRender; import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.client.block.DryingRackRender; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tconstruct/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java similarity index 95% rename from src/main/java/tconstruct/inventory/ArmorExtendedContainer.java rename to src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java index 084a2a3a..53f4fbe5 100644 --- a/src/main/java/tconstruct/inventory/ArmorExtendedContainer.java +++ b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java @@ -1,9 +1,10 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.smeltery.inventory.ActiveContainer; import tconstruct.util.player.ArmorExtended; public class ArmorExtendedContainer extends ActiveContainer diff --git a/src/main/java/tconstruct/inventory/KnapsackContainer.java b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java similarity index 98% rename from src/main/java/tconstruct/inventory/KnapsackContainer.java rename to src/main/java/tconstruct/armor/inventory/KnapsackContainer.java index 048bb710..9451f7fe 100644 --- a/src/main/java/tconstruct/inventory/KnapsackContainer.java +++ b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/tconstruct/inventory/SlotArmorCopy.java b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java similarity index 98% rename from src/main/java/tconstruct/inventory/SlotArmorCopy.java rename to src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java index 85c9ed7a..bcc9c02c 100644 --- a/src/main/java/tconstruct/inventory/SlotArmorCopy.java +++ b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/tconstruct/inventory/SlotBehavedOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java similarity index 93% rename from src/main/java/tconstruct/inventory/SlotBehavedOnly.java rename to src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java index 4ba4fd39..44d1973e 100644 --- a/src/main/java/tconstruct/inventory/SlotBehavedOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java @@ -1,9 +1,9 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.util.landmine.behavior.Behavior; +import tconstruct.mechworks.landmine.behavior.Behavior; public class SlotBehavedOnly extends Slot { diff --git a/src/main/java/tconstruct/inventory/SlotBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java similarity index 94% rename from src/main/java/tconstruct/inventory/SlotBlocksOnly.java rename to src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java index 8ff1be70..30d0bd08 100644 --- a/src/main/java/tconstruct/inventory/SlotBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/tconstruct/inventory/SlotCanister.java b/src/main/java/tconstruct/armor/inventory/SlotCanister.java similarity index 96% rename from src/main/java/tconstruct/inventory/SlotCanister.java rename to src/main/java/tconstruct/armor/inventory/SlotCanister.java index 8633725a..286e4af0 100644 --- a/src/main/java/tconstruct/inventory/SlotCanister.java +++ b/src/main/java/tconstruct/armor/inventory/SlotCanister.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/tconstruct/inventory/SlotKnapsack.java b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java similarity index 92% rename from src/main/java/tconstruct/inventory/SlotKnapsack.java rename to src/main/java/tconstruct/armor/inventory/SlotKnapsack.java index 1aaa1cc6..192f5d79 100644 --- a/src/main/java/tconstruct/inventory/SlotKnapsack.java +++ b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java @@ -1,10 +1,10 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tconstruct.items.armor.Knapsack; +import tconstruct.armor.items.Knapsack; public class SlotKnapsack extends Slot { diff --git a/src/main/java/tconstruct/inventory/SlotOnlyTake.java b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java similarity index 93% rename from src/main/java/tconstruct/inventory/SlotOnlyTake.java rename to src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java index 8f9062bd..f8262ac7 100644 --- a/src/main/java/tconstruct/inventory/SlotOnlyTake.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java similarity index 95% rename from src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java rename to src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java index 4ecb0d28..ea0b7209 100644 --- a/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import mantle.blocks.BlockUtils; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/inventory/SlotUnused.java b/src/main/java/tconstruct/armor/inventory/SlotUnused.java similarity index 95% rename from src/main/java/tconstruct/inventory/SlotUnused.java rename to src/main/java/tconstruct/armor/inventory/SlotUnused.java index 4f811e59..e0878581 100644 --- a/src/main/java/tconstruct/inventory/SlotUnused.java +++ b/src/main/java/tconstruct/armor/inventory/SlotUnused.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.armor.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/tconstruct/items/armor/ArmorBasic.java b/src/main/java/tconstruct/armor/items/ArmorBasic.java similarity index 96% rename from src/main/java/tconstruct/items/armor/ArmorBasic.java rename to src/main/java/tconstruct/armor/items/ArmorBasic.java index 2569fdb2..d121edd6 100644 --- a/src/main/java/tconstruct/items/armor/ArmorBasic.java +++ b/src/main/java/tconstruct/armor/items/ArmorBasic.java @@ -1,4 +1,4 @@ -package tconstruct.items.armor; +package tconstruct.armor.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/armor/items/ArmorPattern.java similarity index 98% rename from src/main/java/tconstruct/items/ArmorPattern.java rename to src/main/java/tconstruct/armor/items/ArmorPattern.java index 56469881..72d58e82 100644 --- a/src/main/java/tconstruct/items/ArmorPattern.java +++ b/src/main/java/tconstruct/armor/items/ArmorPattern.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.armor.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/armor/ArmorStandard.java b/src/main/java/tconstruct/armor/items/ArmorStandard.java similarity index 92% rename from src/main/java/tconstruct/items/armor/ArmorStandard.java rename to src/main/java/tconstruct/armor/items/ArmorStandard.java index 44c7d6d9..1cc0c638 100644 --- a/src/main/java/tconstruct/items/armor/ArmorStandard.java +++ b/src/main/java/tconstruct/armor/items/ArmorStandard.java @@ -1,9 +1,8 @@ -package tconstruct.items.armor; +package tconstruct.armor.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import tconstruct.common.TRepo; import tconstruct.library.armor.ArmorCore; import tconstruct.library.armor.EnumArmorPart; diff --git a/src/main/java/tconstruct/items/DiamondApple.java b/src/main/java/tconstruct/armor/items/DiamondApple.java similarity index 98% rename from src/main/java/tconstruct/items/DiamondApple.java rename to src/main/java/tconstruct/armor/items/DiamondApple.java index 13d6d33f..d11040c2 100644 --- a/src/main/java/tconstruct/items/DiamondApple.java +++ b/src/main/java/tconstruct/armor/items/DiamondApple.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.armor.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/items/armor/ExoArmor.java b/src/main/java/tconstruct/armor/items/ExoArmor.java similarity index 98% rename from src/main/java/tconstruct/items/armor/ExoArmor.java rename to src/main/java/tconstruct/armor/items/ExoArmor.java index e7c3fc57..c17f2e51 100644 --- a/src/main/java/tconstruct/items/armor/ExoArmor.java +++ b/src/main/java/tconstruct/armor/items/ExoArmor.java @@ -1,4 +1,4 @@ -package tconstruct.items.armor; +package tconstruct.armor.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/armor/Glove.java b/src/main/java/tconstruct/armor/items/Glove.java similarity index 93% rename from src/main/java/tconstruct/items/armor/Glove.java rename to src/main/java/tconstruct/armor/items/Glove.java index 564c0337..c2e38b6a 100644 --- a/src/main/java/tconstruct/items/armor/Glove.java +++ b/src/main/java/tconstruct/armor/items/Glove.java @@ -1,4 +1,4 @@ -package tconstruct.items.armor; +package tconstruct.armor.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/items/armor/HeartCanister.java b/src/main/java/tconstruct/armor/items/HeartCanister.java similarity index 99% rename from src/main/java/tconstruct/items/armor/HeartCanister.java rename to src/main/java/tconstruct/armor/items/HeartCanister.java index c5a06d08..739e4d9b 100644 --- a/src/main/java/tconstruct/items/armor/HeartCanister.java +++ b/src/main/java/tconstruct/armor/items/HeartCanister.java @@ -1,4 +1,4 @@ -package tconstruct.items.armor; +package tconstruct.armor.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/Jerky.java b/src/main/java/tconstruct/armor/items/Jerky.java similarity index 97% rename from src/main/java/tconstruct/items/Jerky.java rename to src/main/java/tconstruct/armor/items/Jerky.java index d9810085..547d2965 100644 --- a/src/main/java/tconstruct/items/Jerky.java +++ b/src/main/java/tconstruct/armor/items/Jerky.java @@ -1,7 +1,9 @@ -package tconstruct.items; +package tconstruct.armor.items; import java.util.List; +import tconstruct.world.items.SpecialFood; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/items/armor/Knapsack.java b/src/main/java/tconstruct/armor/items/Knapsack.java similarity index 97% rename from src/main/java/tconstruct/items/armor/Knapsack.java rename to src/main/java/tconstruct/armor/items/Knapsack.java index 52411353..03b81082 100644 --- a/src/main/java/tconstruct/items/armor/Knapsack.java +++ b/src/main/java/tconstruct/armor/items/Knapsack.java @@ -1,4 +1,4 @@ -package tconstruct.items.armor; +package tconstruct.armor.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/armor/TArmorBase.java b/src/main/java/tconstruct/armor/items/TArmorBase.java similarity index 99% rename from src/main/java/tconstruct/items/armor/TArmorBase.java rename to src/main/java/tconstruct/armor/items/TArmorBase.java index 7c60a391..9848dad6 100644 --- a/src/main/java/tconstruct/items/armor/TArmorBase.java +++ b/src/main/java/tconstruct/armor/items/TArmorBase.java @@ -1,4 +1,4 @@ -package tconstruct.items.armor; +package tconstruct.armor.items; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/tconstruct/client/armor/RenderArmorCast.java b/src/main/java/tconstruct/armor/model/RenderArmorCast.java similarity index 99% rename from src/main/java/tconstruct/client/armor/RenderArmorCast.java rename to src/main/java/tconstruct/armor/model/RenderArmorCast.java index f1f6ecc3..eb429bc8 100644 --- a/src/main/java/tconstruct/client/armor/RenderArmorCast.java +++ b/src/main/java/tconstruct/armor/model/RenderArmorCast.java @@ -1,4 +1,4 @@ -package tconstruct.client.armor; +package tconstruct.armor.model; import java.util.ArrayList; import java.util.List; @@ -15,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import tconstruct.items.ArmorPattern; +import tconstruct.armor.items.ArmorPattern; public class RenderArmorCast implements IItemRenderer { diff --git a/src/main/java/tconstruct/client/armor/WingModel.java b/src/main/java/tconstruct/armor/model/WingModel.java similarity index 99% rename from src/main/java/tconstruct/client/armor/WingModel.java rename to src/main/java/tconstruct/armor/model/WingModel.java index 95b4e224..7c6f9d25 100644 --- a/src/main/java/tconstruct/client/armor/WingModel.java +++ b/src/main/java/tconstruct/armor/model/WingModel.java @@ -1,4 +1,4 @@ -package tconstruct.client.armor; +package tconstruct.armor.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/tconstruct/client/block/DryingRackRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java similarity index 99% rename from src/main/java/tconstruct/client/block/DryingRackRender.java rename to src/main/java/tconstruct/armor/modelblock/DryingRackRender.java index 31d0d350..de38b3c1 100644 --- a/src/main/java/tconstruct/client/block/DryingRackRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.armor.modelblock; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java similarity index 97% rename from src/main/java/tconstruct/client/block/DryingRackSpecialRender.java rename to src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java index 43de7c20..104bb979 100644 --- a/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.armor.modelblock; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.entity.FancyEntityItem; +import tconstruct.tools.entity.FancyEntityItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/modifiers/armor/AModDamageBoost.java b/src/main/java/tconstruct/armor/modifiers/AModDamageBoost.java similarity index 99% rename from src/main/java/tconstruct/modifiers/armor/AModDamageBoost.java rename to src/main/java/tconstruct/armor/modifiers/AModDamageBoost.java index 79d032e7..78d9d076 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModDamageBoost.java +++ b/src/main/java/tconstruct/armor/modifiers/AModDamageBoost.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.armor; +package tconstruct.armor.modifiers; import java.util.EnumSet; import java.util.UUID; diff --git a/src/main/java/tconstruct/modifiers/armor/AModDoubleJump.java b/src/main/java/tconstruct/armor/modifiers/AModDoubleJump.java similarity index 98% rename from src/main/java/tconstruct/modifiers/armor/AModDoubleJump.java rename to src/main/java/tconstruct/armor/modifiers/AModDoubleJump.java index 5e08a47a..c9cb571d 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModDoubleJump.java +++ b/src/main/java/tconstruct/armor/modifiers/AModDoubleJump.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.armor; +package tconstruct.armor.modifiers; import java.util.EnumSet; diff --git a/src/main/java/tconstruct/modifiers/armor/AModHealthBoost.java b/src/main/java/tconstruct/armor/modifiers/AModHealthBoost.java similarity index 98% rename from src/main/java/tconstruct/modifiers/armor/AModHealthBoost.java rename to src/main/java/tconstruct/armor/modifiers/AModHealthBoost.java index 9377febc..ea3a308f 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModHealthBoost.java +++ b/src/main/java/tconstruct/armor/modifiers/AModHealthBoost.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.armor; +package tconstruct.armor.modifiers; import java.util.EnumSet; import java.util.UUID; diff --git a/src/main/java/tconstruct/armor/modifiers/AModJumpBoost.java b/src/main/java/tconstruct/armor/modifiers/AModJumpBoost.java new file mode 100644 index 00000000..ee20d178 --- /dev/null +++ b/src/main/java/tconstruct/armor/modifiers/AModJumpBoost.java @@ -0,0 +1,6 @@ +package tconstruct.armor.modifiers; + +public class AModJumpBoost +{ + +} diff --git a/src/main/java/tconstruct/modifiers/armor/AModKnockbackResistance.java b/src/main/java/tconstruct/armor/modifiers/AModKnockbackResistance.java similarity index 98% rename from src/main/java/tconstruct/modifiers/armor/AModKnockbackResistance.java rename to src/main/java/tconstruct/armor/modifiers/AModKnockbackResistance.java index d2f8dc4d..cc14323c 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModKnockbackResistance.java +++ b/src/main/java/tconstruct/armor/modifiers/AModKnockbackResistance.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.armor; +package tconstruct.armor.modifiers; import java.util.EnumSet; import java.util.UUID; diff --git a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java b/src/main/java/tconstruct/armor/modifiers/AModMoveSpeed.java similarity index 98% rename from src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java rename to src/main/java/tconstruct/armor/modifiers/AModMoveSpeed.java index 3d4dc21d..b98d7022 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java +++ b/src/main/java/tconstruct/armor/modifiers/AModMoveSpeed.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.armor; +package tconstruct.armor.modifiers; import java.util.EnumSet; import java.util.UUID; diff --git a/src/main/java/tconstruct/modifiers/armor/AModProtection.java b/src/main/java/tconstruct/armor/modifiers/AModProtection.java similarity index 97% rename from src/main/java/tconstruct/modifiers/armor/AModProtection.java rename to src/main/java/tconstruct/armor/modifiers/AModProtection.java index 71858c87..c3e8f11e 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModProtection.java +++ b/src/main/java/tconstruct/armor/modifiers/AModProtection.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.armor; +package tconstruct.armor.modifiers; import java.util.EnumSet; diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java deleted file mode 100644 index 606e5664..00000000 --- a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java +++ /dev/null @@ -1,67 +0,0 @@ -package tconstruct.blocks.logic; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; - -public class RedwireLogic extends TileEntity -{ - byte facesUsed; - byte type; - byte distanceTravelled; - byte maxDistance; - - public void readCustomNBT (NBTTagCompound tags) - { - /* - * hasMaster = tags.getBoolean("HasMaster"); if (hasMaster) { int - * xCenter = tags.getInteger("xCenter"); int yCenter = - * tags.getInteger("yCenter"); int zCenter = tags.getInteger("zCenter"); - * master = new CoordTuple(xCenter, yCenter, zCenter); masterID = - * tags.getShort("MasterID"); masterMeat = tags.getByte("masterMeat"); } - */ - } - - public void writeCustomNBT (NBTTagCompound tags) - { - /* - * tags.setBoolean("HasMaster", hasMaster); if (hasMaster) { - * tags.setInteger("xCenter", master.x); tags.setInteger("yCenter", - * master.y); tags.setInteger("zCenter", master.z); - * tags.setShort("MasterID", masterID); tags.setByte("masterMeat", - * masterMeat); } - */ - } - - @Override - public void readFromNBT (NBTTagCompound tags) - { - super.readFromNBT(tags); - readCustomNBT(tags); - } - - @Override - public void writeToNBT (NBTTagCompound tags) - { - super.writeToNBT(tags); - writeCustomNBT(tags); - } - - /* Packets */ - @Override - public Packet getDescriptionPacket () - { - NBTTagCompound tag = new NBTTagCompound(); - writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); - } - - @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { - readCustomNBT(packet.func_148857_g()); - worldObj.func_147479_m(xCoord, yCoord, zCoord); - } -} diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index 9e0bc7db..d487f2a9 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -11,7 +11,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; -import tconstruct.entity.BlueSlime; +import tconstruct.world.entity.BlueSlime; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index b6e0fa8f..091a307f 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -17,8 +17,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -99,7 +99,7 @@ public class SlimeGrass extends MantleBlock @Override public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) { - world.setBlock(x, y, z, TRepo.craftedSoil, 5, 3); + world.setBlock(x, y, z, TinkerTools.craftedSoil, 5, 3); } @Override @@ -109,7 +109,7 @@ public class SlimeGrass extends MantleBlock { if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && par1World.getBlockLightOpacity(par2, par3 + 1, par4) > 2) { - par1World.setBlock(par2, par3, par4, TRepo.craftedSoil, 5, 3); + par1World.setBlock(par2, par3, par4, TinkerTools.craftedSoil, 5, 3); } else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) { @@ -129,7 +129,7 @@ public class SlimeGrass extends MantleBlock return; } int blockMeta = par1World.getBlockMetadata(posX, posY, posZ); - if (block == TRepo.craftedSoil) + if (block == TinkerTools.craftedSoil) { if (blockMeta == 5) par1World.setBlock(posX, posY, posZ, (Block) this, 0, 3); @@ -145,6 +145,6 @@ public class SlimeGrass extends MantleBlock if (metadata == 1) return Blocks.dirt; else - return TRepo.craftedSoil; + return TinkerTools.craftedSoil; } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 0d6fb086..f1eba470 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -103,7 +103,7 @@ public class SlimeLeaves extends BlockLeaves @Override public Item getItemDropped (int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Item.getItemFromBlock(TRepo.slimeSapling); + return Item.getItemFromBlock(TinkerWorld.slimeSapling); } /** @@ -151,7 +151,7 @@ public class SlimeLeaves extends BlockLeaves if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0) { - this.dropBlockAsItem(world, x, y, z, new ItemStack(TRepo.strangeFood, 1, 0)); + this.dropBlockAsItem(world, x, y, z, new ItemStack(TinkerWorld.strangeFood, 1, 0)); } } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 03e2a70a..9d332864 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -14,10 +14,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tconstruct.common.TContent; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; -import tconstruct.worldgen.SlimeTreeGen; +import tconstruct.tools.TinkerTools; +import tconstruct.world.TinkerWorld; +import tconstruct.world.gen.SlimeTreeGen; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -51,7 +51,7 @@ public class SlimeSapling extends BlockSapling @Override public boolean canPlaceBlockOn (Block id) { - return id == Blocks.grass || id == Blocks.dirt || id == TRepo.slimeGrass || id == TRepo.craftedSoil; + return id == Blocks.grass || id == Blocks.dirt || id == TinkerWorld.slimeGrass || id == TinkerTools.craftedSoil; } @Override diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index c90a5a6a..af41ea40 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -13,8 +13,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tconstruct.client.block.BarricadeRender; import tconstruct.library.TConstructRegistry; +import tconstruct.world.model.BarricadeRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 6e319e35..83c9e542 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -16,9 +16,9 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tconstruct.client.block.PunjiRender; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.world.TinkerWorld; +import tconstruct.world.model.PunjiRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -59,7 +59,7 @@ public class Punji extends MantleBlock if (meta < 4) { ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.getItem() == Item.getItemFromBlock(TRepo.punji)) + if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerWorld.punji)) { world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3); world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F, diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java similarity index 99% rename from src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java rename to src/main/java/tconstruct/client/BlockSkinRenderHelper.java index e2cac628..b841fae0 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.client; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/tconstruct/client/block/BreakingFX.java b/src/main/java/tconstruct/client/BreakingFX.java similarity index 99% rename from src/main/java/tconstruct/client/block/BreakingFX.java rename to src/main/java/tconstruct/client/BreakingFX.java index e45fab77..7c374cc2 100644 --- a/src/main/java/tconstruct/client/block/BreakingFX.java +++ b/src/main/java/tconstruct/client/BreakingFX.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.client; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java index 999e7496..0cfac584 100644 --- a/src/main/java/tconstruct/client/TClientEvents.java +++ b/src/main/java/tconstruct/client/TClientEvents.java @@ -22,8 +22,8 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent; import tconstruct.TConstruct; -import tconstruct.client.armor.WingModel; -import tconstruct.common.TRepo; +import tconstruct.armor.model.WingModel; +import tconstruct.smeltery.TinkerSmeltery; import tconstruct.util.player.TPlayerStats; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -83,11 +83,11 @@ public class TClientEvents { if (event.map.getTextureType() == 0) { - for (int i = 0; i < TRepo.fluidBlocks.length; i++) + for (int i = 0; i < TinkerSmeltery.fluidBlocks.length; i++) { - TRepo.fluids[i].setIcons(TRepo.fluidBlocks[i].getIcon(0, 0), TRepo.fluidBlocks[i].getIcon(2, 0)); + TinkerSmeltery.fluids[i].setIcons(TinkerSmeltery.fluidBlocks[i].getIcon(0, 0), TinkerSmeltery.fluidBlocks[i].getIcon(2, 0)); } - TRepo.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]); + TinkerSmeltery.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]); } } diff --git a/src/main/java/tconstruct/client/TClientTickHandler.java b/src/main/java/tconstruct/client/TClientTickHandler.java index dc1cccaa..73eff1e4 100644 --- a/src/main/java/tconstruct/client/TClientTickHandler.java +++ b/src/main/java/tconstruct/client/TClientTickHandler.java @@ -3,7 +3,7 @@ package tconstruct.client; import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import tconstruct.TConstruct; -import tconstruct.common.TRepo; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.relauncher.Side; @@ -19,9 +19,9 @@ public class TClientTickHandler @SubscribeEvent public void tickEnd (ClientTickEvent event) { - TRepo.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P); - TRepo.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P); - TRepo.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P); + TinkerWorld.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P); + TinkerWorld.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P); + TinkerWorld.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P); if (mc.thePlayer != null && mc.thePlayer.onGround) controlInstance.landOnGround(); } diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 2f23644a..1f4bb704 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -60,44 +60,10 @@ import org.lwjgl.opengl.GL11; import org.w3c.dom.Document; import tconstruct.TConstruct; -import tconstruct.blocks.logic.AdaptiveSmelteryLogic; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.CraftingStationLogic; +import tconstruct.armor.TinkerArmor; +import tconstruct.armor.modelblock.DryingRackRender; +import tconstruct.armor.modelblock.DryingRackSpecialRender; import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.blocks.logic.FurnaceLogic; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.client.block.BarricadeRender; -import tconstruct.client.block.BlockRenderCastingChannel; -import tconstruct.client.block.CastingBasinSpecialRender; -import tconstruct.client.block.CastingTableSpecialRenderer; -import tconstruct.client.block.DryingRackRender; -import tconstruct.client.block.DryingRackSpecialRender; -import tconstruct.client.block.FrypanRender; -import tconstruct.client.block.OreberryRender; -import tconstruct.client.block.PaneConnectedRender; -import tconstruct.client.block.PaneRender; -import tconstruct.client.block.PunjiRender; -import tconstruct.client.block.RenderLandmine; -import tconstruct.client.block.SearedRender; -import tconstruct.client.block.SlimeChannelRender; -import tconstruct.client.block.SlimePadRender; -import tconstruct.client.block.SmelteryRender; -import tconstruct.client.block.TableForgeRender; -import tconstruct.client.block.TableRender; -import tconstruct.client.block.TankAirRender; -import tconstruct.client.block.TankRender; -import tconstruct.client.entity.CartRender; -import tconstruct.client.entity.CrystalRender; -import tconstruct.client.entity.FancyItemRender; -import tconstruct.client.entity.SlimeRender; import tconstruct.client.entity.item.ExplosiveRender; import tconstruct.client.entity.projectile.ArrowRenderCustom; import tconstruct.client.entity.projectile.DaggerRenderCustom; @@ -124,23 +90,48 @@ import tconstruct.client.tabs.InventoryTabKnapsack; import tconstruct.client.tabs.InventoryTabVanilla; import tconstruct.client.tabs.TabRegistry; import tconstruct.common.TProxyCommon; -import tconstruct.common.TRepo; -import tconstruct.entity.BlueSlime; -import tconstruct.entity.CartEntity; -import tconstruct.entity.Crystal; -import tconstruct.entity.FancyEntityItem; -import tconstruct.entity.item.EntityLandmineFirework; -import tconstruct.entity.item.ExplosivePrimed; -import tconstruct.entity.projectile.ArrowEntity; -import tconstruct.entity.projectile.DaggerEntity; -import tconstruct.entity.projectile.LaunchedPotion; -import tconstruct.inventory.ContainerLandmine; -import tconstruct.items.ManualInfo; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.client.ToolGuiElement; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; +import tconstruct.mechworks.entity.item.EntityLandmineFirework; +import tconstruct.mechworks.entity.item.ExplosivePrimed; +import tconstruct.mechworks.inventory.ContainerLandmine; +import tconstruct.mechworks.logic.TileEntityLandmine; +import tconstruct.mechworks.model.CartRender; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.SmelteryLogic; +import tconstruct.smeltery.model.BlockRenderCastingChannel; +import tconstruct.smeltery.model.CastingBasinSpecialRender; +import tconstruct.smeltery.model.CastingTableSpecialRenderer; +import tconstruct.smeltery.model.PaneConnectedRender; +import tconstruct.smeltery.model.PaneRender; +import tconstruct.smeltery.model.SearedRender; +import tconstruct.smeltery.model.SmelteryRender; +import tconstruct.smeltery.model.TankAirRender; +import tconstruct.smeltery.model.TankRender; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.entity.ArrowEntity; +import tconstruct.tools.entity.DaggerEntity; +import tconstruct.tools.entity.FancyEntityItem; +import tconstruct.tools.entity.LaunchedPotion; +import tconstruct.tools.items.ManualInfo; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.FrypanLogic; +import tconstruct.tools.logic.FurnaceLogic; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.model.FancyItemRender; +import tconstruct.tools.model.FrypanRender; +import tconstruct.tools.model.TableForgeRender; +import tconstruct.tools.model.TableRender; import tconstruct.util.config.PHConstruct; import tconstruct.util.player.ArmorExtended; import tconstruct.util.player.KnapsackInventory; @@ -152,6 +143,18 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.VillagerRegistry; import tconstruct.util.player.TPlayerStats; +import tconstruct.world.TinkerWorld; +import tconstruct.world.entity.BlueSlime; +import tconstruct.world.entity.CartEntity; +import tconstruct.world.entity.Crystal; +import tconstruct.world.model.BarricadeRender; +import tconstruct.world.model.CrystalRender; +import tconstruct.world.model.OreberryRender; +import tconstruct.world.model.PunjiRender; +import tconstruct.world.model.RenderLandmine; +import tconstruct.world.model.SlimeChannelRender; +import tconstruct.world.model.SlimePadRender; +import tconstruct.world.model.SlimeRender; public class TProxyClient extends TProxyCommon { @@ -348,12 +351,12 @@ public class TProxyClient extends TProxyCommon // RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, // new PlayerArmorRender()); // <-- Works, woo! - MinecraftForgeClient.registerItemRenderer(TRepo.shortbow, new CustomBowRenderer()); + MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer()); VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png")); ToolCoreRenderer renderer = new ToolCoreRenderer(); - MinecraftForgeClient.registerItemRenderer(TRepo.arrow, renderer); - MinecraftForgeClient.registerItemRenderer(TRepo.dagger, renderer); + MinecraftForgeClient.registerItemRenderer(TinkerTools.arrow, renderer); + MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, renderer); addRenderMappings(); addToolButtons(); @@ -398,32 +401,32 @@ public class TProxyClient extends TProxyCommon public void initManualIcons () { - MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TRepo.manualBook, 1, 2)); - MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TRepo.smeltery)); - MantleClientRegistry.registerManualIcon("blankcast", new ItemStack(TRepo.blankPattern, 1, 1)); - MantleClientRegistry.registerManualIcon("castingtable", new ItemStack(TRepo.searedBlock)); + MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TinkerTools.manualBook, 1, 2)); + MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TinkerSmeltery.smeltery)); + MantleClientRegistry.registerManualIcon("blankcast", new ItemStack(TinkerTools.blankPattern, 1, 1)); + MantleClientRegistry.registerManualIcon("castingtable", new ItemStack(TinkerSmeltery.searedBlock)); // MantleClientRegistry.registerManualIcon("liquidiron", new // ItemStack(TRepo.liquidMetalStill)); - MantleClientRegistry.registerManualIcon("lavatank", new ItemStack(TRepo.lavaTank)); - MantleClientRegistry.registerManualIcon("searedbrick", new ItemStack(TRepo.smeltery, 1, 2)); - MantleClientRegistry.registerManualIcon("drain", new ItemStack(TRepo.smeltery, 1, 1)); - MantleClientRegistry.registerManualIcon("faucet", new ItemStack(TRepo.searedBlock, 1, 1)); - MantleClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TRepo.materials, 1, 13)); - MantleClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TRepo.materials, 1, 14)); - MantleClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TRepo.materials, 1, 5)); - MantleClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TRepo.materials, 1, 15)); - MantleClientRegistry.registerManualIcon("blankpattern", new ItemStack(TRepo.blankPattern, 1, 0)); - MantleClientRegistry.registerManualIcon("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0)); - MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1)); - MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5)); - MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10)); + MantleClientRegistry.registerManualIcon("lavatank", new ItemStack(TinkerSmeltery.lavaTank)); + MantleClientRegistry.registerManualIcon("searedbrick", new ItemStack(TinkerSmeltery.smeltery, 1, 2)); + MantleClientRegistry.registerManualIcon("drain", new ItemStack(TinkerSmeltery.smeltery, 1, 1)); + MantleClientRegistry.registerManualIcon("faucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1)); + MantleClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TinkerTools.materials, 1, 13)); + MantleClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TinkerTools.materials, 1, 14)); + MantleClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TinkerTools.materials, 1, 5)); + MantleClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TinkerTools.materials, 1, 15)); + MantleClientRegistry.registerManualIcon("blankpattern", new ItemStack(TinkerTools.blankPattern, 1, 0)); + MantleClientRegistry.registerManualIcon("toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0)); + MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1)); + MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5)); + MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10)); MantleClientRegistry.registerManualIcon("torch", new ItemStack(Blocks.torch)); MantleClientRegistry.registerManualIcon("sapling", new ItemStack(Blocks.sapling)); MantleClientRegistry.registerManualIcon("workbench", new ItemStack(Blocks.crafting_table)); MantleClientRegistry.registerManualIcon("coal", new ItemStack(Items.coal)); - MantleClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TRepo.materials, 1, 18)); - MantleClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TRepo.materials, 1, 7)); + MantleClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TinkerTools.materials, 1, 18)); + MantleClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TinkerTools.materials, 1, 7)); // Tool Materials MantleClientRegistry.registerManualIcon("woodplanks", new ItemStack(Blocks.planks)); @@ -434,92 +437,92 @@ public class TProxyClient extends TProxyCommon MantleClientRegistry.registerManualIcon("bone", new ItemStack(Items.bone)); MantleClientRegistry.registerManualIcon("obsidian", new ItemStack(Blocks.obsidian)); MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Blocks.netherrack)); - MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TRepo.materials, 1, 17)); - MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TRepo.materials, 1, 1)); - MantleClientRegistry.registerManualIcon("paperstack", new ItemStack(TRepo.materials, 1, 0)); - MantleClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TRepo.materials, 1, 3)); - MantleClientRegistry.registerManualIcon("arditeingot", new ItemStack(TRepo.materials, 1, 4)); - MantleClientRegistry.registerManualIcon("copperingot", new ItemStack(TRepo.materials, 1, 9)); - MantleClientRegistry.registerManualIcon("steelingot", new ItemStack(TRepo.materials, 1, 16)); - MantleClientRegistry.registerManualIcon("pigironingot", new ItemStack(TRepo.materials, 1, 34)); + MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TinkerTools.materials, 1, 17)); + MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1)); + MantleClientRegistry.registerManualIcon("paperstack", new ItemStack(TinkerTools.materials, 1, 0)); + MantleClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TinkerTools.materials, 1, 3)); + MantleClientRegistry.registerManualIcon("arditeingot", new ItemStack(TinkerTools.materials, 1, 4)); + MantleClientRegistry.registerManualIcon("copperingot", new ItemStack(TinkerTools.materials, 1, 9)); + MantleClientRegistry.registerManualIcon("steelingot", new ItemStack(TinkerTools.materials, 1, 16)); + MantleClientRegistry.registerManualIcon("pigironingot", new ItemStack(TinkerTools.materials, 1, 34)); // Tool parts - MantleClientRegistry.registerManualIcon("pickhead", new ItemStack(TRepo.pickaxeHead, 1, 2)); - MantleClientRegistry.registerManualIcon("shovelhead", new ItemStack(TRepo.shovelHead, 1, 2)); - MantleClientRegistry.registerManualIcon("axehead", new ItemStack(TRepo.hatchetHead, 1, 2)); - MantleClientRegistry.registerManualIcon("swordblade", new ItemStack(TRepo.swordBlade, 1, 2)); - MantleClientRegistry.registerManualIcon("pan", new ItemStack(TRepo.frypanHead, 1, 2)); - MantleClientRegistry.registerManualIcon("board", new ItemStack(TRepo.signHead, 1, 2)); - MantleClientRegistry.registerManualIcon("knifeblade", new ItemStack(TRepo.knifeBlade, 1, 2)); - MantleClientRegistry.registerManualIcon("chiselhead", new ItemStack(TRepo.chiselHead, 1, 2)); + MantleClientRegistry.registerManualIcon("pickhead", new ItemStack(TinkerTools.pickaxeHead, 1, 2)); + MantleClientRegistry.registerManualIcon("shovelhead", new ItemStack(TinkerTools.shovelHead, 1, 2)); + MantleClientRegistry.registerManualIcon("axehead", new ItemStack(TinkerTools.hatchetHead, 1, 2)); + MantleClientRegistry.registerManualIcon("swordblade", new ItemStack(TinkerTools.swordBlade, 1, 2)); + MantleClientRegistry.registerManualIcon("pan", new ItemStack(TinkerTools.frypanHead, 1, 2)); + MantleClientRegistry.registerManualIcon("board", new ItemStack(TinkerTools.signHead, 1, 2)); + MantleClientRegistry.registerManualIcon("knifeblade", new ItemStack(TinkerTools.knifeBlade, 1, 2)); + MantleClientRegistry.registerManualIcon("chiselhead", new ItemStack(TinkerTools.chiselHead, 1, 2)); - MantleClientRegistry.registerManualIcon("hammerhead", new ItemStack(TRepo.hammerHead, 1, 2)); - MantleClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TRepo.excavatorHead, 1, 2)); - MantleClientRegistry.registerManualIcon("scythehead", new ItemStack(TRepo.scytheBlade, 1, 2)); - MantleClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TRepo.broadAxeHead, 1, 2)); - MantleClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TRepo.largeSwordBlade, 1, 2)); + MantleClientRegistry.registerManualIcon("hammerhead", new ItemStack(TinkerTools.hammerHead, 1, 2)); + MantleClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TinkerTools.excavatorHead, 1, 2)); + MantleClientRegistry.registerManualIcon("scythehead", new ItemStack(TinkerTools.scytheBlade, 1, 2)); + MantleClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TinkerTools.broadAxeHead, 1, 2)); + MantleClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TinkerTools.largeSwordBlade, 1, 2)); MantleClientRegistry.registerManualIcon("toolrod", new ItemStack(Items.stick)); - MantleClientRegistry.registerManualIcon("binding", new ItemStack(TRepo.binding, 1, 4)); - MantleClientRegistry.registerManualIcon("wideguard", new ItemStack(TRepo.wideGuard, 1, 4)); - MantleClientRegistry.registerManualIcon("handguard", new ItemStack(TRepo.handGuard, 1, 4)); - MantleClientRegistry.registerManualIcon("crossbar", new ItemStack(TRepo.crossbar, 1, 4)); + MantleClientRegistry.registerManualIcon("binding", new ItemStack(TinkerTools.binding, 1, 4)); + MantleClientRegistry.registerManualIcon("wideguard", new ItemStack(TinkerTools.wideGuard, 1, 4)); + MantleClientRegistry.registerManualIcon("handguard", new ItemStack(TinkerTools.handGuard, 1, 4)); + MantleClientRegistry.registerManualIcon("crossbar", new ItemStack(TinkerTools.crossbar, 1, 4)); - MantleClientRegistry.registerManualIcon("toughrod", new ItemStack(TRepo.toughRod, 1, 0)); - MantleClientRegistry.registerManualIcon("toughbinding", new ItemStack(TRepo.toughBinding, 1, 17)); - MantleClientRegistry.registerManualIcon("largeplate", new ItemStack(TRepo.largePlate, 1, 17)); + MantleClientRegistry.registerManualIcon("toughrod", new ItemStack(TinkerTools.toughRod, 1, 0)); + MantleClientRegistry.registerManualIcon("toughbinding", new ItemStack(TinkerTools.toughBinding, 1, 17)); + MantleClientRegistry.registerManualIcon("largeplate", new ItemStack(TinkerTools.largePlate, 1, 17)); - MantleClientRegistry.registerManualIcon("bowstring", new ItemStack(TRepo.bowstring, 1, 0)); - MantleClientRegistry.registerManualIcon("arrowhead", new ItemStack(TRepo.arrowhead, 1, 2)); - MantleClientRegistry.registerManualIcon("fletching", new ItemStack(TRepo.fletching, 1, 0)); + MantleClientRegistry.registerManualIcon("bowstring", new ItemStack(TinkerTools.bowstring, 1, 0)); + MantleClientRegistry.registerManualIcon("arrowhead", new ItemStack(TinkerTools.arrowhead, 1, 2)); + MantleClientRegistry.registerManualIcon("fletching", new ItemStack(TinkerTools.fletching, 1, 0)); - MantleClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TRepo.buckets, 1, 16)); - MantleClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TRepo.buckets, 1, 15)); - MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TRepo.buckets, 1, 25)); - MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TRepo.buckets, 1, 24)); - MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TRepo.buckets, 1, 23)); + MantleClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TinkerSmeltery.buckets, 1, 16)); + MantleClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TinkerSmeltery.buckets, 1, 15)); + MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TinkerSmeltery.buckets, 1, 25)); + MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TinkerSmeltery.buckets, 1, 24)); + MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TinkerSmeltery.buckets, 1, 23)); // ToolIcons MantleClientRegistry.registerManualIcon("pickicon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.binding, 1, 12), "")); - MantleClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.shovelHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.binding, 1, 12), "")); + MantleClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.shovelHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); MantleClientRegistry.registerManualIcon("mattockicon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.shovelHead, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.shovelHead, 1, 12), "")); MantleClientRegistry.registerManualIcon("swordicon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.wideGuard, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.wideGuard, 1, 12), "")); MantleClientRegistry.registerManualIcon("longswordicon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.handGuard, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.handGuard, 1, 12), "")); MantleClientRegistry.registerManualIcon("rapiericon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); MantleClientRegistry.registerManualIcon("daggerIcon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.knifeBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), "")); - MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.frypanHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.signHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.chiselHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.knifeBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); + MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.frypanHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.signHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.chiselHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); MantleClientRegistry.registerManualIcon("shortbowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.toolRod, 1, 10), new ItemStack(TRepo.bowstring, 1, 0), new ItemStack(TRepo.toolRod, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerTools.bowstring, 1, 0), new ItemStack(TinkerTools.toolRod, 1, 12), "")); MantleClientRegistry.registerManualIcon("arrowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TRepo.arrowhead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.fletching, 1, 0), "")); + ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.fletching, 1, 0), "")); - MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hammerHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( - TRepo.largePlate, 1, 12), new ItemStack(TRepo.largePlate, 8), "")); - MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.broadAxeHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( - TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughBinding, 8), "")); - MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.excavatorHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( - TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughBinding, 8), "")); - MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.scytheBlade, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( - TRepo.toughBinding, 1, 12), new ItemStack(TRepo.toughRod, 8), "")); - MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.largeSwordBlade, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( - TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughRod, 8), "")); - MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.broadAxeHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( - TRepo.broadAxeHead, 1, 12), new ItemStack(TRepo.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hammerHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( + TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.largePlate, 8), "")); + MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( + TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.excavatorHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( + TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.scytheBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( + TinkerTools.toughBinding, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); + MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.largeSwordBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( + TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); + MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( + TinkerTools.broadAxeHead, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); } public void initManualRecipes () { - ItemStack pattern = new ItemStack(TRepo.blankPattern, 1, 0); + ItemStack pattern = new ItemStack(TinkerTools.blankPattern, 1, 0); ItemStack stick = new ItemStack(Items.stick, 1, 0); ItemStack plank = new ItemStack(Blocks.planks, 1, 0); @@ -537,47 +540,47 @@ public class TProxyClient extends TProxyCommon ItemStack glass = new ItemStack(Blocks.glass, 1, 0); ItemStack ironblock = new ItemStack(Blocks.iron_block, 1, 0); - ItemStack grout = new ItemStack(TRepo.craftedSoil, 2, 1); - ItemStack searedbrick = new ItemStack(TRepo.materials, 1, 2); - ItemStack searedbrickBlock = new ItemStack(TRepo.smeltery, 1, 2); + ItemStack grout = new ItemStack(TinkerTools.craftedSoil, 2, 1); + ItemStack searedbrick = new ItemStack(TinkerTools.materials, 1, 2); + ItemStack searedbrickBlock = new ItemStack(TinkerSmeltery.smeltery, 1, 2); ItemStack coal = new ItemStack(Items.coal); ItemStack paper = new ItemStack(Items.paper); ItemStack slimeball = new ItemStack(Items.slime_ball); - ItemStack slimyMud = new ItemStack(TRepo.craftedSoil); + ItemStack slimyMud = new ItemStack(TinkerTools.craftedSoil); ItemStack blazerod = new ItemStack(Items.blaze_rod); ItemStack firecharge = new ItemStack(Items.fire_charge); ItemStack string = new ItemStack(Items.string); - ItemStack silkyCloth = new ItemStack(TRepo.materials, 1, 25); + ItemStack silkyCloth = new ItemStack(TinkerTools.materials, 1, 25); - ItemStack graveyardsoil = new ItemStack(TRepo.craftedSoil, 1, 3); - ItemStack consecratedsoil = new ItemStack(TRepo.craftedSoil, 1, 4); + ItemStack graveyardsoil = new ItemStack(TinkerTools.craftedSoil, 1, 3); + ItemStack consecratedsoil = new ItemStack(TinkerTools.craftedSoil, 1, 4); // TConstruct recipes MantleClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Items.book), paper, paper, paper, string, pattern, pattern, null, null, null); - MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TRepo.manualBook, 1, 0), new ItemStack(Items.paper), pattern, null, null); - MantleClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0), null, null, null); - MantleClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1), null, null, null); + MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TinkerTools.manualBook, 1, 0), new ItemStack(Items.paper), pattern, null, null); + MantleClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TinkerTools.manualBook, 1, 1), new ItemStack(TinkerTools.manualBook, 1, 0), null, null, null); + MantleClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TinkerTools.manualBook, 1, 2), new ItemStack(TinkerTools.manualBook, 1, 1), null, null, null); MantleClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank); - MantleClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0), null, pattern, null, workbench); - MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1), null, pattern, null, log); - MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5), null, pattern, null, chest); - MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10), null, pattern, null, plank); - MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(Items.redstone), null, null); - MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TRepo.slimePad, 1, 0), new ItemStack(TRepo.slimeChannel), new ItemStack(Items.slime_ball), null, null); - MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TRepo.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( - TRepo.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); + MantleClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0), null, pattern, null, workbench); + MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1), null, pattern, null, log); + MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5), null, pattern, null, chest); + MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10), null, pattern, null, plank); + MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TinkerWorld.slimeChannel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.redstone), null, null); + MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimeChannel), new ItemStack(Items.slime_ball), null, null); + MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TinkerTools.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( + TinkerTools.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); MantleClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); - MantleClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TRepo.materials, 1, 1), slimyMud); - MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TRepo.materials, 1, 0), paper, paper, paper, paper); - MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TRepo.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, + MantleClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1), slimyMud); + MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TinkerTools.materials, 1, 0), paper, paper, paper, paper); + MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TinkerTools.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble); - MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TRepo.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge, + MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TinkerTools.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge, blazerod, firecharge, blazerod); - MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TRepo.materials, 1, 24), string, string, string, string); - MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TRepo.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null, + MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TinkerTools.materials, 1, 24), string, string, string, string); + MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TinkerTools.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null, silkyCloth, null); MantleClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Blocks.dirt), new ItemStack(Items.rotten_flesh), new ItemStack(Items.dye, 1, 15), null); @@ -585,60 +588,60 @@ public class TProxyClient extends TProxyCommon MantleClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); MantleClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); - MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TRepo.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TRepo.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, + MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TinkerSmeltery.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TinkerSmeltery.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TRepo.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null); + MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TinkerArmor.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null); - MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TRepo.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, + MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TinkerSmeltery.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TRepo.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick, + MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TinkerSmeltery.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TRepo.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TRepo.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass, + MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TinkerSmeltery.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TinkerSmeltery.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TRepo.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, + MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TinkerSmeltery.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TRepo.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); - MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TRepo.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TRepo.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, + MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); + MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TinkerSmeltery.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TinkerSmeltery.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); // Traps ItemStack reed = new ItemStack(Items.sugar); - MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TRepo.punji), reed, null, reed, null, reed, null, reed, null, reed); - MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TRepo.barricadeOak), null, log, null, log); + MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TinkerWorld.punji), reed, null, reed, null, reed, null, reed, null, reed); + MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log); // Machines - ItemStack alubrassIngot = new ItemStack(TRepo.materials, 1, 14); - ItemStack bronzeIngot = new ItemStack(TRepo.materials, 1, 13); - ItemStack blankCast = new ItemStack(TRepo.blankPattern, 1, 1); + ItemStack alubrassIngot = new ItemStack(TinkerTools.materials, 1, 14); + ItemStack bronzeIngot = new ItemStack(TinkerTools.materials, 1, 13); + ItemStack blankCast = new ItemStack(TinkerTools.blankPattern, 1, 1); ItemStack redstone = new ItemStack(Items.redstone); // Modifier recipes - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), ""); + ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.binding, 1, 6), ""); MantleClientRegistry.registerManualIcon("ironpick", ironpick); - ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.handGuard, 1, 10), ""); + ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.handGuard, 1, 10), ""); MantleClientRegistry.registerManualIcon("ironlongsword", ironlongsword); TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Items.diamond)); TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Items.emerald)); TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Items.redstone), new ItemStack(Blocks.redstone_block)); - TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 7)); + TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 7)); TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Items.dye, 1, 4), new ItemStack(Blocks.lapis_block)); - TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 6)); + TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 6)); TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block)); TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Items.blaze_powder)); - TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TRepo.materials, 1, 8)); - TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 26)); - TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TRepo.largePlate, 1, 6)); + TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TinkerTools.materials, 1, 8)); + TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 26)); + TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.largePlate, 1, 6)); TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston)); TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Items.ender_pearl), new ItemStack(Blocks.obsidian)); TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Items.fermented_spider_eye)); - TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TRepo.craftedSoil, 1, 4)); + TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TinkerTools.craftedSoil, 1, 4)); TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Blocks.dirt)); TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Blocks.dirt)); @@ -646,13 +649,13 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Items.diamond), new ItemStack(Blocks.gold_block)); TConstructClientRegistry.registerManualModifier("tier1.5free", ironpick.copy(), new ItemStack(Items.golden_apple, 1, 1), new ItemStack(Blocks.diamond_block)); TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Items.nether_star)); - TConstructClientRegistry.registerManualModifier("creativefree", ironpick.copy(), new ItemStack(TRepo.creativeModifier)); + TConstructClientRegistry.registerManualModifier("creativefree", ironpick.copy(), new ItemStack(TinkerTools.creativeModifier)); - TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TRepo.speedBlock), new ItemStack(TRepo.moltenTin, 1), new ItemStack(Blocks.gravel)); - TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TRepo.clearGlass), new ItemStack(TRepo.moltenGlass, 1), null); - TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TRepo.smeltery, 1, 4), new ItemStack(TRepo.moltenStone, 1), null); - TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Blocks.end_stone), new ItemStack(TRepo.moltenEnder, 1), new ItemStack(Blocks.obsidian)); - TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TRepo.materials, 1, 36), new ItemStack(TRepo.glueFluidBlock, 1), null); + TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TinkerSmeltery.speedBlock), new ItemStack(TinkerSmeltery.moltenTin, 1), new ItemStack(Blocks.gravel)); + TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TinkerSmeltery.clearGlass), new ItemStack(TinkerSmeltery.moltenGlass, 1), null); + TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TinkerSmeltery.smeltery, 1, 4), new ItemStack(TinkerSmeltery.moltenStone, 1), null); + TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Blocks.end_stone), new ItemStack(TinkerSmeltery.moltenEnder, 1), new ItemStack(Blocks.obsidian)); + TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TinkerTools.materials, 1, 36), new ItemStack(TinkerSmeltery.glueFluidBlock, 1), null); } @@ -801,13 +804,13 @@ public class TProxyClient extends TProxyCommon String[] bowstringTypes = { "string", "magicfabric", "flamestring" }; for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) { - TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); + TConstructClientRegistry.addAlternateMaterialRenderMapping(TinkerTools.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); } String[] fletching = { "feather", "leaf", "slime", "blueslime" }; for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++) { - TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.arrow, arrowIter, "tinker", fletching[arrowIter], true); + TConstructClientRegistry.addAlternateMaterialRenderMapping(TinkerTools.arrow, arrowIter, "tinker", fletching[arrowIter], true); } } @@ -1010,7 +1013,7 @@ public class TProxyClient extends TProxyCommon } else if (par1Str.equals("blueslime")) { - entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TRepo.strangeFood); + entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TinkerWorld.strangeFood); } else if (par1Str.equals("heart")) { diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index 8aeecfde..a0a77374 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -9,8 +9,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import tconstruct.common.TRepo; -import tconstruct.entity.item.ExplosivePrimed; +import tconstruct.mechworks.entity.item.ExplosivePrimed; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -52,7 +52,7 @@ public class ExplosiveRender extends Render f2 = (1.0F - ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F) / 100.0F) * 0.8F; this.bindEntityTexture(par1EntityTNTPrimed); - this.blockRenderer.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); + this.blockRenderer.renderBlockAsItem(TinkerWorld.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); if (par1EntityTNTPrimed.fuse / 5 % 2 == 0) { diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index 560bfb4b..35b796a7 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -20,7 +20,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tconstruct.entity.projectile.ArrowEntity; +import tconstruct.tools.entity.ArrowEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 65a8408c..2b5b025f 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -15,7 +15,7 @@ import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tconstruct.entity.projectile.ArrowEntity; +import tconstruct.tools.entity.ArrowEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 4a198257..33e3894f 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -23,7 +23,7 @@ import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tconstruct.entity.projectile.DaggerEntity; +import tconstruct.tools.entity.DaggerEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index d02fee59..84928e11 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -15,7 +15,7 @@ import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tconstruct.entity.projectile.DaggerEntity; +import tconstruct.tools.entity.DaggerEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index e139961f..0d023547 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tconstruct.entity.projectile.LaunchedPotion; +import tconstruct.tools.entity.LaunchedPotion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java index 32d470d0..45862dc0 100644 --- a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java @@ -24,11 +24,11 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import tconstruct.TConstruct; -import tconstruct.blocks.component.SmelteryComponent; -import tconstruct.blocks.logic.AdaptiveSmelteryLogic; -import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.AdaptiveSmelteryContainer; import tconstruct.library.component.MultiFluidTank; +import tconstruct.smeltery.component.SmelteryComponent; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.smeltery.inventory.AdaptiveSmelteryContainer; +import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; public class AdaptiveSmelteryGui extends NewContainerGui { diff --git a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java index d7a73c72..1508675e 100644 --- a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java @@ -11,9 +11,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import tconstruct.armor.inventory.ArmorExtendedContainer; import tconstruct.client.tabs.InventoryTabArmorExtended; import tconstruct.client.tabs.TabRegistry; -import tconstruct.inventory.ArmorExtendedContainer; import tconstruct.util.player.ArmorExtended; public class ArmorExtendedGui extends InventoryEffectRenderer diff --git a/src/main/java/tconstruct/client/gui/CraftingStationGui.java b/src/main/java/tconstruct/client/gui/CraftingStationGui.java index d848c996..5a72d91e 100644 --- a/src/main/java/tconstruct/client/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/client/gui/CraftingStationGui.java @@ -16,9 +16,9 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.CraftingStationLogic; import tconstruct.library.armor.ArmorCore; import tconstruct.library.tools.ToolCore; +import tconstruct.tools.logic.CraftingStationLogic; public class CraftingStationGui extends GuiContainer { diff --git a/src/main/java/tconstruct/client/gui/FrypanGui.java b/src/main/java/tconstruct/client/gui/FrypanGui.java index d7fb5fce..8af5d654 100644 --- a/src/main/java/tconstruct/client/gui/FrypanGui.java +++ b/src/main/java/tconstruct/client/gui/FrypanGui.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.FrypanLogic; +import tconstruct.tools.logic.FrypanLogic; public class FrypanGui extends GuiContainer { diff --git a/src/main/java/tconstruct/client/gui/FurnaceGui.java b/src/main/java/tconstruct/client/gui/FurnaceGui.java index 5537fe9a..12fc893c 100644 --- a/src/main/java/tconstruct/client/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/client/gui/FurnaceGui.java @@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.FurnaceLogic; -import tconstruct.inventory.FurnaceContainer; +import tconstruct.tools.inventory.FurnaceContainer; +import tconstruct.tools.logic.FurnaceLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/gui/GuiLandmine.java b/src/main/java/tconstruct/client/gui/GuiLandmine.java index b663fe7c..a2cc6131 100644 --- a/src/main/java/tconstruct/client/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/client/gui/GuiLandmine.java @@ -11,8 +11,8 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import tconstruct.inventory.ContainerLandmine; -import tconstruct.util.landmine.behavior.Behavior; +import tconstruct.mechworks.inventory.ContainerLandmine; +import tconstruct.mechworks.landmine.behavior.Behavior; /** * diff --git a/src/main/java/tconstruct/client/gui/KnapsackGui.java b/src/main/java/tconstruct/client/gui/KnapsackGui.java index 93e112f2..117d25a3 100644 --- a/src/main/java/tconstruct/client/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/client/gui/KnapsackGui.java @@ -8,9 +8,9 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import tconstruct.armor.inventory.KnapsackContainer; import tconstruct.client.tabs.InventoryTabKnapsack; import tconstruct.client.tabs.TabRegistry; -import tconstruct.inventory.KnapsackContainer; import tconstruct.util.player.KnapsackInventory; public class KnapsackGui extends InventoryEffectRenderer diff --git a/src/main/java/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java index 5efc7dc1..10b5fae5 100644 --- a/src/main/java/tconstruct/client/gui/NewContainerGui.java +++ b/src/main/java/tconstruct/client/gui/NewContainerGui.java @@ -24,8 +24,8 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.ActiveSlot; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.smeltery.inventory.ActiveSlot; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/gui/PartCrafterGui.java b/src/main/java/tconstruct/client/gui/PartCrafterGui.java index 65a06570..015fe895 100644 --- a/src/main/java/tconstruct/client/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/client/gui/PartCrafterGui.java @@ -12,12 +12,12 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.PartCrafterChestContainer; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.TToolMaterial; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.tools.inventory.PartCrafterChestContainer; +import tconstruct.tools.logic.PartBuilderLogic; public class PartCrafterGui extends NewContainerGui { diff --git a/src/main/java/tconstruct/client/gui/PatternChestGui.java b/src/main/java/tconstruct/client/gui/PatternChestGui.java index 87ef271b..0b261570 100644 --- a/src/main/java/tconstruct/client/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/client/gui/PatternChestGui.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.PatternChestLogic; +import tconstruct.tools.logic.PatternChestLogic; public class PatternChestGui extends GuiContainer { diff --git a/src/main/java/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java index 1064ff1a..0b819e93 100644 --- a/src/main/java/tconstruct/client/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/SmelteryGui.java @@ -22,9 +22,9 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import tconstruct.TConstruct; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.SmelteryContainer; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.smeltery.inventory.SmelteryContainer; +import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.network.packet.PacketSmeltery; public class SmelteryGui extends NewContainerGui diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index c6708c70..fc4c3a1d 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -11,9 +11,9 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import tconstruct.TConstruct; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.common.TRepo; -import tconstruct.inventory.PatternShaperContainer; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.inventory.PatternShaperContainer; +import tconstruct.tools.logic.StencilTableLogic; import tconstruct.util.network.packet.PacketStencilTable; public class StencilTableGui extends GuiContainer @@ -85,7 +85,7 @@ public class StencilTableGui extends GuiContainer protected void actionPerformed (GuiButton button) { ItemStack pattern = logic.getStackInSlot(0); - if (pattern != null && pattern.getItem() == TRepo.blankPattern) + if (pattern != null && pattern.getItem() == TinkerTools.blankPattern) { int meta = pattern.getItemDamage(); if (meta == 0) @@ -95,18 +95,18 @@ public class StencilTableGui extends GuiContainer patternIndex++; if (patternIndex == 21) patternIndex++; - if (patternIndex >= TRepo.patternOutputs.length - 1) + if (patternIndex >= TinkerTools.patternOutputs.length - 1) patternIndex = 0; } else if (button.id == 1) { patternIndex--; if (patternIndex < 0) - patternIndex = TRepo.patternOutputs.length - 2; + patternIndex = TinkerTools.patternOutputs.length - 2; if (patternIndex == 21) patternIndex--; } - ItemStack stack = new ItemStack(TRepo.woodPattern, 1, patternIndex + 1); + ItemStack stack = new ItemStack(TinkerTools.woodPattern, 1, patternIndex + 1); logic.setInventorySlotContents(1, stack); updateServer(stack); } diff --git a/src/main/java/tconstruct/client/gui/ToolForgeGui.java b/src/main/java/tconstruct/client/gui/ToolForgeGui.java index bd184236..c38c378f 100644 --- a/src/main/java/tconstruct/client/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/client/gui/ToolForgeGui.java @@ -4,9 +4,9 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.client.ToolGuiElement; +import tconstruct.tools.logic.ToolForgeLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java index da8a22e2..1bd2902f 100644 --- a/src/main/java/tconstruct/client/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/client/gui/ToolStationGui.java @@ -19,12 +19,12 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import tconstruct.TConstruct; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.ToolStationContainer; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.client.ToolGuiElement; import tconstruct.library.tools.ToolCore; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.tools.inventory.ToolStationContainer; +import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.network.packet.PacketToolStation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java index 025d92e9..95aa42f5 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -1,15 +1,15 @@ package tconstruct.client.tabs; import net.minecraft.item.ItemStack; +import tconstruct.armor.TinkerArmor; import tconstruct.client.TControls; import tconstruct.client.TProxyClient; -import tconstruct.common.TRepo; public class InventoryTabKnapsack extends AbstractTab { public InventoryTabKnapsack() { - super(0, 0, 0, new ItemStack(TRepo.knapsack)); + super(0, 0, 0, new ItemStack(TinkerArmor.knapsack)); } @Override @@ -21,6 +21,6 @@ public class InventoryTabKnapsack extends AbstractTab @Override public boolean shouldAddToList () { - return TProxyClient.armorExtended.inventory[2] != null && TProxyClient.armorExtended.inventory[2].getItem() == TRepo.knapsack; + return TProxyClient.armorExtended.inventory[2] != null && TProxyClient.armorExtended.inventory[2].getItem() == TinkerArmor.knapsack; } } diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java deleted file mode 100644 index e5787b3e..00000000 --- a/src/main/java/tconstruct/common/TContent.java +++ /dev/null @@ -1,969 +0,0 @@ -package tconstruct.common; - -import java.util.HashMap; - -import mantle.blocks.BlockUtils; -import mantle.items.abstracts.CraftingItem; -import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLiquid; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.stats.Achievement; -import net.minecraft.util.StatCollector; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import tconstruct.TConstruct; -import tconstruct.achievements.TAchievements; -import tconstruct.blocks.BlockLandmine; -import tconstruct.blocks.BloodBlock; -import tconstruct.blocks.CastingChannelBlock; -import tconstruct.blocks.ConveyorBase; -import tconstruct.blocks.CraftingSlab; -import tconstruct.blocks.CraftingStationBlock; -import tconstruct.blocks.DryingRack; -import tconstruct.blocks.EquipBlock; -import tconstruct.blocks.FurnaceSlab; -import tconstruct.blocks.GlassBlockConnected; -import tconstruct.blocks.GlassBlockConnectedMeta; -import tconstruct.blocks.GlassPaneConnected; -import tconstruct.blocks.GlassPaneStained; -import tconstruct.blocks.GlueBlock; -import tconstruct.blocks.GlueFluid; -import tconstruct.blocks.GravelOre; -import tconstruct.blocks.LavaTankBlock; -import tconstruct.blocks.MeatBlock; -import tconstruct.blocks.MetalOre; -import tconstruct.blocks.MultiBrick; -import tconstruct.blocks.MultiBrickFancy; -import tconstruct.blocks.OreberryBush; -import tconstruct.blocks.OreberryBushEssence; -import tconstruct.blocks.SearedBlock; -import tconstruct.blocks.SearedSlab; -import tconstruct.blocks.SlabBase; -import tconstruct.blocks.SlimeExplosive; -import tconstruct.blocks.SlimePad; -import tconstruct.blocks.SmelteryBlock; -import tconstruct.blocks.SoilBlock; -import tconstruct.blocks.SpeedBlock; -import tconstruct.blocks.SpeedSlab; -import tconstruct.blocks.StoneLadder; -import tconstruct.blocks.StoneTorch; -import tconstruct.blocks.TConstructFluid; -import tconstruct.blocks.TMetalBlock; -import tconstruct.blocks.TankAirBlock; -import tconstruct.blocks.ToolForgeBlock; -import tconstruct.blocks.ToolStationBlock; -import tconstruct.blocks.WoodRail; -import tconstruct.blocks.slime.SlimeFluid; -import tconstruct.blocks.slime.SlimeGel; -import tconstruct.blocks.slime.SlimeGrass; -import tconstruct.blocks.slime.SlimeLeaves; -import tconstruct.blocks.slime.SlimeSapling; -import tconstruct.blocks.slime.SlimeTallGrass; -import tconstruct.blocks.traps.BarricadeBlock; -import tconstruct.blocks.traps.Punji; -import tconstruct.client.StepSoundSlime; -import tconstruct.entity.BlueSlime; -import tconstruct.entity.Crystal; -import tconstruct.entity.FancyEntityItem; -import tconstruct.entity.item.EntityLandmineFirework; -import tconstruct.entity.item.ExplosivePrimed; -import tconstruct.entity.projectile.ArrowEntity; -import tconstruct.entity.projectile.DaggerEntity; -import tconstruct.entity.projectile.LaunchedPotion; -import tconstruct.items.Bowstring; -import tconstruct.items.CreativeModifier; -import tconstruct.items.DiamondApple; -import tconstruct.items.FilledBucket; -import tconstruct.items.Fletching; -import tconstruct.items.GoldenHead; -import tconstruct.items.Jerky; -import tconstruct.items.Manual; -import tconstruct.items.MaterialItem; -import tconstruct.items.MetalPattern; -import tconstruct.items.OreBerries; -import tconstruct.items.Pattern; -import tconstruct.items.StrangeFood; -import tconstruct.items.TitleIcon; -import tconstruct.items.ToolPart; -import tconstruct.items.ToolPartHidden; -import tconstruct.items.ToolShard; -import tconstruct.items.armor.ArmorBasic; -import tconstruct.items.armor.ExoArmor; -import tconstruct.items.armor.HeartCanister; -import tconstruct.items.armor.Knapsack; -import tconstruct.items.tools.Arrow; -import tconstruct.items.tools.BattleSign; -import tconstruct.items.tools.Battleaxe; -import tconstruct.items.tools.Broadsword; -import tconstruct.items.tools.Chisel; -import tconstruct.items.tools.Cleaver; -import tconstruct.items.tools.Cutlass; -import tconstruct.items.tools.Dagger; -import tconstruct.items.tools.Excavator; -import tconstruct.items.tools.FryingPan; -import tconstruct.items.tools.Hammer; -import tconstruct.items.tools.Hatchet; -import tconstruct.items.tools.Longsword; -import tconstruct.items.tools.LumberAxe; -import tconstruct.items.tools.Mattock; -import tconstruct.items.tools.Pickaxe; -import tconstruct.items.tools.PotionLauncher; -import tconstruct.items.tools.Rapier; -import tconstruct.items.tools.Scythe; -import tconstruct.items.tools.Shortbow; -import tconstruct.items.tools.Shovel; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.armor.EnumArmorPart; -import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.util.IPattern; -import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - -public class TContent implements IFuelHandler -{ - // Temporary items - // public static Item armorTest = new ArmorStandard(2445, 4, - // EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch); - - public TContent() - { - registerItems(); - TRecipes.registerItemRecipes(); - registerBlocks(); - TRecipes.registerBlockRecipes(); - registerMaterials(); - addCraftingRecipes(); - setupToolTabs(); - addLoot(); - if (PHConstruct.achievementsEnabled) - { - addAchievements(); - } - } - - public void createEntities () - { - EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true); - EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 3, TConstruct.instance, 32, 3, true); - EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 4, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(EntityLandmineFirework.class, "LandmineFirework", 5, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(ExplosivePrimed.class, "SlimeExplosive", 6, TConstruct.instance, 32, 5, true); - // EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, - // TConstruct.instance, 32, 5, true); - - EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true); - // EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, - // TConstruct.instance, 64, 5, true); - } - - void registerBlocks () - { - // Tool Station - TRepo.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation"); - TRepo.toolForge = new ToolForgeBlock(Material.iron).setBlockName("ToolForge"); - TRepo.craftingStationWood = new CraftingStationBlock(Material.wood).setBlockName("CraftingStation"); - TRepo.craftingSlabWood = new CraftingSlab(Material.wood).setBlockName("CraftingSlab"); - TRepo.furnaceSlab = new FurnaceSlab(Material.rock).setBlockName("FurnaceSlab"); - - TRepo.heldItemBlock = new EquipBlock(Material.wood).setBlockName("Frypan"); - - /* battlesignBlock = new BattlesignBlock(PHConstruct.battlesignBlock).setUnlocalizedName("Battlesign"); - GameRegistry.registerBlock(battlesignBlock, "BattlesignBlock"); - ameRegistry.registerTileEntity(BattlesignLogic.class, "BattlesignLogic");*/ - - TRepo.craftedSoil = new SoilBlock().setLightOpacity(0).setBlockName("TConstruct.Soil"); - TRepo.craftedSoil.stepSound = Block.soundTypeGravel; - - TRepo.searedSlab = new SearedSlab().setBlockName("SearedSlab"); - TRepo.searedSlab.stepSound = Block.soundTypeStone; - - TRepo.speedSlab = new SpeedSlab().setBlockName("SpeedSlab"); - TRepo.speedSlab.stepSound = Block.soundTypeStone; - - TRepo.metalBlock = new TMetalBlock(Material.iron, 10.0F).setBlockName("tconstruct.metalblock"); - TRepo.metalBlock.stepSound = Block.soundTypeMetal; - - TRepo.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock"); - TRepo.glueBlock = new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); - - TRepo.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth"); - TRepo.woolSlab1.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations); - TRepo.woolSlab2 = new SlabBase(Material.cloth, Blocks.wool, 8, 8).setBlockName("cloth"); - TRepo.woolSlab2.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations); - - // Smeltery - TRepo.smeltery = new SmelteryBlock().setBlockName("Smeltery"); - TRepo.smelteryNether = new SmelteryBlock("nether").setBlockName("Smeltery"); - TRepo.lavaTank = new LavaTankBlock().setBlockName("LavaTank"); - TRepo.lavaTank.setStepSound(Block.soundTypeGlass); - TRepo.lavaTankNether = new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass).setBlockName("LavaTank"); - - TRepo.searedBlock = new SearedBlock().setBlockName("SearedBlock"); - TRepo.searedBlockNether = new SearedBlock("nether").setBlockName("SearedBlock"); - - TRepo.castingChannel = (new CastingChannelBlock()).setBlockName("CastingChannel"); - - TRepo.tankAir = new TankAirBlock(Material.leaves).setBlockUnbreakable().setBlockName("tconstruct.tank.air"); - - // Traps - TRepo.landmine = new BlockLandmine().setHardness(0.5F).setResistance(0F).setStepSound(Block.soundTypeMetal).setCreativeTab(CreativeTabs.tabRedstone).setBlockName("landmine"); - TRepo.punji = new Punji().setBlockName("trap.punji"); - TRepo.barricadeOak = new BarricadeBlock(Blocks.log, 0).setBlockName("trap.barricade.oak"); - TRepo.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).setBlockName("trap.barricade.spruce"); - TRepo.barricadeBirch = new BarricadeBlock(Blocks.log, 2).setBlockName("trap.barricade.birch"); - TRepo.barricadeJungle = new BarricadeBlock(Blocks.log, 3).setBlockName("trap.barricade.jungle"); - TRepo.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundTypeGrass).setBlockName("explosive.slime"); - - TRepo.dryingRack = new DryingRack().setBlockName("Armor.DryingRack"); - - // Liquids - TRepo.liquidMetal = new MaterialLiquid(MapColor.tntColor); - - TRepo.moltenIronFluid = new Fluid("iron.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenIronFluid)) - TRepo.moltenIronFluid = FluidRegistry.getFluid("iron.molten"); - TRepo.moltenIron = new TConstructFluid(TRepo.moltenIronFluid, Material.lava, "liquid_iron").setBlockName("fluid.molten.iron"); - GameRegistry.registerBlock(TRepo.moltenIron, "fluid.molten.iron"); - TRepo.moltenIronFluid.setBlock(TRepo.moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 0), new ItemStack(Items.bucket))); - - TRepo.moltenGoldFluid = new Fluid("gold.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenGoldFluid)) - TRepo.moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); - TRepo.moltenGold = new TConstructFluid(TRepo.moltenGoldFluid, Material.lava, "liquid_gold").setBlockName("fluid.molten.gold"); - GameRegistry.registerBlock(TRepo.moltenGold, "fluid.molten.gold"); - TRepo.moltenGoldFluid.setBlock(TRepo.moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGoldFluid, 1000), new ItemStack(TRepo.buckets, 1, 1), new ItemStack(Items.bucket))); - - TRepo.moltenCopperFluid = new Fluid("copper.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenCopperFluid)) - TRepo.moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); - TRepo.moltenCopper = new TConstructFluid(TRepo.moltenCopperFluid, Material.lava, "liquid_copper").setBlockName("fluid.molten.copper"); - GameRegistry.registerBlock(TRepo.moltenCopper, "fluid.molten.copper"); - TRepo.moltenCopperFluid.setBlock(TRepo.moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCopperFluid, 1000), new ItemStack(TRepo.buckets, 1, 2), new ItemStack(Items.bucket))); - - TRepo.moltenTinFluid = new Fluid("tin.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenTinFluid)) - TRepo.moltenTinFluid = FluidRegistry.getFluid("tin.molten"); - TRepo.moltenTin = new TConstructFluid(TRepo.moltenTinFluid, Material.lava, "liquid_tin").setBlockName("fluid.molten.tin"); - GameRegistry.registerBlock(TRepo.moltenTin, "fluid.molten.tin"); - TRepo.moltenTinFluid.setBlock(TRepo.moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenTinFluid, 1000), new ItemStack(TRepo.buckets, 1, 3), new ItemStack(Items.bucket))); - - TRepo.moltenAluminumFluid = new Fluid("aluminum.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenAluminumFluid)) - TRepo.moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); - TRepo.moltenAluminum = new TConstructFluid(TRepo.moltenAluminumFluid, Material.lava, "liquid_aluminum").setBlockName("fluid.molten.aluminum"); - GameRegistry.registerBlock(TRepo.moltenAluminum, "fluid.molten.aluminum"); - TRepo.moltenAluminumFluid.setBlock(TRepo.moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAluminumFluid, 1000), new ItemStack(TRepo.buckets, 1, 4), new ItemStack(Items.bucket))); - - TRepo.moltenCobaltFluid = new Fluid("cobalt.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenCobaltFluid)) - TRepo.moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); - TRepo.moltenCobalt = new TConstructFluid(TRepo.moltenCobaltFluid, Material.lava, "liquid_cobalt").setBlockName("fluid.molten.cobalt"); - GameRegistry.registerBlock(TRepo.moltenCobalt, "fluid.molten.cobalt"); - TRepo.moltenCobaltFluid.setBlock(TRepo.moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCobaltFluid, 1000), new ItemStack(TRepo.buckets, 1, 5), new ItemStack(Items.bucket))); - - TRepo.moltenArditeFluid = new Fluid("ardite.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenArditeFluid)) - TRepo.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); - TRepo.moltenArdite = new TConstructFluid(TRepo.moltenArditeFluid, Material.lava, "liquid_ardite").setBlockName("fluid.molten.ardite"); - GameRegistry.registerBlock(TRepo.moltenArdite, "fluid.molten.ardite"); - TRepo.moltenArditeFluid.setBlock(TRepo.moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenArditeFluid, 1000), new ItemStack(TRepo.buckets, 1, 6), new ItemStack(Items.bucket))); - - TRepo.moltenBronzeFluid = new Fluid("bronze.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenBronzeFluid)) - TRepo.moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); - TRepo.moltenBronze = new TConstructFluid(TRepo.moltenBronzeFluid, Material.lava, "liquid_bronze").setBlockName("fluid.molten.bronze"); - GameRegistry.registerBlock(TRepo.moltenBronze, "fluid.molten.bronze"); - TRepo.moltenBronzeFluid.setBlock(TRepo.moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenBronzeFluid, 1000), new ItemStack(TRepo.buckets, 1, 7), new ItemStack(Items.bucket))); - - TRepo.moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenAlubrassFluid)) - TRepo.moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); - TRepo.moltenAlubrass = new TConstructFluid(TRepo.moltenAlubrassFluid, Material.lava, "liquid_alubrass").setBlockName("fluid.molten.alubrass"); - GameRegistry.registerBlock(TRepo.moltenAlubrass, "fluid.molten.alubrass"); - TRepo.moltenAlubrassFluid.setBlock(TRepo.moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlubrassFluid, 1000), new ItemStack(TRepo.buckets, 1, 8), new ItemStack(Items.bucket))); - - TRepo.moltenManyullynFluid = new Fluid("manyullyn.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenManyullynFluid)) - TRepo.moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); - TRepo.moltenManyullyn = new TConstructFluid(TRepo.moltenManyullynFluid, Material.lava, "liquid_manyullyn").setBlockName("fluid.molten.manyullyn"); - GameRegistry.registerBlock(TRepo.moltenManyullyn, "fluid.molten.manyullyn"); - TRepo.moltenManyullynFluid.setBlock(TRepo.moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenManyullynFluid, 1000), new ItemStack(TRepo.buckets, 1, 9), new ItemStack(Items.bucket))); - - TRepo.moltenAlumiteFluid = new Fluid("alumite.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenAlumiteFluid)) - TRepo.moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); - TRepo.moltenAlumite = new TConstructFluid(TRepo.moltenAlumiteFluid, Material.lava, "liquid_alumite").setBlockName("fluid.molten.alumite"); - GameRegistry.registerBlock(TRepo.moltenAlumite, "fluid.molten.alumite"); - TRepo.moltenAlumiteFluid.setBlock(TRepo.moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlumiteFluid, 1000), new ItemStack(TRepo.buckets, 1, 10), new ItemStack(Items.bucket))); - - TRepo.moltenObsidianFluid = new Fluid("obsidian.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenObsidianFluid)) - TRepo.moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); - TRepo.moltenObsidian = new TConstructFluid(TRepo.moltenObsidianFluid, Material.lava, "liquid_obsidian").setBlockName("fluid.molten.obsidian"); - GameRegistry.registerBlock(TRepo.moltenObsidian, "fluid.molten.obsidian"); - TRepo.moltenObsidianFluid.setBlock(TRepo.moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenObsidianFluid, 1000), new ItemStack(TRepo.buckets, 1, 11), new ItemStack(Items.bucket))); - - TRepo.moltenSteelFluid = new Fluid("steel.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenSteelFluid)) - TRepo.moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); - TRepo.moltenSteel = new TConstructFluid(TRepo.moltenSteelFluid, Material.lava, "liquid_steel").setBlockName("fluid.molten.steel"); - GameRegistry.registerBlock(TRepo.moltenSteel, "fluid.molten.steel"); - TRepo.moltenSteelFluid.setBlock(TRepo.moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSteelFluid, 1000), new ItemStack(TRepo.buckets, 1, 12), new ItemStack(Items.bucket))); - - TRepo.moltenGlassFluid = new Fluid("glass.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenGlassFluid)) - TRepo.moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); - TRepo.moltenGlass = new TConstructFluid(TRepo.moltenGlassFluid, Material.lava, "liquid_glass", true).setBlockName("fluid.molten.glass"); - GameRegistry.registerBlock(TRepo.moltenGlass, "fluid.molten.glass"); - TRepo.moltenGlassFluid.setBlock(TRepo.moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGlassFluid, 1000), new ItemStack(TRepo.buckets, 1, 13), new ItemStack(Items.bucket))); - - TRepo.moltenStoneFluid = new Fluid("stone.seared"); - if (!FluidRegistry.registerFluid(TRepo.moltenStoneFluid)) - TRepo.moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); - TRepo.moltenStone = new TConstructFluid(TRepo.moltenStoneFluid, Material.lava, "liquid_stone").setBlockName("molten.stone"); - GameRegistry.registerBlock(TRepo.moltenStone, "molten.stone"); - TRepo.moltenStoneFluid.setBlock(TRepo.moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenStoneFluid, 1000), new ItemStack(TRepo.buckets, 1, 14), new ItemStack(Items.bucket))); - - TRepo.moltenEmeraldFluid = new Fluid("emerald.liquid"); - if (!FluidRegistry.registerFluid(TRepo.moltenEmeraldFluid)) - TRepo.moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); - TRepo.moltenEmerald = new TConstructFluid(TRepo.moltenEmeraldFluid, Material.water, "liquid_villager").setBlockName("molten.emerald"); - GameRegistry.registerBlock(TRepo.moltenEmerald, "molten.emerald"); - TRepo.moltenEmeraldFluid.setBlock(TRepo.moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEmeraldFluid, 1000), new ItemStack(TRepo.buckets, 1, 15), new ItemStack(Items.bucket))); - - TRepo.bloodFluid = new Fluid("blood"); - if (!FluidRegistry.registerFluid(TRepo.bloodFluid)) - TRepo.bloodFluid = FluidRegistry.getFluid("blood"); - TRepo.blood = new BloodBlock(TRepo.bloodFluid, Material.water, "liquid_cow").setBlockName("liquid.blood"); - GameRegistry.registerBlock(TRepo.blood, "liquid.blood"); - TRepo.bloodFluid.setBlock(TRepo.blood).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.bloodFluid, 1000), new ItemStack(TRepo.buckets, 1, 16), new ItemStack(Items.bucket))); - - TRepo.moltenNickelFluid = new Fluid("nickel.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenNickelFluid)) - TRepo.moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); - TRepo.moltenNickel = new TConstructFluid(TRepo.moltenNickelFluid, Material.lava, "liquid_ferrous").setBlockName("fluid.molten.nickel"); - GameRegistry.registerBlock(TRepo.moltenNickel, "fluid.molten.nickel"); - TRepo.moltenNickelFluid.setBlock(TRepo.moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenNickelFluid, 1000), new ItemStack(TRepo.buckets, 1, 17), new ItemStack(Items.bucket))); - - TRepo.moltenLeadFluid = new Fluid("lead.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenLeadFluid)) - TRepo.moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); - TRepo.moltenLead = new TConstructFluid(TRepo.moltenLeadFluid, Material.lava, "liquid_lead").setBlockName("fluid.molten.lead"); - GameRegistry.registerBlock(TRepo.moltenLead, "fluid.molten.lead"); - TRepo.moltenLeadFluid.setBlock(TRepo.moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenLeadFluid, 1000), new ItemStack(TRepo.buckets, 1, 18), new ItemStack(Items.bucket))); - - TRepo.moltenSilverFluid = new Fluid("silver.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenSilverFluid)) - TRepo.moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); - TRepo.moltenSilver = new TConstructFluid(TRepo.moltenSilverFluid, Material.lava, "liquid_silver").setBlockName("fluid.molten.silver"); - GameRegistry.registerBlock(TRepo.moltenSilver, "fluid.molten.silver"); - TRepo.moltenSilverFluid.setBlock(TRepo.moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSilverFluid, 1000), new ItemStack(TRepo.buckets, 1, 19), new ItemStack(Items.bucket))); - - TRepo.moltenShinyFluid = new Fluid("platinum.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenShinyFluid)) - TRepo.moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); - TRepo.moltenShiny = new TConstructFluid(TRepo.moltenShinyFluid, Material.lava, "liquid_shiny").setBlockName("fluid.molten.shiny"); - GameRegistry.registerBlock(TRepo.moltenShiny, "fluid.molten.shiny"); - TRepo.moltenShinyFluid.setBlock(TRepo.moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenShinyFluid, 1000), new ItemStack(TRepo.buckets, 1, 20), new ItemStack(Items.bucket))); - - TRepo.moltenInvarFluid = new Fluid("invar.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenInvarFluid)) - TRepo.moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); - TRepo.moltenInvar = new TConstructFluid(TRepo.moltenInvarFluid, Material.lava, "liquid_invar").setBlockName("fluid.molten.invar"); - GameRegistry.registerBlock(TRepo.moltenInvar, "fluid.molten.invar"); - TRepo.moltenInvarFluid.setBlock(TRepo.moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenInvarFluid, 1000), new ItemStack(TRepo.buckets, 1, 21), new ItemStack(Items.bucket))); - - TRepo.moltenElectrumFluid = new Fluid("electrum.molten"); - if (!FluidRegistry.registerFluid(TRepo.moltenElectrumFluid)) - TRepo.moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); - TRepo.moltenElectrum = new TConstructFluid(TRepo.moltenElectrumFluid, Material.lava, "liquid_electrum").setBlockName("fluid.molten.electrum"); - GameRegistry.registerBlock(TRepo.moltenElectrum, "fluid.molten.electrum"); - TRepo.moltenElectrumFluid.setBlock(TRepo.moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenElectrumFluid, 1000), new ItemStack(TRepo.buckets, 1, 22), new ItemStack(Items.bucket))); - - TRepo.moltenEnderFluid = new Fluid("ender"); - if (!FluidRegistry.registerFluid(TRepo.moltenEnderFluid)) - { - TRepo.moltenEnderFluid = FluidRegistry.getFluid("ender"); - TRepo.moltenEnder = TRepo.moltenEnderFluid.getBlock(); - if (TRepo.moltenEnder == null) - TConstruct.logger.info("Molten ender block missing!"); - } - else - { - TRepo.moltenEnder = new TConstructFluid(TRepo.moltenEnderFluid, Material.water, "liquid_ender").setBlockName("fluid.ender"); - GameRegistry.registerBlock(TRepo.moltenEnder, "fluid.ender"); - TRepo.moltenEnderFluid.setBlock(TRepo.moltenEnder).setDensity(3000).setViscosity(6000); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEnderFluid, 1000), new ItemStack(TRepo.buckets, 1, 23), new ItemStack(Items.bucket))); - } - - // Slime - TRepo.slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); - - TRepo.blueSlimeFluid = new Fluid("slime.blue"); - if (!FluidRegistry.registerFluid(TRepo.blueSlimeFluid)) - TRepo.blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); - TRepo.slimePool = new SlimeFluid(TRepo.blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep).setBlockName("liquid.slime"); - GameRegistry.registerBlock(TRepo.slimePool, "liquid.slime"); - TRepo.blueSlimeFluid.setBlock(TRepo.slimePool); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.blueSlimeFluid, 1000), new ItemStack(TRepo.buckets, 1, 24), new ItemStack(Items.bucket))); - - // Glue - TRepo.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); - if (!FluidRegistry.registerFluid(TRepo.glueFluid)) - TRepo.glueFluid = FluidRegistry.getFluid("glue"); - TRepo.glueFluidBlock = new GlueFluid(TRepo.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep).setBlockName("liquid.glue"); - GameRegistry.registerBlock(TRepo.glueFluidBlock, "liquid.glue"); - TRepo.glueFluid.setBlock(TRepo.glueFluidBlock); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.glueFluid, 1000), new ItemStack(TRepo.buckets, 1, 25), new ItemStack(Items.bucket))); - - TRepo.pigIronFluid = new Fluid("pigiron.molten"); - if (!FluidRegistry.registerFluid(TRepo.pigIronFluid)) - TRepo.pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); - else - TRepo.pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.pigIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 26), new ItemStack(Items.bucket))); - TRepo.fluids = new Fluid[] { TRepo.moltenIronFluid, TRepo.moltenGoldFluid, TRepo.moltenCopperFluid, TRepo.moltenTinFluid, TRepo.moltenAluminumFluid, TRepo.moltenCobaltFluid, - TRepo.moltenArditeFluid, TRepo.moltenBronzeFluid, TRepo.moltenAlubrassFluid, TRepo.moltenManyullynFluid, TRepo.moltenAlumiteFluid, TRepo.moltenObsidianFluid, TRepo.moltenSteelFluid, - TRepo.moltenGlassFluid, TRepo.moltenStoneFluid, TRepo.moltenEmeraldFluid, TRepo.bloodFluid, TRepo.moltenNickelFluid, TRepo.moltenLeadFluid, TRepo.moltenSilverFluid, - TRepo.moltenShinyFluid, TRepo.moltenInvarFluid, TRepo.moltenElectrumFluid, TRepo.moltenEnderFluid, TRepo.blueSlimeFluid, TRepo.glueFluid, TRepo.pigIronFluid }; - TRepo.fluidBlocks = new Block[] { TRepo.moltenIron, TRepo.moltenGold, TRepo.moltenCopper, TRepo.moltenTin, TRepo.moltenAluminum, TRepo.moltenCobalt, TRepo.moltenArdite, TRepo.moltenBronze, - TRepo.moltenAlubrass, TRepo.moltenManyullyn, TRepo.moltenAlumite, TRepo.moltenObsidian, TRepo.moltenSteel, TRepo.moltenGlass, TRepo.moltenStone, TRepo.moltenEmerald, TRepo.blood, - TRepo.moltenNickel, TRepo.moltenLead, TRepo.moltenSilver, TRepo.moltenShiny, TRepo.moltenInvar, TRepo.moltenElectrum, TRepo.moltenEnder, TRepo.slimePool, TRepo.glueFluidBlock }; - // Slime Islands - TRepo.slimeGel = new SlimeGel().setStepSound(TRepo.slimeStep).setLightOpacity(0).setBlockName("slime.gel"); - TRepo.slimeGrass = new SlimeGrass().setStepSound(Block.soundTypeGrass).setLightOpacity(0).setBlockName("slime.grass"); - TRepo.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall"); - TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves().setStepSound(TRepo.slimeStep).setLightOpacity(0).setBlockName("slime.leaves"); - TRepo.slimeSapling = (SlimeSapling) new SlimeSapling().setStepSound(TRepo.slimeStep).setBlockName("slime.sapling"); - TRepo.slimeChannel = new ConveyorBase(Material.water, "greencurrent").setHardness(0.3f).setStepSound(TRepo.slimeStep).setBlockName("slime.channel"); - TRepo.bloodChannel = new ConveyorBase(Material.water, "liquid_cow").setHardness(0.3f).setStepSound(TRepo.slimeStep).setBlockName("blood.channel"); - TRepo.slimePad = new SlimePad(Material.cloth).setStepSound(TRepo.slimeStep).setHardness(0.3f).setBlockName("slime.pad"); - - // Decoration - TRepo.stoneTorch = new StoneTorch().setBlockName("decoration.stonetorch"); - TRepo.stoneLadder = new StoneLadder().setBlockName("decoration.stoneladder"); - TRepo.multiBrick = new MultiBrick().setBlockName("Decoration.Brick"); - TRepo.multiBrickFancy = new MultiBrickFancy().setBlockName("Decoration.BrickFancy"); - - // Ores - String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; - TRepo.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setBlockName("ore.berries.one"); - String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; - TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setBlockName("ore.berries.two"); - - String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; - TRepo.oreSlag = new MetalOre(Material.rock, 10.0F, oreTypes).setBlockName("tconstruct.stoneore"); - TRepo.oreSlag.setHarvestLevel("pickaxe", 4, 1); - TRepo.oreSlag.setHarvestLevel("pickaxe", 4, 2); - TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 3); - TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 4); - TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 5); - - TRepo.oreGravel = new GravelOre().setBlockName("GravelOre").setBlockName("tconstruct.gravelore"); - TRepo.oreGravel.setHarvestLevel("shovel", 1, 0); - TRepo.oreGravel.setHarvestLevel("shovel", 2, 1); - TRepo.oreGravel.setHarvestLevel("shovel", 1, 2); - TRepo.oreGravel.setHarvestLevel("shovel", 1, 3); - TRepo.oreGravel.setHarvestLevel("shovel", 1, 4); - TRepo.oreGravel.setHarvestLevel("shovel", 4, 5); - - TRepo.speedBlock = new SpeedBlock().setBlockName("SpeedBlock"); - - // Glass - TRepo.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock"); - TRepo.clearGlass.stepSound = Block.soundTypeGlass; - TRepo.glassPane = new GlassPaneConnected("clear", false); - TRepo.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", - "brown", "green", "red", "black").setBlockName("GlassBlock.StainedClear"); - TRepo.stainedGlassClear.stepSound = Block.soundTypeGlass; - TRepo.stainedGlassClearPane = new GlassPaneStained(); - - // Rail - TRepo.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood).setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood"); - - } - - void registerItems () - { - TRepo.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon"); - GameRegistry.registerItem(TRepo.titleIcon, "titleIcon"); - String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; - TRepo.blankPattern = new CraftingItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab).setUnlocalizedName("tconstruct.Pattern"); - GameRegistry.registerItem(TRepo.blankPattern, "blankPattern"); - - TRepo.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials"); - TRepo.toolRod = new ToolPart("_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); - TRepo.toolShard = new ToolShard("_chunk").setUnlocalizedName("tconstruct.ToolShard"); - TRepo.woodPattern = new Pattern("pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); - TRepo.metalPattern = new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); - // armorPattern = new ArmorPattern(PHConstruct.armorPattern, - // "armorcast_", - // "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); - GameRegistry.registerItem(TRepo.materials, "materials"); - GameRegistry.registerItem(TRepo.woodPattern, "woodPattern"); - GameRegistry.registerItem(TRepo.metalPattern, "metalPattern"); - // GameRegistry.registerItem(TRepo.armorPattern, "armorPattern"); - - TConstructRegistry.addItemToDirectory("blankPattern", TRepo.blankPattern); - TConstructRegistry.addItemToDirectory("woodPattern", TRepo.woodPattern); - TConstructRegistry.addItemToDirectory("metalPattern", TRepo.metalPattern); - // TConstructRegistry.addItemToDirectory("armorPattern", armorPattern); - - String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", - "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; - - for (int i = 1; i < patternTypes.length; i++) - { - TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Pattern", new ItemStack(TRepo.woodPattern, 1, i)); - } - for (int i = 0; i < patternTypes.length; i++) - { - TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(TRepo.metalPattern, 1, i)); - } - /* - * String[] armorPartTypes = { "helmet", "chestplate", "leggings", - * "boots" }; for (int i = 1; i < armorPartTypes.length; i++) { - * TConstructRegistry.addItemStackToDirectory(armorPartTypes[i] + - * "Cast", new ItemStack(armorPattern, 1, i)); } - */ - - TRepo.manualBook = new Manual(); - GameRegistry.registerItem(TRepo.manualBook, "manualBook"); - TRepo.buckets = new FilledBucket(BlockUtils.getBlockFromItem(TRepo.buckets)); - GameRegistry.registerItem(TRepo.buckets, "buckets"); - - TRepo.pickaxe = new Pickaxe(); - TRepo.shovel = new Shovel(); - TRepo.hatchet = new Hatchet(); - TRepo.broadsword = new Broadsword(); - TRepo.longsword = new Longsword(); - TRepo.rapier = new Rapier(); - TRepo.dagger = new Dagger(); - TRepo.cutlass = new Cutlass(); - - TRepo.frypan = new FryingPan(); - TRepo.battlesign = new BattleSign(); - TRepo.mattock = new Mattock(); - TRepo.chisel = new Chisel(); - - TRepo.lumberaxe = new LumberAxe(); - TRepo.cleaver = new Cleaver(); - TRepo.scythe = new Scythe(); - TRepo.excavator = new Excavator(); - TRepo.hammer = new Hammer(); - TRepo.battleaxe = new Battleaxe(); - - TRepo.shortbow = new Shortbow(); - TRepo.arrow = new Arrow(); - - Item[] tools = { TRepo.pickaxe, TRepo.shovel, TRepo.hatchet, TRepo.broadsword, TRepo.longsword, TRepo.rapier, TRepo.dagger, TRepo.cutlass, TRepo.frypan, TRepo.battlesign, TRepo.mattock, - TRepo.chisel, TRepo.lumberaxe, TRepo.cleaver, TRepo.scythe, TRepo.excavator, TRepo.hammer, TRepo.battleaxe, TRepo.shortbow, TRepo.arrow }; - String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", - "scythe", "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; - - for (int i = 0; i < tools.length; i++) - { - GameRegistry.registerItem(tools[i], toolStrings[i]); // 1.7 compat - TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); - } - - TRepo.potionLauncher = new PotionLauncher().setUnlocalizedName("tconstruct.PotionLauncher"); - GameRegistry.registerItem(TRepo.potionLauncher, "potionLauncher"); - - TRepo.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); - TRepo.shovelHead = new ToolPart("_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); - TRepo.hatchetHead = new ToolPart("_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead"); - TRepo.binding = new ToolPart("_binding", "Binding").setUnlocalizedName("tconstruct.Binding"); - TRepo.toughBinding = new ToolPart("_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding"); - TRepo.toughRod = new ToolPart("_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod"); - TRepo.largePlate = new ToolPart("_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate"); - - TRepo.swordBlade = new ToolPart("_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade"); - TRepo.wideGuard = new ToolPart("_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard"); - TRepo.handGuard = new ToolPart("_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard"); - TRepo.crossbar = new ToolPart("_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar"); - TRepo.knifeBlade = new ToolPart("_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade"); - TRepo.fullGuard = new ToolPartHidden("_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); - - TRepo.frypanHead = new ToolPart("_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead"); - TRepo.signHead = new ToolPart("_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead"); - TRepo.chiselHead = new ToolPart("_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead"); - - TRepo.scytheBlade = new ToolPart("_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade"); - TRepo.broadAxeHead = new ToolPart("_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead"); - TRepo.excavatorHead = new ToolPart("_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead"); - TRepo.largeSwordBlade = new ToolPart("_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade"); - TRepo.hammerHead = new ToolPart("_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead"); - - TRepo.bowstring = new Bowstring().setUnlocalizedName("tconstruct.Bowstring"); - TRepo.arrowhead = new ToolPart("_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); - TRepo.fletching = new Fletching().setUnlocalizedName("tconstruct.Fletching"); - - Item[] toolParts = { TRepo.toolRod, TRepo.toolShard, TRepo.pickaxeHead, TRepo.shovelHead, TRepo.hatchetHead, TRepo.binding, TRepo.toughBinding, TRepo.toughRod, TRepo.largePlate, - TRepo.swordBlade, TRepo.wideGuard, TRepo.handGuard, TRepo.crossbar, TRepo.knifeBlade, TRepo.fullGuard, TRepo.frypanHead, TRepo.signHead, TRepo.chiselHead, TRepo.scytheBlade, - TRepo.broadAxeHead, TRepo.excavatorHead, TRepo.largeSwordBlade, TRepo.hammerHead, TRepo.bowstring, TRepo.fletching, TRepo.arrowhead }; - String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", - "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring", - "fletching", "arrowhead" }; - - for (int i = 0; i < toolParts.length; i++) - { - GameRegistry.registerItem(toolParts[i], toolPartStrings[i]); // 1.7 - // compat - TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]); - } - - TRepo.diamondApple = new DiamondApple().setUnlocalizedName("tconstruct.apple.diamond"); - TRepo.strangeFood = new StrangeFood().setUnlocalizedName("tconstruct.strangefood"); - TRepo.oreBerries = new OreBerries().setUnlocalizedName("oreberry"); - GameRegistry.registerItem(TRepo.diamondApple, "diamondApple"); - GameRegistry.registerItem(TRepo.strangeFood, "strangeFood"); - GameRegistry.registerItem(TRepo.oreBerries, "oreBerries"); - - boolean foodOverhaul = false; - if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food")) - { - foodOverhaul = true; - } - - TRepo.jerky = new Jerky(foodOverhaul).setUnlocalizedName("tconstruct.jerky"); - GameRegistry.registerItem(TRepo.jerky, "jerky"); - - // Wearables - // heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, - // 0).setUnlocalizedName("tconstruct.HeavyHelmet"); - TRepo.heartCanister = new HeartCanister().setUnlocalizedName("tconstruct.canister"); - // heavyBoots = new TArmorBase(PHConstruct.heavyBoots, - // 3).setUnlocalizedName("tconstruct.HeavyBoots"); - // glove = new - // Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); - TRepo.knapsack = new Knapsack().setUnlocalizedName("tconstruct.storage"); - TRepo.goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); - // GameRegistry.registerItem(TRepo.heavyHelmet, "heavyHelmet"); - GameRegistry.registerItem(TRepo.heartCanister, "heartCanister"); - // GameRegistry.registerItem(TRepo.heavyBoots, "heavyBoots"); - // GameRegistry.registerItem(TRepo.glove, "glove"); - GameRegistry.registerItem(TRepo.knapsack, "knapsack"); - GameRegistry.registerItem(TRepo.goldHead, "goldHead"); - - TRepo.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative"); - GameRegistry.registerItem(TRepo.creativeModifier, "creativeModifier"); - - LiquidCasting basinCasting = TConstruct.getBasinCasting(); - TRepo.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); - TRepo.helmetWood = new ArmorBasic(TRepo.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); - TRepo.chestplateWood = new ArmorBasic(TRepo.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); - TRepo.leggingsWood = new ArmorBasic(TRepo.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); - TRepo.bootsWood = new ArmorBasic(TRepo.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); - GameRegistry.registerItem(TRepo.helmetWood, "helmetWood"); - GameRegistry.registerItem(TRepo.chestplateWood, "chestplateWood"); - GameRegistry.registerItem(TRepo.leggingsWood, "leggingsWood"); - GameRegistry.registerItem(TRepo.bootsWood, "bootsWood"); - - TRepo.exoGoggles = new ExoArmor(EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles"); - TRepo.exoChest = new ExoArmor(EnumArmorPart.CHEST, "exosuit").setUnlocalizedName("tconstruct.exoChest"); - TRepo.exoPants = new ExoArmor(EnumArmorPart.PANTS, "exosuit").setUnlocalizedName("tconstruct.exoPants"); - TRepo.exoShoes = new ExoArmor(EnumArmorPart.SHOES, "exosuit").setUnlocalizedName("tconstruct.exoShoes"); - - GameRegistry.registerItem(TRepo.exoGoggles, "helmetExo"); - GameRegistry.registerItem(TRepo.exoChest, "chestplateExo"); - GameRegistry.registerItem(TRepo.exoPants, "leggingsExo"); - GameRegistry.registerItem(TRepo.exoShoes, "bootsExo"); - - String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", - "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", - "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze", - "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" }; - - for (int i = 0; i < materialStrings.length; i++) - { - TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(TRepo.materials, 1, i)); - } - - String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence" }; - - for (int i = 0; i < oreberries.length; i++) - { - TConstructRegistry.addItemStackToDirectory("oreberry" + oreberries[i], new ItemStack(TRepo.oreBerries, 1, i)); - } - - TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(TRepo.diamondApple, 1, 0)); - TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(TRepo.strangeFood, 1, 0)); - - TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(TRepo.heartCanister, 1, 0)); - TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(TRepo.heartCanister, 1, 1)); - TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(TRepo.heartCanister, 1, 2)); - - // Vanilla stack sizes - Items.wooden_door.setMaxStackSize(16); - Items.iron_door.setMaxStackSize(16); - Items.boat.setMaxStackSize(16); - Items.minecart.setMaxStackSize(3); - // Items.minecartEmpty.setMaxStackSize(3); - // Items.minecartCrate.setMaxStackSize(3); - // Items.minecartPowered.setMaxStackSize(3); - Items.cake.setMaxStackSize(16); - // Block.torchWood.setTickRandomly(false); - } - - void registerMaterials () - { - TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", ""); - TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", StatCollector.translateToLocal("materialtraits.stonebound")); - TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", ""); - TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", ""); - TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", StatCollector.translateToLocal("materialtraits.jagged")); - TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", ""); - TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", ""); - TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound")); - TConstructRegistry.addToolMaterial(8, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7a", ""); - TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", StatCollector.translateToLocal("materialtraits.writable")); - TConstructRegistry.addToolMaterial(10, "Cobalt", 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", ""); - TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound")); - TConstructRegistry.addToolMaterial(12, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", ""); - TConstructRegistry.addToolMaterial(13, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", ""); - TConstructRegistry.addToolMaterial(14, "Bronze", 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", ""); - TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); - TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); - TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); - TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", StatCollector.translateToLocal("materialtraits.tasty")); - - TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); // Wood - TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); // Stone - TConstructRegistry.addBowMaterial(2, 576, 40, 1.2f); // Iron - TConstructRegistry.addBowMaterial(3, 10, 80, 0.2f); // Flint - TConstructRegistry.addBowMaterial(4, 384, 20, 1.0f); // Cactus - TConstructRegistry.addBowMaterial(5, 192, 30, 1.0f); // Bone - TConstructRegistry.addBowMaterial(6, 10, 80, 0.2f); // Obsidian - TConstructRegistry.addBowMaterial(7, 10, 80, 0.2f); // Netherrack - TConstructRegistry.addBowMaterial(8, 1536, 20, 1.2f); // Slime - TConstructRegistry.addBowMaterial(9, 48, 25, 0.5f); // Paper - TConstructRegistry.addBowMaterial(10, 1152, 40, 1.2f); // Cobalt - TConstructRegistry.addBowMaterial(11, 960, 40, 1.2f); // Ardite - TConstructRegistry.addBowMaterial(12, 1536, 40, 1.2f); // Manyullyn - TConstructRegistry.addBowMaterial(13, 384, 40, 1.2f); // Copper - TConstructRegistry.addBowMaterial(14, 576, 40, 1.2f); // Bronze - TConstructRegistry.addBowMaterial(15, 768, 40, 1.2f); // Alumite - TConstructRegistry.addBowMaterial(16, 768, 40, 1.2f); // Steel - TConstructRegistry.addBowMaterial(17, 576, 20, 1.2f); // Blue Slime - TConstructRegistry.addBowMaterial(18, 384, 20, 1.2f); // Slime - - // Material ID, mass, fragility - TConstructRegistry.addArrowMaterial(0, 0.69F, 1.0F, 100F); // Wood - TConstructRegistry.addArrowMaterial(1, 2.5F, 5.0F, 100F); // Stone - TConstructRegistry.addArrowMaterial(2, 7.2F, 0.5F, 100F); // Iron - TConstructRegistry.addArrowMaterial(3, 2.65F, 1.0F, 100F); // Flint - TConstructRegistry.addArrowMaterial(4, 0.76F, 1.0F, 100F); // Cactus - TConstructRegistry.addArrowMaterial(5, 0.69F, 1.0F, 100); // Bone - TConstructRegistry.addArrowMaterial(6, 2.4F, 1.0F, 100F); // Obsidian - TConstructRegistry.addArrowMaterial(7, 3.5F, 1.0F, 100F); // Netherrack - TConstructRegistry.addArrowMaterial(8, 0.42F, 0.0F, 100F); // Slime - TConstructRegistry.addArrowMaterial(9, 1.1F, 3.0F, 90F); // Paper - TConstructRegistry.addArrowMaterial(10, 8.9F, 0.25F, 100F); // Cobalt - TConstructRegistry.addArrowMaterial(11, 7.2F, 0.25F, 100F); // Ardite - TConstructRegistry.addArrowMaterial(12, 10.6F, 0.1F, 100F); // Manyullyn - TConstructRegistry.addArrowMaterial(13, 8.96F, 0.5F, 100F); // Copper - TConstructRegistry.addArrowMaterial(14, 7.9F, 0.25F, 100F); // Bronze - TConstructRegistry.addArrowMaterial(15, 4.7F, 0.25F, 100F); // Alumite - TConstructRegistry.addArrowMaterial(16, 7.6F, 0.25F, 100F); // Steel - TConstructRegistry.addArrowMaterial(17, 0.42F, 0.0F, 100F); // Blue - // Slime - TConstructRegistry.addArrowMaterial(18, 6.8F, 0.5F, 100F); // Iron - - TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TRepo.bowstring, 1, 0), 1F, 1F, 1f); // String - TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TRepo.fletching, 1, 0), 100F, 0F, 0.05F); // Feather - for (int i = 0; i < 4; i++) - TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Blocks.leaves, 1, i), new ItemStack(TRepo.fletching, 1, 1), 75F, 0F, 0.2F); // All four vanialla Leaves - TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(TRepo.materials, 1, 1), new ItemStack(TRepo.fletching, 1, 2), 100F, 0F, 0.12F); // Slime - TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(TRepo.materials, 1, 17), new ItemStack(TRepo.fletching, 1, 3), 100F, 0F, 0.12F); // BlueSlime - - PatternBuilder pb = PatternBuilder.instance; - if (PHConstruct.enableTWood) - pb.registerFullMaterial(Blocks.planks, 2, StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick), new ItemStack(Items.stick), 0); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0); - if (PHConstruct.enableTStone) - { - pb.registerFullMaterial(Blocks.stone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 1); - pb.registerMaterial(Blocks.cobblestone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone")); - } - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 0); - pb.registerFullMaterial(Items.iron_ingot, 2, StatCollector.translateToLocal("gui.partbuilder.material.iron"), new ItemStack(TRepo.toolShard, 1, 2), new ItemStack(TRepo.toolRod, 1, 2), 2); - if (PHConstruct.enableTFlint) - pb.registerFullMaterial(Items.flint, 2, StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); - if (PHConstruct.enableTCactus) - pb.registerFullMaterial(Blocks.cactus, 2, StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); - if (PHConstruct.enableTBone) - pb.registerFullMaterial(Items.bone, 2, StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); - pb.registerFullMaterial(Blocks.obsidian, 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian"), new ItemStack(TRepo.toolShard, 1, 6), new ItemStack(TRepo.toolRod, 1, 6), 6); - pb.registerMaterial(new ItemStack(TRepo.materials, 1, 18), 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian")); - if (PHConstruct.enableTNetherrack) - pb.registerFullMaterial(Blocks.netherrack, 2, StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); - if (PHConstruct.enableTSlime) - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 1), 2, StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 8), 8); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 17), 8); - if (PHConstruct.enableTPaper) - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 0), 2, StatCollector.translateToLocal("gui.partbuilder.material.paper"), new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cobalt"), new ItemStack(TRepo.toolShard, 1, 10), new ItemStack(TRepo.toolRod, 1, 10), 10); - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.ardite"), new ItemStack(TRepo.toolShard, 1, 11), new ItemStack(TRepo.toolRod, 1, 11), 11); - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.manyullyn"), new ItemStack(TRepo.toolShard, 1, 12), new ItemStack(TRepo.toolRod, 1, 12), 12); - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.copper"), new ItemStack(TRepo.toolShard, 1, 13), new ItemStack(TRepo.toolRod, 1, 13), 13); - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bronze"), new ItemStack(TRepo.toolShard, 1, 14), new ItemStack(TRepo.toolRod, 1, 14), 14); - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.alumite"), new ItemStack(TRepo.toolShard, 1, 15), new ItemStack(TRepo.toolRod, 1, 15), 15); - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.steel"), new ItemStack(TRepo.toolShard, 1, 16), new ItemStack(TRepo.toolRod, 1, 16), 16); - if (PHConstruct.enableTBlueSlime) - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 17), 2, StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); - else - pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 34), 2, StatCollector.translateToLocal("gui.partbuilder.material.pigiron"), new ItemStack(TRepo.toolShard, 1, 18), new ItemStack(TRepo.toolRod, 1, 18), 18); - - pb.addToolPattern((IPattern) TRepo.woodPattern); - } - - void addCraftingRecipes () - { - TRecipes.addPartMapping(); - TRecipes.addRecipesForToolBuilder(); - TRecipes.addRecipesForTableCasting(); - TRecipes.addRecipesForBasinCasting(); - TRecipes.addRecipesForSmeltery(); - TRecipes.addRecipesForChisel(); - TRecipes.addRecipesForFurnace(); - TRecipes.addRecipesForCraftingTable(); - TRecipes.addRecipesForDryingRack(); - } - - void setupToolTabs () - { - TConstructRegistry.materialTab.init(new ItemStack(TRepo.manualBook, 1, 0)); - TConstructRegistry.partTab.init(new ItemStack(TRepo.titleIcon, 1, 255)); - TConstructRegistry.blockTab.init(new ItemStack(TRepo.toolStationWood)); - ItemStack tool = new ItemStack(TRepo.longsword, 1, 0); - - NBTTagCompound compound = new NBTTagCompound(); - compound.setTag("InfiTool", new NBTTagCompound()); - compound.getCompoundTag("InfiTool").setInteger("RenderHead", 2); - compound.getCompoundTag("InfiTool").setInteger("RenderHandle", 0); - compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", 10); - tool.setTagCompound(compound); - - // TConstruct. - TConstructRegistry.toolTab.init(tool); - } - - public void addLoot () - { - // Item, min, max, weight - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 10)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 10)); - - TRepo.tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); - TRepo.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 1)); - int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 }; - Item[] partTypes = { TRepo.pickaxeHead, TRepo.shovelHead, TRepo.hatchetHead, TRepo.binding, TRepo.swordBlade, TRepo.wideGuard, TRepo.handGuard, TRepo.crossbar, TRepo.knifeBlade, - TRepo.frypanHead, TRepo.signHead, TRepo.chiselHead }; - - for (int partIter = 0; partIter < partTypes.length; partIter++) - { - for (int typeIter = 0; typeIter < validTypes.length; typeIter++) - { - TRepo.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); - } - } - - TRepo.tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30); - for (int i = 0; i < 13; i++) - { - TRepo.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.woodPattern, 1, i + 1), 1, 3, 20)); - } - TRepo.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.woodPattern, 1, 22), 1, 3, 40)); - } - - public static String[] liquidNames; - - @Override - public int getBurnTime (ItemStack fuel) - { - if (fuel.getItem() == TRepo.materials && fuel.getItemDamage() == 7) - return 26400; - return 0; - } - - public void addAchievements () - { - HashMap achievements = TAchievements.achievements; - - achievements.put("tconstruct:beginner", new Achievement("tconstruct:beginner", "tconstruct.beginner", 0, 0, TRepo.manualBook, null));// .setIndependent()); - achievements.put("tconstruct:pattern", new Achievement("tconstruct:pattern", "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct:beginner"))); - achievements.put("tconstruct:tinkerer", new Achievement("tconstruct:tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct:pattern"))); - achievements.put("tconstruct:preparedFight", - new Achievement("tconstruct:preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct:tinkerer"))); - achievements.put("tconstruct:proTinkerer", - new Achievement("tconstruct:proTinkerer", "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct:tinkerer")).setSpecial()); - achievements.put("tconstruct:smelteryMaker", new Achievement("tconstruct:smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct:beginner"))); - achievements.put("tconstruct:enemySlayer", - new Achievement("tconstruct:enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct:preparedFight"))); - achievements.put("tconstruct:dualConvenience", - new Achievement("tconstruct:dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct:enemySlayer")).setSpecial()); - achievements.put("tconstruct:doingItWrong", - new Achievement("tconstruct:doingItWrong", "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct:smelteryMaker"))); - achievements.put("tconstruct:betterCrafting", - new Achievement("tconstruct:betterCrafting", "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct:beginner"))); - } -} diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index b0fa6e54..a0c506df 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.inventory.ArmorExtendedContainer; -import tconstruct.inventory.ContainerLandmine; -import tconstruct.inventory.KnapsackContainer; +import tconstruct.armor.inventory.ArmorExtendedContainer; +import tconstruct.armor.inventory.KnapsackContainer; +import tconstruct.mechworks.inventory.ContainerLandmine; +import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.util.player.TPlayerStats; /** diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java deleted file mode 100644 index 819517a6..00000000 --- a/src/main/java/tconstruct/common/TRecipes.java +++ /dev/null @@ -1,1658 +0,0 @@ -package tconstruct.common; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; - -import mantle.blocks.abstracts.MultiServantLogic; -import mantle.utils.RecipeRemover; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDispenser; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; -import tconstruct.TConstruct; -import tconstruct.blocks.logic.AdaptiveDrainLogic; -import tconstruct.blocks.logic.AdaptiveSmelteryLogic; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingChannelLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.blocks.logic.FaucetLogic; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.blocks.logic.FurnaceLogic; -import tconstruct.blocks.logic.LavaTankLogic; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.blocks.logic.SmelteryDrainLogic; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.blocks.logic.TankAirLogic; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.items.blocks.BarricadeItem; -import tconstruct.items.blocks.CastingChannelItem; -import tconstruct.items.blocks.CraftedSoilItemBlock; -import tconstruct.items.blocks.CraftingSlabItemBlock; -import tconstruct.items.blocks.GlassBlockItem; -import tconstruct.items.blocks.GlassPaneItem; -import tconstruct.items.blocks.GravelOreItem; -import tconstruct.items.blocks.HamboneItemBlock; -import tconstruct.items.blocks.ItemBlockLandmine; -import tconstruct.items.blocks.LavaTankItemBlock; -import tconstruct.items.blocks.MetadataItemBlock; -import tconstruct.items.blocks.MetalItemBlock; -import tconstruct.items.blocks.MetalOreItemBlock; -import tconstruct.items.blocks.MultiBrickFancyItem; -import tconstruct.items.blocks.MultiBrickItem; -import tconstruct.items.blocks.OreberryBushItem; -import tconstruct.items.blocks.OreberryBushSecondItem; -import tconstruct.items.blocks.SearedSlabItem; -import tconstruct.items.blocks.SearedTableItemBlock; -import tconstruct.items.blocks.SlimeGelItemBlock; -import tconstruct.items.blocks.SlimeGrassItemBlock; -import tconstruct.items.blocks.SlimeLeavesItemBlock; -import tconstruct.items.blocks.SlimeSaplingItemBlock; -import tconstruct.items.blocks.SlimeTallGrassItem; -import tconstruct.items.blocks.SmelteryItemBlock; -import tconstruct.items.blocks.SpeedBlockItem; -import tconstruct.items.blocks.SpeedSlabItem; -import tconstruct.items.blocks.StainedGlassClearItem; -import tconstruct.items.blocks.StainedGlassClearPaneItem; -import tconstruct.items.blocks.ToolStationItemBlock; -import tconstruct.items.blocks.WoolSlab1Item; -import tconstruct.items.blocks.WoolSlab2Item; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.armor.EnumArmorPart; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.Detailing; -import tconstruct.library.crafting.Detailing.DetailInput; -import tconstruct.library.crafting.DryingRackRecipes; -import tconstruct.library.crafting.FluidType; -import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.crafting.Smeltery; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.util.IPattern; -import tconstruct.modifiers.armor.AModDamageBoost; -import tconstruct.modifiers.armor.AModDoubleJump; -import tconstruct.modifiers.armor.AModHealthBoost; -import tconstruct.modifiers.armor.AModKnockbackResistance; -import tconstruct.modifiers.armor.AModMoveSpeed; -import tconstruct.modifiers.armor.AModProtection; -import tconstruct.modifiers.tools.ModAntiSpider; -import tconstruct.modifiers.tools.ModAttack; -import tconstruct.modifiers.tools.ModAutoSmelt; -import tconstruct.modifiers.tools.ModBlaze; -import tconstruct.modifiers.tools.ModButtertouch; -import tconstruct.modifiers.tools.ModCreativeToolModifier; -import tconstruct.modifiers.tools.ModDurability; -import tconstruct.modifiers.tools.ModExtraModifier; -import tconstruct.modifiers.tools.ModFlux; -import tconstruct.modifiers.tools.ModInteger; -import tconstruct.modifiers.tools.ModLapis; -import tconstruct.modifiers.tools.ModPiston; -import tconstruct.modifiers.tools.ModRedstone; -import tconstruct.modifiers.tools.ModReinforced; -import tconstruct.modifiers.tools.ModRepair; -import tconstruct.modifiers.tools.ModSmite; -import tconstruct.modifiers.tools.TActiveOmniMod; -import tconstruct.util.TDispenserBehaviorArrow; -import tconstruct.util.TDispenserBehaviorSpawnEgg; -import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; - -public class TRecipes -{ - static void registerBlockRecipes () - { - // Tool Tables - GameRegistry.registerBlock(TRepo.toolStationWood, ToolStationItemBlock.class, "ToolStationBlock"); - GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation"); - GameRegistry.registerTileEntity(PartBuilderLogic.class, "PartCrafter"); - GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder"); - GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper"); - GameRegistry.registerBlock(TRepo.toolForge, MetadataItemBlock.class, "ToolForgeBlock"); - GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge"); - GameRegistry.registerBlock(TRepo.craftingStationWood, "CraftingStation"); - GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation"); - GameRegistry.registerBlock(TRepo.craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab"); - GameRegistry.registerBlock(TRepo.furnaceSlab, "FurnaceSlab"); - GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace"); - GameRegistry.registerBlock(TRepo.heldItemBlock, "HeldItemBlock"); - GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); - - GameRegistry.registerBlock(TRepo.craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); - - GameRegistry.registerBlock(TRepo.searedSlab, SearedSlabItem.class, "SearedSlab"); - GameRegistry.registerBlock(TRepo.speedSlab, SpeedSlabItem.class, "SpeedSlab"); - - GameRegistry.registerBlock(TRepo.metalBlock, MetalItemBlock.class, "MetalBlock"); - GameRegistry.registerBlock(TRepo.meatBlock, HamboneItemBlock.class, "MeatBlock"); - - OreDictionary.registerOre("hambone", new ItemStack(TRepo.meatBlock)); - GameRegistry.addRecipe(new ItemStack(TRepo.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Items.bone), 'm', new ItemStack(Items.porkchop)); - - GameRegistry.registerBlock(TRepo.glueBlock, "GlueBlock"); - OreDictionary.registerOre("blockRubber", new ItemStack(TRepo.glueBlock)); - - GameRegistry.registerBlock(TRepo.woolSlab1, WoolSlab1Item.class, "WoolSlab1"); - GameRegistry.registerBlock(TRepo.woolSlab2, WoolSlab2Item.class, "WoolSlab2"); - - // Smeltery stuff - GameRegistry.registerBlock(TRepo.smeltery, SmelteryItemBlock.class, "Smeltery"); - GameRegistry.registerBlock(TRepo.smelteryNether, SmelteryItemBlock.class, "SmelteryNether"); - if (PHConstruct.newSmeltery) - { - GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery"); - GameRegistry.registerTileEntity(AdaptiveDrainLogic.class, "TConstruct.SmelteryDrain"); - } - else - { - GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery"); - GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain"); - } - GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants"); - GameRegistry.registerBlock(TRepo.lavaTank, LavaTankItemBlock.class, "LavaTank"); - GameRegistry.registerBlock(TRepo.lavaTankNether, LavaTankItemBlock.class, "LavaTankNether"); - GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank"); - - GameRegistry.registerBlock(TRepo.searedBlock, SearedTableItemBlock.class, "SearedBlock"); - GameRegistry.registerBlock(TRepo.searedBlockNether, SearedTableItemBlock.class, "SearedBlockNether"); - GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable"); - GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet"); - GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin"); - - GameRegistry.registerBlock(TRepo.castingChannel, CastingChannelItem.class, "CastingChannel"); - GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel"); - - GameRegistry.registerBlock(TRepo.tankAir, "TankAir"); - GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air"); - - // Traps - GameRegistry.registerBlock(TRepo.landmine, ItemBlockLandmine.class, "Redstone.Landmine"); - GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); - GameRegistry.registerBlock(TRepo.punji, "trap.punji"); - GameRegistry.registerBlock(TRepo.barricadeOak, BarricadeItem.class, "trap.barricade.oak"); - GameRegistry.registerBlock(TRepo.barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce"); - GameRegistry.registerBlock(TRepo.barricadeBirch, BarricadeItem.class, "trap.barricade.birch"); - GameRegistry.registerBlock(TRepo.barricadeJungle, BarricadeItem.class, "trap.barricade.jungle"); - GameRegistry.registerBlock(TRepo.slimeExplosive, MetadataItemBlock.class, "explosive.slime"); - - GameRegistry.registerBlock(TRepo.dryingRack, "Armor.DryingRack"); - GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack"); - // fluids - - // Slime Islands - GameRegistry.registerBlock(TRepo.slimeGel, SlimeGelItemBlock.class, "slime.gel"); - GameRegistry.registerBlock(TRepo.slimeGrass, SlimeGrassItemBlock.class, "slime.grass"); - GameRegistry.registerBlock(TRepo.slimeTallGrass, SlimeTallGrassItem.class, "slime.grass.tall"); - GameRegistry.registerBlock(TRepo.slimeLeaves, SlimeLeavesItemBlock.class, "slime.leaves"); - GameRegistry.registerBlock(TRepo.slimeSapling, SlimeSaplingItemBlock.class, "slime.sapling"); - GameRegistry.registerBlock(TRepo.slimeChannel, "slime.channel"); - GameRegistry.registerBlock(TRepo.bloodChannel, "blood.channel"); - GameRegistry.registerBlock(TRepo.slimePad, "slime.pad"); - // TODO fix this - /* - * TConstructRegistry.drawbridgeState[TRepo.slimePad] = 1; - * TConstructRegistry.drawbridgeState[TRepo.bloodChannel] = 1; - */ - - // Decoration - GameRegistry.registerBlock(TRepo.stoneTorch, "decoration.stonetorch"); - GameRegistry.registerBlock(TRepo.stoneLadder, "decoration.stoneladder"); - GameRegistry.registerBlock(TRepo.multiBrick, MultiBrickItem.class, "decoration.multibrick"); - GameRegistry.registerBlock(TRepo.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); - - // Ores - GameRegistry.registerBlock(TRepo.oreBerry, OreberryBushItem.class, "ore.berries.one"); - GameRegistry.registerBlock(TRepo.oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two"); - GameRegistry.registerBlock(TRepo.oreSlag, MetalOreItemBlock.class, "SearedBrick"); - GameRegistry.registerBlock(TRepo.oreGravel, GravelOreItem.class, "GravelOre"); - - GameRegistry.registerBlock(TRepo.speedBlock, SpeedBlockItem.class, "SpeedBlock"); - - // Glass - GameRegistry.registerBlock(TRepo.clearGlass, GlassBlockItem.class, "GlassBlock"); - GameRegistry.registerBlock(TRepo.glassPane, GlassPaneItem.class, "GlassPane"); - GameRegistry.registerBlock(TRepo.stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); - GameRegistry.registerBlock(TRepo.stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); - - // Rail - GameRegistry.registerBlock(TRepo.woodenRail, "rail.wood"); - } - - static void registerItemRecipes () - { - - } - - public void addOreDictionarySmelteryRecipes () - { - List exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime, FluidType.Obsidian }); - for (FluidType ft : FluidType.values()) - { - if (exceptions.contains(ft)) - continue; - - // Nuggets - Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); - - // Ingots, Dust - registerIngotCasting(ft); - Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); - Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue); - - // Factorization support - Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); - - // Ores - Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); - - // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); - - // Blocks - Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); - - if (ft.isToolpart) - { - registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); - registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); - } - } - // Obsidian, different dust amount - { - FluidType ft = FluidType.Obsidian; - Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); - - // Ingots, Dust - registerIngotCasting(ft); - Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); - Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue / 4); - - // Factorization support - Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); - - // Ores - Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); - - // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); - - // Blocks - Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); - - if (ft.isToolpart) - { - registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); - registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); - } - } - - // Compressed materials - for (int i = 1; i <= 8; i++) - { - Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.Stone, 0, TConstruct.ingotLiquidValue / 18 * (9 ^ i)); - } - Smeltery.addDictionaryMelting("compressedSand1x", FluidType.Glass, 175, FluidContainerRegistry.BUCKET_VOLUME * 9); - - registerPatternMaterial("plankWood", 2, "Wood"); - registerPatternMaterial("stickWood", 1, "Wood"); - registerPatternMaterial("slabWood", 1, "Wood"); - registerPatternMaterial("compressedCobblestone1x", 18, "Stone"); - } - - protected static void addRecipesForToolBuilder () - { - ToolBuilder tb = ToolBuilder.instance; - tb.addNormalToolRecipe(TRepo.pickaxe, TRepo.pickaxeHead, TRepo.toolRod, TRepo.binding); - tb.addNormalToolRecipe(TRepo.broadsword, TRepo.swordBlade, TRepo.toolRod, TRepo.wideGuard); - tb.addNormalToolRecipe(TRepo.hatchet, TRepo.hatchetHead, TRepo.toolRod); - tb.addNormalToolRecipe(TRepo.shovel, TRepo.shovelHead, TRepo.toolRod); - tb.addNormalToolRecipe(TRepo.longsword, TRepo.swordBlade, TRepo.toolRod, TRepo.handGuard); - tb.addNormalToolRecipe(TRepo.rapier, TRepo.swordBlade, TRepo.toolRod, TRepo.crossbar); - tb.addNormalToolRecipe(TRepo.frypan, TRepo.frypanHead, TRepo.toolRod); - tb.addNormalToolRecipe(TRepo.battlesign, TRepo.signHead, TRepo.toolRod); - tb.addNormalToolRecipe(TRepo.mattock, TRepo.hatchetHead, TRepo.toolRod, TRepo.shovelHead); - tb.addNormalToolRecipe(TRepo.dagger, TRepo.knifeBlade, TRepo.toolRod, TRepo.crossbar); - tb.addNormalToolRecipe(TRepo.cutlass, TRepo.swordBlade, TRepo.toolRod, TRepo.fullGuard); - tb.addNormalToolRecipe(TRepo.chisel, TRepo.chiselHead, TRepo.toolRod); - - tb.addNormalToolRecipe(TRepo.scythe, TRepo.scytheBlade, TRepo.toughRod, TRepo.toughBinding, TRepo.toughRod); - tb.addNormalToolRecipe(TRepo.lumberaxe, TRepo.broadAxeHead, TRepo.toughRod, TRepo.largePlate, TRepo.toughBinding); - tb.addNormalToolRecipe(TRepo.cleaver, TRepo.largeSwordBlade, TRepo.toughRod, TRepo.largePlate, TRepo.toughRod); - tb.addNormalToolRecipe(TRepo.excavator, TRepo.excavatorHead, TRepo.toughRod, TRepo.largePlate, TRepo.toughBinding); - tb.addNormalToolRecipe(TRepo.hammer, TRepo.hammerHead, TRepo.toughRod, TRepo.largePlate, TRepo.largePlate); - tb.addNormalToolRecipe(TRepo.battleaxe, TRepo.broadAxeHead, TRepo.toughRod, TRepo.broadAxeHead, TRepo.toughBinding); - - BowRecipe recipe = new BowRecipe(TRepo.toolRod, TRepo.bowstring, TRepo.toolRod, TRepo.shortbow); - tb.addCustomToolRecipe(recipe); - tb.addNormalToolRecipe(TRepo.arrow, TRepo.arrowhead, TRepo.toolRod, TRepo.fletching); - - ItemStack diamond = new ItemStack(Items.diamond); - tb.registerToolMod(new ModRepair()); - tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, StatCollector.translateToLocal("gui.modifier.diamond"), "\u00a7b" - + StatCollector.translateToLocal("modifier.tool.diamond"), "\u00a7b")); - tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, StatCollector.translateToLocal("gui.modifier.emerald"), "\u00a72" - + StatCollector.translateToLocal("modifier.tool.emerald"), "\u00a72")); - - TRepo.modFlux = new ModFlux(); - tb.registerToolMod(TRepo.modFlux); - - ItemStack redstoneItem = new ItemStack(Items.redstone); - ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); - tb.registerToolMod(new ModRedstone(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); - - ItemStack lapisItem = new ItemStack(Items.dye, 1, 4); - ItemStack lapisBlock = new ItemStack(Blocks.lapis_block); - TRepo.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 }); - tb.registerToolMod(TRepo.modLapis); - - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 6) }, 4, StatCollector.translateToLocal("gui.modifier.moss"), 3, "\u00a72", StatCollector - .translateToLocal("modifier.tool.moss"))); - ItemStack blazePowder = new ItemStack(Items.blaze_powder); - tb.registerToolMod(new ModBlaze(7, new ItemStack[] { blazePowder }, new int[] { 1 })); - tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(TRepo.materials, 1, 7) }, 6, StatCollector.translateToLocal("gui.modifier.lava"), "\u00a74", StatCollector - .translateToLocal("modifier.tool.lava"))); - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 8) }, 8, StatCollector.translateToLocal("gui.modifier.necro"), 1, "\u00a78", StatCollector - .translateToLocal("modifier.tool.necro"))); - - TRepo.modAttack = new ModAttack(StatCollector.translateToLocal("gui.modifier.quartz"), 11, new ItemStack[] { new ItemStack(Items.quartz), - new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }); - tb.registerToolMod(TRepo.modAttack); - - tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free")); - tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1) }, "Tier1.5Free")); - tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Items.nether_star) }, "Tier2Free")); - tb.registerToolMod(new ModCreativeToolModifier(new ItemStack[] { new ItemStack(TRepo.creativeModifier) })); - - ItemStack silkyJewel = new ItemStack(TRepo.materials, 1, 26); - tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12)); - - ItemStack piston = new ItemStack(Blocks.piston); - tb.registerToolMod(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 })); - - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, StatCollector.translateToLocal("modifier.tool.beheading"), 1, - "\u00a7d", StatCollector.translateToLocal("modifier.tool.beheading"))); - - ItemStack holySoil = new ItemStack(TRepo.craftedSoil, 1, 4); - tb.registerToolMod(new ModSmite(StatCollector.translateToLocal("modifier.tool.smite"), 14, new ItemStack[] { holySoil }, new int[] { 1 })); - - ItemStack spidereyeball = new ItemStack(Items.fermented_spider_eye); - tb.registerToolMod(new ModAntiSpider(StatCollector.translateToLocal("gui.modifier.spider"), 15, new ItemStack[] { spidereyeball }, new int[] { 1 })); - - ItemStack obsidianPlate = new ItemStack(TRepo.largePlate, 1, 6); - tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); - - EnumSet allArmors = EnumSet.of(EnumArmorPart.HELMET, EnumArmorPart.CHEST, EnumArmorPart.PANTS, EnumArmorPart.SHOES); - EnumSet chest = EnumSet.of(EnumArmorPart.CHEST); - tb.registerArmorMod(new AModMoveSpeed(0, allArmors, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 }, false)); - tb.registerArmorMod(new AModKnockbackResistance(1, allArmors, new ItemStack[] { new ItemStack(Items.gold_ingot), new ItemStack(Blocks.gold_block) }, new int[] { 1, 9 }, false)); - tb.registerArmorMod(new AModHealthBoost(2, allArmors, new ItemStack[] { new ItemStack(TRepo.heartCanister, 1, 2) }, new int[] { 2 }, true)); - tb.registerArmorMod(new AModDamageBoost(3, allArmors, new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Blocks.diamond_block) }, new int[] { 1, 9 }, false, 3, 0.05)); - tb.registerArmorMod(new AModDamageBoost(4, chest, new ItemStack[] { new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1 }, true, 5, 1)); - tb.registerArmorMod(new AModProtection(5, allArmors, new ItemStack[] { new ItemStack(TRepo.largePlate, 1, 2) }, new int[] { 2 })); - - tb.registerArmorMod(new AModDoubleJump(new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 1) })); - - TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); - } - - protected static void addPartMapping () - { - /* Tools */ - TRepo.patternOutputs = new Item[] { TRepo.toolRod, TRepo.pickaxeHead, TRepo.shovelHead, TRepo.hatchetHead, TRepo.swordBlade, TRepo.wideGuard, TRepo.handGuard, TRepo.crossbar, TRepo.binding, - TRepo.frypanHead, TRepo.signHead, TRepo.knifeBlade, TRepo.chiselHead, TRepo.toughRod, TRepo.toughBinding, TRepo.largePlate, TRepo.broadAxeHead, TRepo.scytheBlade, TRepo.excavatorHead, - TRepo.largeSwordBlade, TRepo.hammerHead, TRepo.fullGuard, null, null, TRepo.arrowhead, null }; - - int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; - - if (PHConstruct.craftMetalTools) - { - for (int mat = 0; mat < 18; mat++) - { - for (int meta = 0; meta < TRepo.patternOutputs.length; meta++) - { - if (TRepo.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(TRepo.woodPattern, meta + 1, mat, new ItemStack(TRepo.patternOutputs[meta], 1, mat)); - } - } - } - else - { - for (int mat = 0; mat < nonMetals.length; mat++) - { - for (int meta = 0; meta < TRepo.patternOutputs.length; meta++) - { - if (TRepo.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(TRepo.woodPattern, meta + 1, nonMetals[mat], new ItemStack(TRepo.patternOutputs[meta], 1, nonMetals[mat])); - } - } - } - } - - protected static void addRecipesForTableCasting () - { - /* Smeltery */ - ItemStack ingotcast = new ItemStack(TRepo.metalPattern, 1, 0); - ItemStack gemcast = new ItemStack(TRepo.metalPattern, 1, 26); - LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - // Blank - tableCasting.addCastingRecipe(new ItemStack(TRepo.blankPattern, 1, 1), new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); - tableCasting.addCastingRecipe(new ItemStack(TRepo.blankPattern, 1, 2), new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Items.emerald), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Items.emerald), 80); - - // Ingots - tableCasting.addCastingRecipe(new ItemStack(TRepo.materials, 1, 2), new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); // stone - - // Misc - tableCasting.addCastingRecipe(new ItemStack(Items.emerald), new FluidStack(TRepo.moltenEmeraldFluid, 640), gemcast, 80); - tableCasting.addCastingRecipe(new ItemStack(TRepo.materials, 1, 36), new FluidStack(TRepo.glueFluid, TConstruct.ingotLiquidValue), null, 50); - tableCasting.addCastingRecipe(new ItemStack(TRepo.strangeFood, 1, 1), new FluidStack(TRepo.bloodFluid, 160), null, 50); - - // Buckets - ItemStack bucket = new ItemStack(Items.bucket); - - for (int sc = 0; sc < 24; sc++) - { - tableCasting.addCastingRecipe(new ItemStack(TRepo.buckets, 1, sc), new FluidStack(TRepo.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); - } - tableCasting.addCastingRecipe(new ItemStack(TRepo.buckets, 1, 26), new FluidStack(TRepo.fluids[26], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); - - // Clear glass pane casting - tableCasting.addCastingRecipe(new ItemStack(TRepo.glassPane), new FluidStack(TRepo.moltenGlassFluid, 250), null, 80); - - // Metal toolpart casting - TRepo.liquids = new FluidStack[] { new FluidStack(TRepo.moltenIronFluid, 1), new FluidStack(TRepo.moltenCopperFluid, 1), new FluidStack(TRepo.moltenCobaltFluid, 1), - new FluidStack(TRepo.moltenArditeFluid, 1), new FluidStack(TRepo.moltenManyullynFluid, 1), new FluidStack(TRepo.moltenBronzeFluid, 1), new FluidStack(TRepo.moltenAlumiteFluid, 1), - new FluidStack(TRepo.moltenObsidianFluid, 1), new FluidStack(TRepo.moltenSteelFluid, 1), new FluidStack(TRepo.pigIronFluid, 1) }; - int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; // ItemStack - // damage - // value - int fluidAmount = 0; - Fluid fs = null; - - for (int iter = 0; iter < TRepo.patternOutputs.length; iter++) - { - if (TRepo.patternOutputs[iter] != null) - { - ItemStack cast = new ItemStack(TRepo.metalPattern, 1, iter + 1); - - tableCasting.addCastingRecipe(cast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TRepo.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TRepo.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - - for (int iterTwo = 0; iterTwo < TRepo.liquids.length; iterTwo++) - { - fs = TRepo.liquids[iterTwo].getFluid(); - fluidAmount = ((IPattern) TRepo.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; - ItemStack metalCast = new ItemStack(TRepo.patternOutputs[iter], 1, liquidDamage[iterTwo]); - tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); - Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount); - } - } - } - - ItemStack[] ingotShapes = { new ItemStack(Items.brick), new ItemStack(Items.netherbrick), new ItemStack(TRepo.materials, 1, 2), new ItemStack(TRepo.materials, 1, 37) }; - for (int i = 0; i < ingotShapes.length; i++) - { - tableCasting.addCastingRecipe(ingotcast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50); - tableCasting.addCastingRecipe(ingotcast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); - } - - ItemStack fullguardCast = new ItemStack(TRepo.metalPattern, 1, 22); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TRepo.fullGuard, 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TRepo.fullGuard, 1, Short.MAX_VALUE), false, 50); - - // Golden Food Stuff - FluidStack goldAmount = null; - if (PHConstruct.goldAppleRecipe) - { - goldAmount = new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 8); - } - else - { - goldAmount = new FluidStack(TRepo.moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); - } - tableCasting.addCastingRecipe(new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50); - tableCasting.addCastingRecipe(new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50); - tableCasting.addCastingRecipe(new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50); - tableCasting.addCastingRecipe(new ItemStack(TRepo.goldHead), goldAmount, new ItemStack(Items.skull, 1, 3), true, 50); - } - - protected static void addRecipesForFurnace () - { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.craftedSoil, 1, 3), new ItemStack(TRepo.craftedSoil, 1, 4), 0.2f); // Concecrated - // Soil - - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.craftedSoil, 1, 0), new ItemStack(TRepo.materials, 1, 1), 2f); // Slime - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.craftedSoil, 1, 1), new ItemStack(TRepo.materials, 1, 2), 2f); // Seared brick item - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.craftedSoil, 1, 2), new ItemStack(TRepo.materials, 1, 17), 2f); // Blue Slime - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.craftedSoil, 1, 6), new ItemStack(TRepo.materials, 1, 37), 2f); // Nether seared - // brick - - // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, - // 1, new ItemStack(TRepo.materials, 1, 3), 3f); - // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, - // 2, new ItemStack(TRepo.materials, 1, 4), 3f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, 1, 3), new ItemStack(TRepo.materials, 1, 9), 0.5f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, 1, 4), new ItemStack(TRepo.materials, 1, 10), 0.5f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, 1, 5), new ItemStack(TRepo.materials, 1, 11), 0.5f); - - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreBerries, 1, 0), new ItemStack(TRepo.materials, 1, 19), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreBerries, 1, 1), new ItemStack(Items.gold_nugget), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreBerries, 1, 2), new ItemStack(TRepo.materials, 1, 20), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreBerries, 1, 3), new ItemStack(TRepo.materials, 1, 21), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreBerries, 1, 4), new ItemStack(TRepo.materials, 1, 22), 0.2f); - // FurnaceRecipes.smelting().func_151394_a(new - // ItemStack(TRepo.oreBerries, 5, new ItemStack(TRepo.materials, 1, 23), - // 0.2f); - - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreGravel, 1, 0), new ItemStack(Items.iron_ingot), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreGravel, 1, 1), new ItemStack(Items.gold_ingot), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreGravel, 1, 2), new ItemStack(TRepo.materials, 1, 9), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreGravel, 1, 3), new ItemStack(TRepo.materials, 1, 10), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreGravel, 1, 4), new ItemStack(TRepo.materials, 1, 11), 0.2f); - - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.speedBlock, 1, 0), new ItemStack(TRepo.speedBlock, 1, 2), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.materials, 1, 38), new ItemStack(TRepo.materials, 1, 4), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.materials, 1, 39), new ItemStack(TRepo.materials, 1, 3), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.materials, 1, 40), new ItemStack(TRepo.materials, 1, 11), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.materials, 1, 41), new ItemStack(TRepo.materials, 1, 5), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.materials, 1, 42), new ItemStack(TRepo.materials, 1, 14), 0.2f); - - } - - protected static void addRecipesForCraftingTable () - { - String[] patBlock = { "###", "###", "###" }; - String[] patSurround = { "###", "#m#", "###" }; - - Object[] toolForgeBlocks = { "blockIron", "blockGold", Blocks.diamond_block, Blocks.emerald_block, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", - "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; - - // ToolForge Recipes (Metal Version) - for (int sc = 0; sc < toolForgeBlocks.length; sc++) - { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(TRepo.smeltery, 1, 2), 's', new ItemStack(TRepo.toolStationWood, - 1, 0), 'm', toolForgeBlocks[sc])); - // adding slab version recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(TRepo.smeltery, 1, 2), 's', new ItemStack( - TRepo.craftingSlabWood, 1, 1), 'm', toolForgeBlocks[sc])); - } - - // ToolStation Recipes (Wooden Version) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(TRepo.craftingStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(TRepo.craftingSlabWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 3)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', Blocks.chest); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', "logWood")); - if (PHConstruct.stencilTableCrafting) - { - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', "plankWood")); - } - GameRegistry.addRecipe(new ItemStack(TRepo.furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Blocks.stone_slab, 1, 3)); - - // Blank Pattern Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); - // Manual Book Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.manualBook), "wp", 'w', new ItemStack(TRepo.blankPattern, 1, 0), 'p', Items.paper); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 0), new ItemStack(TRepo.manualBook, 1, 0), Items.book); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0)); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 1), new ItemStack(TRepo.manualBook, 1, 1), Items.book); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 2), new ItemStack(TRepo.manualBook, 1, 2), Items.book); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 1, 3), new ItemStack(TRepo.manualBook, 1, 2)); - // alternative Vanilla Book Recipe - GameRegistry.addShapelessRecipe(new ItemStack(Items.book), Items.paper, Items.paper, Items.paper, Items.string, TRepo.blankPattern, TRepo.blankPattern); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.name_tag), "P~ ", "~O ", " ~", '~', Items.string, 'P', Items.paper, 'O', "slimeball")); - - // Paperstack Recipe - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 0), "pp", "pp", 'p', Items.paper); - // Mossball Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 6), patBlock, '#', "stoneMossy")); - // LavaCrystal Recipes -Auto-smelt - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'c', Items.fire_charge, 'x', Items.blaze_rod); - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'x', Items.fire_charge, 'c', Items.blaze_rod); - // Slimy sand Recipes - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 0), Items.slime_ball, Items.slime_ball, Items.slime_ball, Items.slime_ball, Blocks.sand, Blocks.dirt); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 2), TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, Blocks.sand, Blocks.dirt); - // Grout Recipes - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 1), Items.clay_ball, Blocks.sand, Blocks.gravel); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 8, 1), new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.gravel, - Blocks.gravel, Blocks.gravel, Blocks.gravel); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Items.nether_wart, Blocks.soul_sand, Blocks.gravel); - // Graveyard Soil Recipes - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 3), Blocks.dirt, Items.rotten_flesh, new ItemStack(Items.dye, 1, 15)); - // Silky Cloth Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', new ItemStack(TRepo.materials, 1, 24), '#', new ItemStack(Items.string)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Items.string))); - // Silky Jewel Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(TRepo.materials, 1, 25), 'e', new ItemStack(Items.emerald)); - // Armor Recipes - Object[] helm = new String[] { "www", "w w" }; - Object[] chest = new String[] { "w w", "www", "www" }; - Object[] pants = new String[] { "www", "w w", "w w" }; - Object[] shoes = new String[] { "w w", "w w" }; - GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.helmetWood, helm, 'w', "logWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.chestplateWood, chest, 'w', "logWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.leggingsWood, pants, 'w', "logWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.bootsWood, shoes, 'w', "logWood")); - - ItemStack exoGoggleStack = new ItemStack(TRepo.exoGoggles); - ItemStack exoChestStack = new ItemStack(TRepo.exoChest); - ItemStack exoPantsStack = new ItemStack(TRepo.exoPants); - ItemStack exoShoesStack = new ItemStack(TRepo.exoShoes); - if (PHConstruct.exoCraftingEnabled) - { - ToolBuilder.instance.addArmorTag(exoGoggleStack); - ToolBuilder.instance.addArmorTag(exoChestStack); - ToolBuilder.instance.addArmorTag(exoPantsStack); - ToolBuilder.instance.addArmorTag(exoShoesStack); - GameRegistry.addShapedRecipe(exoGoggleStack, helm, 'w', new ItemStack(TRepo.largePlate, 1, 14)); - GameRegistry.addShapedRecipe(exoChestStack, chest, 'w', new ItemStack(TRepo.largePlate, 1, 14)); - GameRegistry.addShapedRecipe(exoPantsStack, pants, 'w', new ItemStack(TRepo.largePlate, 1, 14)); - GameRegistry.addShapedRecipe(exoShoesStack, shoes, 'w', new ItemStack(TRepo.largePlate, 1, 14)); - } - - // Metal conversion Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 3), patBlock, '#', new ItemStack(TRepo.materials, 1, 9)); // Copper - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 5), patBlock, '#', new ItemStack(TRepo.materials, 1, 10)); // Tin - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 6), patBlock, '#', new ItemStack(TRepo.materials, 1, 11)); // Aluminum - // GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 6), - // patBlock, '#', new ItemStack(TRepo.materials, 1, 12)); // Aluminum - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 4), patBlock, '#', new ItemStack(TRepo.materials, 1, 13)); // Bronze - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 7), patBlock, '#', new ItemStack(TRepo.materials, 1, 14)); // AluBrass - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 0), patBlock, '#', new ItemStack(TRepo.materials, 1, 3)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 1), patBlock, '#', new ItemStack(TRepo.materials, 1, 4)); // Ardite - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 2), patBlock, '#', new ItemStack(TRepo.materials, 1, 5)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 8), patBlock, '#', new ItemStack(TRepo.materials, 1, 15)); // Alumite - GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 9), patBlock, '#', new ItemStack(TRepo.materials, 1, 16)); // Steel - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 11), "#", '#', new ItemStack(TRepo.materials, 1, 12)); // Aluminum raw -> - // ingot - - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 9), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 3)); // Copper - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 10), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 5)); // Tin - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 11), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 6)); // Aluminum - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 13), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 4)); // Bronze - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 14), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 7)); // AluBrass - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 3), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 0)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 4), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 1)); // Ardite - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 5), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 2)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 15), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 8)); // Alumite - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 16), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 9)); // Steel - - GameRegistry.addRecipe(new ItemStack(Items.iron_ingot), patBlock, '#', new ItemStack(TRepo.materials, 1, 19)); // Iron - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 9), patBlock, '#', new ItemStack(TRepo.materials, 1, 20)); // Copper - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 10), patBlock, '#', new ItemStack(TRepo.materials, 1, 21)); // Tin - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 11), patBlock, '#', new ItemStack(TRepo.materials, 1, 22)); // Aluminum - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 14), patBlock, '#', new ItemStack(TRepo.materials, 1, 24)); // Aluminum Brass - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 18), patBlock, '#', new ItemStack(TRepo.materials, 1, 27)); // Obsidian - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 3), patBlock, '#', new ItemStack(TRepo.materials, 1, 28)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 4), patBlock, '#', new ItemStack(TRepo.materials, 1, 29)); // Ardite - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 5), patBlock, '#', new ItemStack(TRepo.materials, 1, 30)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 13), patBlock, '#', new ItemStack(TRepo.materials, 1, 31)); // Bronze - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 15), patBlock, '#', new ItemStack(TRepo.materials, 1, 32)); // Alumite - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 16), patBlock, '#', new ItemStack(TRepo.materials, 1, 33)); // Steel - - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 19), "m", 'm', new ItemStack(Items.iron_ingot)); // Iron - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 20), "m", 'm', new ItemStack(TRepo.materials, 1, 9)); // Copper - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 21), "m", 'm', new ItemStack(TRepo.materials, 1, 10)); // Tin - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 22), "m", 'm', new ItemStack(TRepo.materials, 1, 11)); // Aluminum - // GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 22), "m", - // 'm', new ItemStack(TRepo.materials, 1, 12)); //Aluminum - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 24), "m", 'm', new ItemStack(TRepo.materials, 1, 14)); // Aluminum Brass - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 27), "m", 'm', new ItemStack(TRepo.materials, 1, 18)); // Obsidian - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 28), "m", 'm', new ItemStack(TRepo.materials, 1, 3)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 29), "m", 'm', new ItemStack(TRepo.materials, 1, 4)); // Ardite - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 30), "m", 'm', new ItemStack(TRepo.materials, 1, 5)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 31), "m", 'm', new ItemStack(TRepo.materials, 1, 13)); // Bronze - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 32), "m", 'm', new ItemStack(TRepo.materials, 1, 15)); // Alumite - GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 33), "m", 'm', new ItemStack(TRepo.materials, 1, 16)); // Steel - - // stained Glass Recipes - String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", - "dyeMagenta", "dyeOrange", "dyeWhite" }; - String color = ""; - for (int i = 0; i < 16; i++) - { - color = dyeTypes[15 - i]; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.wool, 8, i), patSurround, 'm', color, '#', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stainedGlassClear, 8, i), patSurround, 'm', color, '#', TRepo.clearGlass)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.stainedGlassClear, 1, i), color, TRepo.clearGlass)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(TRepo.stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.stainedGlassClear, 1, i), color, new ItemStack(TRepo.stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', TRepo.glassPane)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.stainedGlassClearPane, 1, i), color, TRepo.glassPane)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(TRepo.stainedGlassClearPane, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.stainedGlassClearPane, 1, i), color, new ItemStack(TRepo.stainedGlassClearPane, 1, Short.MAX_VALUE))); - } - - // Glass Recipes - GameRegistry.addRecipe(new ItemStack(Items.glass_bottle, 3), new Object[] { "# #", " # ", '#', TRepo.clearGlass }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.daylight_detector), new Object[] { "GGG", "QQQ", "WWW", 'G', "blockGlass", 'Q', Items.quartz, 'W', "slabWood" })); - GameRegistry.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', TRepo.clearGlass, 'S', Items.nether_star, 'O', Blocks.obsidian }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.glassPane, 16, 0), "GGG", "GGG", 'G', TRepo.clearGlass)); - - // Smeltery Components Recipes - ItemStack searedBrick = new ItemStack(TRepo.materials, 1, 2); - GameRegistry.addRecipe(new ItemStack(TRepo.smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller - GameRegistry.addRecipe(new ItemStack(TRepo.smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain - GameRegistry.addRecipe(new ItemStack(TRepo.smeltery, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTank, 1, 0), patSurround, '#', searedBrick, 'm', "blockGlass")); // Tank - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Glass - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Window - GameRegistry.addRecipe(new ItemStack(TRepo.searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table - GameRegistry.addRecipe(new ItemStack(TRepo.searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet - GameRegistry.addRecipe(new ItemStack(TRepo.searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin - GameRegistry.addRecipe(new ItemStack(TRepo.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel - - searedBrick = new ItemStack(TRepo.materials, 1, 37); - GameRegistry.addRecipe(new ItemStack(TRepo.smelteryNether, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller - GameRegistry.addRecipe(new ItemStack(TRepo.smelteryNether, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain - GameRegistry.addRecipe(new ItemStack(TRepo.smelteryNether, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTankNether, 1, 0), patSurround, '#', searedBrick, 'm', "blockGlass")); // Tank - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTankNether, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Glass - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTankNether, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Window - GameRegistry.addRecipe(new ItemStack(TRepo.searedBlockNether, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table - GameRegistry.addRecipe(new ItemStack(TRepo.searedBlockNether, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet - GameRegistry.addRecipe(new ItemStack(TRepo.searedBlockNether, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin - GameRegistry.addRecipe(new ItemStack(TRepo.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel - - // Jack o'Latern Recipe - Stone Torch - GameRegistry.addRecipe(new ItemStack(Blocks.lit_pumpkin, 1, 0), "p", "s", 'p', new ItemStack(Blocks.pumpkin), 's', new ItemStack(TRepo.stoneTorch)); - // Stone Torch Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stoneTorch, 4), "p", "w", 'p', new ItemStack(Items.coal, 1, Short.MAX_VALUE), 'w', "rodStone")); - // Stone Ladder Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stoneLadder, 3), "w w", "www", "w w", 'w', "rodStone")); - // Wooden Rail Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); - // Stonesticks Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Blocks.stone)); - GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Blocks.cobblestone)); - // - ItemStack aluBrass = new ItemStack(TRepo.materials, 1, 14); - // Clock Recipe - Vanilla alternativ - GameRegistry.addRecipe(new ItemStack(Items.clock), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Items.redstone)); - // Gold Pressure Plate - Vanilla alternativ - GameRegistry.addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate), "ii", 'i', aluBrass); - // Accessories - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); - // GameRegistry.addRecipe(new ShapedOreRecipe(new - // ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', - // "ingotNaturalAluminum")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone)); - - GameRegistry.addRecipe(new ItemStack(TRepo.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Items.diamond), '#', new ItemStack(Items.apple)); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.heartCanister, 1, 2), new ItemStack(TRepo.diamondApple), new ItemStack(TRepo.materials, 1, 8), new ItemStack(TRepo.heartCanister, 1, 0), - new ItemStack(TRepo.heartCanister, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.heartCanister, 1, 4), new ItemStack(TRepo.heartCanister, 1, 2), new ItemStack(TRepo.heartCanister, 1, 3), new ItemStack(Items.golden_apple, - 1, 1)); - //GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5)); - - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm', - "ingotGold")); - GameRegistry.addRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm', aluBrass); - // Drying Rack Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.dryingRack, 1, 0), "bbb", 'b', "slabWood")); - // Landmine Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone, 'p', - Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 1), "mcm", "rpr", 'm', Blocks.stone, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone, 'p', - Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 2), "mcm", "rpr", 'm', Blocks.obsidian, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone, 'p', - Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 3), "mcm", "rpr", 'm', Items.repeater, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone, 'p', - Blocks.stone_pressure_plate)); - - // Ultra hardcore recipes - GameRegistry.addRecipe(new ItemStack(TRepo.goldHead), patSurround, '#', new ItemStack(Items.gold_ingot), 'm', new ItemStack(Items.skull, 1, 3)); - - // Slab Smeltery Components Recipes - for (int i = 0; i < 7; i++) - { - GameRegistry.addRecipe(new ItemStack(TRepo.speedSlab, 6, i), "bbb", 'b', new ItemStack(TRepo.speedBlock, 1, i)); - } - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 0), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 1), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 4)); - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 2), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 5)); - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 3), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 6)); - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 4), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 8)); - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 5), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 9)); - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 6), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 10)); - GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 7), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 11)); - - // Wool Slab Recipes - for (int sc = 0; sc <= 7; sc++) - { - GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc)); - GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8)); - - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc + 8), new ItemStack(TRepo.woolSlab2, 1, sc), new ItemStack(TRepo.woolSlab2, 1, sc)); - } - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth")); - // Trap Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds)); - GameRegistry.addRecipe(new ItemStack(TRepo.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TRepo.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TRepo.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.barricadeOak, 1, 0), "b", "b", 'b', "logWood")); - // Advanced WorkBench Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.craftingStationWood, 1, 0), "b", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); - // Slab crafters - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 0), "b", 'b', new ItemStack(TRepo.craftingStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 1), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 3)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 4)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 4), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 5)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 10)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 11)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 12)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TRepo.toolStationWood, 1, 13)); - GameRegistry.addRecipe(new ItemStack(TRepo.craftingSlabWood, 1, 5), "b", 'b', new ItemStack(TRepo.toolForge, 1, Short.MAX_VALUE)); - // EssenceExtractor Recipe - // Slime Recipes - GameRegistry.addRecipe(new ItemStack(TRepo.slimeGel, 1, 0), "##", "##", '#', TRepo.strangeFood); - GameRegistry.addRecipe(new ItemStack(TRepo.strangeFood, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TRepo.slimeGel, 1, 1), "##", "##", '#', Items.slime_ball); - GameRegistry.addRecipe(new ItemStack(Items.slime_ball, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 1)); - // slimeExplosive - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), Items.slime_ball, Blocks.tnt); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 2), TRepo.strangeFood, Blocks.tnt); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), "slimeball", Blocks.tnt)); - - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, Short.MAX_VALUE), new ItemStack(Items.redstone)); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.bloodChannel, 1, 0), new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(TRepo.strangeFood, 1, 1), - new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(Items.redstone)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), "slimeball", "slimeball", "slimeball", "slimeball", new ItemStack(Items.redstone))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimePad, 1, 0), TRepo.slimeChannel, "slimeball")); - - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.materials, 1, 41), "dustArdite", "dustCobalt")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.materials, 4, 42), "dustAluminium", "dustCopper", "dustCopper", "dustCopper")); - - } - - protected static void addRecipesForDryingRack () - { - // Drying rack - DryingRackRecipes.addDryingRecipe(Items.beef, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 0)); - DryingRackRecipes.addDryingRecipe(Items.chicken, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 1)); - DryingRackRecipes.addDryingRecipe(Items.porkchop, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 2)); - // DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new - // ItemStack(TRepo.jerky, 1, 3)); - DryingRackRecipes.addDryingRecipe(Items.fish, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 4)); - DryingRackRecipes.addDryingRecipe(Items.rotten_flesh, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 5)); - DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.strangeFood, 1, 0), 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 6)); - DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.strangeFood, 1, 1), 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 7)); - - // DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.jerky, 1, 5), - // 20 * 60 * 10, Item.leather); - } - - protected static void addRecipesForChisel () - { - /* Detailing */ - Detailing chiseling = TConstructRegistry.getChiselDetailing(); - chiseling.addDetailing(Blocks.stone, 0, Blocks.stonebrick, 0, TRepo.chisel); - chiseling.addDetailing(TRepo.speedBlock, 0, TRepo.speedBlock, 1, TRepo.chisel); - chiseling.addDetailing(TRepo.speedBlock, 2, TRepo.speedBlock, 3, TRepo.chisel); - chiseling.addDetailing(TRepo.speedBlock, 3, TRepo.speedBlock, 4, TRepo.chisel); - chiseling.addDetailing(TRepo.speedBlock, 4, TRepo.speedBlock, 5, TRepo.chisel); - chiseling.addDetailing(TRepo.speedBlock, 5, TRepo.speedBlock, 6, TRepo.chisel); - - chiseling.addDetailing(Blocks.obsidian, 0, TRepo.multiBrick, 0, TRepo.chisel); - chiseling.addDetailing(Blocks.sandstone, 0, Blocks.sandstone, 2, TRepo.chisel); - chiseling.addDetailing(Blocks.sandstone, 2, Blocks.sandstone, 1, TRepo.chisel); - chiseling.addDetailing(Blocks.sandstone, 1, TRepo.multiBrick, 1, TRepo.chisel); - // chiseling.addDetailing(Block.netherrack, 0, TRepo.multiBrick, 2, - // TRepo.chisel); - // chiseling.addDetailing(Block.stone_refined, 0, TRepo.multiBrick, 3, - // TRepo.chisel); - chiseling.addDetailing(Items.iron_ingot, 0, TRepo.multiBrick, 4, TRepo.chisel); - chiseling.addDetailing(Items.gold_ingot, 0, TRepo.multiBrick, 5, TRepo.chisel); - chiseling.addDetailing(Items.dye, 4, TRepo.multiBrick, 6, TRepo.chisel); - chiseling.addDetailing(Items.diamond, 0, TRepo.multiBrick, 7, TRepo.chisel); - chiseling.addDetailing(Items.redstone, 0, TRepo.multiBrick, 8, TRepo.chisel); - chiseling.addDetailing(Items.bone, 0, TRepo.multiBrick, 9, TRepo.chisel); - chiseling.addDetailing(Items.slime_ball, 0, TRepo.multiBrick, 10, TRepo.chisel); - chiseling.addDetailing(TRepo.strangeFood, 0, TRepo.multiBrick, 11, TRepo.chisel); - chiseling.addDetailing(Blocks.end_stone, 0, TRepo.multiBrick, 12, TRepo.chisel); - chiseling.addDetailing(TRepo.materials, 18, TRepo.multiBrick, 13, TRepo.chisel); - - // adding multiBrick / multiBrickFanxy meta 0-13 to list - for (int sc = 0; sc < 14; sc++) - { - chiseling.addDetailing(TRepo.multiBrick, sc, TRepo.multiBrickFancy, sc, TRepo.chisel); - } - - chiseling.addDetailing(Blocks.stonebrick, 0, TRepo.multiBrickFancy, 15, TRepo.chisel); - chiseling.addDetailing(TRepo.multiBrickFancy, 15, TRepo.multiBrickFancy, 14, TRepo.chisel); - chiseling.addDetailing(TRepo.multiBrickFancy, 14, Blocks.stonebrick, 3, TRepo.chisel); - /* - * chiseling.addDetailing(TRepo.multiBrick, 14, TRepo.multiBrickFancy, - * 14, TRepo.chisel); chiseling.addDetailing(TRepo.multiBrick, 15, - * TRepo.multiBrickFancy, 15, TRepo.chisel); - */ - - chiseling.addDetailing(TRepo.smeltery, 4, TRepo.smeltery, 6, TRepo.chisel); - chiseling.addDetailing(TRepo.smeltery, 6, TRepo.smeltery, 11, TRepo.chisel); - chiseling.addDetailing(TRepo.smeltery, 11, TRepo.smeltery, 2, TRepo.chisel); - chiseling.addDetailing(TRepo.smeltery, 2, TRepo.smeltery, 8, TRepo.chisel); - chiseling.addDetailing(TRepo.smeltery, 8, TRepo.smeltery, 9, TRepo.chisel); - chiseling.addDetailing(TRepo.smeltery, 9, TRepo.smeltery, 10, TRepo.chisel); - } - - public void oreRegistry () - { - OreDictionary.registerOre("oreCobalt", new ItemStack(TRepo.oreSlag, 1, 1)); - OreDictionary.registerOre("oreArdite", new ItemStack(TRepo.oreSlag, 1, 2)); - OreDictionary.registerOre("oreCopper", new ItemStack(TRepo.oreSlag, 1, 3)); - OreDictionary.registerOre("oreTin", new ItemStack(TRepo.oreSlag, 1, 4)); - OreDictionary.registerOre("oreAluminum", new ItemStack(TRepo.oreSlag, 1, 5)); - OreDictionary.registerOre("oreAluminium", new ItemStack(TRepo.oreSlag, 1, 5)); - - OreDictionary.registerOre("oreIron", new ItemStack(TRepo.oreGravel, 1, 0)); - OreDictionary.registerOre("oreGold", new ItemStack(TRepo.oreGravel, 1, 1)); - OreDictionary.registerOre("oreCobalt", new ItemStack(TRepo.oreGravel, 1, 5)); - OreDictionary.registerOre("oreCopper", new ItemStack(TRepo.oreGravel, 1, 2)); - OreDictionary.registerOre("oreTin", new ItemStack(TRepo.oreGravel, 1, 3)); - OreDictionary.registerOre("oreAluminum", new ItemStack(TRepo.oreGravel, 1, 4)); - OreDictionary.registerOre("oreAluminium", new ItemStack(TRepo.oreGravel, 1, 4)); - - OreDictionary.registerOre("ingotCobalt", new ItemStack(TRepo.materials, 1, 3)); - OreDictionary.registerOre("ingotArdite", new ItemStack(TRepo.materials, 1, 4)); - OreDictionary.registerOre("ingotManyullyn", new ItemStack(TRepo.materials, 1, 5)); - OreDictionary.registerOre("ingotCopper", new ItemStack(TRepo.materials, 1, 9)); - OreDictionary.registerOre("ingotTin", new ItemStack(TRepo.materials, 1, 10)); - OreDictionary.registerOre("ingotAluminum", new ItemStack(TRepo.materials, 1, 11)); - OreDictionary.registerOre("ingotAluminium", new ItemStack(TRepo.materials, 1, 11)); - OreDictionary.registerOre("ingotBronze", new ItemStack(TRepo.materials, 1, 13)); - OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(TRepo.materials, 1, 14)); - OreDictionary.registerOre("ingotAluminiumBrass", new ItemStack(TRepo.materials, 1, 14)); - OreDictionary.registerOre("ingotAlumite", new ItemStack(TRepo.materials, 1, 15)); - OreDictionary.registerOre("ingotSteel", new ItemStack(TRepo.materials, 1, 16)); - ensureOreIsRegistered("ingotIron", new ItemStack(Items.iron_ingot)); - ensureOreIsRegistered("ingotGold", new ItemStack(Items.gold_ingot)); - OreDictionary.registerOre("ingotObsidian", new ItemStack(TRepo.materials, 1, 18)); - OreDictionary.registerOre("ingotPigIron", new ItemStack(TRepo.materials, 1, 34)); - OreDictionary.registerOre("itemRawRubber", new ItemStack(TRepo.materials, 1, 36)); - - OreDictionary.registerOre("blockCobalt", new ItemStack(TRepo.metalBlock, 1, 0)); - OreDictionary.registerOre("blockArdite", new ItemStack(TRepo.metalBlock, 1, 1)); - OreDictionary.registerOre("blockManyullyn", new ItemStack(TRepo.metalBlock, 1, 2)); - OreDictionary.registerOre("blockCopper", new ItemStack(TRepo.metalBlock, 1, 3)); - OreDictionary.registerOre("blockBronze", new ItemStack(TRepo.metalBlock, 1, 4)); - OreDictionary.registerOre("blockTin", new ItemStack(TRepo.metalBlock, 1, 5)); - OreDictionary.registerOre("blockAluminum", new ItemStack(TRepo.metalBlock, 1, 6)); - OreDictionary.registerOre("blockAluminium", new ItemStack(TRepo.metalBlock, 1, 6)); - OreDictionary.registerOre("blockAluminumBrass", new ItemStack(TRepo.metalBlock, 1, 7)); - OreDictionary.registerOre("blockAluminiumBrass", new ItemStack(TRepo.metalBlock, 1, 7)); - OreDictionary.registerOre("blockAlumite", new ItemStack(TRepo.metalBlock, 1, 8)); - OreDictionary.registerOre("blockSteel", new ItemStack(TRepo.metalBlock, 1, 9)); - OreDictionary.registerOre("blockEnder", new ItemStack(TRepo.metalBlock, 1, 10)); - ensureOreIsRegistered("blockIron", new ItemStack(Blocks.iron_block)); - ensureOreIsRegistered("blockGold", new ItemStack(Blocks.gold_block)); - - OreDictionary.registerOre("nuggetIron", new ItemStack(TRepo.materials, 1, 19)); - OreDictionary.registerOre("nuggetIron", new ItemStack(TRepo.oreBerries, 1, 0)); - OreDictionary.registerOre("nuggetCopper", new ItemStack(TRepo.materials, 1, 20)); - OreDictionary.registerOre("nuggetCopper", new ItemStack(TRepo.oreBerries, 1, 2)); - OreDictionary.registerOre("nuggetTin", new ItemStack(TRepo.materials, 1, 21)); - OreDictionary.registerOre("nuggetTin", new ItemStack(TRepo.oreBerries, 1, 3)); - OreDictionary.registerOre("nuggetAluminum", new ItemStack(TRepo.materials, 1, 22)); - OreDictionary.registerOre("nuggetAluminum", new ItemStack(TRepo.oreBerries, 1, 4)); - OreDictionary.registerOre("nuggetAluminium", new ItemStack(TRepo.materials, 1, 22)); - OreDictionary.registerOre("nuggetAluminium", new ItemStack(TRepo.oreBerries, 1, 4)); - OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(TRepo.materials, 1, 24)); - OreDictionary.registerOre("nuggetAluminiumBrass", new ItemStack(TRepo.materials, 1, 24)); - OreDictionary.registerOre("nuggetObsidian", new ItemStack(TRepo.materials, 1, 27)); - OreDictionary.registerOre("nuggetCobalt", new ItemStack(TRepo.materials, 1, 28)); - OreDictionary.registerOre("nuggetArdite", new ItemStack(TRepo.materials, 1, 29)); - OreDictionary.registerOre("nuggetManyullyn", new ItemStack(TRepo.materials, 1, 30)); - OreDictionary.registerOre("nuggetBronze", new ItemStack(TRepo.materials, 1, 31)); - OreDictionary.registerOre("nuggetAlumite", new ItemStack(TRepo.materials, 1, 32)); - OreDictionary.registerOre("nuggetSteel", new ItemStack(TRepo.materials, 1, 33)); - OreDictionary.registerOre("nuggetGold", new ItemStack(TRepo.oreBerries, 1, 1)); - ensureOreIsRegistered("nuggetGold", new ItemStack(Items.gold_nugget)); - OreDictionary.registerOre("nuggetPigIron", new ItemStack(TRepo.materials, 1, 35)); - - OreDictionary.registerOre("dustArdite", new ItemStack(TRepo.materials, 1, 38)); - OreDictionary.registerOre("dustCobalt", new ItemStack(TRepo.materials, 1, 39)); - OreDictionary.registerOre("dustAluminium", new ItemStack(TRepo.materials, 1, 40)); - OreDictionary.registerOre("dustAluminum", new ItemStack(TRepo.materials, 1, 40)); - OreDictionary.registerOre("dustManyullyn", new ItemStack(TRepo.materials, 1, 41)); - OreDictionary.registerOre("dustAluminiumBrass", new ItemStack(TRepo.materials, 1, 42)); - OreDictionary.registerOre("dustAluminumBrass", new ItemStack(TRepo.materials, 1, 42)); - - OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab1, 1, Short.MAX_VALUE)); - OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab2, 1, Short.MAX_VALUE)); - - ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.stonebrick, 1, 1)); - ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.mossy_cobblestone)); - - OreDictionary.registerOre("crafterWood", new ItemStack(Blocks.crafting_table, 1)); - OreDictionary.registerOre("craftingTableWood", new ItemStack(Blocks.crafting_table, 1)); - - OreDictionary.registerOre("torchStone", new ItemStack(TRepo.stoneTorch)); - - String[] matNames = { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", - "Blueslime" }; - for (int i = 0; i < matNames.length; i++) - { - //TODO 1.8 remove this ore dict entry as it's outdated(use materialRod instead) - OreDictionary.registerOre(matNames[i].toLowerCase() + "Rod", new ItemStack(TRepo.toolRod, 1, i)); - OreDictionary.registerOre("rod" + matNames[i], new ItemStack(TRepo.toolRod, 1, i)); - } - OreDictionary.registerOre("thaumiumRod", new ItemStack(TRepo.toolRod, 1, 31)); - - String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", - "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; - for (int i = 0; i < 16; i++) - { - OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TRepo.stainedGlassClear, 1, i)); - } - - BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.titleIcon, new TDispenserBehaviorSpawnEgg()); - - BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.arrow, new TDispenserBehaviorArrow()); - - // Vanilla stuff - OreDictionary.registerOre("slimeball", new ItemStack(Items.slime_ball)); - OreDictionary.registerOre("slimeball", new ItemStack(TRepo.strangeFood, 1, 0)); - OreDictionary.registerOre("slimeball", new ItemStack(TRepo.strangeFood, 1, 1)); - OreDictionary.registerOre("slimeball", new ItemStack(TRepo.materials, 1, 36)); - OreDictionary.registerOre("blockGlass", new ItemStack(TRepo.clearGlass)); - OreDictionary.registerOre("blockGlass", new ItemStack(Blocks.glass)); - RecipeRemover.removeShapedRecipe(new ItemStack(Blocks.sticky_piston)); - RecipeRemover.removeShapedRecipe(new ItemStack(Items.magma_cream)); - RecipeRemover.removeShapedRecipe(new ItemStack(Items.lead)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.sticky_piston), "slimeball", Blocks.piston)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.lead, 2), "ss ", "sS ", " s", 's', Items.string, 'S', "slimeball")); - } - - private static void ensureOreIsRegistered (String oreName, ItemStack is) - { - int oreId = OreDictionary.getOreID(is); - if (oreId == -1) - { - OreDictionary.registerOre(oreName, is); - } - } - - public void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray) - { - String var3 = ""; - int var4 = 0; - int var5 = 0; - int var6 = 0; - - if (objArray[var4] instanceof String[]) - { - String[] var7 = ((String[]) objArray[var4++]); - - for (int var8 = 0; var8 < var7.length; ++var8) - { - String var9 = var7[var8]; - ++var6; - var5 = var9.length(); - var3 = var3 + var9; - } - } - else - { - while (objArray[var4] instanceof String) - { - String var11 = (String) objArray[var4++]; - ++var6; - var5 = var11.length(); - var3 = var3 + var11; - } - } - - HashMap var12; - - for (var12 = new HashMap(); var4 < objArray.length; var4 += 2) - { - Character var13 = (Character) objArray[var4]; - ItemStack var14 = null; - - if (objArray[var4 + 1] instanceof Item) - { - var14 = new ItemStack((Item) objArray[var4 + 1]); - } - else if (objArray[var4 + 1] instanceof Block) - { - var14 = new ItemStack((Block) objArray[var4 + 1], 1, Short.MAX_VALUE); - } - else if (objArray[var4 + 1] instanceof ItemStack) - { - var14 = (ItemStack) objArray[var4 + 1]; - } - - var12.put(var13, var14); - } - - ItemStack[] var15 = new ItemStack[var5 * var6]; - - for (int var16 = 0; var16 < var5 * var6; ++var16) - { - char var10 = var3.charAt(var16); - - if (var12.containsKey(Character.valueOf(var10))) - { - var15[var16] = ((ItemStack) var12.get(Character.valueOf(var10))).copy(); - } - else - { - var15[var16] = null; - } - } - - ShapedRecipes var17 = new ShapedRecipes(var5, var6, var15, itemstack); - recipeList.add(0, var17); - } - - public void modRecipes () - { - if (!TRepo.initRecipes) - { - TRepo.initRecipes = true; - if (PHConstruct.removeVanillaToolRecipes) - { - RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_pickaxe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_axe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_shovel)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_hoe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_sword)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_pickaxe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_axe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_shovel)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_hoe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_sword)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_pickaxe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_axe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_shovel)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_hoe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_sword)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_pickaxe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_axe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_shovel)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_hoe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_sword)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_pickaxe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_axe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_shovel)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_hoe)); - RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_sword)); - } - - if (PHConstruct.labotimizeVanillaTools) - { - Items.wooden_pickaxe.setMaxDamage(1); - Items.wooden_axe.setMaxDamage(1); - Items.wooden_shovel.setMaxDamage(1); - Items.wooden_hoe.setMaxDamage(1); - Items.wooden_sword.setMaxDamage(1); - - Items.stone_pickaxe.setMaxDamage(1); - Items.stone_axe.setMaxDamage(1); - Items.stone_shovel.setMaxDamage(1); - Items.stone_hoe.setMaxDamage(1); - Items.stone_sword.setMaxDamage(1); - - Items.iron_pickaxe.setMaxDamage(1); - Items.iron_axe.setMaxDamage(1); - Items.iron_shovel.setMaxDamage(1); - Items.iron_hoe.setMaxDamage(1); - Items.iron_sword.setMaxDamage(1); - - Items.diamond_pickaxe.setMaxDamage(1); - Items.diamond_axe.setMaxDamage(1); - Items.diamond_shovel.setMaxDamage(1); - Items.diamond_hoe.setMaxDamage(1); - Items.diamond_sword.setMaxDamage(1); - - Items.golden_pickaxe.setMaxDamage(1); - Items.golden_axe.setMaxDamage(1); - Items.golden_shovel.setMaxDamage(1); - Items.golden_hoe.setMaxDamage(1); - Items.golden_sword.setMaxDamage(1); - } - } - } - - private static void registerPatternMaterial (String oreName, int value, String materialName) - { - for (ItemStack ore : OreDictionary.getOres(oreName)) - { - PatternBuilder.instance.registerMaterial(ore, value, materialName); - } - } - - private static void registerIngotCasting (FluidType ft) - { - ItemStack pattern = new ItemStack(TRepo.metalPattern, 1, 0); - LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - for (ItemStack ore : OreDictionary.getOres("ingot" + ft.toString())) - { - tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); - } - - } - - protected static void addRecipesForBasinCasting () - { - LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); - // Block Casting - basinCasting.addCastingRecipe(new ItemStack(Blocks.iron_block), new FluidStack(TRepo.moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); // Iron - basinCasting.addCastingRecipe(new ItemStack(Blocks.gold_block), new FluidStack(TRepo.moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); // gold - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 3), new FluidStack(TRepo.moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); // copper - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 5), new FluidStack(TRepo.moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); // tin - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 6), new FluidStack(TRepo.moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); // aluminum - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 0), new FluidStack(TRepo.moltenCobaltFluid, TConstruct.blockLiquidValue), null, true, 100); // cobalt - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 1), new FluidStack(TRepo.moltenArditeFluid, TConstruct.blockLiquidValue), null, true, 100); // ardite - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 4), new FluidStack(TRepo.moltenBronzeFluid, TConstruct.blockLiquidValue), null, true, 100); // bronze - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 7), new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.blockLiquidValue), null, true, 100); // albrass - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 2), new FluidStack(TRepo.moltenManyullynFluid, TConstruct.blockLiquidValue), null, true, 100); // manyullyn - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 8), new FluidStack(TRepo.moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); // alumite - basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TRepo.moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 9), new FluidStack(TRepo.moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); // steel - basinCasting.addCastingRecipe(new ItemStack(TRepo.clearGlass, 1, 0), new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); // glass - basinCasting.addCastingRecipe(new ItemStack(TRepo.smeltery, 1, 4), new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); // seared - // stone - basinCasting.addCastingRecipe(new ItemStack(TRepo.smeltery, 1, 5), new FluidStack(TRepo.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Blocks.cobblestone), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Blocks.emerald_block), new FluidStack(TRepo.moltenEmeraldFluid, 640 * 9), null, true, 100); // emerald - basinCasting.addCastingRecipe(new ItemStack(TRepo.speedBlock, 1, 0), new FluidStack(TRepo.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Blocks.gravel), true, 100); // brownstone - if (PHConstruct.craftEndstone) - { - basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TRepo.moltenEnderFluid, 50), new ItemStack(Blocks.obsidian), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TRepo.moltenEnderFluid, 250), new ItemStack(Blocks.sandstone), true, 100); - } - basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 10), new FluidStack(TRepo.moltenEnderFluid, 1000), null, true, 100); // ender - basinCasting.addCastingRecipe(new ItemStack(TRepo.glueBlock), new FluidStack(TRepo.glueFluid, TConstruct.blockLiquidValue), null, true, 100); // glue - - // basinCasting.addCastingRecipe(new ItemStack(slimeGel, 1, 0), new - // FluidStack(blueSlimeFluid, FluidContainerRegistry.BUCKET_VOLUME), - // null, true, 100); - - // Armor casts - /* - * FluidRenderProperties frp = new - * FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, - * Applications.BASIN); FluidStack aluFlu = new - * FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue * - * 10); FluidStack gloFlu = new FluidStack(TRepo.moltenGoldFluid, - * TConstruct.ingotLiquidValue * 10); ItemStack[] armor = { new - * ItemStack(helmetWood), new ItemStack(chestplateWood), new - * ItemStack(leggingsWood), new ItemStack(bootsWood) }; for (int sc = 0; - * sc < armor.length; sc++) { basinCasting.addCastingRecipe(new - * ItemStack(armorPattern, 1, sc), aluFlu, armor[sc], 50, frp); - * basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), - * gloFlu, armor[sc], 50, frp); } - */ - } - - protected static void addRecipesForSmeltery () - { - // Alloy Smelting - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenBronzeFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TRepo.moltenCopperFluid, - TConstruct.ingotLiquidValue * 3), new FluidStack(TRepo.moltenTinFluid, TConstruct.ingotLiquidValue)); // Bronze - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenAlubrassFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack(TRepo.moltenAluminumFluid, - TConstruct.ingotLiquidValue * 3), new FluidStack(TRepo.moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); // Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenAlumiteFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack(TRepo.moltenAluminumFluid, - TConstruct.ingotLiquidValue * 5), new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); // Alumite - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenManyullynFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack(TRepo.moltenCobaltFluid, - TConstruct.ingotLiquidValue), new FluidStack(TRepo.moltenArditeFluid, TConstruct.ingotLiquidValue)); // Manyullyn - Smeltery.addAlloyMixing(new FluidStack(TRepo.pigIronFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TRepo.moltenIronFluid, - TConstruct.ingotLiquidValue), new FluidStack(TRepo.moltenEmeraldFluid, 640), new FluidStack(TRepo.bloodFluid, 80)); // Pigiron - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenObsidianFluid, TConstruct.oreLiquidValue), new FluidStack(FluidRegistry.LAVA, 1000), new FluidStack(FluidRegistry.WATER, 1000)); //Obsidian - // Stone parts - for (int sc = 0; sc < TRepo.patternOutputs.length; sc++) - { - if (TRepo.patternOutputs[sc] != null) - { - Smeltery.addMelting(FluidType.Stone, new ItemStack(TRepo.patternOutputs[sc], 1, 1), 1, - (8 * ((IPattern) TRepo.woodPattern).getPatternCost(new ItemStack(TRepo.woodPattern, 1, sc + 1))) / 2); - } - } - - // Chunks - Smeltery.addMelting(FluidType.Stone, new ItemStack(TRepo.toolShard, 1, 1), 0, 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(TRepo.toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(TRepo.toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Cobalt, new ItemStack(TRepo.toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Ardite, new ItemStack(TRepo.toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(TRepo.toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Copper, new ItemStack(TRepo.toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Bronze, new ItemStack(TRepo.toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Alumite, new ItemStack(TRepo.toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(TRepo.toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); - - // Items - - Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(TRepo.blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(TRepo.blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Glue, new ItemStack(TRepo.materials, 1, 36), 0, TConstruct.ingotLiquidValue); - - Smeltery.addMelting(FluidType.Ender, new ItemStack(Items.ender_pearl, 4), 0, 250); - Smeltery.addMelting(TRepo.metalBlock, 10, 50, new FluidStack(TRepo.moltenEnderFluid, 1000)); - Smeltery.addMelting(FluidType.Water, new ItemStack(Items.snowball, 1, 0), 0, 125); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.flint_and_steel, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bucket), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecart), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.chest_minecart), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.hopper_minecart), 50, TConstruct.ingotLiquidValue * 10); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_door), 0, TConstruct.ingotLiquidValue * 6); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.cauldron), 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.shears), 0, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Emerald, new ItemStack(Items.emerald), -50, 640); - - Smeltery.addMelting(FluidType.Ardite, new ItemStack(TRepo.materials, 1, 38), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Cobalt, new ItemStack(TRepo.materials, 1, 39), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Aluminum, new ItemStack(TRepo.materials, 1, 40), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(TRepo.materials, 1, 41), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(TRepo.materials, 1, 42), 0, TConstruct.ingotLiquidValue); - - // Blocks melt as themselves! - // Ore - Smeltery.addMelting(Blocks.iron_ore, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Blocks.gold_ore, 0, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(TRepo.oreGravel, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(TRepo.oreGravel, 1, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); - - // Blocks - Smeltery.addMelting(Blocks.iron_block, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Blocks.gold_block, 0, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Blocks.obsidian, 0, 800, new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Blocks.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); - Smeltery.addMelting(Blocks.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); - Smeltery.addMelting(Blocks.snow_layer, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); - Smeltery.addMelting(Blocks.sand, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Blocks.glass, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Blocks.glass_pane, 0, 625, new FluidStack(TRepo.moltenGlassFluid, 250)); - Smeltery.addMelting(Blocks.stone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Blocks.cobblestone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Blocks.emerald_block, 0, 800, new FluidStack(TRepo.moltenEmeraldFluid, 640 * 9)); - Smeltery.addMelting(TRepo.glueBlock, 0, 250, new FluidStack(TRepo.glueFluid, TConstruct.blockLiquidValue)); - Smeltery.addMelting(TRepo.craftedSoil, 1, 600, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); - - Smeltery.addMelting(TRepo.clearGlass, 0, 500, new FluidStack(TRepo.moltenGlassFluid, 1000)); - Smeltery.addMelting(TRepo.glassPane, 0, 350, new FluidStack(TRepo.moltenGlassFluid, 250)); - - for (int i = 0; i < 16; i++) - { - Smeltery.addMelting(TRepo.stainedGlassClear, i, 500, new FluidStack(TRepo.moltenGlassFluid, 1000)); - Smeltery.addMelting(TRepo.stainedGlassClearPane, i, 350, new FluidStack(TRepo.moltenGlassFluid, 250)); - } - - // Bricks - Smeltery.addMelting(TRepo.multiBrick, 4, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TRepo.multiBrickFancy, 4, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TRepo.multiBrick, 5, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TRepo.multiBrickFancy, 5, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TRepo.multiBrick, 0, 800, new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(TRepo.multiBrickFancy, 0, 800, new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - - // Vanilla blocks - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.iron_bars), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.heavy_weighted_pressure_plate), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.light_weighted_pressure_plate, 4), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.golden_rail), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.detector_rail), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.activator_rail), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Blocks.enchanting_table), 0, TConstruct.ingotLiquidValue * 4); - // Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.cauldron), - // 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.hopper), 0, TConstruct.ingotLiquidValue * 5); - - // Vanilla Armor - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_helmet, 1, 0), 25, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_chestplate, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_leggings, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_boots, 1, 0), 25, TConstruct.ingotLiquidValue); - - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); - - // Vanilla tools - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_hoe, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_sword, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_hoe, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_sword, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - } - - public void modIntegration () - { - /* Natura */ - Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted"); - Block heatSand = GameRegistry.findBlock("Natura", "heatsand"); - if (taintedSoil != null && heatSand != null) - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); - - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), ""); - /* TE3 Flux */ - ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1); - if (batHardened != null) - { - TRepo.modFlux.batteries.add(batHardened); - } - ItemStack basicCell = GameRegistry.findItemStack("ThermalExpansion", "cellBasic", 1); - if (basicCell != null) - { - TRepo.modFlux.batteries.add(basicCell); - } - if (batHardened != null) - TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); - if (basicCell != null) - TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); - - /* Thaumcraft */ - Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); - if (obj != null) - { - TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); - TRepo.thaumcraftAvailable = true; - TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); - TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", StatCollector.translateToLocal("materialtraits.thaumic")); - PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, StatCollector.translateToLocal("gui.partbuilder.material.thaumium"), - new ItemStack(TRepo.toolShard, 1, 31), new ItemStack(TRepo.toolRod, 1, 31), 31); - for (int meta = 0; meta < TRepo.patternOutputs.length; meta++) - { - if (TRepo.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(TRepo.woodPattern, meta + 1, 31, new ItemStack(TRepo.patternOutputs[meta], 1, 31)); - } - - TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TRepo.bowstring, 1, 1), 1F, 1F, 0.9f); - TConstructRegistry.addBowMaterial(31, 576, 40, 1.2f); - TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F, 100F); - } - else - { - TConstruct.logger.warn("Thaumcraft not detected."); - } - - if (Loader.isModLoaded("Natura")) - { - try - { - Object plantItem = getStaticItem("plantItem", "mods.natura.common.NContent"); - TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item) plantItem, 1, 7), new ItemStack(TRepo.bowstring, 1, 2), 1.2F, 0.8F, 1.3f); - } - catch (Exception e) - { - } // No need to handle - } - - ItemStack ingotcast = new ItemStack(TRepo.metalPattern, 1, 0); - LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - LiquidCasting basinCasting = TConstructRegistry.instance.getBasinCasting(); - - /* Thermal Expansion 3 Metals */ - ArrayList ores = OreDictionary.getOres("ingotNickel"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenNickelFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotLead"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenLeadFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotSilver"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenSilverFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotPlatinum"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenShinyFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotInvar"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenInvarFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack( - TRepo.moltenNickelFluid, TConstruct.ingotLiquidValue * 1)); // Invar - } - ores = OreDictionary.getOres("ingotElectrum"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenElectrumFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue), new FluidStack( - TRepo.moltenSilverFluid, TConstruct.ingotLiquidValue)); // Electrum - } - - ores = OreDictionary.getOres("blockNickel"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenNickelFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockLead"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenLeadFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockSilver"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenSilverFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockPlatinum"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenShinyFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockInvar"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenInvarFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockElectrum"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenElectrumFluid, TConstruct.blockLiquidValue), null, 100); - } - - /* Extra Utilities */ - ores = OreDictionary.getOres("compressedGravel1x"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(new ItemStack(TRepo.speedBlock, 9), new FluidStack(TRepo.moltenElectrumFluid, TConstruct.blockLiquidValue), ores.get(0), 100); - } - ores = OreDictionary.getOres("compressedGravel2x"); // Higher won't save - // properly - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(new ItemStack(TRepo.speedBlock, 81), new FluidStack(TRepo.moltenElectrumFluid, TConstruct.blockLiquidValue * 9), ores.get(0), 100); - } - - /* Rubber */ - ores = OreDictionary.getOres("itemRubber"); - if (ores.size() > 0) - { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.materials, 1, 36), ores.get(0), 0.2f); - } - } - - public Object getStaticItem (String name, String classPackage) - { - try - { - Class clazz = Class.forName(classPackage); - Field field = clazz.getDeclaredField(name); - Object ret = field.get(null); - if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) - return ret; - return null; - } - catch (Exception e) - { - TConstruct.logger.warn("Could not find " + name + "from " + classPackage); - return null; - } - } - -} diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java deleted file mode 100644 index b8477663..00000000 --- a/src/main/java/tconstruct/common/TRepo.java +++ /dev/null @@ -1,285 +0,0 @@ -package tconstruct.common; - -import net.minecraft.block.Block; -import net.minecraft.block.Block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import tconstruct.blocks.OreberryBush; -import tconstruct.blocks.slime.SlimeLeaves; -import tconstruct.blocks.slime.SlimeSapling; -import tconstruct.library.tools.ToolCore; -import tconstruct.modifiers.tools.ModAttack; -import tconstruct.modifiers.tools.ModFlux; -import tconstruct.modifiers.tools.ModLapis; - -public class TRepo -{ - // Supresses console spam when iguana's tweaks remove stuff - public static boolean supressMissingToolLogs = false; - - // Patterns and other materials - public static Item blankPattern; - public static Item materials; - public static Item toolRod; - public static Item toolShard; - public static Item woodPattern; - public static Item metalPattern; - // public static Item armorPattern; - - public static Item manualBook; - public static Item buckets; - public static Item titleIcon; - - public static Item strangeFood; - public static Item diamondApple; - public static Item jerky; - // public static Item stonePattern; - // public static Item netherPattern; - - // Tools - public static ToolCore pickaxe; - public static ToolCore shovel; - public static ToolCore hatchet; - public static ToolCore broadsword; - public static ToolCore longsword; - public static ToolCore rapier; - public static ToolCore dagger; - public static ToolCore cutlass; - - public static ToolCore frypan; - public static ToolCore battlesign; - public static ToolCore chisel; - public static ToolCore mattock; - - public static ToolCore scythe; - public static ToolCore lumberaxe; - public static ToolCore cleaver; - public static ToolCore excavator; - public static ToolCore hammer; - public static ToolCore battleaxe; - - public static ToolCore shortbow; - public static ToolCore arrow; - - public static Item potionLauncher; - - // Tool parts - public static Item binding; - public static Item toughBinding; - public static Item toughRod; - public static Item largePlate; - - public static Item pickaxeHead; - public static Item shovelHead; - public static Item hatchetHead; - public static Item frypanHead; - public static Item signHead; - public static Item chiselHead; - public static Item scytheBlade; - public static Item broadAxeHead; - public static Item excavatorHead; - public static Item hammerHead; - - public static Item swordBlade; - public static Item largeSwordBlade; - public static Item knifeBlade; - - public static Item wideGuard; - public static Item handGuard; - public static Item crossbar; - public static Item fullGuard; - - public static Item bowstring; - public static Item arrowhead; - public static Item fletching; - - // Crafting blocks - public static Block toolStationWood; - public static Block toolStationStone; - public static Block toolForge; - public static Block craftingStationWood; - public static Block craftingSlabWood; - public static Block furnaceSlab; - - public static Block heldItemBlock; - public static Block battlesignBlock; - public static Block craftedSoil; - - public static Block smeltery; - public static Block lavaTank; - public static Block searedBlock; - public static Block castingChannel; - public static Block metalBlock; - public static Block tankAir; - public static Block smelteryNether; - public static Block lavaTankNether; - public static Block searedBlockNether; - - public static Block dryingRack; - - // Decoration - public static Block stoneTorch; - public static Block stoneLadder; - public static Block multiBrick; - public static Block multiBrickFancy; - - public static Block searedSlab; - public static Block speedSlab; - - public static Block meatBlock; - public static Block woolSlab1; - public static Block woolSlab2; - public static Block glueBlock; - - // Traps - public static Block landmine; - public static Block punji; - public static Block barricadeOak; - public static Block barricadeSpruce; - public static Block barricadeBirch; - public static Block barricadeJungle; - public static Block slimeExplosive; - - // InfiBlocks - public static Block speedBlock; - public static Block clearGlass; - // public static Block stainedGlass; - public static Block stainedGlassClear; - public static Block glassPane; - // public static Block stainedGlassPane; - public static Block stainedGlassClearPane; - public static Block glassMagicSlab; - public static Block stainedGlassMagicSlab; - public static Block stainedGlassClearMagicSlab; - - // Liquids - public static Material liquidMetal; - - public static Fluid moltenIronFluid; - public static Fluid moltenGoldFluid; - public static Fluid moltenCopperFluid; - public static Fluid moltenTinFluid; - public static Fluid moltenAluminumFluid; - public static Fluid moltenCobaltFluid; - public static Fluid moltenArditeFluid; - public static Fluid moltenBronzeFluid; - public static Fluid moltenAlubrassFluid; - public static Fluid moltenManyullynFluid; - public static Fluid moltenAlumiteFluid; - public static Fluid moltenObsidianFluid; - public static Fluid moltenSteelFluid; - public static Fluid moltenGlassFluid; - public static Fluid moltenStoneFluid; - public static Fluid moltenEmeraldFluid; - public static Fluid bloodFluid; - public static Fluid moltenNickelFluid; - public static Fluid moltenLeadFluid; - public static Fluid moltenSilverFluid; - public static Fluid moltenShinyFluid; - public static Fluid moltenInvarFluid; - public static Fluid moltenElectrumFluid; - public static Fluid moltenEnderFluid; - public static Fluid blueSlimeFluid; - public static Fluid pigIronFluid; - - public static Block moltenIron; - public static Block moltenGold; - public static Block moltenCopper; - public static Block moltenTin; - public static Block moltenAluminum; - public static Block moltenCobalt; - public static Block moltenArdite; - public static Block moltenBronze; - public static Block moltenAlubrass; - public static Block moltenManyullyn; - public static Block moltenAlumite; - public static Block moltenObsidian; - public static Block moltenSteel; - public static Block moltenGlass; - public static Block moltenStone; - public static Block moltenEmerald; - public static Block blood; - public static Block moltenNickel; - public static Block moltenLead; - public static Block moltenSilver; - public static Block moltenShiny; - public static Block moltenInvar; - public static Block moltenElectrum; - public static Block moltenEnder; - - // Slime - public static SoundType slimeStep; - public static Block slimePool; - public static Block slimeGel; - public static Block slimeGrass; - public static Block slimeTallGrass; - public static SlimeLeaves slimeLeaves; - public static SlimeSapling slimeSapling; - - public static Block slimeChannel; - public static Block slimePad; - public static Block bloodChannel; - - // Glue - public static Fluid glueFluid; - public static Block glueFluidBlock; - - // Ores - public static Block oreSlag; - public static Block oreGravel; - public static OreberryBush oreBerry; - public static OreberryBush oreBerrySecond; - public static Item oreBerries; - - // Tool modifiers - public static ModFlux modFlux; - public static ModLapis modLapis; - public static ModAttack modAttack; - - public static Item creativeModifier; - - // Wearables - public static Item heavyHelmet; - public static Item heavyChestplate; - public static Item heavyPants; - public static Item heavyBoots; - public static Item glove; - public static Item knapsack; - - public static Item heartCanister; - public static Item goldHead; - - // Rail-related - public static Block woodenRail; - - // Chest hooks - public static ChestGenHooks tinkerHouseChest; - public static ChestGenHooks tinkerHousePatterns; - - // Armor - basic - public static Item helmetWood; - public static Item chestplateWood; - public static Item leggingsWood; - public static Item bootsWood; - public static ArmorMaterial materialWood; - - // Armor - exosuit - public static Item exoGoggles; - public static Item exoChest; - public static Item exoPants; - public static Item exoShoes; - - public static Fluid[] fluids = new Fluid[27]; - public static Block[] fluidBlocks = new Block[26]; - - // recipe stuff - public static boolean thaumcraftAvailable; - public static boolean initRecipes; - public static Item[] patternOutputs; - public static FluidStack[] liquids; - -} diff --git a/src/main/java/tconstruct/items/blocks/MetadataItemBlock.java b/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java similarity index 89% rename from src/main/java/tconstruct/items/blocks/MetadataItemBlock.java rename to src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java index 14ab6758..27652cb3 100644 --- a/src/main/java/tconstruct/items/blocks/MetadataItemBlock.java +++ b/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.common.itemblocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/tconstruct/entity/FakeBlockEntity.java b/src/main/java/tconstruct/entity/FakeBlockEntity.java deleted file mode 100644 index 037f4e6c..00000000 --- a/src/main/java/tconstruct/entity/FakeBlockEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -package tconstruct.entity; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; - -public class FakeBlockEntity extends Entity implements IEntityAdditionalSpawnData -{ - - public FakeBlockEntity(World world) - { - super(world); - preventEntitySpawning = true; - } - - @Override - protected void entityInit () - { - - } - - @Override - protected void readEntityFromNBT (NBTTagCompound var1) - { - - } - - @Override - protected void writeEntityToNBT (NBTTagCompound var1) - { - - } - - @Override - public void writeSpawnData (ByteBuf buffer) - { - - } - - @Override - public void readSpawnData (ByteBuf additionalData) - { - - } - -} diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index b3bc653b..e6028b35 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -10,9 +10,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.common.TRepo; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -73,13 +73,13 @@ public class Arrow extends ToolCore @Override public Item getHeadItem () { - return TRepo.arrowhead; + return TinkerTools.arrowhead; } @Override public Item getAccessoryItem () { - return TRepo.fletching; + return TinkerTools.fletching; } @Override @@ -105,7 +105,7 @@ public class Arrow extends ToolCore ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 3), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, ""); if (tool == null) { - if (!TRepo.supressMissingToolLogs) + if (!TinkerTools.supressMissingToolLogs) { TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName()); TConstruct.logger.warn("Make sure you do not have item ID conflicts"); @@ -128,9 +128,9 @@ public class Arrow extends ToolCore if (tool == null) { - if (!TRepo.supressMissingToolLogs) + if (!TinkerTools.supressMissingToolLogs) { - if (!TRepo.supressMissingToolLogs) + if (!TinkerTools.supressMissingToolLogs) { TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName()); TConstruct.logger.warn("Make sure you do not have item ID conflicts"); diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index 92077465..58e6bb2c 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -1,8 +1,8 @@ package tconstruct.items.tools; import net.minecraft.item.Item; -import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -61,7 +61,7 @@ public class BattleSign extends Weapon @Override public Item getHeadItem () { - return TRepo.signHead; + return TinkerTools.signHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index e4e4aca6..32bc9fc8 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -15,11 +15,11 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.HarvestTool; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -57,25 +57,25 @@ public class Battleaxe extends HarvestTool @Override public Item getHeadItem () { - return TRepo.broadAxeHead; + return TinkerTools.broadAxeHead; } @Override public Item getHandleItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @Override public Item getAccessoryItem () { - return TRepo.broadAxeHead; + return TinkerTools.broadAxeHead; } @Override public Item getExtraItem () { - return TRepo.toughBinding; + return TinkerTools.toughBinding; } @Override diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 72223288..bc4a7b3f 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -22,11 +22,11 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; import tconstruct.TConstruct; -import tconstruct.common.TRepo; -import tconstruct.entity.projectile.ArrowEntity; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.entity.ArrowEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -65,7 +65,7 @@ public abstract class BowBase extends ToolCore time = event.charge; boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; - int slotID = getInventorySlotContainItem(TRepo.arrow, player.inventory); + int slotID = getInventorySlotContainItem(TinkerTools.arrow, player.inventory); int arrowID = getInventorySlotContainItem(Items.arrow, player.inventory); int arrowState = 0; ItemStack tinkerArrow = null; @@ -151,7 +151,7 @@ public abstract class BowBase extends ToolCore // if (tinkerArrow != null) if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) { - player.inventory.consumeInventoryItem(TRepo.arrow); + player.inventory.consumeInventoryItem(TinkerTools.arrow); } else { @@ -222,7 +222,7 @@ public abstract class BowBase extends ToolCore return event.result; } - if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TRepo.arrow))) + if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow))) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } @@ -773,7 +773,7 @@ public abstract class BowBase extends ToolCore ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, name + getToolName()); if (tool == null) { - if (!TRepo.supressMissingToolLogs) + if (!TinkerTools.supressMissingToolLogs) { TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName()); TConstruct.logger.warn("Make sure you do not have item ID conflicts"); diff --git a/src/main/java/tconstruct/items/tools/Broadsword.java b/src/main/java/tconstruct/items/tools/Broadsword.java index b67eff4e..4cddea7a 100644 --- a/src/main/java/tconstruct/items/tools/Broadsword.java +++ b/src/main/java/tconstruct/items/tools/Broadsword.java @@ -1,8 +1,8 @@ package tconstruct.items.tools; import net.minecraft.item.Item; -import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; public class Broadsword extends Weapon { @@ -15,13 +15,13 @@ public class Broadsword extends Weapon @Override public Item getHeadItem () { - return TRepo.swordBlade; + return TinkerTools.swordBlade; } @Override public Item getAccessoryItem () { - return TRepo.wideGuard; + return TinkerTools.wideGuard; } @Override diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index 8b7e9a04..2267f34d 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -12,10 +12,10 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.common.TRepo; import tconstruct.library.crafting.Detailing.DetailInput; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -213,7 +213,7 @@ public class Chisel extends ToolCore @Override public Item getHeadItem () { - return TRepo.chiselHead; + return TinkerTools.chiselHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index 4d387499..1967890e 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,25 +25,25 @@ public class Cleaver extends Weapon @Override public Item getHeadItem () { - return TRepo.largeSwordBlade; + return TinkerTools.largeSwordBlade; } @Override public Item getHandleItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @Override public Item getAccessoryItem () { - return TRepo.largePlate; + return TinkerTools.largePlate; } @Override public Item getExtraItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @Override diff --git a/src/main/java/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java index 3e6a49e8..abc29c13 100644 --- a/src/main/java/tconstruct/items/tools/Cutlass.java +++ b/src/main/java/tconstruct/items/tools/Cutlass.java @@ -1,8 +1,8 @@ package tconstruct.items.tools; import net.minecraft.item.Item; -import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; public class Cutlass extends Weapon { @@ -15,13 +15,13 @@ public class Cutlass extends Weapon @Override public Item getHeadItem () { - return TRepo.swordBlade; + return TinkerTools.swordBlade; } @Override public Item getAccessoryItem () { - return TRepo.fullGuard; + return TinkerTools.fullGuard; } @Override diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java index a493b454..04973cb4 100644 --- a/src/main/java/tconstruct/items/tools/Dagger.java +++ b/src/main/java/tconstruct/items/tools/Dagger.java @@ -5,9 +5,9 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.common.TRepo; -import tconstruct.entity.projectile.DaggerEntity; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.entity.DaggerEntity; public class Dagger extends Weapon { @@ -101,12 +101,12 @@ public class Dagger extends Weapon @Override public Item getHeadItem () { - return TRepo.knifeBlade; + return TinkerTools.knifeBlade; } @Override public Item getAccessoryItem () { - return TRepo.crossbar; + return TinkerTools.crossbar; } } diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 59fcbbbb..35a7961f 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -9,11 +9,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.HarvestTool; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -42,25 +42,25 @@ public class Excavator extends HarvestTool @Override public Item getHeadItem () { - return TRepo.excavatorHead; + return TinkerTools.excavatorHead; } @Override public Item getHandleItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @Override public Item getAccessoryItem () { - return TRepo.largePlate; + return TinkerTools.largePlate; } @Override public Item getExtraItem () { - return TRepo.toughBinding; + return TinkerTools.toughBinding; } @Override diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index be7654a8..36492250 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -12,11 +12,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import tconstruct.blocks.logic.EquipLogic; -import tconstruct.common.TRepo; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.EquipLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -125,14 +125,14 @@ public class FryingPan extends Weapon { return false; } - else if (!TRepo.heldItemBlock.canPlaceBlockAt(world, x, y, z)) + else if (!TinkerTools.heldItemBlock.canPlaceBlockAt(world, x, y, z)) { return false; } else { - world.setBlock(x, y, z, TRepo.heldItemBlock, 0, 3); - TRepo.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack); + world.setBlock(x, y, z, TinkerTools.heldItemBlock, 0, 3); + TinkerTools.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack); world.playSoundEffect(x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F); EquipLogic logic = (EquipLogic) world.getTileEntity(x, y, z); @@ -147,7 +147,7 @@ public class FryingPan extends Weapon @Override public Item getHeadItem () { - return TRepo.frypanHead; + return TinkerTools.frypanHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 0aa72590..517a22a4 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -14,12 +14,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.HarvestTool; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -73,25 +73,25 @@ public class Hammer extends HarvestTool @Override public Item getHeadItem () { - return TRepo.hammerHead; + return TinkerTools.hammerHead; } @Override public Item getHandleItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @Override public Item getAccessoryItem () { - return TRepo.largePlate; + return TinkerTools.largePlate; } @Override public Item getExtraItem () { - return TRepo.largePlate; + return TinkerTools.largePlate; } @Override diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index d466593c..056b80f1 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -6,9 +6,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.HarvestTool; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -50,7 +50,7 @@ public class Hatchet extends HarvestTool @Override public Item getHeadItem () { - return TRepo.hatchetHead; + return TinkerTools.hatchetHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index 6440d1e1..a911b5f0 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -8,8 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -102,13 +102,13 @@ public class Longsword extends Weapon @Override public Item getHeadItem () { - return TRepo.swordBlade; + return TinkerTools.swordBlade; } @Override public Item getAccessoryItem () { - return TRepo.handGuard; + return TinkerTools.handGuard; } @Override diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 137bd177..92cc6b3d 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -9,11 +9,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.HarvestTool; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -324,25 +324,25 @@ public class LumberAxe extends HarvestTool @Override public Item getHeadItem () { - return TRepo.broadAxeHead; + return TinkerTools.broadAxeHead; } @Override public Item getHandleItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @Override public Item getAccessoryItem () { - return TRepo.largePlate; + return TinkerTools.largePlate; } @Override public Item getExtraItem () { - return TRepo.toughBinding; + return TinkerTools.toughBinding; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index 4d08c05a..732bb84b 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -9,10 +9,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.common.TRepo; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.DualHarvestTool; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; public class Mattock extends DualHarvestTool @@ -59,13 +59,13 @@ public class Mattock extends DualHarvestTool @Override public Item getHeadItem () { - return TRepo.hatchetHead; + return TinkerTools.hatchetHead; } @Override public Item getAccessoryItem () { - return TRepo.shovelHead; + return TinkerTools.shovelHead; } @Override @@ -128,7 +128,7 @@ public class Mattock extends DualHarvestTool ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName()); if (tool == null) { - if (!TRepo.supressMissingToolLogs) + if (!TinkerTools.supressMissingToolLogs) { TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName()); TConstruct.logger.warn("Make sure you do not have item ID conflicts"); diff --git a/src/main/java/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java index 0afe7425..8bc8be40 100644 --- a/src/main/java/tconstruct/items/tools/Pickaxe.java +++ b/src/main/java/tconstruct/items/tools/Pickaxe.java @@ -2,8 +2,8 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; import net.minecraft.item.Item; -import tconstruct.common.TRepo; import tconstruct.library.tools.HarvestTool; +import tconstruct.tools.TinkerTools; public class Pickaxe extends HarvestTool { @@ -30,13 +30,13 @@ public class Pickaxe extends HarvestTool @Override public Item getHeadItem () { - return TRepo.pickaxeHead; + return TinkerTools.pickaxeHead; } @Override public Item getAccessoryItem () { - return TRepo.binding; + return TinkerTools.binding; } @Override diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index 6b7e19ae..d4bfea34 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.entity.projectile.LaunchedPotion; +import tconstruct.tools.entity.LaunchedPotion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index 4a0efe99..f80ea3a6 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -8,8 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; public class Rapier extends Weapon { @@ -75,13 +75,13 @@ public class Rapier extends Weapon @Override public Item getHeadItem () { - return TRepo.swordBlade; + return TinkerTools.swordBlade; } @Override public Item getAccessoryItem () { - return TRepo.crossbar; + return TinkerTools.crossbar; } @Override diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 2359208f..171520a6 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -19,11 +19,11 @@ import net.minecraft.stats.StatList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; -import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.Weapon; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -52,25 +52,25 @@ public class Scythe extends Weapon @Override public Item getHeadItem () { - return TRepo.scytheBlade; + return TinkerTools.scytheBlade; } @Override public Item getHandleItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @Override public Item getAccessoryItem () { - return TRepo.toughBinding; + return TinkerTools.toughBinding; } @Override public Item getExtraItem () { - return TRepo.toughRod; + return TinkerTools.toughRod; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index c4c89b53..2268cd97 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.common.TRepo; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -55,19 +55,19 @@ public class Shortbow extends BowBase @Override public Item getHeadItem () { - return TRepo.toolRod; + return TinkerTools.toolRod; } @Override public Item getHandleItem () { - return TRepo.bowstring; + return TinkerTools.bowstring; } @Override public Item getAccessoryItem () { - return TRepo.toolRod; + return TinkerTools.toolRod; } @Override diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index 75e7f8ad..7e763961 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -2,8 +2,8 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; import net.minecraft.item.Item; -import tconstruct.common.TRepo; import tconstruct.library.tools.HarvestTool; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -32,7 +32,7 @@ public class Shovel extends HarvestTool @Override public Item getHeadItem () { - return TRepo.shovelHead; + return TinkerTools.shovelHead; } @Override diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index f097a649..a2f8d112 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -4,66 +4,67 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import tconstruct.common.TRepo; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.world.TinkerWorld; public enum FluidType { /** Vanilla Water Smelting **/ Water(Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false), /** Iron Smelting **/ - Iron(Blocks.iron_block, 0, 600, TRepo.moltenIronFluid, true), + Iron(Blocks.iron_block, 0, 600, TinkerSmeltery.moltenIronFluid, true), /** Gold Smelting **/ - Gold(Blocks.gold_block, 0, 400, TRepo.moltenGoldFluid, false), + Gold(Blocks.gold_block, 0, 400, TinkerSmeltery.moltenGoldFluid, false), /** Tin Smelting **/ - Tin(TRepo.metalBlock, 5, 400, TRepo.moltenTinFluid, false), + Tin(TinkerSmeltery.metalBlock, 5, 400, TinkerSmeltery.moltenTinFluid, false), /** Copper Smelting **/ - Copper(TRepo.metalBlock, 3, 550, TRepo.moltenCopperFluid, true), + Copper(TinkerSmeltery.metalBlock, 3, 550, TinkerSmeltery.moltenCopperFluid, true), /** Aluminum Smelting **/ - Aluminum(TRepo.metalBlock, 6, 350, TRepo.moltenAluminumFluid, false), + Aluminum(TinkerSmeltery.metalBlock, 6, 350, TinkerSmeltery.moltenAluminumFluid, false), /** Natural Aluminum Smelting **/ - NaturalAluminum(TRepo.oreSlag, 6, 350, TRepo.moltenAluminumFluid, false), + NaturalAluminum(TinkerWorld.oreSlag, 6, 350, TinkerSmeltery.moltenAluminumFluid, false), /** Cobalt Smelting **/ - Cobalt(TRepo.metalBlock, 0, 650, TRepo.moltenCobaltFluid, true), + Cobalt(TinkerSmeltery.metalBlock, 0, 650, TinkerSmeltery.moltenCobaltFluid, true), /** Ardite Smelting **/ - Ardite(TRepo.metalBlock, 1, 650, TRepo.moltenArditeFluid, true), + Ardite(TinkerSmeltery.metalBlock, 1, 650, TinkerSmeltery.moltenArditeFluid, true), /** AluminumBrass Smelting **/ - AluminumBrass(TRepo.metalBlock, 7, 350, TRepo.moltenAlubrassFluid, false), + AluminumBrass(TinkerSmeltery.metalBlock, 7, 350, TinkerSmeltery.moltenAlubrassFluid, false), /** Alumite Smelting **/ - Alumite(TRepo.metalBlock, 8, 800, TRepo.moltenAlumiteFluid, true), + Alumite(TinkerSmeltery.metalBlock, 8, 800, TinkerSmeltery.moltenAlumiteFluid, true), /** Manyullyn Smelting **/ - Manyullyn(TRepo.metalBlock, 2, 750, TRepo.moltenManyullynFluid, true), + Manyullyn(TinkerSmeltery.metalBlock, 2, 750, TinkerSmeltery.moltenManyullynFluid, true), /** Bronze Smelting **/ - Bronze(TRepo.metalBlock, 4, 500, TRepo.moltenBronzeFluid, true), + Bronze(TinkerSmeltery.metalBlock, 4, 500, TinkerSmeltery.moltenBronzeFluid, true), /** Steel Smelting **/ - Steel(TRepo.metalBlock, 9, 700, TRepo.moltenSteelFluid, true), + Steel(TinkerSmeltery.metalBlock, 9, 700, TinkerSmeltery.moltenSteelFluid, true), /** Nickel Smelting **/ - Nickel(TRepo.metalBlock, 0, 400, TRepo.moltenNickelFluid, false), + Nickel(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenNickelFluid, false), /** Lead Smelting **/ - Lead(TRepo.metalBlock, 0, 400, TRepo.moltenLeadFluid, false), + Lead(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenLeadFluid, false), /** Silver Smelting **/ - Silver(TRepo.metalBlock, 0, 400, TRepo.moltenSilverFluid, false), + Silver(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenSilverFluid, false), /** Platinum Smelting **/ - Platinum(TRepo.metalBlock, 0, 400, TRepo.moltenShinyFluid, false), + Platinum(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenShinyFluid, false), /** Invar Smelting **/ - Invar(TRepo.metalBlock, 0, 400, TRepo.moltenInvarFluid, false), + Invar(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenInvarFluid, false), /** Electrum Smelting **/ - Electrum(TRepo.metalBlock, 0, 400, TRepo.moltenElectrumFluid, false), + Electrum(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenElectrumFluid, false), /** Obsidian Smelting **/ - Obsidian(Blocks.obsidian, 0, 750, TRepo.moltenObsidianFluid, true), + Obsidian(Blocks.obsidian, 0, 750, TinkerSmeltery.moltenObsidianFluid, true), /** Ender Smelting **/ - Ender(TRepo.metalBlock, 10, 500, TRepo.moltenEnderFluid, false), + Ender(TinkerSmeltery.metalBlock, 10, 500, TinkerSmeltery.moltenEnderFluid, false), /** Glass Smelting **/ - Glass(Blocks.sand, 0, 625, TRepo.moltenGlassFluid, false), + Glass(Blocks.sand, 0, 625, TinkerSmeltery.moltenGlassFluid, false), /** Stone Smelting **/ - Stone(Blocks.stone, 0, 800, TRepo.moltenStoneFluid, true), + Stone(Blocks.stone, 0, 800, TinkerSmeltery.moltenStoneFluid, true), /** Emerald Smelting **/ - Emerald(Blocks.emerald_ore, 0, 575, TRepo.moltenEmeraldFluid, false), + Emerald(Blocks.emerald_ore, 0, 575, TinkerSmeltery.moltenEmeraldFluid, false), /** Slime Smelting **/ - Slime(TRepo.slimeGel, 0, 250, TRepo.blueSlimeFluid, false), + Slime(TinkerWorld.slimeGel, 0, 250, TinkerWorld.blueSlimeFluid, false), /** Pigiron Smelting **/ - PigIron(TRepo.meatBlock, 0, 610, TRepo.pigIronFluid, true), + PigIron(TinkerWorld.meatBlock, 0, 610, TinkerSmeltery.pigIronFluid, true), /** Glue Smelting **/ - Glue(TRepo.glueBlock, 0, 125, TRepo.glueFluid, false); + Glue(TinkerSmeltery.glueBlock, 0, 125, TinkerSmeltery.glueFluid, false); public final Block renderBlock; public final int renderMeta; diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index ab0fae9b..208334de 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -22,10 +22,10 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import tconstruct.entity.FancyEntityItem; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; +import tconstruct.tools.entity.FancyEntityItem; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/mechworks/TinkerMechworks.java b/src/main/java/tconstruct/mechworks/TinkerMechworks.java new file mode 100644 index 00000000..cc93617f --- /dev/null +++ b/src/main/java/tconstruct/mechworks/TinkerMechworks.java @@ -0,0 +1,93 @@ +package tconstruct.mechworks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import tconstruct.armor.TinkerArmor; +import tconstruct.blocks.SlabBase; +import tconstruct.blocks.logic.DryingRackLogic; +import tconstruct.blocks.slime.SlimeFluid; +import tconstruct.blocks.slime.SlimeGel; +import tconstruct.blocks.slime.SlimeGrass; +import tconstruct.blocks.slime.SlimeLeaves; +import tconstruct.blocks.slime.SlimeSapling; +import tconstruct.blocks.slime.SlimeTallGrass; +import tconstruct.blocks.traps.BarricadeBlock; +import tconstruct.blocks.traps.Punji; +import tconstruct.client.StepSoundSlime; +import tconstruct.common.itemblocks.MetadataItemBlock; +import tconstruct.library.TConstructRegistry; +import tconstruct.mechworks.blocks.BlockLandmine; +import tconstruct.mechworks.itemblocks.ItemBlockLandmine; +import tconstruct.mechworks.logic.TileEntityLandmine; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.blocks.MetalOre; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.blocks.MultiBrick; +import tconstruct.tools.blocks.MultiBrickFancy; +import tconstruct.tools.itemblocks.MultiBrickFancyItem; +import tconstruct.tools.itemblocks.MultiBrickItem; +import tconstruct.world.TinkerWorld; +import tconstruct.world.blocks.ConveyorBase; +import tconstruct.world.blocks.GravelOre; +import tconstruct.world.blocks.MeatBlock; +import tconstruct.world.blocks.OreberryBush; +import tconstruct.world.blocks.OreberryBushEssence; +import tconstruct.world.blocks.SlimeExplosive; +import tconstruct.world.blocks.SlimePad; +import tconstruct.world.blocks.StoneLadder; +import tconstruct.world.blocks.StoneTorch; +import tconstruct.world.blocks.WoodRail; +import tconstruct.world.itemblocks.BarricadeItem; +import tconstruct.world.itemblocks.GravelOreItem; +import tconstruct.world.itemblocks.HamboneItemBlock; +import tconstruct.world.itemblocks.MetalOreItemBlock; +import tconstruct.world.itemblocks.OreberryBushItem; +import tconstruct.world.itemblocks.OreberryBushSecondItem; +import tconstruct.world.itemblocks.SlimeGelItemBlock; +import tconstruct.world.itemblocks.SlimeGrassItemBlock; +import tconstruct.world.itemblocks.SlimeLeavesItemBlock; +import tconstruct.world.itemblocks.SlimeSaplingItemBlock; +import tconstruct.world.itemblocks.SlimeTallGrassItem; +import tconstruct.world.itemblocks.WoolSlab1Item; +import tconstruct.world.itemblocks.WoolSlab2Item; +import tconstruct.world.items.OreBerries; +import tconstruct.world.items.StrangeFood; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; + +@Mod(modid = "TinkerMechworks", name = "TinkerMechworks", version = "${tinkermechworksversion}") +public class TinkerMechworks +{ + + @EventHandler + public void preInit (FMLPreInitializationEvent event) + { + // Traps + GameRegistry.registerBlock(TinkerWorld.landmine, ItemBlockLandmine.class, "Redstone.Landmine"); + GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); + } + + @EventHandler + public void init (FMLInitializationEvent event) + { + } + + @EventHandler + public void postInit (FMLPostInitializationEvent evt) + { + + } +} diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java similarity index 98% rename from src/main/java/tconstruct/blocks/BlockLandmine.java rename to src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index e7d1f8c7..b7942861 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.mechworks.blocks; import static net.minecraftforge.common.util.ForgeDirection.DOWN; import static net.minecraftforge.common.util.ForgeDirection.EAST; @@ -37,11 +37,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.TConstruct; -import tconstruct.blocks.logic.LandmineExplodeLogic; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.client.block.RenderLandmine; import tconstruct.common.TProxyCommon; -import tconstruct.util.landmine.Helper; +import tconstruct.mechworks.landmine.Helper; +import tconstruct.mechworks.logic.LandmineExplodeLogic; +import tconstruct.mechworks.logic.TileEntityLandmine; +import tconstruct.world.model.RenderLandmine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java similarity index 99% rename from src/main/java/tconstruct/entity/item/EntityLandmineFirework.java rename to src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java index 5f1d9868..2cb1aa0c 100644 --- a/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java @@ -1,4 +1,4 @@ -package tconstruct.entity.item; +package tconstruct.mechworks.entity.item; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java similarity index 99% rename from src/main/java/tconstruct/entity/item/ExplosivePrimed.java rename to src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java index 181e5431..518b5e31 100644 --- a/src/main/java/tconstruct/entity/item/ExplosivePrimed.java +++ b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java @@ -1,4 +1,4 @@ -package tconstruct.entity.item; +package tconstruct.mechworks.entity.item; import net.minecraft.block.Block; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java similarity index 98% rename from src/main/java/tconstruct/inventory/ContainerLandmine.java rename to src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index c5744e4e..cbd525f3 100644 --- a/src/main/java/tconstruct/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.mechworks.inventory; import java.util.HashSet; import java.util.Iterator; @@ -10,8 +10,10 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.common.TRepo; +import tconstruct.armor.inventory.SlotBehavedOnly; +import tconstruct.armor.inventory.SlotOpaqueBlocksOnly; +import tconstruct.mechworks.logic.TileEntityLandmine; +import tconstruct.world.TinkerWorld; /** * @@ -63,7 +65,7 @@ public class ContainerLandmine extends Container public boolean canInteractWith (EntityPlayer entityplayer) { Block block = te.getWorldObj().getBlock(te.xCoord, te.yCoord, te.zCoord); - if (block != TRepo.landmine) + if (block != TinkerWorld.landmine) return false; return te.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java similarity index 78% rename from src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java rename to src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java index d3ac2bd3..2c85b729 100644 --- a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.mechworks.itemblocks; import java.util.List; import java.util.Random; @@ -9,8 +9,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.common.TRepo; +import tconstruct.mechworks.logic.TileEntityLandmine; +import tconstruct.world.TinkerWorld; /** * @@ -59,25 +59,25 @@ public class ItemBlockLandmine extends ItemBlock @Override public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, TRepo.landmine, metadata, 3)) + if (!world.setBlock(x, y, z, TinkerWorld.landmine, metadata, 3)) { return false; } - if (world.getBlock(x, y, z) == TRepo.landmine) + if (world.getBlock(x, y, z) == TinkerWorld.landmine) { - TRepo.landmine.onBlockPlacedBy(world, x, y, z, player, stack); + TinkerWorld.landmine.onBlockPlacedBy(world, x, y, z, player, stack); TileEntityLandmine te = (TileEntityLandmine) world.getTileEntity(x, y, z); if (te == null) { - te = (TileEntityLandmine) TRepo.landmine.createTileEntity(world, metadata); + te = (TileEntityLandmine) TinkerWorld.landmine.createTileEntity(world, metadata); } te.triggerType = stack.getItemDamage(); world.setTileEntity(x, y, z, te); - TRepo.landmine.onPostBlockPlaced(world, x, y, z, metadata); + TinkerWorld.landmine.onPostBlockPlaced(world, x, y, z, metadata); } return true; diff --git a/src/main/java/tconstruct/util/landmine/Helper.java b/src/main/java/tconstruct/mechworks/landmine/Helper.java similarity index 98% rename from src/main/java/tconstruct/util/landmine/Helper.java rename to src/main/java/tconstruct/mechworks/landmine/Helper.java index 84da91f6..7f4519f4 100644 --- a/src/main/java/tconstruct/util/landmine/Helper.java +++ b/src/main/java/tconstruct/mechworks/landmine/Helper.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine; +package tconstruct.mechworks.landmine; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/util/landmine/LandmineStack.java b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java similarity index 98% rename from src/main/java/tconstruct/util/landmine/LandmineStack.java rename to src/main/java/tconstruct/mechworks/landmine/LandmineStack.java index c729dc8a..efc80065 100644 --- a/src/main/java/tconstruct/util/landmine/LandmineStack.java +++ b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine; +package tconstruct.mechworks.landmine; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/util/landmine/behavior/Behavior.java b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java similarity index 98% rename from src/main/java/tconstruct/util/landmine/behavior/Behavior.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java index ca417725..7bb9abbd 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import java.util.ArrayList; import java.util.HashMap; @@ -15,8 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.util.landmine.Helper; -import tconstruct.util.landmine.LandmineStack; +import tconstruct.mechworks.landmine.Helper; +import tconstruct.mechworks.landmine.LandmineStack; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java similarity index 98% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java index 462e4ac3..25bfb603 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import mantle.blocks.BlockUtils; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java similarity index 91% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java index af32af30..c4b34c0c 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java similarity index 88% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java index 8ddf9ca6..4d5c3510 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java similarity index 97% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java index e3880c7c..1db2675b 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import java.util.List; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java similarity index 95% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java index e03070cc..153f0ca6 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import java.util.Random; @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import tconstruct.items.blocks.ItemBlockLandmine; +import tconstruct.mechworks.itemblocks.ItemBlockLandmine; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java similarity index 93% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java index f0859c98..a62ee1ce 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java @@ -1,11 +1,11 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import tconstruct.entity.item.EntityLandmineFirework; +import tconstruct.mechworks.entity.item.EntityLandmineFirework; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java similarity index 95% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java index 15349bf8..8dafdd97 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import java.util.Iterator; import java.util.List; @@ -12,7 +12,7 @@ import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import tconstruct.items.blocks.ItemBlockLandmine; +import tconstruct.mechworks.itemblocks.ItemBlockLandmine; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorPreventExplode.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java similarity index 94% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorPreventExplode.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java index 0d68840d..23b81087 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorPreventExplode.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java similarity index 97% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java index c6babc5b..b6af0fbf 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java similarity index 97% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java index 7163d499..c9cef1a5 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import java.util.ArrayList; import java.util.Iterator; @@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; -import tconstruct.items.blocks.ItemBlockLandmine; +import tconstruct.mechworks.itemblocks.ItemBlockLandmine; //TODO Add a block that is similar to landmine, but only triggers by redstone, does not hurt the player, and does not disappear when used(also does not do anything that can deal damage) diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java similarity index 96% rename from src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java index 32b97baf..3d991474 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior; +package tconstruct.mechworks.landmine.behavior; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java similarity index 93% rename from src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java index b6c3db02..6049f82f 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior.stackCombo; +package tconstruct.mechworks.landmine.behavior.stackCombo; import java.util.ArrayList; @@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.util.landmine.Helper; -import tconstruct.util.landmine.behavior.Behavior; +import tconstruct.mechworks.landmine.Helper; +import tconstruct.mechworks.landmine.behavior.Behavior; +import tconstruct.mechworks.logic.TileEntityLandmine; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java similarity index 98% rename from src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java rename to src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java index f716a16a..838dedfb 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java @@ -1,4 +1,4 @@ -package tconstruct.util.landmine.behavior.stackCombo; +package tconstruct.mechworks.landmine.behavior.stackCombo; import java.util.ArrayList; import java.util.Random; diff --git a/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java similarity index 98% rename from src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java rename to src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index 28b9c259..f08fec9c 100644 --- a/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.mechworks.logic; import java.util.ArrayList; import java.util.Iterator; @@ -7,7 +7,7 @@ import mantle.world.WorldHelper; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.util.landmine.behavior.Behavior; +import tconstruct.mechworks.landmine.behavior.Behavior; /** * This logic is designed only for blocks having TileEntityLandmine as their diff --git a/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java similarity index 91% rename from src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java rename to src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java index 97fe77d1..5f7bcfb6 100644 --- a/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.mechworks.logic; import java.util.ArrayList; import java.util.Iterator; @@ -6,7 +6,7 @@ import java.util.Iterator; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; +import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; public class LandmineSpecialStackLogic { diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java rename to src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index e8449413..91342e4e 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.mechworks.logic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/mechworks/model/CartRender.java similarity index 98% rename from src/main/java/tconstruct/client/entity/CartRender.java rename to src/main/java/tconstruct/mechworks/model/CartRender.java index ac3c8d74..829eb9eb 100644 --- a/src/main/java/tconstruct/client/entity/CartRender.java +++ b/src/main/java/tconstruct/mechworks/model/CartRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.entity; +package tconstruct.mechworks.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.RenderBlocks; @@ -11,7 +11,7 @@ import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; -import tconstruct.entity.CartEntity; +import tconstruct.world.entity.CartEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/entity/ModelPullcart.java b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java similarity index 99% rename from src/main/java/tconstruct/client/entity/ModelPullcart.java rename to src/main/java/tconstruct/mechworks/model/ModelPullcart.java index d5a90978..f0fb9da8 100644 --- a/src/main/java/tconstruct/client/entity/ModelPullcart.java +++ b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java @@ -1,4 +1,4 @@ -package tconstruct.client.entity; +package tconstruct.mechworks.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/tconstruct/client/entity/ModelWagon.java b/src/main/java/tconstruct/mechworks/model/ModelWagon.java similarity index 99% rename from src/main/java/tconstruct/client/entity/ModelWagon.java rename to src/main/java/tconstruct/mechworks/model/ModelWagon.java index be1acbf9..1cbe56e2 100644 --- a/src/main/java/tconstruct/client/entity/ModelWagon.java +++ b/src/main/java/tconstruct/mechworks/model/ModelWagon.java @@ -1,4 +1,4 @@ -package tconstruct.client.entity; +package tconstruct.mechworks.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/tconstruct/modifiers/armor/AModJumpBoost.java b/src/main/java/tconstruct/modifiers/armor/AModJumpBoost.java deleted file mode 100644 index 1c5a9172..00000000 --- a/src/main/java/tconstruct/modifiers/armor/AModJumpBoost.java +++ /dev/null @@ -1,6 +0,0 @@ -package tconstruct.modifiers.armor; - -public class AModJumpBoost -{ - -} diff --git a/src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java b/src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java deleted file mode 100644 index 23fb2a2f..00000000 --- a/src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java +++ /dev/null @@ -1,586 +0,0 @@ -package tconstruct.plugins.fmp; - -import codechicken.lib.lighting.*; -import codechicken.lib.render.*; -import codechicken.lib.render.uv.MultiIconTransformation; -import codechicken.lib.vec.*; -import codechicken.microblock.*; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; -import tconstruct.blocks.GlassBlockConnected; -import tconstruct.util.config.PHConstruct; - -public class ConnectedTexturesMicroMaterial extends BlockMicroMaterial -{ - - public GlassBlockConnected b; - - MultiIconTransformation icont = null; - - public ConnectedTexturesMicroMaterial(GlassBlockConnected block, int meta) - { - super(block, meta); - b = block; - } - /* - @Override - public void loadIcons () - { - icont = new MultiIconTransformation(b.getIcons()); - } - - @Override - public void renderMicroFace (Vertex5[] verts, int side, Vector3 pos, LightMatrix lightMatrix, IMicroMaterialRender part) - { - renderMicroFace(verts, side, pos, lightMatrix, getColour(part), icont); - } - - public int determineTextre (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { - if (PHConstruct.connectedTexturesMode == 0) - { - return 0; - } - - boolean isOpenUp = false, isOpenDown = false, isOpenLeft = false, isOpenRight = false; - - switch (par5) - { - case 0: - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenDown = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenUp = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return 15; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return 11; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return 12; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return 13; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return 14; - } - else if (isOpenDown && isOpenUp) - { - return 5; - } - else if (isOpenLeft && isOpenRight) - { - return 6; - } - else if (isOpenDown && isOpenLeft) - { - return 8; - } - else if (isOpenDown && isOpenRight) - { - return 10; - } - else if (isOpenUp && isOpenLeft) - { - return 7; - } - else if (isOpenUp && isOpenRight) - { - return 9; - } - else if (isOpenDown) - { - return 3; - } - else if (isOpenUp) - { - return 4; - } - else if (isOpenLeft) - { - return 2; - } - else if (isOpenRight) - { - return 1; - } - break; - case 1: - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenDown = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenUp = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return 15; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return 11; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return 12; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return 13; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return 14; - } - else if (isOpenDown && isOpenUp) - { - return 5; - } - else if (isOpenLeft && isOpenRight) - { - return 6; - } - else if (isOpenDown && isOpenLeft) - { - return 8; - } - else if (isOpenDown && isOpenRight) - { - return 10; - } - else if (isOpenUp && isOpenLeft) - { - return 7; - } - else if (isOpenUp && isOpenRight) - { - return 9; - } - else if (isOpenDown) - { - return 3; - } - else if (isOpenUp) - { - return 4; - } - else if (isOpenLeft) - { - return 2; - } - else if (isOpenRight) - { - return 1; - } - break; - case 2: - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenLeft = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return 15; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return 13; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return 14; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return 11; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return 12; - } - else if (isOpenDown && isOpenUp) - { - return 6; - } - else if (isOpenLeft && isOpenRight) - { - return 5; - } - else if (isOpenDown && isOpenLeft) - { - return 9; - } - else if (isOpenDown && isOpenRight) - { - return 10; - } - else if (isOpenUp && isOpenLeft) - { - return 7; - } - else if (isOpenUp && isOpenRight) - { - return 8; - } - else if (isOpenDown) - { - return 1; - } - else if (isOpenUp) - { - return 2; - } - else if (isOpenLeft) - { - return 4; - } - else if (isOpenRight) - { - return 3; - } - break; - case 3: - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenLeft = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return 15; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return 14; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return 13; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return 11; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return 12; - } - else if (isOpenDown && isOpenUp) - { - return 6; - } - else if (isOpenLeft && isOpenRight) - { - return 5; - } - else if (isOpenDown && isOpenLeft) - { - return 10; - } - else if (isOpenDown && isOpenRight) - { - return 9; - } - else if (isOpenUp && isOpenLeft) - { - return 8; - } - else if (isOpenUp && isOpenRight) - { - return 7; - } - else if (isOpenDown) - { - return 1; - } - else if (isOpenUp) - { - return 2; - } - else if (isOpenLeft) - { - return 3; - } - else if (isOpenRight) - { - return 4; - } - break; - case 4: - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return 15; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return 14; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return 13; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return 11; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return 12; - } - else if (isOpenDown && isOpenUp) - { - return 6; - } - else if (isOpenLeft && isOpenRight) - { - return 5; - } - else if (isOpenDown && isOpenLeft) - { - return 10; - } - else if (isOpenDown && isOpenRight) - { - return 9; - } - else if (isOpenUp && isOpenLeft) - { - return 8; - } - else if (isOpenUp && isOpenRight) - { - return 7; - } - else if (isOpenDown) - { - return 1; - } - else if (isOpenUp) - { - return 2; - } - else if (isOpenLeft) - { - return 3; - } - else if (isOpenRight) - { - return 4; - } - break; - case 5: - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (b.shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return 15; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return 13; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return 14; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return 11; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return 12; - } - else if (isOpenDown && isOpenUp) - { - return 6; - } - else if (isOpenLeft && isOpenRight) - { - return 5; - } - else if (isOpenDown && isOpenLeft) - { - return 9; - } - else if (isOpenDown && isOpenRight) - { - return 10; - } - else if (isOpenUp && isOpenLeft) - { - return 7; - } - else if (isOpenUp && isOpenRight) - { - return 8; - } - else if (isOpenDown) - { - return 1; - } - else if (isOpenUp) - { - return 2; - } - else if (isOpenLeft) - { - return 4; - } - else if (isOpenRight) - { - return 3; - } - break; - } - - return 0; - } - - public void renderMicroFace (Vertex5[] verts, int side, Vector3 pos, LightMatrix lightMatrix, int colour, IUVTransformation uvt) - { - UV uv = new UV(); - Tessellator t = Tessellator.instance; - int i = 0; - while (i < 4) - { - if (CCRenderState.useNormals()) - { - Vector3 n = Rotation.axes[side % 6]; - t.setNormal((float) n.x, (float) n.y, (float) n.z); - } - Vertex5 vert = verts[i]; - if (lightMatrix != null) - { - LC lc = LC.computeO(vert.vec, side); - if (CCRenderState.useModelColours()) - lightMatrix.setColour(t, lc, colour); - lightMatrix.setBrightness(t, lc); - } - else - { - if (CCRenderState.useModelColours()) - CCRenderState.vertexColour(colour); - } - - // ((MultiIconTransformation)uvt).setIconIndex(null, determineTextre(Minecraft.getMinecraft().theWorld, (int)pos.x, (int)pos.y, (int)pos.z, side)); - - uvt.transform(uv.set(vert.uv)); - t.addVertexWithUV(vert.vec.x + pos.x, vert.vec.y + pos.y, vert.vec.z + pos.z, uv.u, uv.v); - i += 1; - } - } - - public static void createAndRegister (GlassBlockConnected block) - { - MicroMaterialRegistry.registerMaterial(new ConnectedTexturesMicroMaterial(block, 0), block.getUnlocalizedName()); - }*/ -} diff --git a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java deleted file mode 100644 index c415e4f3..00000000 --- a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java +++ /dev/null @@ -1,71 +0,0 @@ -package tconstruct.plugins.fmp; - -import codechicken.microblock.BlockMicroMaterial; -import codechicken.microblock.MicroMaterialRegistry; -import mantle.module.ILoadableModule; -import net.minecraft.block.Block; -import tconstruct.TConstruct; -import tconstruct.common.TRepo; - -public class ForgeMultiPart implements ILoadableModule -{ - - @SuppressWarnings("unused") - public static String modId = "ForgeMultipart"; - - @Override - public void preInit() { - // Nothing - } - - @Override - public void init() - { - TConstruct.logger.info("ForgeMultipart detected. Registering TConstruct decorative blocks with FMP."); - registerBlock(TRepo.clearGlass); - registerBlock(TRepo.stainedGlassClear, 0, 15); - registerBlock(TRepo.multiBrick, 0, 13); - registerBlock(TRepo.metalBlock, 0, 10); - registerBlock(TRepo.multiBrickFancy, 0, 15); - registerBlock(TRepo.smeltery, 2, 2); - registerBlock(TRepo.smeltery, 4, 10); - } - - @Override - public void postInit() { - // Nothing - } - - //For blocks with metadata values only - public static void registerBlock (Block block, int metastart, int metaend) - { - for (int meta = metastart; meta <= metaend; meta++) - { - String identifier = new String(block.getUnlocalizedName()); - MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), identifier + meta); - } - } - - //For blocks without metadata values only. - public static void registerBlock (Block block) - { - BlockMicroMaterial.createAndRegister(block, 0); - } - - //For blocks with metadata values and special MicroMaterial only - public static void registerBlock (Block block, int metastart, int metaend, MicroMaterialRegistry.IMicroMaterial material) - { - for (int meta = metastart; meta <= metaend; meta++) - { - String identifier = new String(block.getUnlocalizedName()); - MicroMaterialRegistry.registerMaterial(material, identifier + meta); - } - } - - //For blocks without metadata values and special MicroMaterial only. - public static void registerBlock (Block block, MicroMaterialRegistry.IMicroMaterial material) - { - MicroMaterialRegistry.registerMaterial(material, new String(block.getUnlocalizedName())); - } - -} diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java new file mode 100644 index 00000000..005b8815 --- /dev/null +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -0,0 +1,1066 @@ +package tconstruct.smeltery; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import mantle.blocks.BlockUtils; +import mantle.blocks.abstracts.MultiServantLogic; +import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.block.material.MaterialLiquid; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; +import tconstruct.TConstruct; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.FluidType; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.crafting.Smeltery; +import tconstruct.library.util.IPattern; +import tconstruct.smeltery.blocks.BloodBlock; +import tconstruct.smeltery.blocks.GlassBlockConnected; +import tconstruct.smeltery.blocks.GlassBlockConnectedMeta; +import tconstruct.smeltery.blocks.GlassPaneConnected; +import tconstruct.smeltery.blocks.GlassPaneStained; +import tconstruct.smeltery.blocks.GlueBlock; +import tconstruct.smeltery.blocks.GlueFluid; +import tconstruct.smeltery.blocks.LavaTankBlock; +import tconstruct.smeltery.blocks.SearedBlock; +import tconstruct.smeltery.blocks.SearedSlab; +import tconstruct.smeltery.blocks.SmelteryBlock; +import tconstruct.smeltery.blocks.SpeedBlock; +import tconstruct.smeltery.blocks.SpeedSlab; +import tconstruct.smeltery.blocks.TConstructFluid; +import tconstruct.smeltery.blocks.TankAirBlock; +import tconstruct.smeltery.itemblocks.CastingChannelItem; +import tconstruct.smeltery.itemblocks.GlassBlockItem; +import tconstruct.smeltery.itemblocks.GlassPaneItem; +import tconstruct.smeltery.itemblocks.LavaTankItemBlock; +import tconstruct.smeltery.itemblocks.MetalItemBlock; +import tconstruct.smeltery.itemblocks.SearedSlabItem; +import tconstruct.smeltery.itemblocks.SearedTableItemBlock; +import tconstruct.smeltery.itemblocks.SmelteryItemBlock; +import tconstruct.smeltery.itemblocks.SpeedBlockItem; +import tconstruct.smeltery.itemblocks.SpeedSlabItem; +import tconstruct.smeltery.itemblocks.StainedGlassClearItem; +import tconstruct.smeltery.itemblocks.StainedGlassClearPaneItem; +import tconstruct.smeltery.items.FilledBucket; +import tconstruct.smeltery.items.MetalPattern; +import tconstruct.smeltery.logic.AdaptiveDrainLogic; +import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingChannelLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.FaucetLogic; +import tconstruct.smeltery.logic.LavaTankLogic; +import tconstruct.smeltery.logic.SmelteryDrainLogic; +import tconstruct.smeltery.logic.SmelteryLogic; +import tconstruct.smeltery.logic.TankAirLogic; +import tconstruct.tools.TinkerTools; +import tconstruct.util.config.PHConstruct; +import tconstruct.world.TinkerWorld; +import tconstruct.world.blocks.CastingChannelBlock; +import tconstruct.world.blocks.TMetalBlock; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; + +public class TinkerSmeltery +{ + + public static Item metalPattern; + // public static Item armorPattern; + public static Item buckets; + public static Block smeltery; + public static Block lavaTank; + public static Block searedBlock; + public static Block castingChannel; + public static Block metalBlock; + public static Block tankAir; + public static Block smelteryNether; + public static Block lavaTankNether; + public static Block searedBlockNether; + public static Block searedSlab; + public static Block glueBlock; + public static Block clearGlass; + // public static Block stainedGlass; + public static Block stainedGlassClear; + public static Block glassPane; + // public static Block stainedGlassPane; + public static Block stainedGlassClearPane; + public static Block glassMagicSlab; + public static Block stainedGlassMagicSlab; + public static Block stainedGlassClearMagicSlab; + // Liquids + public static Material liquidMetal; + public static Fluid moltenIronFluid; + public static Fluid moltenGoldFluid; + public static Fluid moltenCopperFluid; + public static Fluid moltenTinFluid; + public static Fluid moltenAluminumFluid; + public static Fluid moltenCobaltFluid; + public static Fluid moltenArditeFluid; + public static Fluid moltenBronzeFluid; + public static Fluid moltenAlubrassFluid; + public static Fluid moltenManyullynFluid; + public static Fluid moltenAlumiteFluid; + public static Fluid moltenObsidianFluid; + public static Fluid moltenSteelFluid; + public static Fluid moltenGlassFluid; + public static Fluid moltenStoneFluid; + public static Fluid moltenEmeraldFluid; + public static Fluid moltenNickelFluid; + public static Fluid moltenLeadFluid; + public static Fluid moltenSilverFluid; + public static Fluid moltenShinyFluid; + public static Fluid moltenInvarFluid; + public static Fluid moltenElectrumFluid; + public static Fluid moltenEnderFluid; + public static Fluid pigIronFluid; + public static Block moltenIron; + public static Block moltenGold; + public static Block moltenCopper; + public static Block moltenTin; + public static Block moltenAluminum; + public static Block moltenCobalt; + public static Block moltenArdite; + public static Block moltenBronze; + public static Block moltenAlubrass; + public static Block moltenManyullyn; + public static Block moltenAlumite; + public static Block moltenObsidian; + public static Block moltenSteel; + public static Block moltenGlass; + public static Block moltenStone; + public static Block moltenEmerald; + public static Block moltenNickel; + public static Block moltenLead; + public static Block moltenSilver; + public static Block moltenShiny; + public static Block moltenInvar; + public static Block moltenElectrum; + public static Block moltenEnder; + // Glue + public static Fluid glueFluid; + public static Block glueFluidBlock; + public static Fluid[] fluids = new Fluid[27]; + public static Block[] fluidBlocks = new Block[26]; + public static FluidStack[] liquids; + public static Block speedSlab; + // InfiBlocks + public static Block speedBlock; + public static Fluid bloodFluid; + public static Block blood; + + + + @EventHandler + public void preInit (FMLPreInitializationEvent event) + { + + + TinkerSmeltery.searedSlab = new SearedSlab().setBlockName("SearedSlab"); + TinkerSmeltery.searedSlab.stepSound = Block.soundTypeStone; + + TinkerSmeltery.speedSlab = new SpeedSlab().setBlockName("SpeedSlab"); + TinkerSmeltery.speedSlab.stepSound = Block.soundTypeStone; + + TinkerSmeltery.metalBlock = new TMetalBlock(Material.iron, 10.0F).setBlockName("tconstruct.metalblock"); + TinkerSmeltery.metalBlock.stepSound = Block.soundTypeMetal; + + TinkerSmeltery.glueBlock = new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); + + // Smeltery + TinkerSmeltery.smeltery = new SmelteryBlock().setBlockName("Smeltery"); + TinkerSmeltery.smelteryNether = new SmelteryBlock("nether").setBlockName("Smeltery"); + TinkerSmeltery.lavaTank = new LavaTankBlock().setBlockName("LavaTank"); + TinkerSmeltery.lavaTank.setStepSound(Block.soundTypeGlass); + TinkerSmeltery.lavaTankNether = new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass).setBlockName("LavaTank"); + + TinkerSmeltery.searedBlock = new SearedBlock().setBlockName("SearedBlock"); + TinkerSmeltery.searedBlockNether = new SearedBlock("nether").setBlockName("SearedBlock"); + + TinkerSmeltery.castingChannel = (new CastingChannelBlock()).setBlockName("CastingChannel"); + + TinkerSmeltery.tankAir = new TankAirBlock(Material.leaves).setBlockUnbreakable().setBlockName("tconstruct.tank.air"); + + // Liquids + TinkerSmeltery.liquidMetal = new MaterialLiquid(MapColor.tntColor); + + TinkerSmeltery.moltenIronFluid = new Fluid("iron.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenIronFluid)) + TinkerSmeltery.moltenIronFluid = FluidRegistry.getFluid("iron.molten"); + TinkerSmeltery.moltenIron = new TConstructFluid(TinkerSmeltery.moltenIronFluid, Material.lava, "liquid_iron").setBlockName("fluid.molten.iron"); + GameRegistry.registerBlock(TinkerSmeltery.moltenIron, "fluid.molten.iron"); + TinkerSmeltery.moltenIronFluid.setBlock(TinkerSmeltery.moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenIronFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 0), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenGoldFluid = new Fluid("gold.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenGoldFluid)) + TinkerSmeltery.moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); + TinkerSmeltery.moltenGold = new TConstructFluid(TinkerSmeltery.moltenGoldFluid, Material.lava, "liquid_gold").setBlockName("fluid.molten.gold"); + GameRegistry.registerBlock(TinkerSmeltery.moltenGold, "fluid.molten.gold"); + TinkerSmeltery.moltenGoldFluid.setBlock(TinkerSmeltery.moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenGoldFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 1), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenCopperFluid = new Fluid("copper.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenCopperFluid)) + TinkerSmeltery.moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); + TinkerSmeltery.moltenCopper = new TConstructFluid(TinkerSmeltery.moltenCopperFluid, Material.lava, "liquid_copper").setBlockName("fluid.molten.copper"); + GameRegistry.registerBlock(TinkerSmeltery.moltenCopper, "fluid.molten.copper"); + TinkerSmeltery.moltenCopperFluid.setBlock(TinkerSmeltery.moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenCopperFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 2), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenTinFluid = new Fluid("tin.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenTinFluid)) + TinkerSmeltery.moltenTinFluid = FluidRegistry.getFluid("tin.molten"); + TinkerSmeltery.moltenTin = new TConstructFluid(TinkerSmeltery.moltenTinFluid, Material.lava, "liquid_tin").setBlockName("fluid.molten.tin"); + GameRegistry.registerBlock(TinkerSmeltery.moltenTin, "fluid.molten.tin"); + TinkerSmeltery.moltenTinFluid.setBlock(TinkerSmeltery.moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenTinFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 3), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenAluminumFluid = new Fluid("aluminum.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenAluminumFluid)) + TinkerSmeltery.moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); + TinkerSmeltery.moltenAluminum = new TConstructFluid(TinkerSmeltery.moltenAluminumFluid, Material.lava, "liquid_aluminum").setBlockName("fluid.molten.aluminum"); + GameRegistry.registerBlock(TinkerSmeltery.moltenAluminum, "fluid.molten.aluminum"); + TinkerSmeltery.moltenAluminumFluid.setBlock(TinkerSmeltery.moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAluminumFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 4), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenCobaltFluid = new Fluid("cobalt.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenCobaltFluid)) + TinkerSmeltery.moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); + TinkerSmeltery.moltenCobalt = new TConstructFluid(TinkerSmeltery.moltenCobaltFluid, Material.lava, "liquid_cobalt").setBlockName("fluid.molten.cobalt"); + GameRegistry.registerBlock(TinkerSmeltery.moltenCobalt, "fluid.molten.cobalt"); + TinkerSmeltery.moltenCobaltFluid.setBlock(TinkerSmeltery.moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 5), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenArditeFluid = new Fluid("ardite.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenArditeFluid)) + TinkerSmeltery.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); + TinkerSmeltery.moltenArdite = new TConstructFluid(TinkerSmeltery.moltenArditeFluid, Material.lava, "liquid_ardite").setBlockName("fluid.molten.ardite"); + GameRegistry.registerBlock(TinkerSmeltery.moltenArdite, "fluid.molten.ardite"); + TinkerSmeltery.moltenArditeFluid.setBlock(TinkerSmeltery.moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenArditeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 6), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenBronzeFluid = new Fluid("bronze.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenBronzeFluid)) + TinkerSmeltery.moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); + TinkerSmeltery.moltenBronze = new TConstructFluid(TinkerSmeltery.moltenBronzeFluid, Material.lava, "liquid_bronze").setBlockName("fluid.molten.bronze"); + GameRegistry.registerBlock(TinkerSmeltery.moltenBronze, "fluid.molten.bronze"); + TinkerSmeltery.moltenBronzeFluid.setBlock(TinkerSmeltery.moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 7), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenAlubrassFluid)) + TinkerSmeltery.moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); + TinkerSmeltery.moltenAlubrass = new TConstructFluid(TinkerSmeltery.moltenAlubrassFluid, Material.lava, "liquid_alubrass").setBlockName("fluid.molten.alubrass"); + GameRegistry.registerBlock(TinkerSmeltery.moltenAlubrass, "fluid.molten.alubrass"); + TinkerSmeltery.moltenAlubrassFluid.setBlock(TinkerSmeltery.moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 8), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenManyullynFluid = new Fluid("manyullyn.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenManyullynFluid)) + TinkerSmeltery.moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); + TinkerSmeltery.moltenManyullyn = new TConstructFluid(TinkerSmeltery.moltenManyullynFluid, Material.lava, "liquid_manyullyn").setBlockName("fluid.molten.manyullyn"); + GameRegistry.registerBlock(TinkerSmeltery.moltenManyullyn, "fluid.molten.manyullyn"); + TinkerSmeltery.moltenManyullynFluid.setBlock(TinkerSmeltery.moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 9), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenAlumiteFluid = new Fluid("alumite.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenAlumiteFluid)) + TinkerSmeltery.moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); + TinkerSmeltery.moltenAlumite = new TConstructFluid(TinkerSmeltery.moltenAlumiteFluid, Material.lava, "liquid_alumite").setBlockName("fluid.molten.alumite"); + GameRegistry.registerBlock(TinkerSmeltery.moltenAlumite, "fluid.molten.alumite"); + TinkerSmeltery.moltenAlumiteFluid.setBlock(TinkerSmeltery.moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 10), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenObsidianFluid = new Fluid("obsidian.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenObsidianFluid)) + TinkerSmeltery.moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); + TinkerSmeltery.moltenObsidian = new TConstructFluid(TinkerSmeltery.moltenObsidianFluid, Material.lava, "liquid_obsidian").setBlockName("fluid.molten.obsidian"); + GameRegistry.registerBlock(TinkerSmeltery.moltenObsidian, "fluid.molten.obsidian"); + TinkerSmeltery.moltenObsidianFluid.setBlock(TinkerSmeltery.moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 11), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenSteelFluid = new Fluid("steel.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenSteelFluid)) + TinkerSmeltery.moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); + TinkerSmeltery.moltenSteel = new TConstructFluid(TinkerSmeltery.moltenSteelFluid, Material.lava, "liquid_steel").setBlockName("fluid.molten.steel"); + GameRegistry.registerBlock(TinkerSmeltery.moltenSteel, "fluid.molten.steel"); + TinkerSmeltery.moltenSteelFluid.setBlock(TinkerSmeltery.moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenSteelFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 12), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenGlassFluid = new Fluid("glass.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenGlassFluid)) + TinkerSmeltery.moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); + TinkerSmeltery.moltenGlass = new TConstructFluid(TinkerSmeltery.moltenGlassFluid, Material.lava, "liquid_glass", true).setBlockName("fluid.molten.glass"); + GameRegistry.registerBlock(TinkerSmeltery.moltenGlass, "fluid.molten.glass"); + TinkerSmeltery.moltenGlassFluid.setBlock(TinkerSmeltery.moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 13), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenStoneFluid = new Fluid("stone.seared"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenStoneFluid)) + TinkerSmeltery.moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); + TinkerSmeltery.moltenStone = new TConstructFluid(TinkerSmeltery.moltenStoneFluid, Material.lava, "liquid_stone").setBlockName("molten.stone"); + GameRegistry.registerBlock(TinkerSmeltery.moltenStone, "molten.stone"); + TinkerSmeltery.moltenStoneFluid.setBlock(TinkerSmeltery.moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenStoneFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 14), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenEmeraldFluid = new Fluid("emerald.liquid"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenEmeraldFluid)) + TinkerSmeltery.moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); + TinkerSmeltery.moltenEmerald = new TConstructFluid(TinkerSmeltery.moltenEmeraldFluid, Material.water, "liquid_villager").setBlockName("molten.emerald"); + GameRegistry.registerBlock(TinkerSmeltery.moltenEmerald, "molten.emerald"); + TinkerSmeltery.moltenEmeraldFluid.setBlock(TinkerSmeltery.moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 15), new ItemStack(Items.bucket))); + + TinkerSmeltery.bloodFluid = new Fluid("blood"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.bloodFluid)) + TinkerSmeltery.bloodFluid = FluidRegistry.getFluid("blood"); + TinkerSmeltery.blood = new BloodBlock(TinkerSmeltery.bloodFluid, Material.water, "liquid_cow").setBlockName("liquid.blood"); + GameRegistry.registerBlock(TinkerSmeltery.blood, "liquid.blood"); + TinkerSmeltery.bloodFluid.setBlock(TinkerSmeltery.blood).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 16), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenNickelFluid = new Fluid("nickel.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenNickelFluid)) + TinkerSmeltery.moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); + TinkerSmeltery.moltenNickel = new TConstructFluid(TinkerSmeltery.moltenNickelFluid, Material.lava, "liquid_ferrous").setBlockName("fluid.molten.nickel"); + GameRegistry.registerBlock(TinkerSmeltery.moltenNickel, "fluid.molten.nickel"); + TinkerSmeltery.moltenNickelFluid.setBlock(TinkerSmeltery.moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenNickelFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 17), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenLeadFluid = new Fluid("lead.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenLeadFluid)) + TinkerSmeltery.moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); + TinkerSmeltery.moltenLead = new TConstructFluid(TinkerSmeltery.moltenLeadFluid, Material.lava, "liquid_lead").setBlockName("fluid.molten.lead"); + GameRegistry.registerBlock(TinkerSmeltery.moltenLead, "fluid.molten.lead"); + TinkerSmeltery.moltenLeadFluid.setBlock(TinkerSmeltery.moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenLeadFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 18), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenSilverFluid = new Fluid("silver.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenSilverFluid)) + TinkerSmeltery.moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); + TinkerSmeltery.moltenSilver = new TConstructFluid(TinkerSmeltery.moltenSilverFluid, Material.lava, "liquid_silver").setBlockName("fluid.molten.silver"); + GameRegistry.registerBlock(TinkerSmeltery.moltenSilver, "fluid.molten.silver"); + TinkerSmeltery.moltenSilverFluid.setBlock(TinkerSmeltery.moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenSilverFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 19), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenShinyFluid = new Fluid("platinum.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenShinyFluid)) + TinkerSmeltery.moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); + TinkerSmeltery.moltenShiny = new TConstructFluid(TinkerSmeltery.moltenShinyFluid, Material.lava, "liquid_shiny").setBlockName("fluid.molten.shiny"); + GameRegistry.registerBlock(TinkerSmeltery.moltenShiny, "fluid.molten.shiny"); + TinkerSmeltery.moltenShinyFluid.setBlock(TinkerSmeltery.moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenShinyFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 20), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenInvarFluid = new Fluid("invar.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenInvarFluid)) + TinkerSmeltery.moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); + TinkerSmeltery.moltenInvar = new TConstructFluid(TinkerSmeltery.moltenInvarFluid, Material.lava, "liquid_invar").setBlockName("fluid.molten.invar"); + GameRegistry.registerBlock(TinkerSmeltery.moltenInvar, "fluid.molten.invar"); + TinkerSmeltery.moltenInvarFluid.setBlock(TinkerSmeltery.moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenInvarFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 21), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenElectrumFluid = new Fluid("electrum.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenElectrumFluid)) + TinkerSmeltery.moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); + TinkerSmeltery.moltenElectrum = new TConstructFluid(TinkerSmeltery.moltenElectrumFluid, Material.lava, "liquid_electrum").setBlockName("fluid.molten.electrum"); + GameRegistry.registerBlock(TinkerSmeltery.moltenElectrum, "fluid.molten.electrum"); + TinkerSmeltery.moltenElectrumFluid.setBlock(TinkerSmeltery.moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenElectrumFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 22), new ItemStack(Items.bucket))); + + TinkerSmeltery.moltenEnderFluid = new Fluid("ender"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenEnderFluid)) + { + TinkerSmeltery.moltenEnderFluid = FluidRegistry.getFluid("ender"); + TinkerSmeltery.moltenEnder = TinkerSmeltery.moltenEnderFluid.getBlock(); + if (TinkerSmeltery.moltenEnder == null) + TConstruct.logger.info("Molten ender block missing!"); + } + else + { + TinkerSmeltery.moltenEnder = new TConstructFluid(TinkerSmeltery.moltenEnderFluid, Material.water, "liquid_ender").setBlockName("fluid.ender"); + GameRegistry.registerBlock(TinkerSmeltery.moltenEnder, "fluid.ender"); + TinkerSmeltery.moltenEnderFluid.setBlock(TinkerSmeltery.moltenEnder).setDensity(3000).setViscosity(6000); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 23), new ItemStack(Items.bucket))); + } + + + // Glue + TinkerSmeltery.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); + if (!FluidRegistry.registerFluid(TinkerSmeltery.glueFluid)) + TinkerSmeltery.glueFluid = FluidRegistry.getFluid("glue"); + TinkerSmeltery.glueFluidBlock = new GlueFluid(TinkerSmeltery.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep).setBlockName("liquid.glue"); + GameRegistry.registerBlock(TinkerSmeltery.glueFluidBlock, "liquid.glue"); + TinkerSmeltery.glueFluid.setBlock(TinkerSmeltery.glueFluidBlock); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 25), new ItemStack(Items.bucket))); + + TinkerSmeltery.pigIronFluid = new Fluid("pigiron.molten"); + if (!FluidRegistry.registerFluid(TinkerSmeltery.pigIronFluid)) + TinkerSmeltery.pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); + else + TinkerSmeltery.pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 26), new ItemStack(Items.bucket))); + TinkerSmeltery.fluids = new Fluid[] { TinkerSmeltery.moltenIronFluid, TinkerSmeltery.moltenGoldFluid, TinkerSmeltery.moltenCopperFluid, TinkerSmeltery.moltenTinFluid, TinkerSmeltery.moltenAluminumFluid, TinkerSmeltery.moltenCobaltFluid, + TinkerSmeltery.moltenArditeFluid, TinkerSmeltery.moltenBronzeFluid, TinkerSmeltery.moltenAlubrassFluid, TinkerSmeltery.moltenManyullynFluid, TinkerSmeltery.moltenAlumiteFluid, TinkerSmeltery.moltenObsidianFluid, TinkerSmeltery.moltenSteelFluid, + TinkerSmeltery.moltenGlassFluid, TinkerSmeltery.moltenStoneFluid, TinkerSmeltery.moltenEmeraldFluid, TinkerSmeltery.bloodFluid, TinkerSmeltery.moltenNickelFluid, TinkerSmeltery.moltenLeadFluid, TinkerSmeltery.moltenSilverFluid, + TinkerSmeltery.moltenShinyFluid, TinkerSmeltery.moltenInvarFluid, TinkerSmeltery.moltenElectrumFluid, TinkerSmeltery.moltenEnderFluid, TinkerWorld.blueSlimeFluid, TinkerSmeltery.glueFluid, TinkerSmeltery.pigIronFluid }; + TinkerSmeltery.fluidBlocks = new Block[] { TinkerSmeltery.moltenIron, TinkerSmeltery.moltenGold, TinkerSmeltery.moltenCopper, TinkerSmeltery.moltenTin, TinkerSmeltery.moltenAluminum, TinkerSmeltery.moltenCobalt, TinkerSmeltery.moltenArdite, TinkerSmeltery.moltenBronze, + TinkerSmeltery.moltenAlubrass, TinkerSmeltery.moltenManyullyn, TinkerSmeltery.moltenAlumite, TinkerSmeltery.moltenObsidian, TinkerSmeltery.moltenSteel, TinkerSmeltery.moltenGlass, TinkerSmeltery.moltenStone, TinkerSmeltery.moltenEmerald, TinkerSmeltery.blood, + TinkerSmeltery.moltenNickel, TinkerSmeltery.moltenLead, TinkerSmeltery.moltenSilver, TinkerSmeltery.moltenShiny, TinkerSmeltery.moltenInvar, TinkerSmeltery.moltenElectrum, TinkerSmeltery.moltenEnder, TinkerWorld.slimePool, TinkerSmeltery.glueFluidBlock }; + + + TinkerSmeltery.speedBlock = new SpeedBlock().setBlockName("SpeedBlock"); + + // Glass + TinkerSmeltery.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock"); + TinkerSmeltery.clearGlass.stepSound = Block.soundTypeGlass; + TinkerSmeltery.glassPane = new GlassPaneConnected("clear", false); + TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", + "brown", "green", "red", "black").setBlockName("GlassBlock.StainedClear"); + TinkerSmeltery.stainedGlassClear.stepSound = Block.soundTypeGlass; + TinkerSmeltery.stainedGlassClearPane = new GlassPaneStained(); + + GameRegistry.registerBlock(TinkerSmeltery.searedSlab, SearedSlabItem.class, "SearedSlab"); + GameRegistry.registerBlock(TinkerSmeltery.speedSlab, SpeedSlabItem.class, "SpeedSlab"); + + GameRegistry.registerBlock(TinkerSmeltery.metalBlock, MetalItemBlock.class, "MetalBlock"); + + OreDictionary.registerOre("hambone", new ItemStack(TinkerWorld.meatBlock)); + GameRegistry.addRecipe(new ItemStack(TinkerWorld.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Items.bone), 'm', new ItemStack(Items.porkchop)); + + GameRegistry.registerBlock(TinkerSmeltery.glueBlock, "GlueBlock"); + OreDictionary.registerOre("blockRubber", new ItemStack(TinkerSmeltery.glueBlock)); + + // Smeltery stuff + GameRegistry.registerBlock(TinkerSmeltery.smeltery, SmelteryItemBlock.class, "Smeltery"); + GameRegistry.registerBlock(TinkerSmeltery.smelteryNether, SmelteryItemBlock.class, "SmelteryNether"); + if (PHConstruct.newSmeltery) + { + GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery"); + GameRegistry.registerTileEntity(AdaptiveDrainLogic.class, "TConstruct.SmelteryDrain"); + } + else + { + GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery"); + GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain"); + } + GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants"); + GameRegistry.registerBlock(TinkerSmeltery.lavaTank, LavaTankItemBlock.class, "LavaTank"); + GameRegistry.registerBlock(TinkerSmeltery.lavaTankNether, LavaTankItemBlock.class, "LavaTankNether"); + GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank"); + + GameRegistry.registerBlock(TinkerSmeltery.searedBlock, SearedTableItemBlock.class, "SearedBlock"); + GameRegistry.registerBlock(TinkerSmeltery.searedBlockNether, SearedTableItemBlock.class, "SearedBlockNether"); + GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable"); + GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet"); + GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin"); + + GameRegistry.registerBlock(TinkerSmeltery.castingChannel, CastingChannelItem.class, "CastingChannel"); + GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel"); + + GameRegistry.registerBlock(TinkerSmeltery.tankAir, "TankAir"); + GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air"); + + GameRegistry.registerBlock(TinkerSmeltery.speedBlock, SpeedBlockItem.class, "SpeedBlock"); + + // Glass + GameRegistry.registerBlock(TinkerSmeltery.clearGlass, GlassBlockItem.class, "GlassBlock"); + GameRegistry.registerBlock(TinkerSmeltery.glassPane, GlassPaneItem.class, "GlassPane"); + GameRegistry.registerBlock(TinkerSmeltery.stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); + GameRegistry.registerBlock(TinkerSmeltery.stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); + + //Items + TinkerSmeltery.metalPattern = new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + GameRegistry.registerItem(TinkerSmeltery.metalPattern, "metalPattern"); + TConstructRegistry.addItemToDirectory("metalPattern", TinkerSmeltery.metalPattern); + String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", + "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; + for (int i = 0; i < patternTypes.length; i++) + { + TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.metalPattern, 1, i)); + } + TinkerSmeltery.buckets = new FilledBucket(BlockUtils.getBlockFromItem(TinkerSmeltery.buckets)); + GameRegistry.registerItem(TinkerSmeltery.buckets, "buckets"); + } + + @EventHandler + public void init (FMLInitializationEvent event) + { + + } + + @EventHandler + public void postInit (FMLPostInitializationEvent evt) + { + craftingTableRecipes(); + addOreDictionarySmelteryRecipes(); + addRecipesForTableCasting(); + } + + private void craftingTableRecipes() + { + + String[] patSurround = { "###", "#m#", "###" }; + + + // stained Glass Recipes + String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", + "dyeMagenta", "dyeOrange", "dyeWhite" }; + String color = ""; + for (int i = 0; i < 16; i++) + { + color = dyeTypes[15 - i]; + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), patSurround, 'm', color, '#', TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClear, 1, + Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', TinkerSmeltery.glassPane)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, TinkerSmeltery.glassPane)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, + Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); + } + + + + // Glass Recipes + GameRegistry.addRecipe(new ItemStack(Items.glass_bottle, 3), new Object[] { "# #", " # ", '#', TinkerSmeltery.clearGlass }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.daylight_detector), new Object[] { "GGG", "QQQ", "WWW", 'G', "blockGlass", 'Q', Items.quartz, 'W', "slabWood" })); + GameRegistry.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', TinkerSmeltery.clearGlass, 'S', Items.nether_star, 'O', Blocks.obsidian }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.glassPane, 16, 0), "GGG", "GGG", 'G', TinkerSmeltery.clearGlass)); + + // Smeltery Components Recipes + ItemStack searedBrick = new ItemStack(TinkerTools.materials, 1, 2); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTank, 1, 0), patSurround, '#', searedBrick, 'm', "blockGlass")); // Tank + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Glass + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Window + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel + + searedBrick = new ItemStack(TinkerTools.materials, 1, 37); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTankNether, 1, 0), patSurround, '#', searedBrick, 'm', "blockGlass")); // Tank + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTankNether, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Glass + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTankNether, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Window + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlockNether, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlockNether, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlockNether, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel + + + // Slab Smeltery Components Recipes + for (int i = 0; i < 7; i++) + { + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.speedSlab, 6, i), "bbb", 'b', new ItemStack(TinkerSmeltery.speedBlock, 1, i)); + } + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 0), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 1), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 4)); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 2), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 5)); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 3), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 6)); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 4), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 8)); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 5), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 9)); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 6), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 10)); + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 7), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 11)); + } + + public void addOreDictionarySmelteryRecipes () + { + List exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime, FluidType.Obsidian }); + for (FluidType ft : FluidType.values()) + { + if (exceptions.contains(ft)) + continue; + + // Nuggets + Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); + + // Ingots, Dust + registerIngotCasting(ft); + Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue); + + // Factorization support + Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + + // Ores + Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); + + // NetherOres support + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); + + // Blocks + Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); + + if (ft.isToolpart) + { + TinkerTools.registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); + TinkerTools.registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); + } + } + // Obsidian, different dust amount + { + FluidType ft = FluidType.Obsidian; + Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); + + // Ingots, Dust + registerIngotCasting(ft); + Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue / 4); + + // Factorization support + Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + + // Ores + Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); + + // NetherOres support + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); + + // Blocks + Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); + + if (ft.isToolpart) + { + TinkerTools.registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); + TinkerTools.registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); + } + } + + // Compressed materials + for (int i = 1; i <= 8; i++) + { + Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.Stone, 0, TConstruct.ingotLiquidValue / 18 * (9 ^ i)); + } + Smeltery.addDictionaryMelting("compressedSand1x", FluidType.Glass, 175, FluidContainerRegistry.BUCKET_VOLUME * 9); + } + + private void addRecipesForTableCasting () + { + /* Smeltery */ + ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); + ItemStack gemcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 26); + LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); + // Blank + tableCasting.addCastingRecipe(new ItemStack(TinkerTools.blankPattern, 1, 1), new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); + tableCasting.addCastingRecipe(new ItemStack(TinkerTools.blankPattern, 1, 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Items.emerald), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Items.emerald), 80); + + // Ingots + tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 2), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); // stone + + // Misc + tableCasting.addCastingRecipe(new ItemStack(Items.emerald), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), gemcast, 80); + tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 36), new FluidStack(TinkerSmeltery.glueFluid, TConstruct.ingotLiquidValue), null, 50); + tableCasting.addCastingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 1), new FluidStack(TinkerSmeltery.bloodFluid, 160), null, 50); + + // Buckets + ItemStack bucket = new ItemStack(Items.bucket); + + for (int sc = 0; sc < 24; sc++) + { + tableCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.buckets, 1, sc), new FluidStack(TinkerSmeltery.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + } + tableCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.buckets, 1, 26), new FluidStack(TinkerSmeltery.fluids[26], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + + // Clear glass pane casting + tableCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.glassPane), new FluidStack(TinkerSmeltery.moltenGlassFluid, 250), null, 80); + + // Metal toolpart casting + TinkerSmeltery.liquids = new FluidStack[] { new FluidStack(TinkerSmeltery.moltenIronFluid, 1), new FluidStack(TinkerSmeltery.moltenCopperFluid, 1), new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1), + new FluidStack(TinkerSmeltery.moltenArditeFluid, 1), new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1), new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1), + new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1), new FluidStack(TinkerSmeltery.moltenSteelFluid, 1), new FluidStack(TinkerSmeltery.pigIronFluid, 1) }; + int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; // ItemStack + // damage + // value + int fluidAmount = 0; + Fluid fs = null; + + for (int iter = 0; iter < TinkerTools.patternOutputs.length; iter++) + { + if (TinkerTools.patternOutputs[iter] != null) + { + ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, iter + 1); + + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + + for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) + { + fs = TinkerSmeltery.liquids[iterTwo].getFluid(); + fluidAmount = ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; + ItemStack metalCast = new ItemStack(TinkerTools.patternOutputs[iter], 1, liquidDamage[iterTwo]); + tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); + Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount); + } + } + } + + ItemStack[] ingotShapes = { new ItemStack(Items.brick), new ItemStack(Items.netherbrick), new ItemStack(TinkerTools.materials, 1, 2), new ItemStack(TinkerTools.materials, 1, 37) }; + for (int i = 0; i < ingotShapes.length; i++) + { + tableCasting.addCastingRecipe(ingotcast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50); + tableCasting.addCastingRecipe(ingotcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); + } + + ItemStack fullguardCast = new ItemStack(TinkerSmeltery.metalPattern, 1, 22); + tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); + + // Golden Food Stuff + FluidStack goldAmount = null; + if (PHConstruct.goldAppleRecipe) + { + goldAmount = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 8); + } + else + { + goldAmount = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); + } + tableCasting.addCastingRecipe(new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50); + tableCasting.addCastingRecipe(new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50); + tableCasting.addCastingRecipe(new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50); + tableCasting.addCastingRecipe(new ItemStack(TinkerTools.goldHead), goldAmount, new ItemStack(Items.skull, 1, 3), true, 50); + } + + + protected static void addRecipesForBasinCasting () + { + LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); + // Block Casting + basinCasting.addCastingRecipe(new ItemStack(Blocks.iron_block), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); // Iron + basinCasting.addCastingRecipe(new ItemStack(Blocks.gold_block), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); // gold + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); // copper + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 5), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); // tin + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 6), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); // aluminum + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 0), new FluidStack(TinkerSmeltery.moltenCobaltFluid, TConstruct.blockLiquidValue), null, true, 100); // cobalt + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 1), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.blockLiquidValue), null, true, 100); // ardite + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 4), new FluidStack(TinkerSmeltery.moltenBronzeFluid, TConstruct.blockLiquidValue), null, true, 100); // bronze + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 7), new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.blockLiquidValue), null, true, 100); // albrass + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 2), new FluidStack(TinkerSmeltery.moltenManyullynFluid, TConstruct.blockLiquidValue), null, true, 100); // manyullyn + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 8), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); // alumite + basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 9), new FluidStack(TinkerSmeltery.moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); // steel + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.clearGlass, 1, 0), new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); // glass + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 4), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); // seared + // stone + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 5), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Blocks.cobblestone), true, 100); + basinCasting.addCastingRecipe(new ItemStack(Blocks.emerald_block), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 9), null, true, 100); // emerald + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 1, 0), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Blocks.gravel), true, 100); // brownstone + if (PHConstruct.craftEndstone) + { + basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TinkerSmeltery.moltenEnderFluid, 50), new ItemStack(Blocks.obsidian), true, 100); + basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), new ItemStack(Blocks.sandstone), true, 100); + } + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 10), new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000), null, true, 100); // ender + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.glueBlock), new FluidStack(TinkerSmeltery.glueFluid, TConstruct.blockLiquidValue), null, true, 100); // glue + + // basinCasting.addCastingRecipe(new ItemStack(slimeGel, 1, 0), new + // FluidStack(blueSlimeFluid, FluidContainerRegistry.BUCKET_VOLUME), + // null, true, 100); + + // Armor casts + /* + * FluidRenderProperties frp = new + * FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, + * Applications.BASIN); FluidStack aluFlu = new + * FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue * + * 10); FluidStack gloFlu = new FluidStack(TRepo.moltenGoldFluid, + * TConstruct.ingotLiquidValue * 10); ItemStack[] armor = { new + * ItemStack(helmetWood), new ItemStack(chestplateWood), new + * ItemStack(leggingsWood), new ItemStack(bootsWood) }; for (int sc = 0; + * sc < armor.length; sc++) { basinCasting.addCastingRecipe(new + * ItemStack(armorPattern, 1, sc), aluFlu, armor[sc], 50, frp); + * basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), + * gloFlu, armor[sc], 50, frp); } + */ + } + + protected static void addRecipesForSmeltery () + { + // Alloy Smelting + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TinkerSmeltery.moltenCopperFluid, + TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.ingotLiquidValue)); // Bronze + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, + TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); // Aluminum Brass + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, + TConstruct.ingotLiquidValue * 5), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); // Alumite + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack(TinkerSmeltery.moltenCobaltFluid, + TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.ingotLiquidValue)); // Manyullyn + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.pigIronFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TinkerSmeltery.moltenIronFluid, + TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), new FluidStack(FluidRegistry.LAVA, 1000), new FluidStack(FluidRegistry.WATER, 1000)); //Obsidian + // Stone parts + for (int sc = 0; sc < TinkerTools.patternOutputs.length; sc++) + { + if (TinkerTools.patternOutputs[sc] != null) + { + Smeltery.addMelting(FluidType.Stone, new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), 1, + (8 * ((IPattern) TinkerTools.woodPattern).getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) / 2); + } + } + + // Chunks + Smeltery.addMelting(FluidType.Stone, new ItemStack(TinkerTools.toolShard, 1, 1), 0, 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(TinkerTools.toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Obsidian, new ItemStack(TinkerTools.toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Cobalt, new ItemStack(TinkerTools.toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Ardite, new ItemStack(TinkerTools.toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(TinkerTools.toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Copper, new ItemStack(TinkerTools.toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Bronze, new ItemStack(TinkerTools.toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Alumite, new ItemStack(TinkerTools.toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(TinkerTools.toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); + + // Items + + Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(TinkerTools.blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(TinkerTools.blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.Glue, new ItemStack(TinkerTools.materials, 1, 36), 0, TConstruct.ingotLiquidValue); + + Smeltery.addMelting(FluidType.Ender, new ItemStack(Items.ender_pearl, 4), 0, 250); + Smeltery.addMelting(TinkerSmeltery.metalBlock, 10, 50, new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000)); + Smeltery.addMelting(FluidType.Water, new ItemStack(Items.snowball, 1, 0), 0, 125); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.flint_and_steel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bucket), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.chest_minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.hopper_minecart), 50, TConstruct.ingotLiquidValue * 10); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_door), 0, TConstruct.ingotLiquidValue * 6); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.cauldron), 0, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.shears), 0, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.Emerald, new ItemStack(Items.emerald), -50, 640); + + Smeltery.addMelting(FluidType.Ardite, new ItemStack(TinkerTools.materials, 1, 38), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Cobalt, new ItemStack(TinkerTools.materials, 1, 39), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Aluminum, new ItemStack(TinkerTools.materials, 1, 40), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(TinkerTools.materials, 1, 41), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(TinkerTools.materials, 1, 42), 0, TConstruct.ingotLiquidValue); + + // Blocks melt as themselves! + // Ore + Smeltery.addMelting(Blocks.iron_ore, 0, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Blocks.gold_ore, 0, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(TinkerWorld.oreGravel, 0, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(TinkerWorld.oreGravel, 1, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + + // Blocks + Smeltery.addMelting(Blocks.iron_block, 0, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Blocks.gold_block, 0, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Blocks.obsidian, 0, 800, new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Blocks.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); + Smeltery.addMelting(Blocks.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); + Smeltery.addMelting(Blocks.snow_layer, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); + Smeltery.addMelting(Blocks.sand, 0, 625, new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Blocks.glass, 0, 625, new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Blocks.glass_pane, 0, 625, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); + Smeltery.addMelting(Blocks.stone, 0, 800, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Blocks.cobblestone, 0, 800, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Blocks.emerald_block, 0, 800, new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 9)); + Smeltery.addMelting(TinkerSmeltery.glueBlock, 0, 250, new FluidStack(TinkerSmeltery.glueFluid, TConstruct.blockLiquidValue)); + Smeltery.addMelting(TinkerTools.craftedSoil, 1, 600, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); + + Smeltery.addMelting(TinkerSmeltery.clearGlass, 0, 500, new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000)); + Smeltery.addMelting(TinkerSmeltery.glassPane, 0, 350, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); + + for (int i = 0; i < 16; i++) + { + Smeltery.addMelting(TinkerSmeltery.stainedGlassClear, i, 500, new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000)); + Smeltery.addMelting(TinkerSmeltery.stainedGlassClearPane, i, 350, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); + } + + // Bricks + Smeltery.addMelting(TinkerTools.multiBrick, 4, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(TinkerTools.multiBrickFancy, 4, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(TinkerTools.multiBrick, 5, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(TinkerTools.multiBrickFancy, 5, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(TinkerTools.multiBrick, 0, 800, new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(TinkerTools.multiBrickFancy, 0, 800, new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + + // Vanilla blocks + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.iron_bars), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.heavy_weighted_pressure_plate), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.light_weighted_pressure_plate, 4), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.golden_rail), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.detector_rail), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.activator_rail), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Blocks.enchanting_table), 0, TConstruct.ingotLiquidValue * 4); + // Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.cauldron), + // 0, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.hopper), 0, TConstruct.ingotLiquidValue * 5); + + // Vanilla Armor + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_helmet, 1, 0), 25, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_chestplate, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_leggings, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_boots, 1, 0), 25, TConstruct.ingotLiquidValue); + + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); + + // Vanilla tools + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_hoe, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_sword, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_hoe, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_sword, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + } + + private void registerIngotCasting (FluidType ft) + { + ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); + LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); + for (ItemStack ore : OreDictionary.getOres("ingot" + ft.toString())) + { + tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); + } + } + + public void modIntegration () + { + /* Natura */ + Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted"); + Block heatSand = GameRegistry.findBlock("Natura", "heatsand"); + if (taintedSoil != null && heatSand != null) + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); + + ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); + LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); + LiquidCasting basinCasting = TConstructRegistry.instance.getBasinCasting(); + + /* Thermal Expansion 3 Metals */ + ArrayList ores = OreDictionary.getOres("ingotNickel"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenNickelFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotLead"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenLeadFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotSilver"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenSilverFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotPlatinum"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenShinyFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotInvar"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2), + new FluidStack(TinkerSmeltery.moltenNickelFluid, TConstruct.ingotLiquidValue * 1)); // Invar + } + ores = OreDictionary.getOres("ingotElectrum"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue), + new FluidStack(TinkerSmeltery.moltenSilverFluid, TConstruct.ingotLiquidValue)); // Electrum + } + + ores = OreDictionary.getOres("blockNickel"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenNickelFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockLead"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenLeadFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockSilver"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenSilverFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockPlatinum"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenShinyFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockInvar"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockElectrum"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue), null, 100); + } + + /* Extra Utilities */ + ores = OreDictionary.getOres("compressedGravel1x"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 9), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue), ores.get(0), 100); + } + ores = OreDictionary.getOres("compressedGravel2x"); // Higher won't save + // properly + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 81), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue * 9), ores.get(0), 100); + } + + /* Rubber */ + ores = OreDictionary.getOres("itemRubber"); + if (ores.size() > 0) + { + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 36), ores.get(0), 0.2f); + } + } +} diff --git a/src/main/java/tconstruct/blocks/BloodBlock.java b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java similarity index 95% rename from src/main/java/tconstruct/blocks/BloodBlock.java rename to src/main/java/tconstruct/smeltery/blocks/BloodBlock.java index 03a7ec90..0b4ed925 100644 --- a/src/main/java/tconstruct/blocks/BloodBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java similarity index 96% rename from src/main/java/tconstruct/blocks/GlassBlock.java rename to src/main/java/tconstruct/smeltery/blocks/GlassBlock.java index 59b7309a..6ea86bb3 100644 --- a/src/main/java/tconstruct/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java @@ -1,5 +1,6 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; +import tconstruct.blocks.TConstructBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java similarity index 99% rename from src/main/java/tconstruct/blocks/GlassBlockConnected.java rename to src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index a55389e2..35352802 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import mantle.blocks.MantleBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java similarity index 99% rename from src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java rename to src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java index 692a5933..35eb8ab8 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; diff --git a/src/main/java/tconstruct/blocks/GlassBlockStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java similarity index 95% rename from src/main/java/tconstruct/blocks/GlassBlockStained.java rename to src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java index ed3ef6a6..c9901fd4 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java @@ -1,5 +1,6 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; +import tconstruct.blocks.TConstructBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/smeltery/blocks/GlassPane.java similarity index 93% rename from src/main/java/tconstruct/blocks/GlassPane.java rename to src/main/java/tconstruct/smeltery/blocks/GlassPane.java index e1f05e35..de1506ac 100644 --- a/src/main/java/tconstruct/blocks/GlassPane.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPane.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java similarity index 99% rename from src/main/java/tconstruct/blocks/GlassPaneConnected.java rename to src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index c3673e8f..05301f02 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; @@ -11,7 +11,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.client.block.PaneConnectedRender; +import tconstruct.smeltery.model.PaneConnectedRender; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java similarity index 96% rename from src/main/java/tconstruct/blocks/GlassPaneStained.java rename to src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java index 877dbdde..9123ebfa 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/blocks/GlueBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java similarity index 94% rename from src/main/java/tconstruct/blocks/GlueBlock.java rename to src/main/java/tconstruct/smeltery/blocks/GlueBlock.java index a87d8e9d..790d1f16 100644 --- a/src/main/java/tconstruct/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java @@ -1,5 +1,6 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; +import tconstruct.blocks.TConstructBlock; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java similarity index 97% rename from src/main/java/tconstruct/blocks/GlueFluid.java rename to src/main/java/tconstruct/smeltery/blocks/GlueFluid.java index d5a3618e..5b2000e2 100644 --- a/src/main/java/tconstruct/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java similarity index 98% rename from src/main/java/tconstruct/blocks/LavaTankBlock.java rename to src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index 8d5cbbea..8365263e 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; @@ -25,9 +25,9 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import tconstruct.TConstruct; -import tconstruct.blocks.logic.LavaTankLogic; -import tconstruct.client.block.TankRender; import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.logic.LavaTankLogic; +import tconstruct.smeltery.model.TankRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java similarity index 92% rename from src/main/java/tconstruct/blocks/LiquidMetalFinite.java rename to src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java index ce503afc..c3cbc864 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java @@ -1,7 +1,5 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -11,9 +9,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; -import tconstruct.common.TContent; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.TinkerSmeltery; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class LiquidMetalFinite extends BlockFluidFinite { @@ -23,7 +22,7 @@ public class LiquidMetalFinite extends BlockFluidFinite public LiquidMetalFinite(Fluid fluid, String texture) { - super(fluid, TRepo.liquidMetal); + super(fluid, TinkerSmeltery.liquidMetal); this.texture = texture; this.setCreativeTab(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/MetalOre.java b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java similarity index 91% rename from src/main/java/tconstruct/blocks/MetalOre.java rename to src/main/java/tconstruct/smeltery/blocks/MetalOre.java index c275e264..9193d2a1 100644 --- a/src/main/java/tconstruct/blocks/MetalOre.java +++ b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java @@ -1,7 +1,9 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; +import tconstruct.blocks.TConstructBlock; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java similarity index 98% rename from src/main/java/tconstruct/blocks/PaneBase.java rename to src/main/java/tconstruct/smeltery/blocks/PaneBase.java index de7b2212..1ef7662f 100644 --- a/src/main/java/tconstruct/blocks/PaneBase.java +++ b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; @@ -16,7 +16,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.client.block.PaneRender; +import tconstruct.smeltery.model.PaneRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java similarity index 98% rename from src/main/java/tconstruct/blocks/SearedBlock.java rename to src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index 11f51558..d044f7b8 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; @@ -18,13 +18,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import tconstruct.TConstruct; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.FaucetLogic; -import tconstruct.client.block.SearedRender; import tconstruct.library.TConstructRegistry; import tconstruct.library.event.SmelteryEvent; import tconstruct.library.tools.AbilityHelper; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.FaucetLogic; +import tconstruct.smeltery.model.SearedRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java similarity index 78% rename from src/main/java/tconstruct/blocks/SearedSlab.java rename to src/main/java/tconstruct/smeltery/blocks/SearedSlab.java index 828d232c..16368d47 100644 --- a/src/main/java/tconstruct/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java @@ -1,9 +1,10 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; -import tconstruct.common.TRepo; +import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.TinkerSmeltery; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -34,11 +35,11 @@ public class SearedSlab extends SlabBase { meta = meta % 8; if (meta == 0) - return TRepo.smeltery.getIcon(side, 2); + return TinkerSmeltery.smeltery.getIcon(side, 2); if (meta <= 3) - return TRepo.smeltery.getIcon(side, meta + 3); + return TinkerSmeltery.smeltery.getIcon(side, meta + 3); - return TRepo.smeltery.getIcon(side, meta + 4); + return TinkerSmeltery.smeltery.getIcon(side, meta + 4); } @Override diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java similarity index 96% rename from src/main/java/tconstruct/blocks/SmelteryBlock.java rename to src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java index 2ef6c893..4a207dc2 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; import java.util.Random; @@ -20,12 +20,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.blocks.logic.AdaptiveDrainLogic; -import tconstruct.blocks.logic.AdaptiveSmelteryLogic; -import tconstruct.blocks.logic.SmelteryDrainLogic; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.client.block.SmelteryRender; import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.logic.AdaptiveDrainLogic; +import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; +import tconstruct.smeltery.logic.SmelteryDrainLogic; +import tconstruct.smeltery.logic.SmelteryLogic; +import tconstruct.smeltery.model.SmelteryRender; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/SpeedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java similarity index 95% rename from src/main/java/tconstruct/blocks/SpeedBlock.java rename to src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java index 440b069c..ae3e1f63 100644 --- a/src/main/java/tconstruct/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java @@ -1,7 +1,9 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; +import tconstruct.blocks.TConstructBlock; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/blocks/SpeedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java similarity index 90% rename from src/main/java/tconstruct/blocks/SpeedSlab.java rename to src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java index d50679b0..bc877477 100644 --- a/src/main/java/tconstruct/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; @@ -10,8 +10,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import tconstruct.common.TRepo; +import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.TinkerSmeltery; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -35,7 +36,7 @@ public class SpeedSlab extends SlabBase public IIcon getIcon (int side, int meta) { meta = meta % 8; - return TRepo.speedBlock.getIcon(side, meta); + return TinkerSmeltery.speedBlock.getIcon(side, meta); } @Override diff --git a/src/main/java/tconstruct/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java similarity index 97% rename from src/main/java/tconstruct/blocks/TConstructFluid.java rename to src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java index d5ef0fc4..b858102d 100644 --- a/src/main/java/tconstruct/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/TankAirBlock.java b/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java similarity index 95% rename from src/main/java/tconstruct/blocks/TankAirBlock.java rename to src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java index 38e8086f..2cf45c42 100644 --- a/src/main/java/tconstruct/blocks/TankAirBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.smeltery.blocks; import java.util.List; @@ -16,8 +16,8 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import tconstruct.blocks.logic.TankAirLogic; -import tconstruct.client.block.TankAirRender; +import tconstruct.smeltery.logic.TankAirLogic; +import tconstruct.smeltery.model.TankAirRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/smeltery/component/SmelteryComponent.java similarity index 99% rename from src/main/java/tconstruct/blocks/component/SmelteryComponent.java rename to src/main/java/tconstruct/smeltery/component/SmelteryComponent.java index 80afb29d..0807313c 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java +++ b/src/main/java/tconstruct/smeltery/component/SmelteryComponent.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.component; +package tconstruct.smeltery.component; import java.util.ArrayList; @@ -11,10 +11,10 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import tconstruct.blocks.logic.AdaptiveSmelteryLogic; import tconstruct.library.component.LogicComponent; import tconstruct.library.component.MultiFluidTank; import tconstruct.library.crafting.Smeltery; +import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; public class SmelteryComponent extends LogicComponent { diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/smeltery/component/SmelteryScan.java similarity index 94% rename from src/main/java/tconstruct/blocks/component/SmelteryScan.java rename to src/main/java/tconstruct/smeltery/component/SmelteryScan.java index 2a0e6f62..784ba760 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/smeltery/component/SmelteryScan.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.component; +package tconstruct.smeltery.component; import java.util.ArrayList; import java.util.Iterator; @@ -10,8 +10,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import tconstruct.common.TRepo; import tconstruct.library.component.TankLayerScan; +import tconstruct.smeltery.TinkerSmeltery; public class SmelteryScan extends TankLayerScan { @@ -33,7 +33,7 @@ public class SmelteryScan extends TankLayerScan protected boolean checkAir (int x, int y, int z) { Block block = world.getBlock(x, y, z); - if (block == null || world.isAirBlock(x, y, z) || block == TRepo.tankAir) + if (block == null || world.isAirBlock(x, y, z) || block == TinkerSmeltery.tankAir) return true; return false; @@ -53,7 +53,7 @@ public class SmelteryScan extends TankLayerScan if (be instanceof IServantLogic) { boolean ret = ((IServantLogic) be).setPotentialMaster(this.imaster, this.world, x, y, z); - if (ret && block == TRepo.lavaTank) + if (ret && block == TinkerSmeltery.lavaTank) lavaTanks.add(new CoordTuple(x, y, z)); return ret; } @@ -71,9 +71,9 @@ public class SmelteryScan extends TankLayerScan { for (CoordTuple coord : airCoords) { - if (world.getBlock(coord.x, coord.y, coord.z) != TRepo.tankAir) + if (world.getBlock(coord.x, coord.y, coord.z) != TinkerSmeltery.tankAir) { - world.setBlock(coord.x, coord.y, coord.z, TRepo.tankAir); + world.setBlock(coord.x, coord.y, coord.z, TinkerSmeltery.tankAir); IServantLogic servant = (IServantLogic) world.getTileEntity(coord.x, coord.y, coord.z); servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } diff --git a/src/main/java/tconstruct/blocks/component/TankAirComponent.java b/src/main/java/tconstruct/smeltery/component/TankAirComponent.java similarity index 91% rename from src/main/java/tconstruct/blocks/component/TankAirComponent.java rename to src/main/java/tconstruct/smeltery/component/TankAirComponent.java index 8bf1aede..3b1ac06d 100644 --- a/src/main/java/tconstruct/blocks/component/TankAirComponent.java +++ b/src/main/java/tconstruct/smeltery/component/TankAirComponent.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.component; +package tconstruct.smeltery.component; import java.util.ArrayList; diff --git a/src/main/java/tconstruct/inventory/ActiveContainer.java b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java similarity index 94% rename from src/main/java/tconstruct/inventory/ActiveContainer.java rename to src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java index f770a638..0a6c2ec5 100644 --- a/src/main/java/tconstruct/inventory/ActiveContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.smeltery.inventory; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/inventory/ActiveSlot.java b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java similarity index 92% rename from src/main/java/tconstruct/inventory/ActiveSlot.java rename to src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java index 2a67e3cb..8fc4bf45 100644 --- a/src/main/java/tconstruct/inventory/ActiveSlot.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.smeltery.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/tconstruct/inventory/AdaptiveSmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/AdaptiveSmelteryContainer.java similarity index 98% rename from src/main/java/tconstruct/inventory/AdaptiveSmelteryContainer.java rename to src/main/java/tconstruct/smeltery/inventory/AdaptiveSmelteryContainer.java index 6dc76941..593c975a 100644 --- a/src/main/java/tconstruct/inventory/AdaptiveSmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/AdaptiveSmelteryContainer.java @@ -1,10 +1,10 @@ -package tconstruct.inventory; +package tconstruct.smeltery.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.AdaptiveSmelteryLogic; +import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; public class AdaptiveSmelteryContainer extends ActiveContainer { diff --git a/src/main/java/tconstruct/inventory/SmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java similarity index 97% rename from src/main/java/tconstruct/inventory/SmelteryContainer.java rename to src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java index a5bc966f..17941d6f 100644 --- a/src/main/java/tconstruct/inventory/SmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java @@ -1,12 +1,12 @@ -package tconstruct.inventory; +package tconstruct.smeltery.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.common.TRepo; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.logic.SmelteryLogic; public class SmelteryContainer extends ActiveContainer { @@ -117,7 +117,7 @@ public class SmelteryContainer extends ActiveContainer public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.smeltery && block != TRepo.smelteryNether) + if (block != TinkerSmeltery.smeltery && block != TinkerSmeltery.smelteryNether) return false; return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/items/blocks/CastingChannelItem.java b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java similarity index 89% rename from src/main/java/tconstruct/items/blocks/CastingChannelItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java index ed45b67f..bd61d65a 100644 --- a/src/main/java/tconstruct/items/blocks/CastingChannelItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/GlassBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java similarity index 98% rename from src/main/java/tconstruct/items/blocks/GlassBlockItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java index 7ba746c4..dba12320 100644 --- a/src/main/java/tconstruct/items/blocks/GlassBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/GlassPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java similarity index 90% rename from src/main/java/tconstruct/items/blocks/GlassPaneItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java index e5f1ab4c..f2b1c97b 100644 --- a/src/main/java/tconstruct/items/blocks/GlassPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java similarity index 96% rename from src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java rename to src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java index 043f27ff..f1de7409 100644 --- a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/MetalItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java similarity index 95% rename from src/main/java/tconstruct/items/blocks/MetalItemBlock.java rename to src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java index 072dabbe..e02f476f 100644 --- a/src/main/java/tconstruct/items/blocks/MetalItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/SearedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java similarity index 91% rename from src/main/java/tconstruct/items/blocks/SearedSlabItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java index 3c1da0f2..cc9dbd4e 100644 --- a/src/main/java/tconstruct/items/blocks/SearedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java similarity index 90% rename from src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java rename to src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java index dd041da3..ee2701a8 100644 --- a/src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java similarity index 97% rename from src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java rename to src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java index dfa2a289..5f6c6098 100644 --- a/src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java similarity index 96% rename from src/main/java/tconstruct/items/blocks/SpeedBlockItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java index 25ad7fb9..4e393358 100644 --- a/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/SpeedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java similarity index 96% rename from src/main/java/tconstruct/items/blocks/SpeedSlabItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java index c3de6fc6..0f0201d4 100644 --- a/src/main/java/tconstruct/items/blocks/SpeedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java similarity index 92% rename from src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java index 658d3c62..db62d6f4 100644 --- a/src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java similarity index 92% rename from src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java rename to src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java index 8d2f72da..d238a06b 100644 --- a/src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.smeltery.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/smeltery/items/FilledBucket.java similarity index 95% rename from src/main/java/tconstruct/items/FilledBucket.java rename to src/main/java/tconstruct/smeltery/items/FilledBucket.java index 5cf92091..f8e2dabc 100644 --- a/src/main/java/tconstruct/items/FilledBucket.java +++ b/src/main/java/tconstruct/smeltery/items/FilledBucket.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.smeltery.items; import java.util.List; @@ -17,7 +17,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import tconstruct.TConstruct; -import tconstruct.common.TRepo; +import tconstruct.smeltery.TinkerSmeltery; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -133,10 +133,10 @@ public class FilledBucket extends ItemBucket try { int metadata = 0; - if (TRepo.fluidBlocks[type] instanceof BlockFluidFinite) + if (TinkerSmeltery.fluidBlocks[type] instanceof BlockFluidFinite) metadata = 7; - world.setBlock(clickX, clickY, clickZ, TRepo.fluidBlocks[type], metadata, 3); // TODO: Merge liquids + world.setBlock(clickX, clickY, clickZ, TinkerSmeltery.fluidBlocks[type], metadata, 3); // TODO: Merge liquids } catch (ArrayIndexOutOfBoundsException ex) { diff --git a/src/main/java/tconstruct/items/MetalPattern.java b/src/main/java/tconstruct/smeltery/items/MetalPattern.java similarity index 94% rename from src/main/java/tconstruct/items/MetalPattern.java rename to src/main/java/tconstruct/smeltery/items/MetalPattern.java index 786ea357..58247630 100644 --- a/src/main/java/tconstruct/items/MetalPattern.java +++ b/src/main/java/tconstruct/smeltery/items/MetalPattern.java @@ -1,7 +1,9 @@ -package tconstruct.items; +package tconstruct.smeltery.items; import java.util.List; +import tconstruct.tools.items.Pattern; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java rename to src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java index 9a2183a6..12e80602 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import tconstruct.TConstruct; import tconstruct.library.crafting.AlloyMix; diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/AdaptiveSmelteryLogic.java similarity index 97% rename from src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java rename to src/main/java/tconstruct/smeltery/logic/AdaptiveSmelteryLogic.java index 0143842b..2e289a29 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/AdaptiveSmelteryLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import java.util.ArrayList; import java.util.HashMap; @@ -28,13 +28,13 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import tconstruct.TConstruct; -import tconstruct.blocks.component.SmelteryComponent; -import tconstruct.blocks.component.SmelteryScan; -import tconstruct.common.TRepo; -import tconstruct.inventory.AdaptiveSmelteryContainer; import tconstruct.library.component.IComponentHolder; import tconstruct.library.component.LogicComponent; import tconstruct.library.component.MultiFluidTank; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.component.SmelteryComponent; +import tconstruct.smeltery.component.SmelteryScan; +import tconstruct.smeltery.inventory.AdaptiveSmelteryContainer; public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IActiveLogic, IMasterLogic, IComponentHolder, IFluidHandler { @@ -42,7 +42,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc boolean updateFluids = false; boolean recheckStructure = false; boolean updateAir = false; - SmelteryScan structure = new SmelteryScan(this, TRepo.smeltery, TRepo.lavaTank); + SmelteryScan structure = new SmelteryScan(this, TinkerSmeltery.smeltery, TinkerSmeltery.lavaTank); MultiFluidTank multitank = new MultiFluidTank(); SmelteryComponent smeltery = new SmelteryComponent(this, structure, multitank, 800); HashMap airUpdates = new HashMap(); diff --git a/src/main/java/tconstruct/blocks/logic/AqueductLogic.java b/src/main/java/tconstruct/smeltery/logic/AqueductLogic.java similarity index 96% rename from src/main/java/tconstruct/blocks/logic/AqueductLogic.java rename to src/main/java/tconstruct/smeltery/logic/AqueductLogic.java index 270ac45c..20a53810 100644 --- a/src/main/java/tconstruct/blocks/logic/AqueductLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/AqueductLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java rename to src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java index cc573141..88df7d35 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java rename to src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index 25622c99..7ecfc388 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/CastingTableLogic.java rename to src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java index ab8cf13d..9dae22eb 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/FaucetLogic.java rename to src/main/java/tconstruct/smeltery/logic/FaucetLogic.java index 9a964367..ae0aca88 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import tconstruct.TConstruct; import mantle.blocks.iface.IActiveLogic; diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/LavaTankLogic.java rename to src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java index 9e3ae6f8..22be7db8 100644 --- a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import mantle.blocks.abstracts.MultiServantLogic; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java similarity index 97% rename from src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java rename to src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java index 7dc87dd4..1022cdc6 100644 --- a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java rename to src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index 24118860..91b71af2 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import mantle.blocks.abstracts.MultiServantLogic; import mantle.blocks.iface.IFacingLogic; diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java similarity index 97% rename from src/main/java/tconstruct/blocks/logic/SmelteryLogic.java rename to src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 869273dd..6d9caa44 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import java.util.ArrayList; import java.util.List; @@ -38,9 +38,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; -import tconstruct.common.TRepo; -import tconstruct.inventory.SmelteryContainer; import tconstruct.library.crafting.Smeltery; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.util.SmelteryDamageSource; import tconstruct.util.config.PHConstruct; @@ -323,7 +323,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (currentLiquid + 40 < maxLiquid) { int amount = villager.isChild() ? 5 : 40; - this.fill(new FluidStack(TRepo.moltenEmeraldFluid, amount), true); + this.fill(new FluidStack(TinkerSmeltery.moltenEmeraldFluid, amount), true); } } } @@ -334,7 +334,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { if (currentLiquid + 125 < maxLiquid) { - this.fill(new FluidStack(TRepo.moltenEnderFluid, 125), true); + this.fill(new FluidStack(TinkerSmeltery.moltenEnderFluid, 125), true); } } } @@ -345,7 +345,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { if (currentLiquid + 40 < maxLiquid) { - this.fill(new FluidStack(TRepo.moltenIronFluid, 40), true); + this.fill(new FluidStack(TinkerSmeltery.moltenIronFluid, 40), true); } } } @@ -356,7 +356,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { if (currentLiquid + 108 < maxLiquid) { - this.fill(new FluidStack(TRepo.glueFluid, 108), true); + this.fill(new FluidStack(TinkerSmeltery.glueFluid, 108), true); } } } @@ -368,7 +368,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (currentLiquid + 40 < maxLiquid) { int amount = (living.isChild() || living instanceof EntityPlayer) ? 5 : 40; - this.fill(new FluidStack(TRepo.bloodFluid, amount), true); + this.fill(new FluidStack(TinkerSmeltery.bloodFluid, amount), true); } } } @@ -956,12 +956,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci boolean validBlockID (Block blockID) { - return blockID == TRepo.smeltery || blockID == TRepo.smelteryNether; + return blockID == TinkerSmeltery.smeltery || blockID == TinkerSmeltery.smelteryNether; } boolean validTankID (Block blockID) { - return blockID == TRepo.lavaTank || blockID == TRepo.lavaTankNether; + return blockID == TinkerSmeltery.lavaTank || blockID == TinkerSmeltery.lavaTankNether; } @Override diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/smeltery/logic/TankAirLogic.java similarity index 98% rename from src/main/java/tconstruct/blocks/logic/TankAirLogic.java rename to src/main/java/tconstruct/smeltery/logic/TankAirLogic.java index 4c66c4f3..c112dd70 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/TankAirLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import java.util.ArrayList; import java.util.List; @@ -18,7 +18,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; import tconstruct.TConstruct; -import tconstruct.blocks.component.TankAirComponent; +import tconstruct.smeltery.component.TankAirComponent; public class TankAirLogic extends InventoryLogic implements IServantLogic, ISidedInventory { diff --git a/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java b/src/main/java/tconstruct/smeltery/logic/TowerFurnaceLogic.java similarity index 90% rename from src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java rename to src/main/java/tconstruct/smeltery/logic/TowerFurnaceLogic.java index bca8372d..8ec7faa6 100644 --- a/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/TowerFurnaceLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.smeltery.logic; import mantle.blocks.abstracts.AdaptiveInventoryLogic; import mantle.blocks.iface.IActiveLogic; diff --git a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java similarity index 98% rename from src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java rename to src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java index c7b73ad6..aace4fa4 100644 --- a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import java.util.Set; @@ -13,7 +13,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.CastingChannelLogic; +import tconstruct.client.BlockSkinRenderHelper; +import tconstruct.smeltery.logic.CastingChannelLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java similarity index 94% rename from src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java rename to src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java index 1d1b8084..0326db8c 100644 --- a/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -9,9 +9,9 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.entity.FancyEntityItem; import tconstruct.library.ItemBlocklike; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.tools.entity.FancyEntityItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java similarity index 94% rename from src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java rename to src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java index 037afbc9..7558d1eb 100644 --- a/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -9,9 +9,9 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.entity.FancyEntityItem; import tconstruct.library.ItemBlocklike; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.tools.entity.FancyEntityItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/block/PaneConnectedRender.java b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java similarity index 97% rename from src/main/java/tconstruct/client/block/PaneConnectedRender.java rename to src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java index ed2341f1..773010f5 100644 --- a/src/main/java/tconstruct/client/block/PaneConnectedRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import static net.minecraftforge.common.util.ForgeDirection.EAST; import static net.minecraftforge.common.util.ForgeDirection.NORTH; @@ -8,7 +8,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import tconstruct.blocks.GlassPaneConnected; +import tconstruct.smeltery.blocks.GlassPaneConnected; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/smeltery/model/PaneRender.java similarity index 99% rename from src/main/java/tconstruct/client/block/PaneRender.java rename to src/main/java/tconstruct/smeltery/model/PaneRender.java index 146cad81..6da56108 100644 --- a/src/main/java/tconstruct/client/block/PaneRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import mantle.world.WorldHelper; import net.minecraft.block.Block; @@ -8,8 +8,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.blocks.PaneBase; import tconstruct.client.TProxyClient; +import tconstruct.smeltery.blocks.PaneBase; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/smeltery/model/SearedRender.java similarity index 97% rename from src/main/java/tconstruct/client/block/SearedRender.java rename to src/main/java/tconstruct/smeltery/model/SearedRender.java index 458e308d..23d8994b 100644 --- a/src/main/java/tconstruct/client/block/SearedRender.java +++ b/src/main/java/tconstruct/smeltery/model/SearedRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,12 +6,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; import tconstruct.TConstruct; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.FaucetLogic; +import tconstruct.client.BlockSkinRenderHelper; import tconstruct.client.TProxyClient; -import tconstruct.common.TRepo; import tconstruct.library.crafting.CastingRecipe; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.FaucetLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -256,19 +257,19 @@ public class SearedRender implements ISimpleBlockRenderingHandler float yMin = 0F; Block uBlock = world.getBlock(x, y - 1, z); int uMeta = world.getBlockMetadata(x, y - 1, z); - if (uBlock == TRepo.searedBlock && uMeta == 0) + if (uBlock == TinkerSmeltery.searedBlock && uMeta == 0) { yMin = -0.125F; } - else if (uBlock == TRepo.searedBlock && uMeta == 2) + else if (uBlock == TinkerSmeltery.searedBlock && uMeta == 2) { yMin = -0.75F; } - else if (uBlock == TRepo.lavaTank) + else if (uBlock == TinkerSmeltery.lavaTank) { yMin = -1F; } - else if (uBlock == TRepo.castingChannel) + else if (uBlock == TinkerSmeltery.castingChannel) { yMin = -0.5F; } diff --git a/src/main/java/tconstruct/client/block/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java similarity index 98% rename from src/main/java/tconstruct/client/block/SmelteryRender.java rename to src/main/java/tconstruct/smeltery/model/SmelteryRender.java index d521e50e..9edd7f4e 100644 --- a/src/main/java/tconstruct/client/block/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,9 +7,10 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import tconstruct.blocks.logic.SmelteryLogic; +import tconstruct.client.BlockSkinRenderHelper; import tconstruct.client.TProxyClient; import tconstruct.library.crafting.Smeltery; +import tconstruct.smeltery.logic.SmelteryLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/TankAirRender.java b/src/main/java/tconstruct/smeltery/model/TankAirRender.java similarity index 95% rename from src/main/java/tconstruct/client/block/TankAirRender.java rename to src/main/java/tconstruct/smeltery/model/TankAirRender.java index 91f6d1ea..67164738 100644 --- a/src/main/java/tconstruct/client/block/TankAirRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankAirRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -8,7 +8,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import tconstruct.TConstruct; -import tconstruct.blocks.logic.TankAirLogic; +import tconstruct.client.BlockSkinRenderHelper; +import tconstruct.smeltery.logic.TankAirLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/TankRender.java b/src/main/java/tconstruct/smeltery/model/TankRender.java similarity index 96% rename from src/main/java/tconstruct/client/block/TankRender.java rename to src/main/java/tconstruct/smeltery/model/TankRender.java index 0b936733..c0598185 100644 --- a/src/main/java/tconstruct/client/block/TankRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.smeltery.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -10,8 +10,9 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import tconstruct.blocks.logic.LavaTankLogic; +import tconstruct.client.BlockSkinRenderHelper; import tconstruct.client.TProxyClient; +import tconstruct.smeltery.logic.LavaTankLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/common/BowRecipe.java b/src/main/java/tconstruct/tools/BowRecipe.java similarity index 97% rename from src/main/java/tconstruct/common/BowRecipe.java rename to src/main/java/tconstruct/tools/BowRecipe.java index 62f645cc..cffcb744 100644 --- a/src/main/java/tconstruct/common/BowRecipe.java +++ b/src/main/java/tconstruct/tools/BowRecipe.java @@ -1,4 +1,4 @@ -package tconstruct.common; +package tconstruct.tools; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java new file mode 100644 index 00000000..92648bb7 --- /dev/null +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -0,0 +1,962 @@ +package tconstruct.tools; + +import java.util.EnumSet; + +import mantle.items.abstracts.CraftingItem; +import mantle.utils.RecipeRemover; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; +import tconstruct.TConstruct; +import tconstruct.armor.TinkerArmor; +import tconstruct.armor.modifiers.AModDamageBoost; +import tconstruct.armor.modifiers.AModDoubleJump; +import tconstruct.armor.modifiers.AModHealthBoost; +import tconstruct.armor.modifiers.AModKnockbackResistance; +import tconstruct.armor.modifiers.AModMoveSpeed; +import tconstruct.armor.modifiers.AModProtection; +import tconstruct.common.itemblocks.MetadataItemBlock; +import tconstruct.items.tools.Arrow; +import tconstruct.items.tools.BattleSign; +import tconstruct.items.tools.Battleaxe; +import tconstruct.items.tools.Broadsword; +import tconstruct.items.tools.Chisel; +import tconstruct.items.tools.Cleaver; +import tconstruct.items.tools.Cutlass; +import tconstruct.items.tools.Dagger; +import tconstruct.items.tools.Excavator; +import tconstruct.items.tools.FryingPan; +import tconstruct.items.tools.Hammer; +import tconstruct.items.tools.Hatchet; +import tconstruct.items.tools.Longsword; +import tconstruct.items.tools.LumberAxe; +import tconstruct.items.tools.Mattock; +import tconstruct.items.tools.Pickaxe; +import tconstruct.items.tools.PotionLauncher; +import tconstruct.items.tools.Rapier; +import tconstruct.items.tools.Scythe; +import tconstruct.items.tools.Shortbow; +import tconstruct.items.tools.Shovel; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.armor.EnumArmorPart; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.crafting.Detailing; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.util.IPattern; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.tools.blocks.CraftingSlab; +import tconstruct.tools.blocks.CraftingStationBlock; +import tconstruct.tools.blocks.EquipBlock; +import tconstruct.tools.blocks.FurnaceSlab; +import tconstruct.tools.blocks.ToolForgeBlock; +import tconstruct.tools.blocks.ToolStationBlock; +import tconstruct.tools.itemblocks.CraftingSlabItemBlock; +import tconstruct.tools.itemblocks.ToolStationItemBlock; +import tconstruct.tools.items.Bowstring; +import tconstruct.tools.items.CreativeModifier; +import tconstruct.tools.items.Fletching; +import tconstruct.tools.items.Manual; +import tconstruct.tools.items.MaterialItem; +import tconstruct.tools.items.Pattern; +import tconstruct.tools.items.TitleIcon; +import tconstruct.tools.items.ToolPart; +import tconstruct.tools.items.ToolPartHidden; +import tconstruct.tools.items.ToolShard; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.FrypanLogic; +import tconstruct.tools.logic.FurnaceLogic; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.modifiers.ModAntiSpider; +import tconstruct.tools.modifiers.ModAttack; +import tconstruct.tools.modifiers.ModAutoSmelt; +import tconstruct.tools.modifiers.ModBlaze; +import tconstruct.tools.modifiers.ModButtertouch; +import tconstruct.tools.modifiers.ModCreativeToolModifier; +import tconstruct.tools.modifiers.ModDurability; +import tconstruct.tools.modifiers.ModExtraModifier; +import tconstruct.tools.modifiers.ModFlux; +import tconstruct.tools.modifiers.ModInteger; +import tconstruct.tools.modifiers.ModLapis; +import tconstruct.tools.modifiers.ModPiston; +import tconstruct.tools.modifiers.ModRedstone; +import tconstruct.tools.modifiers.ModReinforced; +import tconstruct.tools.modifiers.ModRepair; +import tconstruct.tools.modifiers.ModSmite; +import tconstruct.tools.modifiers.TActiveOmniMod; +import tconstruct.util.ItemHelper; +import tconstruct.util.config.PHConstruct; +import tconstruct.world.TinkerWorld; +import tconstruct.world.blocks.SoilBlock; +import tconstruct.world.itemblocks.CraftedSoilItemBlock; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; + +@Mod(modid = "TinkerTools", name = "TinkerTools", version = "${tinkertoolversion}") +public class TinkerTools +{ + /* Proxies for sides, used for graphics processing */ + @SidedProxy(clientSide = "tconstruct.tools.ToolProxyClient", serverSide = "tconstruct.tools.ToolProxyCommon") + public static ToolProxyCommon proxy; + + @Instance("TinkerTools") + public static TinkerTools instance; + + // Crafting blocks + public static Block toolStationWood; + public static Block toolStationStone; + public static Block toolForge; + public static Block craftingStationWood; + public static Block craftingSlabWood; + public static Block furnaceSlab; + public static Block heldItemBlock; + public static Block battlesignBlock; + + // Tool parts + public static Item binding; + public static Item toughBinding; + public static Item toughRod; + public static Item largePlate; + public static Item pickaxeHead; + public static Item shovelHead; + public static Item hatchetHead; + public static Item frypanHead; + public static Item signHead; + public static Item chiselHead; + public static Item scytheBlade; + public static Item broadAxeHead; + public static Item excavatorHead; + public static Item hammerHead; + public static Item swordBlade; + public static Item largeSwordBlade; + public static Item knifeBlade; + public static Item wideGuard; + + // Supresses console spam when iguana's tweaks remove stuff + public static boolean supressMissingToolLogs = false; + + // Patterns and other materials + public static Item blankPattern; + public static Item materials; //TODO: Untwine this item + public static Item toolRod; + public static Item toolShard; + public static Item titleIcon; + + // Tools + public static ToolCore pickaxe; + public static ToolCore shovel; + public static ToolCore hatchet; + public static ToolCore broadsword; + public static ToolCore longsword; + public static ToolCore rapier; + public static ToolCore dagger; + public static ToolCore cutlass; + public static ToolCore frypan; + public static ToolCore battlesign; + public static ToolCore chisel; + public static ToolCore mattock; + public static ToolCore scythe; + public static ToolCore lumberaxe; + public static ToolCore cleaver; + public static ToolCore hammer; + public static ToolCore battleaxe; + public static ToolCore shortbow; + public static ToolCore arrow; + public static Item potionLauncher; + public static Item handGuard; + public static Item crossbar; + public static Item fullGuard; + public static Item bowstring; + public static Item arrowhead; + public static Item fletching; + public static Block craftedSoil; + public static Block multiBrick; + public static Block multiBrickFancy; + // Tool modifiers + public static ModFlux modFlux; + public static ModLapis modLapis; + public static ModAttack modAttack; + public static Item[] patternOutputs; + public static Item woodPattern; + public static Item manualBook; + public static ToolCore excavator; + public static Item creativeModifier; + public static Item goldHead; + + // recipe stuff + public static boolean thaumcraftAvailable; + + @EventHandler + public void preInit (FMLPreInitializationEvent event) + { + //Blocks + TinkerTools.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation"); + TinkerTools.toolForge = new ToolForgeBlock(Material.iron).setBlockName("ToolForge"); + TinkerTools.craftingStationWood = new CraftingStationBlock(Material.wood).setBlockName("CraftingStation"); + TinkerTools.craftingSlabWood = new CraftingSlab(Material.wood).setBlockName("CraftingSlab"); + TinkerTools.furnaceSlab = new FurnaceSlab(Material.rock).setBlockName("FurnaceSlab"); + + TinkerTools.heldItemBlock = new EquipBlock(Material.wood).setBlockName("Frypan"); + + /* battlesignBlock = new BattlesignBlock(PHConstruct.battlesignBlock).setUnlocalizedName("Battlesign"); + GameRegistry.registerBlock(battlesignBlock, "BattlesignBlock"); + ameRegistry.registerTileEntity(BattlesignLogic.class, "BattlesignLogic");*/ + + TinkerTools.craftedSoil = new SoilBlock().setLightOpacity(0).setBlockName("TConstruct.Soil"); + TinkerTools.craftedSoil.stepSound = Block.soundTypeGravel; + + GameRegistry.registerBlock(TinkerTools.toolStationWood, ToolStationItemBlock.class, "ToolStationBlock"); + GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation"); + GameRegistry.registerTileEntity(PartBuilderLogic.class, "PartCrafter"); + GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder"); + GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper"); + GameRegistry.registerBlock(TinkerTools.toolForge, MetadataItemBlock.class, "ToolForgeBlock"); + GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge"); + GameRegistry.registerBlock(TinkerTools.craftingStationWood, "CraftingStation"); + GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation"); + GameRegistry.registerBlock(TinkerTools.craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab"); + GameRegistry.registerBlock(TinkerTools.furnaceSlab, "FurnaceSlab"); + GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace"); + GameRegistry.registerBlock(TinkerTools.heldItemBlock, "HeldItemBlock"); + GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); + + GameRegistry.registerBlock(TinkerTools.craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); + + //Items + TinkerTools.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon"); + GameRegistry.registerItem(TinkerTools.titleIcon, "titleIcon"); + String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; + TinkerTools.blankPattern = new CraftingItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab).setUnlocalizedName("tconstruct.Pattern"); + GameRegistry.registerItem(TinkerTools.blankPattern, "blankPattern"); + + TinkerTools.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials"); + TinkerTools.toolRod = new ToolPart("_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); + TinkerTools.toolShard = new ToolShard("_chunk").setUnlocalizedName("tconstruct.ToolShard"); + TinkerTools.woodPattern = new Pattern("pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); + GameRegistry.registerItem(TinkerTools.materials, "materials"); + GameRegistry.registerItem(TinkerTools.woodPattern, "woodPattern"); + TConstructRegistry.addItemToDirectory("blankPattern", TinkerTools.blankPattern); + TConstructRegistry.addItemToDirectory("woodPattern", TinkerTools.woodPattern); + + String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", + "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; + + for (int i = 1; i < patternTypes.length; i++) + { + TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Pattern", new ItemStack(TinkerTools.woodPattern, 1, i)); + } + + TinkerTools.manualBook = new Manual(); + GameRegistry.registerItem(TinkerTools.manualBook, "manualBook"); + + + TinkerTools.pickaxe = new Pickaxe(); + TinkerTools.shovel = new Shovel(); + TinkerTools.hatchet = new Hatchet(); + TinkerTools.broadsword = new Broadsword(); + TinkerTools.longsword = new Longsword(); + TinkerTools.rapier = new Rapier(); + TinkerTools.dagger = new Dagger(); + TinkerTools.cutlass = new Cutlass(); + + TinkerTools.frypan = new FryingPan(); + TinkerTools.battlesign = new BattleSign(); + TinkerTools.mattock = new Mattock(); + TinkerTools.chisel = new Chisel(); + + TinkerTools.lumberaxe = new LumberAxe(); + TinkerTools.cleaver = new Cleaver(); + TinkerTools.scythe = new Scythe(); + TinkerTools.excavator = new Excavator(); + TinkerTools.hammer = new Hammer(); + TinkerTools.battleaxe = new Battleaxe(); + + TinkerTools.shortbow = new Shortbow(); + TinkerTools.arrow = new Arrow(); + + Item[] tools = { TinkerTools.pickaxe, TinkerTools.shovel, TinkerTools.hatchet, TinkerTools.broadsword, TinkerTools.longsword, TinkerTools.rapier, TinkerTools.dagger, TinkerTools.cutlass, TinkerTools.frypan, TinkerTools.battlesign, TinkerTools.mattock, + TinkerTools.chisel, TinkerTools.lumberaxe, TinkerTools.cleaver, TinkerTools.scythe, TinkerTools.excavator, TinkerTools.hammer, TinkerTools.battleaxe, TinkerTools.shortbow, TinkerTools.arrow }; + String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", + "scythe", "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; + + for (int i = 0; i < tools.length; i++) + { + GameRegistry.registerItem(tools[i], toolStrings[i]); // 1.7 compat + TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); + } + + TinkerTools.potionLauncher = new PotionLauncher().setUnlocalizedName("tconstruct.PotionLauncher"); + GameRegistry.registerItem(TinkerTools.potionLauncher, "potionLauncher"); + + TinkerTools.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); + TinkerTools.shovelHead = new ToolPart("_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); + TinkerTools.hatchetHead = new ToolPart("_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead"); + TinkerTools.binding = new ToolPart("_binding", "Binding").setUnlocalizedName("tconstruct.Binding"); + TinkerTools.toughBinding = new ToolPart("_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding"); + TinkerTools.toughRod = new ToolPart("_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod"); + TinkerTools.largePlate = new ToolPart("_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate"); + + TinkerTools.swordBlade = new ToolPart("_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade"); + TinkerTools.wideGuard = new ToolPart("_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard"); + TinkerTools.handGuard = new ToolPart("_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard"); + TinkerTools.crossbar = new ToolPart("_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar"); + TinkerTools.knifeBlade = new ToolPart("_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade"); + TinkerTools.fullGuard = new ToolPartHidden("_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); + + TinkerTools.frypanHead = new ToolPart("_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead"); + TinkerTools.signHead = new ToolPart("_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead"); + TinkerTools.chiselHead = new ToolPart("_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead"); + + TinkerTools.scytheBlade = new ToolPart("_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade"); + TinkerTools.broadAxeHead = new ToolPart("_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead"); + TinkerTools.excavatorHead = new ToolPart("_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead"); + TinkerTools.largeSwordBlade = new ToolPart("_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade"); + TinkerTools.hammerHead = new ToolPart("_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead"); + + TinkerTools.bowstring = new Bowstring().setUnlocalizedName("tconstruct.Bowstring"); + TinkerTools.arrowhead = new ToolPart("_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); + TinkerTools.fletching = new Fletching().setUnlocalizedName("tconstruct.Fletching"); + + Item[] toolParts = { TinkerTools.toolRod, TinkerTools.toolShard, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.toughBinding, TinkerTools.toughRod, TinkerTools.largePlate, + TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.fullGuard, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead, TinkerTools.scytheBlade, + TinkerTools.broadAxeHead, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, TinkerTools.bowstring, TinkerTools.fletching, TinkerTools.arrowhead }; + String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", + "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring", + "fletching", "arrowhead" }; + + for (int i = 0; i < toolParts.length; i++) + { + GameRegistry.registerItem(toolParts[i], toolPartStrings[i]); // 1.7 + // compat + TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]); + } + GameRegistry.registerItem(TinkerTools.goldHead, "goldHead"); + + TinkerTools.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative"); + GameRegistry.registerItem(TinkerTools.creativeModifier, "creativeModifier"); + + String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", + "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", + "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze", + "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" }; + + for (int i = 0; i < materialStrings.length; i++) + { + TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(TinkerTools.materials, 1, i)); + } + + registerMaterials(); + } + + + + void setupToolTabs () + { + TConstructRegistry.materialTab.init(new ItemStack(TinkerTools.manualBook, 1, 0)); + TConstructRegistry.partTab.init(new ItemStack(TinkerTools.titleIcon, 1, 255)); + TConstructRegistry.blockTab.init(new ItemStack(TinkerTools.toolStationWood)); + ItemStack tool = new ItemStack(TinkerTools.longsword, 1, 0); + + NBTTagCompound compound = new NBTTagCompound(); + compound.setTag("InfiTool", new NBTTagCompound()); + compound.getCompoundTag("InfiTool").setInteger("RenderHead", 2); + compound.getCompoundTag("InfiTool").setInteger("RenderHandle", 0); + compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", 10); + tool.setTagCompound(compound); + + // TConstruct. + TConstructRegistry.toolTab.init(tool); + } + + //@Override + public int getBurnTime (ItemStack fuel) + { + if (fuel.getItem() == TinkerTools.materials && fuel.getItemDamage() == 7) + return 26400; + return 0; + } + + @EventHandler + public void init (FMLInitializationEvent event) + { + addPartMapping(); + addRecipesForToolBuilder(); + addRecipesForChisel(); + craftingTableRecipes(); + setupToolTabs(); + } + + @EventHandler + public void postInit (FMLPostInitializationEvent evt) + { + vanillaToolRecipes(); + } + + private void addPartMapping () + { + /* Tools */ + TinkerTools.patternOutputs = new Item[] { TinkerTools.toolRod, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.swordBlade, TinkerTools.wideGuard, + TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod, + TinkerTools.toughBinding, TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, + TinkerTools.fullGuard, null, null, TinkerTools.arrowhead, null }; + + int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; + + if (PHConstruct.craftMetalTools) + { + for (int mat = 0; mat < 18; mat++) + { + for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) + { + if (TinkerTools.patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, mat, new ItemStack(TinkerTools.patternOutputs[meta], 1, mat)); + } + } + } + else + { + for (int mat = 0; mat < nonMetals.length; mat++) + { + for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) + { + if (TinkerTools.patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, nonMetals[mat], new ItemStack(TinkerTools.patternOutputs[meta], 1, nonMetals[mat])); + } + } + } + + registerPatternMaterial("plankWood", 2, "Wood"); + registerPatternMaterial("stickWood", 1, "Wood"); + registerPatternMaterial("slabWood", 1, "Wood"); + registerPatternMaterial("compressedCobblestone1x", 18, "Stone"); + } + + private void addRecipesForToolBuilder () + { + ToolBuilder tb = ToolBuilder.instance; + tb.addNormalToolRecipe(TinkerTools.pickaxe, TinkerTools.pickaxeHead, TinkerTools.toolRod, TinkerTools.binding); + tb.addNormalToolRecipe(TinkerTools.broadsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.wideGuard); + tb.addNormalToolRecipe(TinkerTools.hatchet, TinkerTools.hatchetHead, TinkerTools.toolRod); + tb.addNormalToolRecipe(TinkerTools.shovel, TinkerTools.shovelHead, TinkerTools.toolRod); + tb.addNormalToolRecipe(TinkerTools.longsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.handGuard); + tb.addNormalToolRecipe(TinkerTools.rapier, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.crossbar); + tb.addNormalToolRecipe(TinkerTools.frypan, TinkerTools.frypanHead, TinkerTools.toolRod); + tb.addNormalToolRecipe(TinkerTools.battlesign, TinkerTools.signHead, TinkerTools.toolRod); + tb.addNormalToolRecipe(TinkerTools.mattock, TinkerTools.hatchetHead, TinkerTools.toolRod, TinkerTools.shovelHead); + tb.addNormalToolRecipe(TinkerTools.dagger, TinkerTools.knifeBlade, TinkerTools.toolRod, TinkerTools.crossbar); + tb.addNormalToolRecipe(TinkerTools.cutlass, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.fullGuard); + tb.addNormalToolRecipe(TinkerTools.chisel, TinkerTools.chiselHead, TinkerTools.toolRod); + + tb.addNormalToolRecipe(TinkerTools.scythe, TinkerTools.scytheBlade, TinkerTools.toughRod, TinkerTools.toughBinding, TinkerTools.toughRod); + tb.addNormalToolRecipe(TinkerTools.lumberaxe, TinkerTools.broadAxeHead, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.toughBinding); + tb.addNormalToolRecipe(TinkerTools.cleaver, TinkerTools.largeSwordBlade, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.toughRod); + tb.addNormalToolRecipe(TinkerTools.excavator, TinkerTools.excavatorHead, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.toughBinding); + tb.addNormalToolRecipe(TinkerTools.hammer, TinkerTools.hammerHead, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.largePlate); + tb.addNormalToolRecipe(TinkerTools.battleaxe, TinkerTools.broadAxeHead, TinkerTools.toughRod, TinkerTools.broadAxeHead, TinkerTools.toughBinding); + + BowRecipe recipe = new BowRecipe(TinkerTools.toolRod, TinkerTools.bowstring, TinkerTools.toolRod, TinkerTools.shortbow); + tb.addCustomToolRecipe(recipe); + tb.addNormalToolRecipe(TinkerTools.arrow, TinkerTools.arrowhead, TinkerTools.toolRod, TinkerTools.fletching); + + ItemStack diamond = new ItemStack(Items.diamond); + tb.registerToolMod(new ModRepair()); + tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, StatCollector.translateToLocal("gui.modifier.diamond"), "\u00a7b" + + StatCollector.translateToLocal("modifier.tool.diamond"), "\u00a7b")); + tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, StatCollector.translateToLocal("gui.modifier.emerald"), "\u00a72" + + StatCollector.translateToLocal("modifier.tool.emerald"), "\u00a72")); + + TinkerTools.modFlux = new ModFlux(); + tb.registerToolMod(TinkerTools.modFlux); + + ItemStack redstoneItem = new ItemStack(Items.redstone); + ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); + tb.registerToolMod(new ModRedstone(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); + + ItemStack lapisItem = new ItemStack(Items.dye, 1, 4); + ItemStack lapisBlock = new ItemStack(Blocks.lapis_block); + TinkerTools.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 }); + tb.registerToolMod(TinkerTools.modLapis); + + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, 4, StatCollector.translateToLocal("gui.modifier.moss"), 3, "\u00a72", StatCollector + .translateToLocal("modifier.tool.moss"))); + ItemStack blazePowder = new ItemStack(Items.blaze_powder); + tb.registerToolMod(new ModBlaze(7, new ItemStack[] { blazePowder }, new int[] { 1 })); + tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 7) }, 6, StatCollector.translateToLocal("gui.modifier.lava"), "\u00a74", StatCollector + .translateToLocal("modifier.tool.lava"))); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 8) }, 8, StatCollector.translateToLocal("gui.modifier.necro"), 1, "\u00a78", StatCollector + .translateToLocal("modifier.tool.necro"))); + + TinkerTools.modAttack = new ModAttack(StatCollector.translateToLocal("gui.modifier.quartz"), 11, new ItemStack[] { new ItemStack(Items.quartz), + new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }); + tb.registerToolMod(TinkerTools.modAttack); + + tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free")); + tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1) }, "Tier1.5Free")); + tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Items.nether_star) }, "Tier2Free")); + tb.registerToolMod(new ModCreativeToolModifier(new ItemStack[] { new ItemStack(TinkerTools.creativeModifier) })); + + ItemStack silkyJewel = new ItemStack(TinkerTools.materials, 1, 26); + tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12)); + + ItemStack piston = new ItemStack(Blocks.piston); + tb.registerToolMod(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 })); + + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, StatCollector.translateToLocal("modifier.tool.beheading"), 1, + "\u00a7d", StatCollector.translateToLocal("modifier.tool.beheading"))); + + ItemStack holySoil = new ItemStack(TinkerTools.craftedSoil, 1, 4); + tb.registerToolMod(new ModSmite(StatCollector.translateToLocal("modifier.tool.smite"), 14, new ItemStack[] { holySoil }, new int[] { 1 })); + + ItemStack spidereyeball = new ItemStack(Items.fermented_spider_eye); + tb.registerToolMod(new ModAntiSpider(StatCollector.translateToLocal("gui.modifier.spider"), 15, new ItemStack[] { spidereyeball }, new int[] { 1 })); + + ItemStack obsidianPlate = new ItemStack(TinkerTools.largePlate, 1, 6); + tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); + + EnumSet allArmors = EnumSet.of(EnumArmorPart.HELMET, EnumArmorPart.CHEST, EnumArmorPart.PANTS, EnumArmorPart.SHOES); + EnumSet chest = EnumSet.of(EnumArmorPart.CHEST); + tb.registerArmorMod(new AModMoveSpeed(0, allArmors, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 }, false)); + tb.registerArmorMod(new AModKnockbackResistance(1, allArmors, new ItemStack[] { new ItemStack(Items.gold_ingot), new ItemStack(Blocks.gold_block) }, new int[] { 1, 9 }, false)); + tb.registerArmorMod(new AModHealthBoost(2, allArmors, new ItemStack[] { new ItemStack(TinkerArmor.heartCanister, 1, 2) }, new int[] { 2 }, true)); + tb.registerArmorMod(new AModDamageBoost(3, allArmors, new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Blocks.diamond_block) }, new int[] { 1, 9 }, false, 3, 0.05)); + tb.registerArmorMod(new AModDamageBoost(4, chest, new ItemStack[] { new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1 }, true, 5, 1)); + tb.registerArmorMod(new AModProtection(5, allArmors, new ItemStack[] { new ItemStack(TinkerTools.largePlate, 1, 2) }, new int[] { 2 })); + + tb.registerArmorMod(new AModDoubleJump(new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, 1) })); + + TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); + } + + private void addRecipesForChisel () + { + /* Detailing */ + Detailing chiseling = TConstructRegistry.getChiselDetailing(); + chiseling.addDetailing(Blocks.stone, 0, Blocks.stonebrick, 0, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.speedBlock, 0, TinkerSmeltery.speedBlock, 1, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.speedBlock, 2, TinkerSmeltery.speedBlock, 3, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.speedBlock, 3, TinkerSmeltery.speedBlock, 4, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.speedBlock, 4, TinkerSmeltery.speedBlock, 5, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.speedBlock, 5, TinkerSmeltery.speedBlock, 6, TinkerTools.chisel); + + chiseling.addDetailing(Blocks.obsidian, 0, TinkerTools.multiBrick, 0, TinkerTools.chisel); + chiseling.addDetailing(Blocks.sandstone, 0, Blocks.sandstone, 2, TinkerTools.chisel); + chiseling.addDetailing(Blocks.sandstone, 2, Blocks.sandstone, 1, TinkerTools.chisel); + chiseling.addDetailing(Blocks.sandstone, 1, TinkerTools.multiBrick, 1, TinkerTools.chisel); + // chiseling.addDetailing(Block.netherrack, 0, TRepo.multiBrick, 2, + // TRepo.chisel); + // chiseling.addDetailing(Block.stone_refined, 0, TRepo.multiBrick, 3, + // TRepo.chisel); + chiseling.addDetailing(Items.iron_ingot, 0, TinkerTools.multiBrick, 4, TinkerTools.chisel); + chiseling.addDetailing(Items.gold_ingot, 0, TinkerTools.multiBrick, 5, TinkerTools.chisel); + chiseling.addDetailing(Items.dye, 4, TinkerTools.multiBrick, 6, TinkerTools.chisel); + chiseling.addDetailing(Items.diamond, 0, TinkerTools.multiBrick, 7, TinkerTools.chisel); + chiseling.addDetailing(Items.redstone, 0, TinkerTools.multiBrick, 8, TinkerTools.chisel); + chiseling.addDetailing(Items.bone, 0, TinkerTools.multiBrick, 9, TinkerTools.chisel); + chiseling.addDetailing(Items.slime_ball, 0, TinkerTools.multiBrick, 10, TinkerTools.chisel); + chiseling.addDetailing(TinkerWorld.strangeFood, 0, TinkerTools.multiBrick, 11, TinkerTools.chisel); + chiseling.addDetailing(Blocks.end_stone, 0, TinkerTools.multiBrick, 12, TinkerTools.chisel); + chiseling.addDetailing(TinkerTools.materials, 18, TinkerTools.multiBrick, 13, TinkerTools.chisel); + + // adding multiBrick / multiBrickFanxy meta 0-13 to list + for (int sc = 0; sc < 14; sc++) + { + chiseling.addDetailing(TinkerTools.multiBrick, sc, TinkerTools.multiBrickFancy, sc, TinkerTools.chisel); + } + + chiseling.addDetailing(Blocks.stonebrick, 0, TinkerTools.multiBrickFancy, 15, TinkerTools.chisel); + chiseling.addDetailing(TinkerTools.multiBrickFancy, 15, TinkerTools.multiBrickFancy, 14, TinkerTools.chisel); + chiseling.addDetailing(TinkerTools.multiBrickFancy, 14, Blocks.stonebrick, 3, TinkerTools.chisel); + /* + * chiseling.addDetailing(TRepo.multiBrick, 14, TRepo.multiBrickFancy, + * 14, TRepo.chisel); chiseling.addDetailing(TRepo.multiBrick, 15, + * TRepo.multiBrickFancy, 15, TRepo.chisel); + */ + + chiseling.addDetailing(TinkerSmeltery.smeltery, 4, TinkerSmeltery.smeltery, 6, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.smeltery, 6, TinkerSmeltery.smeltery, 11, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.smeltery, 11, TinkerSmeltery.smeltery, 2, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.smeltery, 2, TinkerSmeltery.smeltery, 8, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.smeltery, 8, TinkerSmeltery.smeltery, 9, TinkerTools.chisel); + chiseling.addDetailing(TinkerSmeltery.smeltery, 9, TinkerSmeltery.smeltery, 10, TinkerTools.chisel); + } + + public void vanillaToolRecipes () + { + if (PHConstruct.removeVanillaToolRecipes) + { + RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_pickaxe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_axe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_shovel)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_hoe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_sword)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_pickaxe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_axe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_shovel)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_hoe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_sword)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_pickaxe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_axe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_shovel)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_hoe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_sword)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_pickaxe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_axe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_shovel)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_hoe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_sword)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_pickaxe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_axe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_shovel)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_hoe)); + RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_sword)); + } + + if (PHConstruct.labotimizeVanillaTools) + { + Items.wooden_pickaxe.setMaxDamage(1); + Items.wooden_axe.setMaxDamage(1); + Items.wooden_shovel.setMaxDamage(1); + Items.wooden_hoe.setMaxDamage(1); + Items.wooden_sword.setMaxDamage(1); + + Items.stone_pickaxe.setMaxDamage(1); + Items.stone_axe.setMaxDamage(1); + Items.stone_shovel.setMaxDamage(1); + Items.stone_hoe.setMaxDamage(1); + Items.stone_sword.setMaxDamage(1); + + Items.iron_pickaxe.setMaxDamage(1); + Items.iron_axe.setMaxDamage(1); + Items.iron_shovel.setMaxDamage(1); + Items.iron_hoe.setMaxDamage(1); + Items.iron_sword.setMaxDamage(1); + + Items.diamond_pickaxe.setMaxDamage(1); + Items.diamond_axe.setMaxDamage(1); + Items.diamond_shovel.setMaxDamage(1); + Items.diamond_hoe.setMaxDamage(1); + Items.diamond_sword.setMaxDamage(1); + + Items.golden_pickaxe.setMaxDamage(1); + Items.golden_axe.setMaxDamage(1); + Items.golden_shovel.setMaxDamage(1); + Items.golden_hoe.setMaxDamage(1); + Items.golden_sword.setMaxDamage(1); + } + } + + public static void registerPatternMaterial (String oreName, int value, String materialName) + { + for (ItemStack ore : OreDictionary.getOres(oreName)) + { + PatternBuilder.instance.registerMaterial(ore, value, materialName); + } + } + + private void craftingTableRecipes() + { + String[] patBlock = { "###", "###", "###" }; + String[] patSurround = { "###", "#m#", "###" }; + + Object[] toolForgeBlocks = { "blockIron", "blockGold", Blocks.diamond_block, Blocks.emerald_block, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", + "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; + + // ToolForge Recipes (Metal Version) + for (int sc = 0; sc < toolForgeBlocks.length; sc++) + { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2), 's', new ItemStack( + TinkerTools.toolStationWood, 1, 0), 'm', toolForgeBlocks[sc])); + // adding slab version recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2), 's', new ItemStack( + TinkerTools.craftingSlabWood, 1, 1), 'm', toolForgeBlocks[sc])); + } + + // ToolStation Recipes (Wooden Version) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "craftingTableWood")); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', + new ItemStack(TinkerTools.craftingStationWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(TinkerTools.craftingSlabWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 3)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', Blocks.chest); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "logWood")); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 3)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "plankWood")); + GameRegistry.addRecipe(new ItemStack(TinkerTools.furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Blocks.stone_slab, 1, 3)); + + // Blank Pattern Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); + // Manual Book Recipes + GameRegistry.addRecipe(new ItemStack(TinkerTools.manualBook), "wp", 'w', new ItemStack(TinkerTools.blankPattern, 1, 0), 'p', Items.paper); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 2, 0), new ItemStack(TinkerTools.manualBook, 1, 0), Items.book); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 1, 1), new ItemStack(TinkerTools.manualBook, 1, 0)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 2, 1), new ItemStack(TinkerTools.manualBook, 1, 1), Items.book); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 1, 2), new ItemStack(TinkerTools.manualBook, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 2, 2), new ItemStack(TinkerTools.manualBook, 1, 2), Items.book); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 1, 3), new ItemStack(TinkerTools.manualBook, 1, 2)); + // alternative Vanilla Book Recipe + GameRegistry.addShapelessRecipe(new ItemStack(Items.book), Items.paper, Items.paper, Items.paper, Items.string, TinkerTools.blankPattern, TinkerTools.blankPattern); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.name_tag), "P~ ", "~O ", " ~", '~', Items.string, 'P', Items.paper, 'O', "slimeball")); + + // Paperstack Recipe + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 0), "pp", "pp", 'p', Items.paper); + // Mossball Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.materials, 1, 6), patBlock, '#', "stoneMossy")); + // LavaCrystal Recipes -Auto-smelt + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'c', Items.fire_charge, 'x', Items.blaze_rod); + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'x', Items.fire_charge, 'c', Items.blaze_rod); + // Slimy sand Recipes + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 0), Items.slime_ball, Items.slime_ball, Items.slime_ball, Items.slime_ball, Blocks.sand, Blocks.dirt); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 2), TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, Blocks.sand, + Blocks.dirt); + // Grout Recipes + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 1), Items.clay_ball, Blocks.sand, Blocks.gravel); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 8, 1), new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, + Blocks.gravel, Blocks.gravel, Blocks.gravel, Blocks.gravel); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, Blocks.soul_sand, Blocks.gravel); + // Graveyard Soil Recipes + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 3), Blocks.dirt, Items.rotten_flesh, new ItemStack(Items.dye, 1, 15)); + // Silky Cloth Recipes + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 25), patSurround, 'm', new ItemStack(TinkerTools.materials, 1, 24), '#', new ItemStack(Items.string)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Items.string))); + // Silky Jewel Recipes + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(TinkerTools.materials, 1, 25), 'e', new ItemStack(Items.emerald)); + + // Advanced WorkBench Recipes + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); + // Slab crafters + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 0), "b", 'b', new ItemStack(TinkerTools.craftingStationWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 1), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 3)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 4)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 4), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 5)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 10)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 11)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 12)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 13)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "b", 'b', new ItemStack(TinkerTools.toolForge, 1, Short.MAX_VALUE)); + + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 4, 42), "dustAluminium", "dustCopper", "dustCopper", "dustCopper")); + } + + private void modIntegration() + { + + /* TE3 Flux */ + ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1); + if (batHardened != null) + { + TinkerTools.modFlux.batteries.add(batHardened); + } + ItemStack basicCell = GameRegistry.findItemStack("ThermalExpansion", "cellBasic", 1); + if (basicCell != null) + { + TinkerTools.modFlux.batteries.add(basicCell); + } + + ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.binding, 1, 6), ""); + if (batHardened != null) + TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); + if (basicCell != null) + TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); + + /* Thaumcraft */ + Object obj = ItemHelper.getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); + if (obj != null) + { + TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); + TinkerTools.thaumcraftAvailable = true; + TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); + TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", StatCollector.translateToLocal("materialtraits.thaumic")); + PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, StatCollector.translateToLocal("gui.partbuilder.material.thaumium"), new ItemStack(TinkerTools.toolShard, + 1, 31), new ItemStack(TinkerTools.toolRod, 1, 31), 31); + for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) + { + if (TinkerTools.patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, 31, new ItemStack(TinkerTools.patternOutputs[meta], 1, 31)); + } + + TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TinkerTools.bowstring, 1, 1), 1F, 1F, 0.9f); + TConstructRegistry.addBowMaterial(31, 576, 40, 1.2f); + TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F, 100F); + } + else + { + TConstruct.logger.warn("Thaumcraft not detected."); + } + + if (Loader.isModLoaded("Natura")) + { + try + { + Object plantItem = ItemHelper.getStaticItem("plantItem", "mods.natura.common.NContent"); + TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item) plantItem, 1, 7), new ItemStack(TinkerTools.bowstring, 1, 2), 1.2F, 0.8F, 1.3f); + } + catch (Exception e) + { + } // No need to handle + } + } + + void registerMaterials () + { + TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", ""); + TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", StatCollector.translateToLocal("materialtraits.stonebound")); + TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", ""); + TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", ""); + TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", StatCollector.translateToLocal("materialtraits.jagged")); + TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", ""); + TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", ""); + TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound")); + TConstructRegistry.addToolMaterial(8, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7a", ""); + TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", StatCollector.translateToLocal("materialtraits.writable")); + TConstructRegistry.addToolMaterial(10, "Cobalt", 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", ""); + TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound")); + TConstructRegistry.addToolMaterial(12, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", ""); + TConstructRegistry.addToolMaterial(13, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", ""); + TConstructRegistry.addToolMaterial(14, "Bronze", 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", ""); + TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); + TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); + TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); + TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", StatCollector.translateToLocal("materialtraits.tasty")); + + TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); // Wood + TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); // Stone + TConstructRegistry.addBowMaterial(2, 576, 40, 1.2f); // Iron + TConstructRegistry.addBowMaterial(3, 10, 80, 0.2f); // Flint + TConstructRegistry.addBowMaterial(4, 384, 20, 1.0f); // Cactus + TConstructRegistry.addBowMaterial(5, 192, 30, 1.0f); // Bone + TConstructRegistry.addBowMaterial(6, 10, 80, 0.2f); // Obsidian + TConstructRegistry.addBowMaterial(7, 10, 80, 0.2f); // Netherrack + TConstructRegistry.addBowMaterial(8, 1536, 20, 1.2f); // Slime + TConstructRegistry.addBowMaterial(9, 48, 25, 0.5f); // Paper + TConstructRegistry.addBowMaterial(10, 1152, 40, 1.2f); // Cobalt + TConstructRegistry.addBowMaterial(11, 960, 40, 1.2f); // Ardite + TConstructRegistry.addBowMaterial(12, 1536, 40, 1.2f); // Manyullyn + TConstructRegistry.addBowMaterial(13, 384, 40, 1.2f); // Copper + TConstructRegistry.addBowMaterial(14, 576, 40, 1.2f); // Bronze + TConstructRegistry.addBowMaterial(15, 768, 40, 1.2f); // Alumite + TConstructRegistry.addBowMaterial(16, 768, 40, 1.2f); // Steel + TConstructRegistry.addBowMaterial(17, 576, 20, 1.2f); // Blue Slime + TConstructRegistry.addBowMaterial(18, 384, 20, 1.2f); // Slime + + // Material ID, mass, fragility + TConstructRegistry.addArrowMaterial(0, 0.69F, 1.0F, 100F); // Wood + TConstructRegistry.addArrowMaterial(1, 2.5F, 5.0F, 100F); // Stone + TConstructRegistry.addArrowMaterial(2, 7.2F, 0.5F, 100F); // Iron + TConstructRegistry.addArrowMaterial(3, 2.65F, 1.0F, 100F); // Flint + TConstructRegistry.addArrowMaterial(4, 0.76F, 1.0F, 100F); // Cactus + TConstructRegistry.addArrowMaterial(5, 0.69F, 1.0F, 100); // Bone + TConstructRegistry.addArrowMaterial(6, 2.4F, 1.0F, 100F); // Obsidian + TConstructRegistry.addArrowMaterial(7, 3.5F, 1.0F, 100F); // Netherrack + TConstructRegistry.addArrowMaterial(8, 0.42F, 0.0F, 100F); // Slime + TConstructRegistry.addArrowMaterial(9, 1.1F, 3.0F, 90F); // Paper + TConstructRegistry.addArrowMaterial(10, 8.9F, 0.25F, 100F); // Cobalt + TConstructRegistry.addArrowMaterial(11, 7.2F, 0.25F, 100F); // Ardite + TConstructRegistry.addArrowMaterial(12, 10.6F, 0.1F, 100F); // Manyullyn + TConstructRegistry.addArrowMaterial(13, 8.96F, 0.5F, 100F); // Copper + TConstructRegistry.addArrowMaterial(14, 7.9F, 0.25F, 100F); // Bronze + TConstructRegistry.addArrowMaterial(15, 4.7F, 0.25F, 100F); // Alumite + TConstructRegistry.addArrowMaterial(16, 7.6F, 0.25F, 100F); // Steel + TConstructRegistry.addArrowMaterial(17, 0.42F, 0.0F, 100F); // Blue + // Slime + TConstructRegistry.addArrowMaterial(18, 6.8F, 0.5F, 100F); // Iron + + TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TinkerTools.bowstring, 1, 0), 1F, 1F, 1f); // String + TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TinkerTools.fletching, 1, 0), 100F, 0F, 0.05F); // Feather + for (int i = 0; i < 4; i++) + TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Blocks.leaves, 1, i), new ItemStack(TinkerTools.fletching, 1, 1), 75F, 0F, 0.2F); // All four vanialla Leaves + TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(TinkerTools.materials, 1, 1), new ItemStack(TinkerTools.fletching, 1, 2), 100F, 0F, 0.12F); // Slime + TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(TinkerTools.materials, 1, 17), new ItemStack(TinkerTools.fletching, 1, 3), 100F, 0F, 0.12F); // BlueSlime + + PatternBuilder pb = PatternBuilder.instance; + if (PHConstruct.enableTWood) + pb.registerFullMaterial(Blocks.planks, 2, StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick), new ItemStack(Items.stick), 0); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0); + if (PHConstruct.enableTStone) + { + pb.registerFullMaterial(Blocks.stone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TinkerTools.toolShard, 1, 1), new ItemStack(TinkerTools.toolRod, 1, 1), 1); + pb.registerMaterial(Blocks.cobblestone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone")); + } + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TinkerTools.toolShard, 1, 1), new ItemStack(TinkerTools.toolRod, 1, 1), 0); + pb.registerFullMaterial(Items.iron_ingot, 2, StatCollector.translateToLocal("gui.partbuilder.material.iron"), new ItemStack(TinkerTools.toolShard, 1, 2), new ItemStack(TinkerTools.toolRod, 1, 2), 2); + if (PHConstruct.enableTFlint) + pb.registerFullMaterial(Items.flint, 2, StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TinkerTools.toolShard, 1, 3), new ItemStack(TinkerTools.toolRod, 1, 3), 3); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TinkerTools.toolShard, 1, 3), new ItemStack(TinkerTools.toolRod, 1, 3), 3); + if (PHConstruct.enableTCactus) + pb.registerFullMaterial(Blocks.cactus, 2, StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TinkerTools.toolShard, 1, 4), new ItemStack(TinkerTools.toolRod, 1, 4), 4); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TinkerTools.toolShard, 1, 4), new ItemStack(TinkerTools.toolRod, 1, 4), 4); + if (PHConstruct.enableTBone) + pb.registerFullMaterial(Items.bone, 2, StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); + pb.registerFullMaterial(Blocks.obsidian, 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian"), new ItemStack(TinkerTools.toolShard, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 6), 6); + pb.registerMaterial(new ItemStack(TinkerTools.materials, 1, 18), 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian")); + if (PHConstruct.enableTNetherrack) + pb.registerFullMaterial(Blocks.netherrack, 2, StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TinkerTools.toolShard, 1, 7), new ItemStack(TinkerTools.toolRod, 1, 7), 7); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TinkerTools.toolShard, 1, 7), new ItemStack(TinkerTools.toolRod, 1, 7), 7); + if (PHConstruct.enableTSlime) + pb.registerFullMaterial(new ItemStack(TinkerTools.materials, 1, 1), 2, StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TinkerTools.toolShard, 1, 8), new ItemStack(TinkerTools.toolRod, 1, 8), 8); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TinkerTools.toolShard, 1, 8), new ItemStack(TinkerTools.toolRod, 1, 17), 8); + if (PHConstruct.enableTPaper) + pb.registerFullMaterial(new ItemStack(TinkerTools.materials, 1, 0), 2, StatCollector.translateToLocal("gui.partbuilder.material.paper"), new ItemStack(Items.paper, 2), new ItemStack(TinkerTools.toolRod, 1, 9), 9); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(Items.paper, 2), new ItemStack(TinkerTools.toolRod, 1, 9), 9); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cobalt"), new ItemStack(TinkerTools.toolShard, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 10), 10); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.ardite"), new ItemStack(TinkerTools.toolShard, 1, 11), new ItemStack(TinkerTools.toolRod, 1, 11), 11); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.manyullyn"), new ItemStack(TinkerTools.toolShard, 1, 12), new ItemStack(TinkerTools.toolRod, 1, 12), 12); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.copper"), new ItemStack(TinkerTools.toolShard, 1, 13), new ItemStack(TinkerTools.toolRod, 1, 13), 13); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bronze"), new ItemStack(TinkerTools.toolShard, 1, 14), new ItemStack(TinkerTools.toolRod, 1, 14), 14); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.alumite"), new ItemStack(TinkerTools.toolShard, 1, 15), new ItemStack(TinkerTools.toolRod, 1, 15), 15); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.steel"), new ItemStack(TinkerTools.toolShard, 1, 16), new ItemStack(TinkerTools.toolRod, 1, 16), 16); + if (PHConstruct.enableTBlueSlime) + pb.registerFullMaterial(new ItemStack(TinkerTools.materials, 1, 17), 2, StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TinkerTools.toolShard, 1, 17), new ItemStack(TinkerTools.toolRod, 1, 17), 17); + else + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TinkerTools.toolShard, 1, 17), new ItemStack(TinkerTools.toolRod, 1, 17), 17); + pb.registerFullMaterial(new ItemStack(TinkerTools.materials, 1, 34), 2, StatCollector.translateToLocal("gui.partbuilder.material.pigiron"), new ItemStack(TinkerTools.toolShard, 1, 18), new ItemStack(TinkerTools.toolRod, 1, 18), 18); + + pb.addToolPattern((IPattern) TinkerTools.woodPattern); + } +} diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java new file mode 100644 index 00000000..2e6d1237 --- /dev/null +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -0,0 +1,10 @@ +package tconstruct.tools; + +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + +public class ToolProxyClient extends ToolProxyCommon +{ +} diff --git a/src/main/java/tconstruct/tools/ToolProxyCommon.java b/src/main/java/tconstruct/tools/ToolProxyCommon.java new file mode 100644 index 00000000..e330b406 --- /dev/null +++ b/src/main/java/tconstruct/tools/ToolProxyCommon.java @@ -0,0 +1,6 @@ +package tconstruct.tools; + +public class ToolProxyCommon +{ + +} diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java similarity index 92% rename from src/main/java/tconstruct/blocks/CraftingSlab.java rename to src/main/java/tconstruct/tools/blocks/CraftingSlab.java index f4bf5dec..485539f9 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; import java.util.List; @@ -15,15 +15,15 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; import tconstruct.common.TProxyCommon; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -153,9 +153,9 @@ public class CraftingSlab extends InventorySlab PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); for (int i = 1; i <= 13; i++) { - logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i)); + logic.setInventorySlotContents(i - 1, new ItemStack(TinkerTools.woodPattern, 1, i)); } - logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22)); + logic.setInventorySlotContents(13, new ItemStack(TinkerTools.woodPattern, 1, 22)); } } super.onBlockPlacedBy(world, x, y, z, entityliving, stack); diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java similarity index 95% rename from src/main/java/tconstruct/blocks/CraftingStationBlock.java rename to src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java index d6c31d4a..7ab3454a 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; import java.util.List; @@ -14,10 +14,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.client.block.TableRender; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.model.TableRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java similarity index 97% rename from src/main/java/tconstruct/blocks/EquipBlock.java rename to src/main/java/tconstruct/tools/blocks/EquipBlock.java index 3a140b2f..22ea12f7 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; import java.util.Random; @@ -19,9 +19,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.blocks.logic.EquipLogic; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.client.block.FrypanRender; +import tconstruct.tools.logic.EquipLogic; +import tconstruct.tools.logic.FrypanLogic; +import tconstruct.tools.model.FrypanRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java similarity index 97% rename from src/main/java/tconstruct/blocks/FurnaceSlab.java rename to src/main/java/tconstruct/tools/blocks/FurnaceSlab.java index 62a49ac6..786beebb 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; import mantle.blocks.abstracts.InventorySlab; import mantle.blocks.iface.IActiveLogic; @@ -11,9 +11,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.blocks.logic.FurnaceLogic; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; +import tconstruct.tools.logic.FurnaceLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/tools/blocks/MultiBrick.java similarity index 98% rename from src/main/java/tconstruct/blocks/MultiBrick.java rename to src/main/java/tconstruct/tools/blocks/MultiBrick.java index a7ae0849..1a6b958b 100644 --- a/src/main/java/tconstruct/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrick.java @@ -1,5 +1,6 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; +import tconstruct.blocks.TConstructBlock; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java similarity index 98% rename from src/main/java/tconstruct/blocks/MultiBrickFancy.java rename to src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java index 7ea37840..81e075b7 100644 --- a/src/main/java/tconstruct/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java @@ -1,5 +1,6 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; +import tconstruct.blocks.TConstructBlock; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java similarity index 93% rename from src/main/java/tconstruct/blocks/ToolForgeBlock.java rename to src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java index c9102144..76db8834 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; import java.util.List; @@ -17,11 +17,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.TConstruct; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.client.block.TableForgeRender; import tconstruct.common.TProxyCommon; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.model.TableForgeRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -82,7 +82,7 @@ public class ToolForgeBlock extends InventoryBlock case 3: return Blocks.emerald_block.getIcon(side, 0); default: - return TRepo.metalBlock.getIcon(side, meta - 4); + return TinkerSmeltery.metalBlock.getIcon(side, meta - 4); } } diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java similarity index 94% rename from src/main/java/tconstruct/blocks/ToolStationBlock.java rename to src/main/java/tconstruct/tools/blocks/ToolStationBlock.java index a156e60e..741cf664 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.tools.blocks; import java.util.List; @@ -17,13 +17,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.TConstruct; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.client.block.TableRender; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.model.TableRender; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -208,9 +208,9 @@ public class ToolStationBlock extends InventoryBlock PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); for (int i = 1; i <= 13; i++) { - logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i)); + logic.setInventorySlotContents(i - 1, new ItemStack(TinkerTools.woodPattern, 1, i)); } - logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22)); + logic.setInventorySlotContents(13, new ItemStack(TinkerTools.woodPattern, 1, 22)); } } super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack); diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java similarity index 99% rename from src/main/java/tconstruct/entity/projectile/ArrowEntity.java rename to src/main/java/tconstruct/tools/entity/ArrowEntity.java index 313a68b9..8e43627b 100644 --- a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -1,4 +1,4 @@ -package tconstruct.entity.projectile; +package tconstruct.tools.entity; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/tconstruct/entity/projectile/DaggerEntity.java b/src/main/java/tconstruct/tools/entity/DaggerEntity.java similarity index 98% rename from src/main/java/tconstruct/entity/projectile/DaggerEntity.java rename to src/main/java/tconstruct/tools/entity/DaggerEntity.java index 5182ed28..79986a4d 100644 --- a/src/main/java/tconstruct/entity/projectile/DaggerEntity.java +++ b/src/main/java/tconstruct/tools/entity/DaggerEntity.java @@ -1,4 +1,4 @@ -package tconstruct.entity.projectile; +package tconstruct.tools.entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/entity/FancyEntityItem.java b/src/main/java/tconstruct/tools/entity/FancyEntityItem.java similarity index 97% rename from src/main/java/tconstruct/entity/FancyEntityItem.java rename to src/main/java/tconstruct/tools/entity/FancyEntityItem.java index ee61320f..0d78fea9 100644 --- a/src/main/java/tconstruct/entity/FancyEntityItem.java +++ b/src/main/java/tconstruct/tools/entity/FancyEntityItem.java @@ -1,4 +1,4 @@ -package tconstruct.entity; +package tconstruct.tools.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/tconstruct/entity/projectile/LaunchedPotion.java b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java similarity index 99% rename from src/main/java/tconstruct/entity/projectile/LaunchedPotion.java rename to src/main/java/tconstruct/tools/entity/LaunchedPotion.java index 27a7bede..614afd4e 100644 --- a/src/main/java/tconstruct/entity/projectile/LaunchedPotion.java +++ b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java @@ -1,4 +1,4 @@ -package tconstruct.entity.projectile; +package tconstruct.tools.entity; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/tconstruct/entity/projectile/RotatingBase.java b/src/main/java/tconstruct/tools/entity/RotatingBase.java similarity index 99% rename from src/main/java/tconstruct/entity/projectile/RotatingBase.java rename to src/main/java/tconstruct/tools/entity/RotatingBase.java index 95074d13..0d6794c6 100644 --- a/src/main/java/tconstruct/entity/projectile/RotatingBase.java +++ b/src/main/java/tconstruct/tools/entity/RotatingBase.java @@ -1,4 +1,4 @@ -package tconstruct.entity.projectile; +package tconstruct.tools.entity; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/tconstruct/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java similarity index 97% rename from src/main/java/tconstruct/inventory/CraftingStationContainer.java rename to src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index e999465b..d597c709 100644 --- a/src/main/java/tconstruct/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -12,11 +12,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.common.TRepo; import tconstruct.library.armor.ArmorCore; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.CraftingStationLogic; public class CraftingStationContainer extends Container { @@ -160,7 +160,7 @@ public class CraftingStationContainer extends Container { Block block = worldObj.getBlock(this.posX, this.posY, this.posZ); - if (block != TRepo.craftingStationWood && block != TRepo.craftingSlabWood) + if (block != TinkerTools.craftingStationWood && block != TinkerTools.craftingSlabWood) return false; return player.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D; } diff --git a/src/main/java/tconstruct/inventory/FrypanContainer.java b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java similarity index 95% rename from src/main/java/tconstruct/inventory/FrypanContainer.java rename to src/main/java/tconstruct/tools/inventory/FrypanContainer.java index 7e9289d4..780cfc59 100644 --- a/src/main/java/tconstruct/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -7,8 +7,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.common.TRepo; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.FrypanLogic; public class FrypanContainer extends Container { @@ -88,7 +88,7 @@ public class FrypanContainer extends Container public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.heldItemBlock) + if (block != TinkerTools.heldItemBlock) return false; return logic.isUseableByPlayer(entityplayer); diff --git a/src/main/java/tconstruct/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java similarity index 98% rename from src/main/java/tconstruct/inventory/FurnaceContainer.java rename to src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index 072de544..31646478 100644 --- a/src/main/java/tconstruct/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -9,7 +9,7 @@ import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; -import tconstruct.blocks.logic.FurnaceLogic; +import tconstruct.tools.logic.FurnaceLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java similarity index 99% rename from src/main/java/tconstruct/inventory/InventoryCraftingStation.java rename to src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java index 9c4e7cb8..964b185b 100644 --- a/src/main/java/tconstruct/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/inventory/InventoryCraftingStationResult.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java similarity index 97% rename from src/main/java/tconstruct/inventory/InventoryCraftingStationResult.java rename to src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java index 7f711b67..4bb3d754 100644 --- a/src/main/java/tconstruct/inventory/InventoryCraftingStationResult.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java @@ -1,9 +1,9 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.CraftingStationLogic; +import tconstruct.tools.logic.CraftingStationLogic; public class InventoryCraftingStationResult extends InventoryCraftResult { diff --git a/src/main/java/tconstruct/inventory/PartCrafterChestContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java similarity index 90% rename from src/main/java/tconstruct/inventory/PartCrafterChestContainer.java rename to src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java index 8c741053..9c81d262 100644 --- a/src/main/java/tconstruct/inventory/PartCrafterChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java @@ -1,14 +1,16 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.common.TRepo; +import tconstruct.armor.inventory.SlotOnlyTake; import tconstruct.library.util.IPattern; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; public class PartCrafterChestContainer extends ActiveContainer { @@ -59,7 +61,7 @@ public class PartCrafterChestContainer extends ActiveContainer public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.toolStationWood && block != TRepo.craftingSlabWood) + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java similarity index 90% rename from src/main/java/tconstruct/inventory/PartCrafterContainer.java rename to src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java index c1b93367..3cd8379f 100644 --- a/src/main/java/tconstruct/inventory/PartCrafterContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java @@ -1,13 +1,15 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.common.TRepo; +import tconstruct.armor.inventory.SlotOnlyTake; import tconstruct.library.util.IPattern; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.PartBuilderLogic; public class PartCrafterContainer extends ActiveContainer { @@ -48,7 +50,7 @@ public class PartCrafterContainer extends ActiveContainer public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.toolStationWood && block != TRepo.craftingSlabWood) + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/inventory/PatternChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java similarity index 93% rename from src/main/java/tconstruct/inventory/PatternChestContainer.java rename to src/main/java/tconstruct/tools/inventory/PatternChestContainer.java index 28dbc90e..6a9ef38a 100644 --- a/src/main/java/tconstruct/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -6,9 +6,9 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.common.TRepo; import tconstruct.library.util.IPattern; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.PatternChestLogic; public class PatternChestContainer extends Container { @@ -47,7 +47,7 @@ public class PatternChestContainer extends Container public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.toolStationWood && block != TRepo.craftingSlabWood) + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java similarity index 92% rename from src/main/java/tconstruct/inventory/PatternShaperContainer.java rename to src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java index 9723b6a7..ad0dca20 100644 --- a/src/main/java/tconstruct/inventory/PatternShaperContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -6,8 +6,9 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.common.TRepo; +import tconstruct.armor.inventory.SlotOnlyTake; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.StencilTableLogic; public class PatternShaperContainer extends Container { @@ -65,7 +66,7 @@ public class PatternShaperContainer extends Container public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.toolStationWood && block != TRepo.craftingSlabWood) + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/inventory/SlotFrypan.java b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java similarity index 96% rename from src/main/java/tconstruct/inventory/SlotFrypan.java rename to src/main/java/tconstruct/tools/inventory/SlotFrypan.java index 38ffc377..762a1236 100644 --- a/src/main/java/tconstruct/inventory/SlotFrypan.java +++ b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/tconstruct/inventory/SlotPartBuilder.java b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java similarity index 91% rename from src/main/java/tconstruct/inventory/SlotPartBuilder.java rename to src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java index b9088d95..8430b477 100644 --- a/src/main/java/tconstruct/inventory/SlotPartBuilder.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/tconstruct/inventory/SlotPattern.java b/src/main/java/tconstruct/tools/inventory/SlotPattern.java similarity index 94% rename from src/main/java/tconstruct/inventory/SlotPattern.java rename to src/main/java/tconstruct/tools/inventory/SlotPattern.java index d747fcd1..a980b72f 100644 --- a/src/main/java/tconstruct/inventory/SlotPattern.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPattern.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/tconstruct/inventory/SlotTool.java b/src/main/java/tconstruct/tools/inventory/SlotTool.java similarity index 98% rename from src/main/java/tconstruct/inventory/SlotTool.java rename to src/main/java/tconstruct/tools/inventory/SlotTool.java index 35dd426d..6296dc98 100644 --- a/src/main/java/tconstruct/inventory/SlotTool.java +++ b/src/main/java/tconstruct/tools/inventory/SlotTool.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import java.util.Random; diff --git a/src/main/java/tconstruct/inventory/SlotToolForge.java b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java similarity index 97% rename from src/main/java/tconstruct/inventory/SlotToolForge.java rename to src/main/java/tconstruct/tools/inventory/SlotToolForge.java index d203e36a..1a95282f 100644 --- a/src/main/java/tconstruct/inventory/SlotToolForge.java +++ b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import java.util.Random; diff --git a/src/main/java/tconstruct/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java similarity index 93% rename from src/main/java/tconstruct/inventory/ToolForgeContainer.java rename to src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java index dc030e7b..17c793cf 100644 --- a/src/main/java/tconstruct/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -6,10 +6,10 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.common.TRepo; import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; public class ToolForgeContainer extends ToolStationContainer { @@ -95,7 +95,7 @@ public class ToolForgeContainer extends ToolStationContainer public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.toolForge && block != TRepo.craftingSlabWood) + if (block != TinkerTools.toolForge && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/inventory/ToolStationContainer.java b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java similarity index 96% rename from src/main/java/tconstruct/inventory/ToolStationContainer.java rename to src/main/java/tconstruct/tools/inventory/ToolStationContainer.java index f2486bdf..ccc74824 100644 --- a/src/main/java/tconstruct/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java @@ -1,4 +1,4 @@ -package tconstruct.inventory; +package tconstruct.tools.inventory; import java.util.Random; @@ -8,9 +8,10 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.common.TRepo; import tconstruct.library.tools.ToolCore; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.ToolStationLogic; public class ToolStationContainer extends ActiveContainer { @@ -85,7 +86,7 @@ public class ToolStationContainer extends ActiveContainer public boolean canInteractWith (EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TRepo.toolStationWood && block != TRepo.craftingSlabWood) + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java similarity index 95% rename from src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java rename to src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java index 459e8efb..8146e479 100644 --- a/src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.tools.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java similarity index 97% rename from src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java rename to src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java index 14a58b7d..20aef4a7 100644 --- a/src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.tools.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/MultiBrickItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java similarity index 97% rename from src/main/java/tconstruct/items/blocks/MultiBrickItem.java rename to src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java index 213a9bb4..713360e2 100644 --- a/src/main/java/tconstruct/items/blocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.tools.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java similarity index 93% rename from src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java rename to src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java index 23b98777..be14bbfa 100644 --- a/src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.tools.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/Bowstring.java b/src/main/java/tconstruct/tools/items/Bowstring.java similarity index 93% rename from src/main/java/tconstruct/items/Bowstring.java rename to src/main/java/tconstruct/tools/items/Bowstring.java index 8571fb98..eb2d6e98 100644 --- a/src/main/java/tconstruct/items/Bowstring.java +++ b/src/main/java/tconstruct/tools/items/Bowstring.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; @@ -6,9 +6,9 @@ import mantle.items.abstracts.CraftingItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.common.Loader; public class Bowstring extends CraftingItem implements IToolPart @@ -47,7 +47,7 @@ public class Bowstring extends CraftingItem implements IToolPart public void getSubItems (Item b, CreativeTabs tab, List list) { list.add(new ItemStack(b, 1, 0)); - if (TRepo.thaumcraftAvailable) + if (TinkerTools.thaumcraftAvailable) list.add(new ItemStack(b, 1, 1)); if (Loader.isModLoaded("Natura")) list.add(new ItemStack(b, 1, 2)); diff --git a/src/main/java/tconstruct/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java similarity index 98% rename from src/main/java/tconstruct/items/CreativeModifier.java rename to src/main/java/tconstruct/tools/items/CreativeModifier.java index 19e5047b..400d31a0 100644 --- a/src/main/java/tconstruct/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/Fletching.java b/src/main/java/tconstruct/tools/items/Fletching.java similarity index 97% rename from src/main/java/tconstruct/items/Fletching.java rename to src/main/java/tconstruct/tools/items/Fletching.java index 96368c08..3da80322 100644 --- a/src/main/java/tconstruct/items/Fletching.java +++ b/src/main/java/tconstruct/tools/items/Fletching.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import mantle.items.abstracts.CraftingItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/items/Manual.java b/src/main/java/tconstruct/tools/items/Manual.java similarity index 98% rename from src/main/java/tconstruct/items/Manual.java rename to src/main/java/tconstruct/tools/items/Manual.java index 7ae7f81e..49ed6893 100644 --- a/src/main/java/tconstruct/items/Manual.java +++ b/src/main/java/tconstruct/tools/items/Manual.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/ManualInfo.java b/src/main/java/tconstruct/tools/items/ManualInfo.java similarity index 98% rename from src/main/java/tconstruct/items/ManualInfo.java rename to src/main/java/tconstruct/tools/items/ManualInfo.java index 65d1e77b..2a27a489 100644 --- a/src/main/java/tconstruct/items/ManualInfo.java +++ b/src/main/java/tconstruct/tools/items/ManualInfo.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import mantle.books.BookData; import mantle.books.BookDataStore; diff --git a/src/main/java/tconstruct/items/MaterialItem.java b/src/main/java/tconstruct/tools/items/MaterialItem.java similarity index 98% rename from src/main/java/tconstruct/items/MaterialItem.java rename to src/main/java/tconstruct/tools/items/MaterialItem.java index 1361712b..0cc748bd 100644 --- a/src/main/java/tconstruct/items/MaterialItem.java +++ b/src/main/java/tconstruct/tools/items/MaterialItem.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java similarity index 99% rename from src/main/java/tconstruct/items/Pattern.java rename to src/main/java/tconstruct/tools/items/Pattern.java index 3c82ed70..f688c8d5 100644 --- a/src/main/java/tconstruct/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java similarity index 98% rename from src/main/java/tconstruct/items/TitleIcon.java rename to src/main/java/tconstruct/tools/items/TitleIcon.java index 68175fdc..cc3dfef8 100644 --- a/src/main/java/tconstruct/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; @@ -17,8 +17,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.client.TProxyClient; -import tconstruct.entity.BlueSlime; import tconstruct.library.tools.ToolCore; +import tconstruct.world.entity.BlueSlime; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java similarity index 96% rename from src/main/java/tconstruct/items/ToolPart.java rename to src/main/java/tconstruct/tools/items/ToolPart.java index 53f8e7de..7c02b78b 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; @@ -7,9 +7,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; +import tconstruct.tools.TinkerTools; public class ToolPart extends CraftingItem implements IToolPart { @@ -74,7 +74,7 @@ public class ToolPart extends CraftingItem implements IToolPart for (int i = 0; i < 19; i++) list.add(new ItemStack(b, 1, i)); - if (TRepo.thaumcraftAvailable) + if (TinkerTools.thaumcraftAvailable) list.add(new ItemStack(b, 1, 31)); } diff --git a/src/main/java/tconstruct/items/ToolPartHidden.java b/src/main/java/tconstruct/tools/items/ToolPartHidden.java similarity index 91% rename from src/main/java/tconstruct/items/ToolPartHidden.java rename to src/main/java/tconstruct/tools/items/ToolPartHidden.java index b08af78d..d9b657f3 100644 --- a/src/main/java/tconstruct/items/ToolPartHidden.java +++ b/src/main/java/tconstruct/tools/items/ToolPartHidden.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/ToolShard.java b/src/main/java/tconstruct/tools/items/ToolShard.java similarity index 94% rename from src/main/java/tconstruct/items/ToolShard.java rename to src/main/java/tconstruct/tools/items/ToolShard.java index 4c2eebe4..8c4a1efd 100644 --- a/src/main/java/tconstruct/items/ToolShard.java +++ b/src/main/java/tconstruct/tools/items/ToolShard.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.tools.items; import java.util.List; @@ -7,7 +7,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import tconstruct.common.TRepo; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -65,7 +65,7 @@ public class ToolShard extends ToolPart for (int i = 10; i < 19; i++) list.add(new ItemStack(b, 1, i)); - if (TRepo.thaumcraftAvailable) + if (TinkerTools.thaumcraftAvailable) list.add(new ItemStack(b, 1, 31)); } } diff --git a/src/main/java/tconstruct/blocks/logic/BattlesignLogic.java b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java similarity index 94% rename from src/main/java/tconstruct/blocks/logic/BattlesignLogic.java rename to src/main/java/tconstruct/tools/logic/BattlesignLogic.java index 99e93cfe..16da8371 100644 --- a/src/main/java/tconstruct/blocks/logic/BattlesignLogic.java +++ b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java @@ -1,6 +1,6 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; -import tconstruct.inventory.FrypanContainer; +import tconstruct.tools.inventory.FrypanContainer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java similarity index 97% rename from src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java rename to src/main/java/tconstruct/tools/logic/CraftingStationLogic.java index 6cfebc4f..ff7999b6 100644 --- a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import java.lang.ref.WeakReference; @@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.world.World; -import tconstruct.inventory.CraftingStationContainer; +import tconstruct.tools.inventory.CraftingStationContainer; public class CraftingStationLogic extends InventoryLogic implements ISidedInventory { diff --git a/src/main/java/tconstruct/blocks/logic/EquipLogic.java b/src/main/java/tconstruct/tools/logic/EquipLogic.java similarity index 96% rename from src/main/java/tconstruct/blocks/logic/EquipLogic.java rename to src/main/java/tconstruct/tools/logic/EquipLogic.java index 3d64a435..0f15f21d 100644 --- a/src/main/java/tconstruct/blocks/logic/EquipLogic.java +++ b/src/main/java/tconstruct/tools/logic/EquipLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/tools/logic/FrypanLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/FrypanLogic.java rename to src/main/java/tconstruct/tools/logic/FrypanLogic.java index 82cb23ec..a96c5e74 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/tools/logic/FrypanLogic.java @@ -1,6 +1,6 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; -import tconstruct.inventory.FrypanContainer; +import tconstruct.tools.inventory.FrypanContainer; import mantle.blocks.BlockUtils; import mantle.blocks.iface.IActiveLogic; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java similarity index 99% rename from src/main/java/tconstruct/blocks/logic/FurnaceLogic.java rename to src/main/java/tconstruct/tools/logic/FurnaceLogic.java index 026c3241..aef43efc 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.InventoryLogic; @@ -25,7 +25,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.inventory.FurnaceContainer; +import tconstruct.tools.inventory.FurnaceContainer; import cpw.mods.fml.common.registry.GameRegistry; /* Slots diff --git a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java similarity index 97% rename from src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java rename to src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index bcbcabe6..6550fed1 100644 --- a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tconstruct.inventory.PartCrafterChestContainer; -import tconstruct.inventory.PartCrafterContainer; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.util.IPattern; +import tconstruct.tools.inventory.PartCrafterChestContainer; +import tconstruct.tools.inventory.PartCrafterContainer; public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { diff --git a/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java similarity index 91% rename from src/main/java/tconstruct/blocks/logic/PatternChestLogic.java rename to src/main/java/tconstruct/tools/logic/PatternChestLogic.java index 74461788..bd42f473 100644 --- a/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java +++ b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java @@ -1,10 +1,10 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; -import tconstruct.inventory.PatternChestContainer; +import tconstruct.tools.inventory.PatternChestContainer; public class PatternChestLogic extends InventoryLogic { diff --git a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java similarity index 92% rename from src/main/java/tconstruct/blocks/logic/StencilTableLogic.java rename to src/main/java/tconstruct/tools/logic/StencilTableLogic.java index e03eed5a..135b16b1 100644 --- a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; @@ -7,8 +7,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.common.TRepo; -import tconstruct.inventory.PatternShaperContainer; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.inventory.PatternShaperContainer; public class StencilTableLogic extends InventoryLogic implements ISidedInventory { @@ -47,10 +47,10 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory public void setInventorySlotContents (int slot, ItemStack itemstack) { super.setInventorySlotContents(slot, itemstack); - if (slot == 0 && itemstack != null && itemstack.getItem() == TRepo.blankPattern)//instanceof tconstruct.items.Pattern) + if (slot == 0 && itemstack != null && itemstack.getItem() == TinkerTools.blankPattern)//instanceof tconstruct.items.Pattern) { if (itemstack.getItemDamage() == 0) - setInventorySlotContents(1, new ItemStack(TRepo.woodPattern, 1, 1)); + setInventorySlotContents(1, new ItemStack(TinkerTools.woodPattern, 1, 1)); /*else if (itemstack.getItemDamage() == 1) setInventorySlotContents(1, new ItemStack(TContent.metalPattern, 1, 0));*/ } diff --git a/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java similarity index 94% rename from src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java rename to src/main/java/tconstruct/tools/logic/ToolForgeLogic.java index 251c9d4b..18053138 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -6,8 +6,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.inventory.ToolForgeContainer; import tconstruct.library.crafting.ToolBuilder; +import tconstruct.tools.inventory.ToolForgeContainer; /* Simple class for storing items in the block */ diff --git a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java similarity index 97% rename from src/main/java/tconstruct/blocks/logic/ToolStationLogic.java rename to src/main/java/tconstruct/tools/logic/ToolStationLogic.java index 4ea9add5..2cc60d7c 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java @@ -1,4 +1,4 @@ -package tconstruct.blocks.logic; +package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; @@ -7,8 +7,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.inventory.ToolStationContainer; import tconstruct.library.crafting.ToolBuilder; +import tconstruct.tools.inventory.ToolStationContainer; /* Simple class for storing items in the block */ diff --git a/src/main/java/tconstruct/client/entity/FancyItemRender.java b/src/main/java/tconstruct/tools/model/FancyItemRender.java similarity index 99% rename from src/main/java/tconstruct/client/entity/FancyItemRender.java rename to src/main/java/tconstruct/tools/model/FancyItemRender.java index 9e90b741..19387c8a 100644 --- a/src/main/java/tconstruct/client/entity/FancyItemRender.java +++ b/src/main/java/tconstruct/tools/model/FancyItemRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.entity; +package tconstruct.tools.model; import java.util.Random; diff --git a/src/main/java/tconstruct/client/block/FrypanRender.java b/src/main/java/tconstruct/tools/model/FrypanRender.java similarity index 98% rename from src/main/java/tconstruct/client/block/FrypanRender.java rename to src/main/java/tconstruct/tools/model/FrypanRender.java index 862fbd04..a38822b0 100644 --- a/src/main/java/tconstruct/client/block/FrypanRender.java +++ b/src/main/java/tconstruct/tools/model/FrypanRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.tools.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/block/TableForgeRender.java b/src/main/java/tconstruct/tools/model/TableForgeRender.java similarity index 99% rename from src/main/java/tconstruct/client/block/TableForgeRender.java rename to src/main/java/tconstruct/tools/model/TableForgeRender.java index ded1370a..d3c7f18f 100644 --- a/src/main/java/tconstruct/client/block/TableForgeRender.java +++ b/src/main/java/tconstruct/tools/model/TableForgeRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.tools.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/block/TableRender.java b/src/main/java/tconstruct/tools/model/TableRender.java similarity index 99% rename from src/main/java/tconstruct/client/block/TableRender.java rename to src/main/java/tconstruct/tools/model/TableRender.java index 03d656a3..13cd87f1 100644 --- a/src/main/java/tconstruct/client/block/TableRender.java +++ b/src/main/java/tconstruct/tools/model/TableRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.tools.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/tools/modifiers/ModAntiSpider.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java rename to src/main/java/tconstruct/tools/modifiers/ModAntiSpider.java index 2bdfb6e9..a61ff9f4 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java +++ b/src/main/java/tconstruct/tools/modifiers/ModAntiSpider.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/tools/modifiers/ModAttack.java similarity index 99% rename from src/main/java/tconstruct/modifiers/tools/ModAttack.java rename to src/main/java/tconstruct/tools/modifiers/ModAttack.java index 673d797f..af89f075 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAttack.java +++ b/src/main/java/tconstruct/tools/modifiers/ModAttack.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java b/src/main/java/tconstruct/tools/modifiers/ModAutoSmelt.java similarity index 94% rename from src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java rename to src/main/java/tconstruct/tools/modifiers/ModAutoSmelt.java index c640c768..4283fbc4 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java +++ b/src/main/java/tconstruct/tools/modifiers/ModAutoSmelt.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/tools/modifiers/ModBlaze.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModBlaze.java rename to src/main/java/tconstruct/tools/modifiers/ModBlaze.java index 89aac43e..6ea1d5cd 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/tools/modifiers/ModBlaze.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java b/src/main/java/tconstruct/tools/modifiers/ModBoolean.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModBoolean.java rename to src/main/java/tconstruct/tools/modifiers/ModBoolean.java index 0ce5a8b7..0b7695b1 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java +++ b/src/main/java/tconstruct/tools/modifiers/ModBoolean.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/tools/modifiers/ModButtertouch.java similarity index 99% rename from src/main/java/tconstruct/modifiers/tools/ModButtertouch.java rename to src/main/java/tconstruct/tools/modifiers/ModButtertouch.java index df64b070..ec105327 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/tools/modifiers/ModButtertouch.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.Arrays; import java.util.Iterator; diff --git a/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java b/src/main/java/tconstruct/tools/modifiers/ModCreativeToolModifier.java similarity index 97% rename from src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java rename to src/main/java/tconstruct/tools/modifiers/ModCreativeToolModifier.java index 233895b0..50ffe2b2 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java +++ b/src/main/java/tconstruct/tools/modifiers/ModCreativeToolModifier.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModDurability.java b/src/main/java/tconstruct/tools/modifiers/ModDurability.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModDurability.java rename to src/main/java/tconstruct/tools/modifiers/ModDurability.java index 52e30aa8..43f13a27 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModDurability.java +++ b/src/main/java/tconstruct/tools/modifiers/ModDurability.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java b/src/main/java/tconstruct/tools/modifiers/ModExtraModifier.java similarity index 96% rename from src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java rename to src/main/java/tconstruct/tools/modifiers/ModExtraModifier.java index 4643d6fd..55dfb7d7 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java +++ b/src/main/java/tconstruct/tools/modifiers/ModExtraModifier.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/tools/modifiers/ModFlux.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModFlux.java rename to src/main/java/tconstruct/tools/modifiers/ModFlux.java index 6cb00829..aa7f026c 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/tools/modifiers/ModFlux.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.ArrayList; diff --git a/src/main/java/tconstruct/modifiers/tools/ModInteger.java b/src/main/java/tconstruct/tools/modifiers/ModInteger.java similarity index 97% rename from src/main/java/tconstruct/modifiers/tools/ModInteger.java rename to src/main/java/tconstruct/tools/modifiers/ModInteger.java index 667a3b16..0eeb5c92 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModInteger.java +++ b/src/main/java/tconstruct/tools/modifiers/ModInteger.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/tools/modifiers/ModLapis.java similarity index 99% rename from src/main/java/tconstruct/modifiers/tools/ModLapis.java rename to src/main/java/tconstruct/tools/modifiers/ModLapis.java index a157d40f..efa6a8f7 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/tools/modifiers/ModLapis.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.Arrays; import java.util.Iterator; diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/tools/modifiers/ModPiston.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModPiston.java rename to src/main/java/tconstruct/tools/modifiers/ModPiston.java index 0a474340..09814368 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/tools/modifiers/ModPiston.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/tools/ModPotion.java b/src/main/java/tconstruct/tools/modifiers/ModPotion.java similarity index 95% rename from src/main/java/tconstruct/modifiers/tools/ModPotion.java rename to src/main/java/tconstruct/tools/modifiers/ModPotion.java index 52364702..30fa4e61 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPotion.java +++ b/src/main/java/tconstruct/tools/modifiers/ModPotion.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/tools/modifiers/ModRedstone.java similarity index 99% rename from src/main/java/tconstruct/modifiers/tools/ModRedstone.java rename to src/main/java/tconstruct/tools/modifiers/ModRedstone.java index 1c8f492b..be5be2e7 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/tools/modifiers/ModRedstone.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/tconstruct/modifiers/tools/ModReinforced.java b/src/main/java/tconstruct/tools/modifiers/ModReinforced.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModReinforced.java rename to src/main/java/tconstruct/tools/modifiers/ModReinforced.java index d463850d..bfa87b4b 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModReinforced.java +++ b/src/main/java/tconstruct/tools/modifiers/ModReinforced.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModRepair.java b/src/main/java/tconstruct/tools/modifiers/ModRepair.java similarity index 99% rename from src/main/java/tconstruct/modifiers/tools/ModRepair.java rename to src/main/java/tconstruct/tools/modifiers/ModRepair.java index 9edc05b5..a24d61e0 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRepair.java +++ b/src/main/java/tconstruct/tools/modifiers/ModRepair.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModSmite.java b/src/main/java/tconstruct/tools/modifiers/ModSmite.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ModSmite.java rename to src/main/java/tconstruct/tools/modifiers/ModSmite.java index 63d9a220..18c831ae 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModSmite.java +++ b/src/main/java/tconstruct/tools/modifiers/ModSmite.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/modifiers/TActiveOmniMod.java similarity index 95% rename from src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java rename to src/main/java/tconstruct/tools/modifiers/TActiveOmniMod.java index 076474ec..952a5ab3 100644 --- a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/tools/modifiers/TActiveOmniMod.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.Random; @@ -18,11 +18,12 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; +import tconstruct.world.TinkerWorld; public class TActiveOmniMod extends ActiveToolMod { @@ -56,7 +57,7 @@ public class TActiveOmniMod extends ActiveToolMod if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) return false; - TRepo.modLapis.midStreamModify(stack, tool); + TinkerTools.modLapis.midStreamModify(stack, tool); World world = entity.worldObj; Block block = entity.worldObj.getBlock(x, y, z); @@ -151,7 +152,7 @@ public class TActiveOmniMod extends ActiveToolMod @Override public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { - TRepo.modLapis.midStreamModify(stack, tool); + TinkerTools.modLapis.midStreamModify(stack, tool); baconator(tool, stack, player, tags); return 0; } @@ -167,9 +168,9 @@ public class TActiveOmniMod extends ActiveToolMod if (random.nextInt(chance) < bacon) { if (entity instanceof EntityPlayer) - AbilityHelper.spawnItemAtPlayer((EntityPlayer) entity, new ItemStack(TRepo.strangeFood, 1, 2)); + AbilityHelper.spawnItemAtPlayer((EntityPlayer) entity, new ItemStack(TinkerWorld.strangeFood, 1, 2)); else - AbilityHelper.spawnItemAtEntity(entity, new ItemStack(TRepo.strangeFood, 1, 2), 0); + AbilityHelper.spawnItemAtEntity(entity, new ItemStack(TinkerWorld.strangeFood, 1, 2), 0); } } @@ -182,7 +183,7 @@ public class TActiveOmniMod extends ActiveToolMod EnumCreatureAttribute attribute = ((EntityLivingBase) entity).getCreatureAttribute(); if (attribute == EnumCreatureAttribute.UNDEAD) { - if (tool == TRepo.hammer) + if (tool == TinkerTools.hammer) { int level = 2; bonus += random.nextInt(level * 2 + 1) + level * 2; @@ -222,7 +223,7 @@ public class TActiveOmniMod extends ActiveToolMod @Override public boolean doesCriticalHit (ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { - if (tool == TRepo.cutlass && random.nextInt(10) == 0) + if (tool == TinkerTools.cutlass && random.nextInt(10) == 0) return true; return false; } diff --git a/src/main/java/tconstruct/modifiers/tools/ToolModTypeFilter.java b/src/main/java/tconstruct/tools/modifiers/ToolModTypeFilter.java similarity index 98% rename from src/main/java/tconstruct/modifiers/tools/ToolModTypeFilter.java rename to src/main/java/tconstruct/tools/modifiers/ToolModTypeFilter.java index 26546821..95470301 100644 --- a/src/main/java/tconstruct/modifiers/tools/ToolModTypeFilter.java +++ b/src/main/java/tconstruct/tools/modifiers/ToolModTypeFilter.java @@ -1,4 +1,4 @@ -package tconstruct.modifiers.tools; +package tconstruct.tools.modifiers; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/util/CraftingRecipeHelper.java b/src/main/java/tconstruct/util/CraftingRecipeHelper.java new file mode 100644 index 00000000..aa19f8ee --- /dev/null +++ b/src/main/java/tconstruct/util/CraftingRecipeHelper.java @@ -0,0 +1,147 @@ +package tconstruct.util; + +import java.util.HashMap; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; + +public class CraftingRecipeHelper +{ + public static void removeShapedRecipes (List removelist) + { + for (ItemStack stack : removelist) + removeShapedRecipe(stack); + } + + public static void removeAnyRecipe (ItemStack resultItem) + { + List recipes = CraftingManager.getInstance().getRecipeList(); + for (int i = 0; i < recipes.size(); i++) + { + IRecipe tmpRecipe = recipes.get(i); + ItemStack recipeResult = tmpRecipe.getRecipeOutput(); + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) + { + recipes.remove(i--); + } + } + } + + public static void removeShapedRecipe (ItemStack resultItem) + { + List recipes = CraftingManager.getInstance().getRecipeList(); + for (int i = 0; i < recipes.size(); i++) + { + IRecipe tmpRecipe = recipes.get(i); + if (tmpRecipe instanceof ShapedRecipes) + { + ShapedRecipes recipe = (ShapedRecipes) tmpRecipe; + ItemStack recipeResult = recipe.getRecipeOutput(); + + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) + { + recipes.remove(i--); + } + } + } + } + + public static void removeShapelessRecipe (ItemStack resultItem) + { + List recipes = CraftingManager.getInstance().getRecipeList(); + for (int i = 0; i < recipes.size(); i++) + { + IRecipe tmpRecipe = recipes.get(i); + if (tmpRecipe instanceof ShapelessRecipes) + { + ShapelessRecipes recipe = (ShapelessRecipes) tmpRecipe; + ItemStack recipeResult = recipe.getRecipeOutput(); + + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) + { + recipes.remove(i--); + } + } + } + } + + + public static void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray) + { + String var3 = ""; + int var4 = 0; + int var5 = 0; + int var6 = 0; + + if (objArray[var4] instanceof String[]) + { + String[] var7 = ((String[]) objArray[var4++]); + + for (int var8 = 0; var8 < var7.length; ++var8) + { + String var9 = var7[var8]; + ++var6; + var5 = var9.length(); + var3 = var3 + var9; + } + } + else + { + while (objArray[var4] instanceof String) + { + String var11 = (String) objArray[var4++]; + ++var6; + var5 = var11.length(); + var3 = var3 + var11; + } + } + + HashMap var12; + + for (var12 = new HashMap(); var4 < objArray.length; var4 += 2) + { + Character var13 = (Character) objArray[var4]; + ItemStack var14 = null; + + if (objArray[var4 + 1] instanceof Item) + { + var14 = new ItemStack((Item) objArray[var4 + 1]); + } + else if (objArray[var4 + 1] instanceof Block) + { + var14 = new ItemStack((Block) objArray[var4 + 1], 1, Short.MAX_VALUE); + } + else if (objArray[var4 + 1] instanceof ItemStack) + { + var14 = (ItemStack) objArray[var4 + 1]; + } + + var12.put(var13, var14); + } + + ItemStack[] var15 = new ItemStack[var5 * var6]; + + for (int var16 = 0; var16 < var5 * var6; ++var16) + { + char var10 = var3.charAt(var16); + + if (var12.containsKey(Character.valueOf(var10))) + { + var15[var16] = ((ItemStack) var12.get(Character.valueOf(var10))).copy(); + } + else + { + var15[var16] = null; + } + } + + ShapedRecipes var17 = new ShapedRecipes(var5, var6, var15, itemstack); + recipeList.add(0, var17); + } +} diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java new file mode 100644 index 00000000..e9a1a335 --- /dev/null +++ b/src/main/java/tconstruct/util/ItemHelper.java @@ -0,0 +1,33 @@ +package tconstruct.util; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.ShapedRecipes; +import tconstruct.TConstruct; + +public class ItemHelper +{ + public static Object getStaticItem (String name, String classPackage) + { + try + { + Class clazz = Class.forName(classPackage); + Field field = clazz.getDeclaredField(name); + Object ret = field.get(null); + if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) + return ret; + return null; + } + catch (Exception e) + { + TConstruct.logger.warn("Could not find " + name + "from " + classPackage); + return null; + } + } + +} diff --git a/src/main/java/tconstruct/util/RecipeRemover.java b/src/main/java/tconstruct/util/RecipeRemover.java deleted file mode 100644 index 23817bd9..00000000 --- a/src/main/java/tconstruct/util/RecipeRemover.java +++ /dev/null @@ -1,70 +0,0 @@ -package tconstruct.util; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; - -public class RecipeRemover -{ - public static void removeShapedRecipes (List removelist) - { - for (ItemStack stack : removelist) - removeShapedRecipe(stack); - } - - public static void removeAnyRecipe (ItemStack resultItem) - { - List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { - IRecipe tmpRecipe = recipes.get(i); - ItemStack recipeResult = tmpRecipe.getRecipeOutput(); - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { - recipes.remove(i--); - } - } - } - - public static void removeShapedRecipe (ItemStack resultItem) - { - List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { - IRecipe tmpRecipe = recipes.get(i); - if (tmpRecipe instanceof ShapedRecipes) - { - ShapedRecipes recipe = (ShapedRecipes) tmpRecipe; - ItemStack recipeResult = recipe.getRecipeOutput(); - - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { - recipes.remove(i--); - } - } - } - } - - public static void removeShapelessRecipe (ItemStack resultItem) - { - List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { - IRecipe tmpRecipe = recipes.get(i); - if (tmpRecipe instanceof ShapelessRecipes) - { - ShapelessRecipes recipe = (ShapelessRecipes) tmpRecipe; - ItemStack recipeResult = recipe.getRecipeOutput(); - - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { - recipes.remove(i--); - } - } - } - } -} diff --git a/src/main/java/tconstruct/util/TCraftingHandler.java b/src/main/java/tconstruct/util/TCraftingHandler.java index 7e479161..c7bfc0f0 100644 --- a/src/main/java/tconstruct/util/TCraftingHandler.java +++ b/src/main/java/tconstruct/util/TCraftingHandler.java @@ -5,8 +5,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; -import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.tools.TinkerTools; import tconstruct.util.player.TPlayerStats; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; @@ -22,31 +23,31 @@ public class TCraftingHandler // implements ICraftingHandler Item item = event.crafting.getItem(); if (!event.player.worldObj.isRemote) { - if (item == Item.getItemFromBlock(TRepo.toolStationWood)) + if (item == Item.getItemFromBlock(TinkerTools.toolStationWood)) { TPlayerStats stats = TPlayerStats.get(event.player); if (!stats.materialManual) { stats.materialManual = true; - AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TRepo.manualBook, 1, 1)); + AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TinkerTools.manualBook, 1, 1)); } } - if (item == Item.getItemFromBlock(TRepo.smeltery) || item == Item.getItemFromBlock(TRepo.lavaTank)) + if (item == Item.getItemFromBlock(TinkerSmeltery.smeltery) || item == Item.getItemFromBlock(TinkerSmeltery.lavaTank)) { TPlayerStats stats = TPlayerStats.get(event.player); if (!stats.smelteryManual) { stats.smelteryManual = true; - AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TRepo.manualBook, 1, 2)); + AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TinkerTools.manualBook, 1, 2)); } event.player.addStat(TAchievements.achievements.get("tconstruct:smelteryMaker"), 1); } - if (item == Item.getItemFromBlock(TRepo.craftingStationWood)) + if (item == Item.getItemFromBlock(TinkerTools.craftingStationWood)) { event.player.addStat(TAchievements.achievements.get("tconstruct:betterCrafting"), 1); } - else if (item == TRepo.blankPattern) + else if (item == TinkerTools.blankPattern) { event.player.addStat(TAchievements.achievements.get("tconstruct:pattern"), 1); } diff --git a/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java b/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java index b51d4c93..9fa7f46c 100644 --- a/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java +++ b/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java @@ -7,7 +7,7 @@ import net.minecraft.dispenser.IPosition; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import tconstruct.entity.projectile.ArrowEntity; +import tconstruct.tools.entity.ArrowEntity; public class TDispenserBehaviorArrow extends BehaviorDefaultDispenseItem { diff --git a/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java index cb604c43..d1eea78d 100644 --- a/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java @@ -6,7 +6,7 @@ import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import tconstruct.items.TitleIcon; +import tconstruct.tools.items.TitleIcon; public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem { diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 3dce4910..37a3f288 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -52,10 +52,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; -import tconstruct.blocks.LiquidMetalFinite; -import tconstruct.blocks.TankAirBlock; -import tconstruct.common.TRepo; -import tconstruct.entity.BlueSlime; +import tconstruct.armor.TinkerArmor; import tconstruct.items.tools.FryingPan; import tconstruct.library.TConstructRegistry; import tconstruct.library.event.PartBuilderEvent; @@ -66,9 +63,15 @@ import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.Weapon; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.blocks.LiquidMetalFinite; +import tconstruct.smeltery.blocks.TankAirBlock; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import tconstruct.util.player.ArmorExtended; import tconstruct.util.player.TPlayerStats; +import tconstruct.world.TinkerWorld; +import tconstruct.world.entity.BlueSlime; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -82,7 +85,7 @@ public class TEventHandler public void craftTool (ToolCraftEvent.NormalTool event) { NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool"); - if (PHConstruct.denyMattock && event.tool == TRepo.mattock) + if (PHConstruct.denyMattock && event.tool == TinkerTools.mattock) { int head = toolTag.getInteger("Head"); int handle = toolTag.getInteger("Handle"); @@ -118,7 +121,7 @@ public class TEventHandler toolTag.setInteger("Modifiers", modifiers); } - if (event.tool == TRepo.shortbow) + if (event.tool == TinkerTools.shortbow) { BowMaterial top = TConstructRegistry.getBowMaterial(toolTag.getInteger("Head")); BowMaterial bottom = TConstructRegistry.getBowMaterial(toolTag.getInteger("Accessory")); @@ -146,7 +149,7 @@ public class TEventHandler } } - if (event.tool == TRepo.arrow) + if (event.tool == TinkerTools.arrow) { ArrowMaterial head = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Head")); ArrowMaterial shaft = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Handle")); @@ -169,7 +172,7 @@ public class TEventHandler } } - if (event.tool == TRepo.battlesign) + if (event.tool == TinkerTools.battlesign) { int modifiers = toolTag.getInteger("Modifiers"); modifiers += 1; @@ -191,7 +194,7 @@ public class TEventHandler @SubscribeEvent public void craftPart (PartBuilderEvent.NormalPart event) { - if (event.pattern.getItem() == TRepo.woodPattern && event.pattern.getItemDamage() == 23) + if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 23) { ItemStack result = craftBowString(event.material); if (result != null) @@ -200,7 +203,7 @@ public class TEventHandler } } - if (event.pattern.getItem() == TRepo.woodPattern && event.pattern.getItemDamage() == 24) + if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 24) { ItemStack result = craftFletching(event.material); if (result != null) @@ -262,11 +265,11 @@ public class TEventHandler if (stack != null && player.isUsingItem()) { Item item = stack.getItem(); - if (item == TRepo.cutlass) + if (item == TinkerTools.cutlass) { player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 3 * 20, 1)); } - else if (item == TRepo.battlesign) + else if (item == TinkerTools.battlesign) { event.ammount *= 1.5; //Puts battlesign blocking at 3/4 instead of 1/2 } @@ -300,7 +303,7 @@ public class TEventHandler EntityPlayer player = (EntityPlayer) event.entityLiving; //Cutlass ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.getItem() == TRepo.battlesign && player.isUsingItem()) + if (stack != null && stack.getItem() == TinkerTools.battlesign && player.isUsingItem()) { DamageSource source = event.source; if (!source.isUnblockable() && !source.isMagicDamage() && !source.isExplosion()) @@ -389,7 +392,7 @@ public class TEventHandler int count = event.entityLiving instanceof EntityDragon ? 5 : 1; for (int i = 0; i < count; i++) { - ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1); + ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1); EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); @@ -398,7 +401,7 @@ public class TEventHandler if (event.entityLiving instanceof IBossDisplayData) { - ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 3); + ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 3); EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); @@ -441,7 +444,7 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TRepo.cleaver) + if (stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 10) { @@ -451,7 +454,7 @@ public class TEventHandler } if (enemy.getSkeletonType() == 1 && random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0) { - addDrops(event, new ItemStack(TRepo.materials, 1, 8)); + addDrops(event, new ItemStack(TinkerTools.materials, 1, 8)); } } @@ -467,7 +470,7 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack != null && stack.hasTagCompound() && stack.getItem() == TRepo.cleaver) + if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 10) { @@ -475,7 +478,7 @@ public class TEventHandler } } - if (stack != null && stack.hasTagCompound() && stack.getItem() == TRepo.cleaver && random.nextInt(100) < 10) //Swap out for real beheading + if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver && random.nextInt(100) < 10) //Swap out for real beheading { addDrops(event, new ItemStack(Items.skull, 1, 2)); } @@ -494,7 +497,7 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TRepo.cleaver) + if (stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 5) { @@ -544,7 +547,7 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TRepo.cleaver) + if (stack.getItem() == TinkerTools.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 50) { @@ -622,9 +625,9 @@ public class TEventHandler { if (!event.world.isRemote) { - if (event.block == TRepo.slimeSapling) + if (event.block == TinkerWorld.slimeSapling) { - if (TRepo.slimeSapling.boneFertilize(event.world, event.x, event.y, event.z, event.world.rand, event.entityPlayer)) + if (TinkerWorld.slimeSapling.boneFertilize(event.world, event.x, event.y, event.z, event.world.rand, event.entityPlayer)) event.setResult(Event.Result.ALLOW); } } @@ -637,12 +640,12 @@ public class TEventHandler if (evt.Name == "crystalQuartz") { - TRepo.modAttack.addStackToMatchList(evt.Ore, 2); + TinkerTools.modAttack.addStackToMatchList(evt.Ore, 2); } else if (evt.Name == "crystalCerusQuartz") { - TRepo.modAttack.addStackToMatchList(evt.Ore, 24); + TinkerTools.modAttack.addStackToMatchList(evt.Ore, 24); } } @@ -661,9 +664,9 @@ public class TEventHandler } Block bID = evt.world.getBlock(hitX, hitY, hitZ); - for (int id = 0; id < TRepo.fluidBlocks.length; id++) + for (int id = 0; id < TinkerSmeltery.fluidBlocks.length; id++) { - if (bID == TRepo.fluidBlocks[id]) + if (bID == TinkerSmeltery.fluidBlocks[id]) { if (evt.entityPlayer.capabilities.isCreativeMode) { @@ -671,7 +674,7 @@ public class TEventHandler } else { - if (TRepo.fluidBlocks[id] instanceof LiquidMetalFinite) + if (TinkerSmeltery.fluidBlocks[id] instanceof LiquidMetalFinite) { WorldHelper.setBlockToAir(evt.world, hitX, hitY, hitZ); /* @@ -701,7 +704,7 @@ public class TEventHandler } evt.setResult(Result.ALLOW); - evt.result = new ItemStack(TRepo.buckets, 1, id); + evt.result = new ItemStack(TinkerSmeltery.buckets, 1, id); } } } diff --git a/src/main/java/tconstruct/util/TEventHandlerAchievement.java b/src/main/java/tconstruct/util/TEventHandlerAchievement.java index c40485e7..1fb72e9c 100644 --- a/src/main/java/tconstruct/util/TEventHandlerAchievement.java +++ b/src/main/java/tconstruct/util/TEventHandlerAchievement.java @@ -1,16 +1,12 @@ package tconstruct.util; -import tconstruct.common.TRepo; - -import mantle.event.ManualOpenEvent; - import net.minecraftforge.common.util.FakePlayer; import tconstruct.achievements.TAchievements; -import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.library.event.SmelteryEvent; import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.Weapon; +import tconstruct.tools.logic.ToolForgeLogic; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TEventHandlerAchievement diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 104eab6c..f3238f4f 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -4,8 +4,8 @@ import java.io.File; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.common.Loader; public class PHConstruct @@ -20,7 +20,7 @@ public class PHConstruct config.load(); superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false); - TRepo.supressMissingToolLogs = config.get("Logging", "Disable tool build messages", false).getBoolean(false); + TinkerTools.supressMissingToolLogs = config.get("Logging", "Disable tool build messages", false).getBoolean(false); keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true); @@ -41,7 +41,6 @@ public class PHConstruct lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true).getBoolean(true); removeVanillaToolRecipes = config.get("Difficulty Changes", "Remove Vanilla Tool Recipes", false).getBoolean(false); labotimizeVanillaTools = config.get("Difficulty Changes", "Remove Vanilla Tool Effectiveness", false).getBoolean(false); - stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); craftEndstone = config.get("Difficulty Changes", "Allow creation of endstone", true).getBoolean(true); @@ -281,7 +280,6 @@ public class PHConstruct public static boolean vanillaMetalBlocks; public static boolean removeVanillaToolRecipes; public static boolean labotimizeVanillaTools; - public static boolean stencilTableCrafting; public static boolean miningLevelIncrease; public static boolean denyMattock; diff --git a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java b/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java index b5753be5..48300d87 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java +++ b/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java @@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; import tconstruct.TConstruct; -import tconstruct.blocks.logic.SmelteryLogic; +import tconstruct.smeltery.logic.SmelteryLogic; public class PacketSmeltery extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java b/src/main/java/tconstruct/util/network/packet/PacketToolStation.java index 6960cb88..e528f310 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java +++ b/src/main/java/tconstruct/util/network/packet/PacketToolStation.java @@ -6,8 +6,8 @@ import mantle.common.network.AbstractPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; import cpw.mods.fml.common.network.ByteBufUtils; public class PacketToolStation extends AbstractPacket diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index 544326b9..caae5490 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -18,9 +18,8 @@ import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.player.PlayerDropsEvent; -import tconstruct.common.TContent; -import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; @@ -83,7 +82,7 @@ public class TPlayerHandler stats.battlesignBonus = true; if (PHConstruct.beginnerBook) { - ItemStack diary = new ItemStack(TRepo.manualBook); + ItemStack diary = new ItemStack(TinkerTools.manualBook); if (!entityplayer.inventory.addItemStackToInventory(diary)) { AbilityHelper.spawnItemAtPlayer(entityplayer, diary); @@ -92,7 +91,7 @@ public class TPlayerHandler if (entityplayer.getDisplayName().toLowerCase().equals("fudgy_fetus")) { - ItemStack pattern = new ItemStack(TRepo.woodPattern, 1, 22); + ItemStack pattern = new ItemStack(TinkerTools.woodPattern, 1, 22); NBTTagCompound compound = new NBTTagCompound(); compound.setTag("display", new NBTTagCompound()); @@ -130,7 +129,7 @@ public class TPlayerHandler if (!stats.battlesignBonus) { stats.battlesignBonus = true; - ItemStack modifier = new ItemStack(TRepo.creativeModifier); + ItemStack modifier = new ItemStack(TinkerTools.creativeModifier); NBTTagCompound compound = new NBTTagCompound(); compound.setTag("display", new NBTTagCompound()); @@ -138,7 +137,7 @@ public class TPlayerHandler list.appendTag(new NBTTagString("Battlesigns were buffed recently.")); list.appendTag(new NBTTagString("This might make up for it.")); compound.getCompoundTag("display").setTag("Lore", list); - compound.setString("TargetLock", TRepo.battlesign.getToolName()); + compound.setString("TargetLock", TinkerTools.battlesign.getToolName()); modifier.setTagCompound(compound); AbilityHelper.spawnItemAtPlayer(entityplayer, modifier); @@ -164,7 +163,7 @@ public class TPlayerHandler void spawnPigmanModifier (EntityPlayer entityplayer) { - ItemStack modifier = new ItemStack(TRepo.creativeModifier); + ItemStack modifier = new ItemStack(TinkerTools.creativeModifier); NBTTagCompound compound = new NBTTagCompound(); compound.setTag("display", new NBTTagCompound()); @@ -173,7 +172,7 @@ public class TPlayerHandler list.appendTag(new NBTTagString("Zombie Pigmen seem to have a natural affinty")); list.appendTag(new NBTTagString("for these types of weapons.")); compound.getCompoundTag("display").setTag("Lore", list); - compound.setString("TargetLock", TRepo.battlesign.getToolName()); + compound.setString("TargetLock", TinkerTools.battlesign.getToolName()); modifier.setTagCompound(compound); AbilityHelper.spawnItemAtPlayer(entityplayer, modifier); diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java new file mode 100644 index 00000000..db1b4d7e --- /dev/null +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -0,0 +1,691 @@ +package tconstruct.world; + +import java.util.HashMap; + +import mantle.utils.RecipeRemover; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDispenser; +import net.minecraft.block.Block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.stats.Achievement; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; +import tconstruct.TConstruct; +import tconstruct.achievements.TAchievements; +import tconstruct.armor.TinkerArmor; +import tconstruct.blocks.SlabBase; +import tconstruct.blocks.logic.DryingRackLogic; +import tconstruct.blocks.slime.SlimeFluid; +import tconstruct.blocks.slime.SlimeGel; +import tconstruct.blocks.slime.SlimeGrass; +import tconstruct.blocks.slime.SlimeLeaves; +import tconstruct.blocks.slime.SlimeSapling; +import tconstruct.blocks.slime.SlimeTallGrass; +import tconstruct.blocks.traps.BarricadeBlock; +import tconstruct.blocks.traps.Punji; +import tconstruct.client.StepSoundSlime; +import tconstruct.common.itemblocks.MetadataItemBlock; +import tconstruct.library.TConstructRegistry; +import tconstruct.mechworks.blocks.BlockLandmine; +import tconstruct.mechworks.entity.item.EntityLandmineFirework; +import tconstruct.mechworks.entity.item.ExplosivePrimed; +import tconstruct.mechworks.itemblocks.ItemBlockLandmine; +import tconstruct.mechworks.logic.TileEntityLandmine; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.blocks.MetalOre; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.blocks.MultiBrick; +import tconstruct.tools.blocks.MultiBrickFancy; +import tconstruct.tools.entity.ArrowEntity; +import tconstruct.tools.entity.DaggerEntity; +import tconstruct.tools.entity.FancyEntityItem; +import tconstruct.tools.entity.LaunchedPotion; +import tconstruct.tools.itemblocks.MultiBrickFancyItem; +import tconstruct.tools.itemblocks.MultiBrickItem; +import tconstruct.util.TDispenserBehaviorArrow; +import tconstruct.util.TDispenserBehaviorSpawnEgg; +import tconstruct.world.blocks.ConveyorBase; +import tconstruct.world.blocks.GravelOre; +import tconstruct.world.blocks.MeatBlock; +import tconstruct.world.blocks.OreberryBush; +import tconstruct.world.blocks.OreberryBushEssence; +import tconstruct.world.blocks.SlimeExplosive; +import tconstruct.world.blocks.SlimePad; +import tconstruct.world.blocks.StoneLadder; +import tconstruct.world.blocks.StoneTorch; +import tconstruct.world.blocks.WoodRail; +import tconstruct.world.entity.BlueSlime; +import tconstruct.world.entity.Crystal; +import tconstruct.world.itemblocks.BarricadeItem; +import tconstruct.world.itemblocks.GravelOreItem; +import tconstruct.world.itemblocks.HamboneItemBlock; +import tconstruct.world.itemblocks.MetalOreItemBlock; +import tconstruct.world.itemblocks.OreberryBushItem; +import tconstruct.world.itemblocks.OreberryBushSecondItem; +import tconstruct.world.itemblocks.SlimeGelItemBlock; +import tconstruct.world.itemblocks.SlimeGrassItemBlock; +import tconstruct.world.itemblocks.SlimeLeavesItemBlock; +import tconstruct.world.itemblocks.SlimeSaplingItemBlock; +import tconstruct.world.itemblocks.SlimeTallGrassItem; +import tconstruct.world.itemblocks.WoolSlab1Item; +import tconstruct.world.itemblocks.WoolSlab2Item; +import tconstruct.world.items.OreBerries; +import tconstruct.world.items.StrangeFood; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; + +@Mod(modid = "TinkerWorld", name = "TinkerWorld", version = "${tinkerworldversion}") +public class TinkerWorld +{ + @Instance("TinkerArmor") + public static TinkerWorld instance; + public static Item strangeFood; + // Decoration + public static Block stoneTorch; + public static Block stoneLadder; + public static Block meatBlock; + public static Block woolSlab1; + public static Block woolSlab2; + public static Block barricadeOak; + public static Block barricadeSpruce; + public static Block barricadeBirch; + public static Block barricadeJungle; + public static Block slimeExplosive; + public static Fluid blueSlimeFluid; + // Slime + public static SoundType slimeStep; + public static Block slimePool; + public static Block slimeGel; + public static Block slimeGrass; + public static Block slimeTallGrass; + public static SlimeLeaves slimeLeaves; + public static SlimeSapling slimeSapling; + public static Block slimeChannel; + public static Block slimePad; + public static Block bloodChannel; + // Ores + public static Block oreSlag; + public static Block oreGravel; + public static OreberryBush oreBerry; + public static OreberryBush oreBerrySecond; + public static Item oreBerries; + // Rail-related + public static Block woodenRail; + // Chest hooks + public static ChestGenHooks tinkerHouseChest; + public static ChestGenHooks tinkerHousePatterns; + // Traps + public static Block landmine; + public static Block punji; + + @EventHandler + public void preInit (FMLPreInitializationEvent event) + { + //Blocks + TinkerWorld.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock"); + TinkerWorld.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth"); + TinkerWorld.woolSlab1.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations); + TinkerWorld.woolSlab2 = new SlabBase(Material.cloth, Blocks.wool, 8, 8).setBlockName("cloth"); + TinkerWorld.woolSlab2.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations); + // Traps + TinkerWorld.landmine = new BlockLandmine().setHardness(0.5F).setResistance(0F).setStepSound(Block.soundTypeMetal).setCreativeTab(CreativeTabs.tabRedstone).setBlockName("landmine"); + TinkerWorld.punji = new Punji().setBlockName("trap.punji"); + TinkerWorld.barricadeOak = new BarricadeBlock(Blocks.log, 0).setBlockName("trap.barricade.oak"); + TinkerWorld.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).setBlockName("trap.barricade.spruce"); + TinkerWorld.barricadeBirch = new BarricadeBlock(Blocks.log, 2).setBlockName("trap.barricade.birch"); + TinkerWorld.barricadeJungle = new BarricadeBlock(Blocks.log, 3).setBlockName("trap.barricade.jungle"); + TinkerWorld.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundTypeGrass).setBlockName("explosive.slime"); + + // Slime + TinkerWorld.slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); + + TinkerWorld.blueSlimeFluid = new Fluid("slime.blue"); + if (!FluidRegistry.registerFluid(TinkerWorld.blueSlimeFluid)) + TinkerWorld.blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); + TinkerWorld.slimePool = new SlimeFluid(TinkerWorld.blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep).setBlockName("liquid.slime"); + GameRegistry.registerBlock(TinkerWorld.slimePool, "liquid.slime"); + TinkerWorld.blueSlimeFluid.setBlock(TinkerWorld.slimePool); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerWorld.blueSlimeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 24), new ItemStack(Items.bucket))); + + // Slime Islands + TinkerWorld.slimeGel = new SlimeGel().setStepSound(TinkerWorld.slimeStep).setLightOpacity(0).setBlockName("slime.gel"); + TinkerWorld.slimeGrass = new SlimeGrass().setStepSound(Block.soundTypeGrass).setLightOpacity(0).setBlockName("slime.grass"); + TinkerWorld.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall"); + TinkerWorld.slimeLeaves = (SlimeLeaves) new SlimeLeaves().setStepSound(TinkerWorld.slimeStep).setLightOpacity(0).setBlockName("slime.leaves"); + TinkerWorld.slimeSapling = (SlimeSapling) new SlimeSapling().setStepSound(TinkerWorld.slimeStep).setBlockName("slime.sapling"); + TinkerWorld.slimeChannel = new ConveyorBase(Material.water, "greencurrent").setHardness(0.3f).setStepSound(TinkerWorld.slimeStep).setBlockName("slime.channel"); + TinkerWorld.bloodChannel = new ConveyorBase(Material.water, "liquid_cow").setHardness(0.3f).setStepSound(TinkerWorld.slimeStep).setBlockName("blood.channel"); + TinkerWorld.slimePad = new SlimePad(Material.cloth).setStepSound(TinkerWorld.slimeStep).setHardness(0.3f).setBlockName("slime.pad"); + + // Decoration + TinkerWorld.stoneTorch = new StoneTorch().setBlockName("decoration.stonetorch"); + TinkerWorld.stoneLadder = new StoneLadder().setBlockName("decoration.stoneladder"); + TinkerTools.multiBrick = new MultiBrick().setBlockName("Decoration.Brick"); + TinkerTools.multiBrickFancy = new MultiBrickFancy().setBlockName("Decoration.BrickFancy"); + + // Ores + String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; + TinkerWorld.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setBlockName("ore.berries.one"); + String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; + TinkerWorld.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setBlockName("ore.berries.two"); + + String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; + TinkerWorld.oreSlag = new MetalOre(Material.rock, 10.0F, oreTypes).setBlockName("tconstruct.stoneore"); + TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 4, 1); + TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 4, 2); + TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 1, 3); + TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 1, 4); + TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 1, 5); + + TinkerWorld.oreGravel = new GravelOre().setBlockName("GravelOre").setBlockName("tconstruct.gravelore"); + TinkerWorld.oreGravel.setHarvestLevel("shovel", 1, 0); + TinkerWorld.oreGravel.setHarvestLevel("shovel", 2, 1); + TinkerWorld.oreGravel.setHarvestLevel("shovel", 1, 2); + TinkerWorld.oreGravel.setHarvestLevel("shovel", 1, 3); + TinkerWorld.oreGravel.setHarvestLevel("shovel", 1, 4); + TinkerWorld.oreGravel.setHarvestLevel("shovel", 4, 5); + // Rail + TinkerWorld.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood).setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood"); + + GameRegistry.registerBlock(TinkerWorld.meatBlock, HamboneItemBlock.class, "MeatBlock"); + GameRegistry.registerBlock(TinkerWorld.woolSlab1, WoolSlab1Item.class, "WoolSlab1"); + GameRegistry.registerBlock(TinkerWorld.woolSlab2, WoolSlab2Item.class, "WoolSlab2"); + + // Traps + GameRegistry.registerBlock(TinkerWorld.landmine, ItemBlockLandmine.class, "Redstone.Landmine"); + GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); + GameRegistry.registerBlock(TinkerWorld.punji, "trap.punji"); + GameRegistry.registerBlock(TinkerWorld.barricadeOak, BarricadeItem.class, "trap.barricade.oak"); + GameRegistry.registerBlock(TinkerWorld.barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce"); + GameRegistry.registerBlock(TinkerWorld.barricadeBirch, BarricadeItem.class, "trap.barricade.birch"); + GameRegistry.registerBlock(TinkerWorld.barricadeJungle, BarricadeItem.class, "trap.barricade.jungle"); + GameRegistry.registerBlock(TinkerWorld.slimeExplosive, MetadataItemBlock.class, "explosive.slime"); + + GameRegistry.registerBlock(TinkerArmor.dryingRack, "Armor.DryingRack"); + GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack"); + // fluids + + // Slime Islands + GameRegistry.registerBlock(TinkerWorld.slimeGel, SlimeGelItemBlock.class, "slime.gel"); + GameRegistry.registerBlock(TinkerWorld.slimeGrass, SlimeGrassItemBlock.class, "slime.grass"); + GameRegistry.registerBlock(TinkerWorld.slimeTallGrass, SlimeTallGrassItem.class, "slime.grass.tall"); + GameRegistry.registerBlock(TinkerWorld.slimeLeaves, SlimeLeavesItemBlock.class, "slime.leaves"); + GameRegistry.registerBlock(TinkerWorld.slimeSapling, SlimeSaplingItemBlock.class, "slime.sapling"); + GameRegistry.registerBlock(TinkerWorld.slimeChannel, "slime.channel"); + GameRegistry.registerBlock(TinkerWorld.bloodChannel, "blood.channel"); + GameRegistry.registerBlock(TinkerWorld.slimePad, "slime.pad"); + // TODO fix this + /* + * TConstructRegistry.drawbridgeState[TRepo.slimePad] = 1; + * TConstructRegistry.drawbridgeState[TRepo.bloodChannel] = 1; + */ + + // Decoration + GameRegistry.registerBlock(TinkerWorld.stoneTorch, "decoration.stonetorch"); + GameRegistry.registerBlock(TinkerWorld.stoneLadder, "decoration.stoneladder"); + GameRegistry.registerBlock(TinkerTools.multiBrick, MultiBrickItem.class, "decoration.multibrick"); + GameRegistry.registerBlock(TinkerTools.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); + + // Ores + GameRegistry.registerBlock(TinkerWorld.oreBerry, OreberryBushItem.class, "ore.berries.one"); + GameRegistry.registerBlock(TinkerWorld.oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two"); + GameRegistry.registerBlock(TinkerWorld.oreSlag, MetalOreItemBlock.class, "SearedBrick"); + GameRegistry.registerBlock(TinkerWorld.oreGravel, GravelOreItem.class, "GravelOre"); + + // Rail + GameRegistry.registerBlock(TinkerWorld.woodenRail, "rail.wood"); + + //Items + + TinkerWorld.strangeFood = new StrangeFood().setUnlocalizedName("tconstruct.strangefood"); + TinkerWorld.oreBerries = new OreBerries().setUnlocalizedName("oreberry"); + GameRegistry.registerItem(TinkerWorld.strangeFood, "strangeFood"); + GameRegistry.registerItem(TinkerWorld.oreBerries, "oreBerries"); + String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence" }; + + for (int i = 0; i < oreberries.length; i++) + { + TConstructRegistry.addItemStackToDirectory("oreberry" + oreberries[i], new ItemStack(TinkerWorld.oreBerries, 1, i)); + } + TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(TinkerWorld.strangeFood, 1, 0)); + + // Vanilla stack sizes + Items.wooden_door.setMaxStackSize(16); + Items.iron_door.setMaxStackSize(16); + Items.boat.setMaxStackSize(16); + Items.minecart.setMaxStackSize(3); + // Items.minecartEmpty.setMaxStackSize(3); + // Items.minecartCrate.setMaxStackSize(3); + // Items.minecartPowered.setMaxStackSize(3); + Items.cake.setMaxStackSize(16); + // Block.torchWood.setTickRandomly(false); + } + + @EventHandler + public void init (FMLInitializationEvent event) + { + craftingTableRecipes(); + addRecipesForFurnace(); + oreRegistry(); + addLoot(); + createEntities(); + } + + @EventHandler + public void postInit (FMLPostInitializationEvent evt) + { + + } + + public void createEntities () + { + EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true); + EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 3, TConstruct.instance, 32, 3, true); + EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 4, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(EntityLandmineFirework.class, "LandmineFirework", 5, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(ExplosivePrimed.class, "SlimeExplosive", 6, TConstruct.instance, 32, 5, true); + // EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, + // TConstruct.instance, 32, 5, true); + + EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true); + // EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, + // TConstruct.instance, 64, 5, true); + } + + private void craftingTableRecipes() + { + String[] patBlock = { "###", "###", "###" }; + String[] patSurround = { "###", "#m#", "###" }; + + // Metal conversion Recipes + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 3), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 9)); // Copper + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 5), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 10)); // Tin + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 6), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 11)); // Aluminum + // GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 6), + // patBlock, '#', new ItemStack(TRepo.materials, 1, 12)); // Aluminum + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 4), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 13)); // Bronze + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 7), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 14)); // AluBrass + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 0), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 3)); // Cobalt + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 1), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 4)); // Ardite + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 2), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 5)); // Manyullyn + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 8), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 15)); // Alumite + GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.metalBlock, 1, 9), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 16)); // Steel + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 11), "#", '#', new ItemStack(TinkerTools.materials, 1, 12)); // Aluminum raw -> + // ingot + + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 9), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 3)); // Copper + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 10), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 5)); // Tin + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 11), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 6)); // Aluminum + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 13), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 4)); // Bronze + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 14), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 7)); // AluBrass + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 3), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 0)); // Cobalt + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 4), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 1)); // Ardite + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 5), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 2)); // Manyullyn + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 15), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 8)); // Alumite + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 16), "m", 'm', new ItemStack(TinkerSmeltery.metalBlock, 1, 9)); // Steel + + GameRegistry.addRecipe(new ItemStack(Items.iron_ingot), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 19)); // Iron + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 9), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 20)); // Copper + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 10), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 21)); // Tin + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 11), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 22)); // Aluminum + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 14), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 24)); // Aluminum Brass + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 18), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 27)); // Obsidian + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 3), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 28)); // Cobalt + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 4), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 29)); // Ardite + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 5), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 30)); // Manyullyn + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 13), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 31)); // Bronze + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 15), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 32)); // Alumite + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 16), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 33)); // Steel + + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 19), "m", 'm', new ItemStack(Items.iron_ingot)); // Iron + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 20), "m", 'm', new ItemStack(TinkerTools.materials, 1, 9)); // Copper + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 21), "m", 'm', new ItemStack(TinkerTools.materials, 1, 10)); // Tin + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 22), "m", 'm', new ItemStack(TinkerTools.materials, 1, 11)); // Aluminum + // GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 22), "m", + // 'm', new ItemStack(TRepo.materials, 1, 12)); //Aluminum + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 24), "m", 'm', new ItemStack(TinkerTools.materials, 1, 14)); // Aluminum Brass + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 27), "m", 'm', new ItemStack(TinkerTools.materials, 1, 18)); // Obsidian + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 28), "m", 'm', new ItemStack(TinkerTools.materials, 1, 3)); // Cobalt + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 29), "m", 'm', new ItemStack(TinkerTools.materials, 1, 4)); // Ardite + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 30), "m", 'm', new ItemStack(TinkerTools.materials, 1, 5)); // Manyullyn + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 31), "m", 'm', new ItemStack(TinkerTools.materials, 1, 13)); // Bronze + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 32), "m", 'm', new ItemStack(TinkerTools.materials, 1, 15)); // Alumite + GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 33), "m", 'm', new ItemStack(TinkerTools.materials, 1, 16)); // Steel + + + String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", + "dyeMagenta", "dyeOrange", "dyeWhite" }; + String color = ""; + for (int i = 0; i < 16; i++) + { + color = dyeTypes[15 - i]; + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.wool, 8, i), patSurround, 'm', color, '#', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); + } + + + // Jack o'Latern Recipe - Stone Torch + GameRegistry.addRecipe(new ItemStack(Blocks.lit_pumpkin, 1, 0), "p", "s", 'p', new ItemStack(Blocks.pumpkin), 's', new ItemStack(TinkerWorld.stoneTorch)); + // Stone Torch Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.stoneTorch, 4), "p", "w", 'p', new ItemStack(Items.coal, 1, Short.MAX_VALUE), 'w', "rodStone")); + // Stone Ladder Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.stoneLadder, 3), "w w", "www", "w w", 'w', "rodStone")); + // Wooden Rail Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); + // Stonesticks Recipes + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Blocks.stone)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Blocks.cobblestone)); + // + ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14); + // Clock Recipe - Vanilla alternativ + GameRegistry.addRecipe(new ItemStack(Items.clock), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Items.redstone)); + // Gold Pressure Plate - Vanilla alternativ + GameRegistry.addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate), "ii", 'i', aluBrass); + + + // Landmine Recipes + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', Items.redstone, + 'p', Blocks.stone_pressure_plate)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.landmine, 1, 1), "mcm", "rpr", 'm', Blocks.stone, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', Items.redstone, + 'p', Blocks.stone_pressure_plate)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.landmine, 1, 2), "mcm", "rpr", 'm', Blocks.obsidian, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', + Items.redstone, 'p', Blocks.stone_pressure_plate)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.landmine, 1, 3), "mcm", "rpr", 'm', Items.repeater, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', + Items.redstone, 'p', Blocks.stone_pressure_plate)); + + // Ultra hardcore recipes + GameRegistry.addRecipe(new ItemStack(TinkerTools.goldHead), patSurround, '#', new ItemStack(Items.gold_ingot), 'm', new ItemStack(Items.skull, 1, 3)); + + + // Wool Slab Recipes + for (int sc = 0; sc <= 7; sc++) + { + GameRegistry.addRecipe(new ItemStack(TinkerWorld.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc)); + GameRegistry.addRecipe(new ItemStack(TinkerWorld.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8)); + + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc), new ItemStack(TinkerWorld.woolSlab1, 1, sc), new ItemStack(TinkerWorld.woolSlab1, 1, sc)); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc + 8), new ItemStack(TinkerWorld.woolSlab2, 1, sc), new ItemStack(TinkerWorld.woolSlab2, 1, sc)); + } + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth")); + // Trap Recipes + GameRegistry.addRecipe(new ItemStack(TinkerWorld.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds)); + GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 3)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.barricadeOak, 1, 0), "b", "b", 'b', "logWood")); + + + + // EssenceExtractor Recipe + // Slime Recipes + GameRegistry.addRecipe(new ItemStack(TinkerWorld.slimeGel, 1, 0), "##", "##", '#', TinkerWorld.strangeFood); + GameRegistry.addRecipe(new ItemStack(TinkerWorld.strangeFood, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TinkerWorld.slimeGel, 1, 1), "##", "##", '#', Items.slime_ball); + GameRegistry.addRecipe(new ItemStack(Items.slime_ball, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 1)); + // slimeExplosive + GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), Items.slime_ball, Blocks.tnt); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 2), TinkerWorld.strangeFood, Blocks.tnt); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), "slimeball", Blocks.tnt)); + + GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.slimeChannel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, Short.MAX_VALUE), new ItemStack(Items.redstone)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.bloodChannel, 1, 0), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack( + TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(Items.redstone)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeChannel, 1, 0), "slimeball", "slimeball", "slimeball", "slimeball", new ItemStack(Items.redstone))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimePad, 1, 0), TinkerWorld.slimeChannel, "slimeball")); + } + + private void addRecipesForFurnace () + { + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 3), new ItemStack(TinkerTools.craftedSoil, 1, 4), 0.2f); // Concecrated + // Soil + + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 0), new ItemStack(TinkerTools.materials, 1, 1), 2f); // Slime + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 1), new ItemStack(TinkerTools.materials, 1, 2), 2f); // Seared brick item + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 2), new ItemStack(TinkerTools.materials, 1, 17), 2f); // Blue Slime + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 6), new ItemStack(TinkerTools.materials, 1, 37), 2f); // Nether seared + // brick + + // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, + // 1, new ItemStack(TRepo.materials, 1, 3), 3f); + // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, + // 2, new ItemStack(TRepo.materials, 1, 4), 3f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreSlag, 1, 3), new ItemStack(TinkerTools.materials, 1, 9), 0.5f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreSlag, 1, 4), new ItemStack(TinkerTools.materials, 1, 10), 0.5f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreSlag, 1, 5), new ItemStack(TinkerTools.materials, 1, 11), 0.5f); + + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 0), new ItemStack(TinkerTools.materials, 1, 19), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 1), new ItemStack(Items.gold_nugget), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 2), new ItemStack(TinkerTools.materials, 1, 20), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 3), new ItemStack(TinkerTools.materials, 1, 21), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 4), new ItemStack(TinkerTools.materials, 1, 22), 0.2f); + // FurnaceRecipes.smelting().func_151394_a(new + // ItemStack(TRepo.oreBerries, 5, new ItemStack(TRepo.materials, 1, 23), + // 0.2f); + + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 0), new ItemStack(Items.iron_ingot), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 1), new ItemStack(Items.gold_ingot), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 2), new ItemStack(TinkerTools.materials, 1, 9), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 3), new ItemStack(TinkerTools.materials, 1, 10), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 4), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); + + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerSmeltery.speedBlock, 1, 0), new ItemStack(TinkerSmeltery.speedBlock, 1, 2), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 38), new ItemStack(TinkerTools.materials, 1, 4), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 39), new ItemStack(TinkerTools.materials, 1, 3), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 40), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 41), new ItemStack(TinkerTools.materials, 1, 5), 0.2f); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 42), new ItemStack(TinkerTools.materials, 1, 14), 0.2f); + + } + + public void oreRegistry () + { + OreDictionary.registerOre("oreCobalt", new ItemStack(TinkerWorld.oreSlag, 1, 1)); + OreDictionary.registerOre("oreArdite", new ItemStack(TinkerWorld.oreSlag, 1, 2)); + OreDictionary.registerOre("oreCopper", new ItemStack(TinkerWorld.oreSlag, 1, 3)); + OreDictionary.registerOre("oreTin", new ItemStack(TinkerWorld.oreSlag, 1, 4)); + OreDictionary.registerOre("oreAluminum", new ItemStack(TinkerWorld.oreSlag, 1, 5)); + OreDictionary.registerOre("oreAluminium", new ItemStack(TinkerWorld.oreSlag, 1, 5)); + + OreDictionary.registerOre("oreIron", new ItemStack(TinkerWorld.oreGravel, 1, 0)); + OreDictionary.registerOre("oreGold", new ItemStack(TinkerWorld.oreGravel, 1, 1)); + OreDictionary.registerOre("oreCobalt", new ItemStack(TinkerWorld.oreGravel, 1, 5)); + OreDictionary.registerOre("oreCopper", new ItemStack(TinkerWorld.oreGravel, 1, 2)); + OreDictionary.registerOre("oreTin", new ItemStack(TinkerWorld.oreGravel, 1, 3)); + OreDictionary.registerOre("oreAluminum", new ItemStack(TinkerWorld.oreGravel, 1, 4)); + OreDictionary.registerOre("oreAluminium", new ItemStack(TinkerWorld.oreGravel, 1, 4)); + + OreDictionary.registerOre("ingotCobalt", new ItemStack(TinkerTools.materials, 1, 3)); + OreDictionary.registerOre("ingotArdite", new ItemStack(TinkerTools.materials, 1, 4)); + OreDictionary.registerOre("ingotManyullyn", new ItemStack(TinkerTools.materials, 1, 5)); + OreDictionary.registerOre("ingotCopper", new ItemStack(TinkerTools.materials, 1, 9)); + OreDictionary.registerOre("ingotTin", new ItemStack(TinkerTools.materials, 1, 10)); + OreDictionary.registerOre("ingotAluminum", new ItemStack(TinkerTools.materials, 1, 11)); + OreDictionary.registerOre("ingotAluminium", new ItemStack(TinkerTools.materials, 1, 11)); + OreDictionary.registerOre("ingotBronze", new ItemStack(TinkerTools.materials, 1, 13)); + OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(TinkerTools.materials, 1, 14)); + OreDictionary.registerOre("ingotAluminiumBrass", new ItemStack(TinkerTools.materials, 1, 14)); + OreDictionary.registerOre("ingotAlumite", new ItemStack(TinkerTools.materials, 1, 15)); + OreDictionary.registerOre("ingotSteel", new ItemStack(TinkerTools.materials, 1, 16)); + ensureOreIsRegistered("ingotIron", new ItemStack(Items.iron_ingot)); + ensureOreIsRegistered("ingotGold", new ItemStack(Items.gold_ingot)); + OreDictionary.registerOre("ingotObsidian", new ItemStack(TinkerTools.materials, 1, 18)); + OreDictionary.registerOre("ingotPigIron", new ItemStack(TinkerTools.materials, 1, 34)); + OreDictionary.registerOre("itemRawRubber", new ItemStack(TinkerTools.materials, 1, 36)); + + OreDictionary.registerOre("blockCobalt", new ItemStack(TinkerSmeltery.metalBlock, 1, 0)); + OreDictionary.registerOre("blockArdite", new ItemStack(TinkerSmeltery.metalBlock, 1, 1)); + OreDictionary.registerOre("blockManyullyn", new ItemStack(TinkerSmeltery.metalBlock, 1, 2)); + OreDictionary.registerOre("blockCopper", new ItemStack(TinkerSmeltery.metalBlock, 1, 3)); + OreDictionary.registerOre("blockBronze", new ItemStack(TinkerSmeltery.metalBlock, 1, 4)); + OreDictionary.registerOre("blockTin", new ItemStack(TinkerSmeltery.metalBlock, 1, 5)); + OreDictionary.registerOre("blockAluminum", new ItemStack(TinkerSmeltery.metalBlock, 1, 6)); + OreDictionary.registerOre("blockAluminium", new ItemStack(TinkerSmeltery.metalBlock, 1, 6)); + OreDictionary.registerOre("blockAluminumBrass", new ItemStack(TinkerSmeltery.metalBlock, 1, 7)); + OreDictionary.registerOre("blockAluminiumBrass", new ItemStack(TinkerSmeltery.metalBlock, 1, 7)); + OreDictionary.registerOre("blockAlumite", new ItemStack(TinkerSmeltery.metalBlock, 1, 8)); + OreDictionary.registerOre("blockSteel", new ItemStack(TinkerSmeltery.metalBlock, 1, 9)); + OreDictionary.registerOre("blockEnder", new ItemStack(TinkerSmeltery.metalBlock, 1, 10)); + ensureOreIsRegistered("blockIron", new ItemStack(Blocks.iron_block)); + ensureOreIsRegistered("blockGold", new ItemStack(Blocks.gold_block)); + + OreDictionary.registerOre("nuggetIron", new ItemStack(TinkerTools.materials, 1, 19)); + OreDictionary.registerOre("nuggetIron", new ItemStack(TinkerWorld.oreBerries, 1, 0)); + OreDictionary.registerOre("nuggetCopper", new ItemStack(TinkerTools.materials, 1, 20)); + OreDictionary.registerOre("nuggetCopper", new ItemStack(TinkerWorld.oreBerries, 1, 2)); + OreDictionary.registerOre("nuggetTin", new ItemStack(TinkerTools.materials, 1, 21)); + OreDictionary.registerOre("nuggetTin", new ItemStack(TinkerWorld.oreBerries, 1, 3)); + OreDictionary.registerOre("nuggetAluminum", new ItemStack(TinkerTools.materials, 1, 22)); + OreDictionary.registerOre("nuggetAluminum", new ItemStack(TinkerWorld.oreBerries, 1, 4)); + OreDictionary.registerOre("nuggetAluminium", new ItemStack(TinkerTools.materials, 1, 22)); + OreDictionary.registerOre("nuggetAluminium", new ItemStack(TinkerWorld.oreBerries, 1, 4)); + OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(TinkerTools.materials, 1, 24)); + OreDictionary.registerOre("nuggetAluminiumBrass", new ItemStack(TinkerTools.materials, 1, 24)); + OreDictionary.registerOre("nuggetObsidian", new ItemStack(TinkerTools.materials, 1, 27)); + OreDictionary.registerOre("nuggetCobalt", new ItemStack(TinkerTools.materials, 1, 28)); + OreDictionary.registerOre("nuggetArdite", new ItemStack(TinkerTools.materials, 1, 29)); + OreDictionary.registerOre("nuggetManyullyn", new ItemStack(TinkerTools.materials, 1, 30)); + OreDictionary.registerOre("nuggetBronze", new ItemStack(TinkerTools.materials, 1, 31)); + OreDictionary.registerOre("nuggetAlumite", new ItemStack(TinkerTools.materials, 1, 32)); + OreDictionary.registerOre("nuggetSteel", new ItemStack(TinkerTools.materials, 1, 33)); + OreDictionary.registerOre("nuggetGold", new ItemStack(TinkerWorld.oreBerries, 1, 1)); + ensureOreIsRegistered("nuggetGold", new ItemStack(Items.gold_nugget)); + OreDictionary.registerOre("nuggetPigIron", new ItemStack(TinkerTools.materials, 1, 35)); + + OreDictionary.registerOre("dustArdite", new ItemStack(TinkerTools.materials, 1, 38)); + OreDictionary.registerOre("dustCobalt", new ItemStack(TinkerTools.materials, 1, 39)); + OreDictionary.registerOre("dustAluminium", new ItemStack(TinkerTools.materials, 1, 40)); + OreDictionary.registerOre("dustAluminum", new ItemStack(TinkerTools.materials, 1, 40)); + OreDictionary.registerOre("dustManyullyn", new ItemStack(TinkerTools.materials, 1, 41)); + OreDictionary.registerOre("dustAluminiumBrass", new ItemStack(TinkerTools.materials, 1, 42)); + OreDictionary.registerOre("dustAluminumBrass", new ItemStack(TinkerTools.materials, 1, 42)); + + OreDictionary.registerOre("slabCloth", new ItemStack(TinkerWorld.woolSlab1, 1, Short.MAX_VALUE)); + OreDictionary.registerOre("slabCloth", new ItemStack(TinkerWorld.woolSlab2, 1, Short.MAX_VALUE)); + + ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.stonebrick, 1, 1)); + ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.mossy_cobblestone)); + + OreDictionary.registerOre("crafterWood", new ItemStack(Blocks.crafting_table, 1)); + OreDictionary.registerOre("craftingTableWood", new ItemStack(Blocks.crafting_table, 1)); + + OreDictionary.registerOre("torchStone", new ItemStack(TinkerWorld.stoneTorch)); + + String[] matNames = { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", + "Blueslime" }; + for (int i = 0; i < matNames.length; i++) + { + //TODO 1.8 remove this ore dict entry as it's outdated(use materialRod instead) + OreDictionary.registerOre(matNames[i].toLowerCase() + "Rod", new ItemStack(TinkerTools.toolRod, 1, i)); + OreDictionary.registerOre("rod" + matNames[i], new ItemStack(TinkerTools.toolRod, 1, i)); + } + OreDictionary.registerOre("thaumiumRod", new ItemStack(TinkerTools.toolRod, 1, 31)); + + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", + "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; + for (int i = 0; i < 16; i++) + { + OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i)); + } + + BlockDispenser.dispenseBehaviorRegistry.putObject(TinkerTools.titleIcon, new TDispenserBehaviorSpawnEgg()); + + BlockDispenser.dispenseBehaviorRegistry.putObject(TinkerTools.arrow, new TDispenserBehaviorArrow()); + + // Vanilla stuff + OreDictionary.registerOre("slimeball", new ItemStack(Items.slime_ball)); + OreDictionary.registerOre("slimeball", new ItemStack(TinkerWorld.strangeFood, 1, 0)); + OreDictionary.registerOre("slimeball", new ItemStack(TinkerWorld.strangeFood, 1, 1)); + OreDictionary.registerOre("slimeball", new ItemStack(TinkerTools.materials, 1, 36)); + OreDictionary.registerOre("blockGlass", new ItemStack(TinkerSmeltery.clearGlass)); + OreDictionary.registerOre("blockGlass", new ItemStack(Blocks.glass)); + RecipeRemover.removeShapedRecipe(new ItemStack(Blocks.sticky_piston)); + RecipeRemover.removeShapedRecipe(new ItemStack(Items.magma_cream)); + RecipeRemover.removeShapedRecipe(new ItemStack(Items.lead)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.sticky_piston), "slimeball", Blocks.piston)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.lead, 2), "ss ", "sS ", " s", 's', Items.string, 'S', "slimeball")); + } + + private static void ensureOreIsRegistered (String oreName, ItemStack is) + { + int oreId = OreDictionary.getOreID(is); + if (oreId == -1) + { + OreDictionary.registerOre(oreName, is); + } + } + + public void addAchievements () + { + HashMap achievements = TAchievements.achievements; + + achievements.put("tconstruct:beginner", new Achievement("tconstruct:beginner", "tconstruct.beginner", 0, 0, TinkerTools.manualBook, null));// .setIndependent()); + achievements.put("tconstruct:pattern", new Achievement("tconstruct:pattern", "tconstruct.pattern", 2, 1, TinkerTools.blankPattern, achievements.get("tconstruct:beginner"))); + achievements.put("tconstruct:tinkerer", new Achievement("tconstruct:tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TinkerTools.titleIcon, 1, 4096), achievements.get("tconstruct:pattern"))); + achievements.put("tconstruct:preparedFight", + new Achievement("tconstruct:preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TinkerTools.titleIcon, 1, 4097), achievements.get("tconstruct:tinkerer"))); + achievements.put("tconstruct:proTinkerer", + new Achievement("tconstruct:proTinkerer", "tconstruct.proTinkerer", 4, 4, new ItemStack(TinkerTools.titleIcon, 1, 4098), achievements.get("tconstruct:tinkerer")).setSpecial()); + achievements.put("tconstruct:smelteryMaker", new Achievement("tconstruct:smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TinkerSmeltery.smeltery, achievements.get("tconstruct:beginner"))); + achievements.put("tconstruct:enemySlayer", + new Achievement("tconstruct:enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TinkerTools.titleIcon, 1, 4099), achievements.get("tconstruct:preparedFight"))); + achievements.put("tconstruct:dualConvenience", + new Achievement("tconstruct:dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TinkerTools.titleIcon, 1, 4100), achievements.get("tconstruct:enemySlayer")).setSpecial()); + achievements.put("tconstruct:doingItWrong", + new Achievement("tconstruct:doingItWrong", "tconstruct.doingItWrong", -2, -3, new ItemStack(TinkerTools.manualBook, 1, 2), achievements.get("tconstruct:smelteryMaker"))); + achievements.put("tconstruct:betterCrafting", + new Achievement("tconstruct:betterCrafting", "tconstruct.betterCrafting", -2, 2, TinkerTools.craftingStationWood, achievements.get("tconstruct:beginner"))); + } + + + + public void addLoot () + { + // Item, min, max, weight + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 10)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 10)); + + TinkerWorld.tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); + TinkerWorld.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 1)); + int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 }; + Item[] partTypes = { TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, + TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead }; + + for (int partIter = 0; partIter < partTypes.length; partIter++) + { + for (int typeIter = 0; typeIter < validTypes.length; typeIter++) + { + TinkerWorld.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); + } + } + + TinkerWorld.tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30); + for (int i = 0; i < 13; i++) + { + TinkerWorld.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, i + 1), 1, 3, 20)); + } + TinkerWorld.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, 22), 1, 3, 40)); + } +} diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/world/blocks/CastingChannelBlock.java similarity index 94% rename from src/main/java/tconstruct/blocks/CastingChannelBlock.java rename to src/main/java/tconstruct/world/blocks/CastingChannelBlock.java index af37b27b..9933837b 100644 --- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/world/blocks/CastingChannelBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -9,9 +9,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.blocks.logic.CastingChannelLogic; -import tconstruct.client.block.BlockRenderCastingChannel; import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.logic.CastingChannelLogic; +import tconstruct.smeltery.model.BlockRenderCastingChannel; /** * @author BluSunrize diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/world/blocks/ConveyorBase.java similarity index 98% rename from src/main/java/tconstruct/blocks/ConveyorBase.java rename to src/main/java/tconstruct/world/blocks/ConveyorBase.java index fceb5bcd..86806008 100644 --- a/src/main/java/tconstruct/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/world/blocks/ConveyorBase.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import mantle.blocks.MantleBlock; import net.minecraft.block.material.Material; @@ -12,8 +12,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tconstruct.client.block.SlimeChannelRender; import tconstruct.library.TConstructRegistry; +import tconstruct.world.model.SlimeChannelRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java similarity index 94% rename from src/main/java/tconstruct/blocks/GravelOre.java rename to src/main/java/tconstruct/world/blocks/GravelOre.java index 42310dc1..5f57c17d 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/world/blocks/GravelOre.java @@ -1,12 +1,12 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import java.util.List; import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.world.TinkerWorld; import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -69,7 +69,7 @@ public class GravelOre extends BlockSand { /*if (par1 == 1) return Item.goldNugget.itemID;*/ - return Item.getItemFromBlock(TRepo.oreGravel); + return Item.getItemFromBlock(TinkerWorld.oreGravel); } @Override diff --git a/src/main/java/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/world/blocks/MeatBlock.java similarity index 99% rename from src/main/java/tconstruct/blocks/MeatBlock.java rename to src/main/java/tconstruct/world/blocks/MeatBlock.java index 264f8e20..4fafdddb 100644 --- a/src/main/java/tconstruct/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/world/blocks/MeatBlock.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import java.util.List; import java.util.Random; diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java similarity index 97% rename from src/main/java/tconstruct/blocks/OreberryBush.java rename to src/main/java/tconstruct/world/blocks/OreberryBush.java index b271f038..0b827b0f 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import java.util.List; import java.util.Random; @@ -21,10 +21,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.client.block.OreberryRender; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; +import tconstruct.world.TinkerWorld; +import tconstruct.world.model.OreberryRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -188,7 +188,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable if (meta >= 12) { world.setBlock(x, y, z, this, meta - 4, 3); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, 1, meta % 4 + itemMeat)); + AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TinkerWorld.oreBerries, 1, meta % 4 + itemMeat)); } } } @@ -207,7 +207,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable return true; world.setBlock(x, y, z, this, meta - 4, 3); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); + AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TinkerWorld.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); return true; } diff --git a/src/main/java/tconstruct/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java similarity index 97% rename from src/main/java/tconstruct/blocks/OreberryBushEssence.java rename to src/main/java/tconstruct/world/blocks/OreberryBushEssence.java index 82c69881..9cf99687 100644 --- a/src/main/java/tconstruct/blocks/OreberryBushEssence.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import java.util.Random; diff --git a/src/main/java/tconstruct/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java similarity index 97% rename from src/main/java/tconstruct/blocks/SlimeExplosive.java rename to src/main/java/tconstruct/world/blocks/SlimeExplosive.java index b6ad7aa5..89a6f40e 100644 --- a/src/main/java/tconstruct/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import java.util.List; @@ -16,7 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import tconstruct.entity.item.ExplosivePrimed; +import tconstruct.blocks.TConstructBlock; +import tconstruct.mechworks.entity.item.ExplosivePrimed; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/world/blocks/SlimePad.java similarity index 92% rename from src/main/java/tconstruct/blocks/SlimePad.java rename to src/main/java/tconstruct/world/blocks/SlimePad.java index 0292013b..4fb3632b 100644 --- a/src/main/java/tconstruct/blocks/SlimePad.java +++ b/src/main/java/tconstruct/world/blocks/SlimePad.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import mantle.blocks.MantleBlock; import net.minecraft.block.material.Material; @@ -11,9 +11,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tconstruct.client.block.SlimePadRender; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import tconstruct.world.TinkerWorld; +import tconstruct.world.model.SlimePadRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -131,18 +131,18 @@ public class SlimePad extends MantleBlock @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { - return TRepo.slimeGel.getIcon(side, 1); + return TinkerWorld.slimeGel.getIcon(side, 1); } @SideOnly(Side.CLIENT) public IIcon getFluidIcon (int meta) { - return TRepo.slimeChannel.getIcon(2, 0); + return TinkerWorld.slimeChannel.getIcon(2, 0); } @SideOnly(Side.CLIENT) public IIcon getNubIcon (int meta) { - return TRepo.slimeGel.getIcon(0, 0); + return TinkerWorld.slimeGel.getIcon(0, 0); } } diff --git a/src/main/java/tconstruct/blocks/SoilBlock.java b/src/main/java/tconstruct/world/blocks/SoilBlock.java similarity index 97% rename from src/main/java/tconstruct/blocks/SoilBlock.java rename to src/main/java/tconstruct/world/blocks/SoilBlock.java index 254105b5..4e93a6f0 100644 --- a/src/main/java/tconstruct/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/world/blocks/SoilBlock.java @@ -1,5 +1,6 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; +import tconstruct.blocks.TConstructBlock; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/world/blocks/SoilSlab.java similarity index 93% rename from src/main/java/tconstruct/blocks/SoilSlab.java rename to src/main/java/tconstruct/world/blocks/SoilSlab.java index ac13b480..cb63a63c 100644 --- a/src/main/java/tconstruct/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/world/blocks/SoilSlab.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import java.util.List; @@ -11,8 +11,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; -import tconstruct.common.TRepo; +import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; +import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -44,7 +45,7 @@ public class SoilSlab extends SlabBase case 2: return Blocks.mycelium.getIcon(1, 0); default: - return TRepo.craftedSoil.getIcon(side, meta - 3); + return TinkerTools.craftedSoil.getIcon(side, meta - 3); } } diff --git a/src/main/java/tconstruct/blocks/StoneLadder.java b/src/main/java/tconstruct/world/blocks/StoneLadder.java similarity index 96% rename from src/main/java/tconstruct/blocks/StoneLadder.java rename to src/main/java/tconstruct/world/blocks/StoneLadder.java index a9bd7044..0d41d34b 100644 --- a/src/main/java/tconstruct/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/world/blocks/StoneLadder.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; diff --git a/src/main/java/tconstruct/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java similarity index 99% rename from src/main/java/tconstruct/blocks/StoneTorch.java rename to src/main/java/tconstruct/world/blocks/StoneTorch.java index 72b16961..e121c485 100644 --- a/src/main/java/tconstruct/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import static net.minecraftforge.common.util.ForgeDirection.EAST; import static net.minecraftforge.common.util.ForgeDirection.NORTH; diff --git a/src/main/java/tconstruct/blocks/TMetalBlock.java b/src/main/java/tconstruct/world/blocks/TMetalBlock.java similarity index 91% rename from src/main/java/tconstruct/blocks/TMetalBlock.java rename to src/main/java/tconstruct/world/blocks/TMetalBlock.java index 53c52a21..48304881 100644 --- a/src/main/java/tconstruct/blocks/TMetalBlock.java +++ b/src/main/java/tconstruct/world/blocks/TMetalBlock.java @@ -1,5 +1,6 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; +import tconstruct.blocks.TConstructBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/blocks/WoodRail.java b/src/main/java/tconstruct/world/blocks/WoodRail.java similarity index 98% rename from src/main/java/tconstruct/blocks/WoodRail.java rename to src/main/java/tconstruct/world/blocks/WoodRail.java index b1a1ec97..c8d23d8e 100644 --- a/src/main/java/tconstruct/blocks/WoodRail.java +++ b/src/main/java/tconstruct/world/blocks/WoodRail.java @@ -1,4 +1,4 @@ -package tconstruct.blocks; +package tconstruct.world.blocks; import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; diff --git a/src/main/java/tconstruct/entity/BlueSlime.java b/src/main/java/tconstruct/world/entity/BlueSlime.java similarity index 98% rename from src/main/java/tconstruct/entity/BlueSlime.java rename to src/main/java/tconstruct/world/entity/BlueSlime.java index 3a020e64..94e517a7 100644 --- a/src/main/java/tconstruct/entity/BlueSlime.java +++ b/src/main/java/tconstruct/world/entity/BlueSlime.java @@ -1,4 +1,4 @@ -package tconstruct.entity; +package tconstruct.world.entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -21,10 +21,11 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import tconstruct.TConstruct; -import tconstruct.common.TRepo; +import tconstruct.armor.TinkerArmor; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; +import tconstruct.world.TinkerWorld; public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData { @@ -464,7 +465,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData this.entityDropItem(toolStack, 0f); if (rand.nextInt(5) == 0) { - ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1); + ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1); this.entityDropItem(dropStack, 0f); } } @@ -538,7 +539,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData @Override protected Item getDropItem () { - return TRepo.strangeFood; + return TinkerWorld.strangeFood; } /** diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java similarity index 99% rename from src/main/java/tconstruct/entity/CartEntity.java rename to src/main/java/tconstruct/world/entity/CartEntity.java index c6b04377..f0cbfb3d 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -1,4 +1,4 @@ -package tconstruct.entity; +package tconstruct.world.entity; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/tconstruct/entity/Crystal.java b/src/main/java/tconstruct/world/entity/Crystal.java similarity index 89% rename from src/main/java/tconstruct/entity/Crystal.java rename to src/main/java/tconstruct/world/entity/Crystal.java index c7a9fd20..fb8873fa 100644 --- a/src/main/java/tconstruct/entity/Crystal.java +++ b/src/main/java/tconstruct/world/entity/Crystal.java @@ -1,4 +1,4 @@ -package tconstruct.entity; +package tconstruct.world.entity; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/entity/CrystalGuardian.java b/src/main/java/tconstruct/world/entity/CrystalGuardian.java similarity index 91% rename from src/main/java/tconstruct/entity/CrystalGuardian.java rename to src/main/java/tconstruct/world/entity/CrystalGuardian.java index f3f92d81..750a0ae5 100644 --- a/src/main/java/tconstruct/entity/CrystalGuardian.java +++ b/src/main/java/tconstruct/world/entity/CrystalGuardian.java @@ -1,4 +1,4 @@ -package tconstruct.entity; +package tconstruct.world.entity; import net.minecraft.entity.EntityLiving; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/entity/MetalSlime.java b/src/main/java/tconstruct/world/entity/MetalSlime.java similarity index 98% rename from src/main/java/tconstruct/entity/MetalSlime.java rename to src/main/java/tconstruct/world/entity/MetalSlime.java index d203c60d..bd7ca9f3 100644 --- a/src/main/java/tconstruct/entity/MetalSlime.java +++ b/src/main/java/tconstruct/world/entity/MetalSlime.java @@ -1,4 +1,4 @@ -package tconstruct.entity; +package tconstruct.world.entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.DamageSource; diff --git a/src/main/java/tconstruct/worldgen/OreberryBushGen.java b/src/main/java/tconstruct/world/gen/OreberryBushGen.java similarity index 99% rename from src/main/java/tconstruct/worldgen/OreberryBushGen.java rename to src/main/java/tconstruct/world/gen/OreberryBushGen.java index fa32ed8b..fc18cdd4 100644 --- a/src/main/java/tconstruct/worldgen/OreberryBushGen.java +++ b/src/main/java/tconstruct/world/gen/OreberryBushGen.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import java.util.Random; diff --git a/src/main/java/tconstruct/worldgen/OverworldProvider.java b/src/main/java/tconstruct/world/gen/OverworldProvider.java similarity index 97% rename from src/main/java/tconstruct/worldgen/OverworldProvider.java rename to src/main/java/tconstruct/world/gen/OverworldProvider.java index d7124b45..5f929d97 100644 --- a/src/main/java/tconstruct/worldgen/OverworldProvider.java +++ b/src/main/java/tconstruct/world/gen/OverworldProvider.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import net.minecraft.world.WorldProvider; diff --git a/src/main/java/tconstruct/worldgen/PlantGen.java b/src/main/java/tconstruct/world/gen/PlantGen.java similarity index 98% rename from src/main/java/tconstruct/worldgen/PlantGen.java rename to src/main/java/tconstruct/world/gen/PlantGen.java index 52e56dea..dbdc0837 100644 --- a/src/main/java/tconstruct/worldgen/PlantGen.java +++ b/src/main/java/tconstruct/world/gen/PlantGen.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import java.util.Random; diff --git a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java similarity index 96% rename from src/main/java/tconstruct/worldgen/SlimeIslandGen.java rename to src/main/java/tconstruct/world/gen/SlimeIslandGen.java index c9ddcaca..343c37cf 100644 --- a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import java.awt.geom.Ellipse2D; import java.util.Random; @@ -12,9 +12,10 @@ import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; import net.minecraft.world.gen.feature.WorldGenerator; -import tconstruct.common.TRepo; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.DimensionBlacklist; import tconstruct.util.config.PHConstruct; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.common.IWorldGenerator; public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator @@ -23,8 +24,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator private int gelMeta; int randomness = 2; Random random = new Random(); - Block base = TRepo.craftedSoil;// Block.dirt.blockID; - Block top = TRepo.slimeGrass; + Block base = TinkerTools.craftedSoil;// Block.dirt.blockID; + Block top = TinkerWorld.slimeGrass; SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0); public SlimeIslandGen(Block slimePool, int meta) @@ -147,7 +148,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { generateSlimePool(world, rand, xChunk + xRange / 2, yCenter + initialHeight, zChunk + zRange / 2); } - PlantGen tallGrass = new PlantGen(TRepo.slimeTallGrass, 0, 128, xRange, 1, zRange, false); + PlantGen tallGrass = new PlantGen(TinkerWorld.slimeTallGrass, 0, 128, xRange, 1, zRange, false); tallGrass.generate(world, rand, xChunk, yCenter + initialHeight + 1, zChunk); for (int i = 0; i < 3; i++) { @@ -285,7 +286,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial().isSolid() && world.getBlock(x + xPos, y + yPos + 1, z + zPos).getMaterial() != Material.water) { - world.setBlock(x + xPos, y + yPos, z + zPos, TRepo.slimeGel, gelMeta, 2); + world.setBlock(x + xPos, y + yPos, z + zPos, TinkerWorld.slimeGel, gelMeta, 2); } } } diff --git a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java similarity index 80% rename from src/main/java/tconstruct/worldgen/SlimeTreeGen.java rename to src/main/java/tconstruct/world/gen/SlimeTreeGen.java index c140ee2b..23e52366 100644 --- a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import java.util.Random; @@ -7,7 +7,8 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.common.TRepo; +import tconstruct.tools.TinkerTools; +import tconstruct.world.TinkerWorld; public class SlimeTreeGen extends WorldGenerator { @@ -44,7 +45,7 @@ public class SlimeTreeGen extends WorldGenerator if (yPos >= 1 && yPos + height + 1 <= 256) { Block soil = world.getBlock(xPos, yPos - 1, zPos); - boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TRepo.slimeSapling)); + boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TinkerWorld.slimeSapling)); if (isSoil) { @@ -77,7 +78,7 @@ public class SlimeTreeGen extends WorldGenerator for (int zPos = range; zPos <= range; zPos++) { Block blockID = world.getBlock(x + xPos, y + yPos, z + zPos); - if (blockID != null && blockID != TRepo.slimeSapling && !blockID.isLeaves(world, x + xPos, y + yPos, z + zPos)) + if (blockID != null && blockID != TinkerWorld.slimeSapling && !blockID.isLeaves(world, x + xPos, y + yPos, z + zPos)) return false; } } @@ -92,7 +93,7 @@ public class SlimeTreeGen extends WorldGenerator do { Block heightID = world.getBlock(x, height, z); - if ((heightID == TRepo.craftedSoil || heightID == TRepo.slimeGrass) && !world.getBlock(x, height + 1, z).isOpaqueCube()) + if ((heightID == TinkerTools.craftedSoil || heightID == TinkerWorld.slimeGrass) && !world.getBlock(x, height + 1, z).isOpaqueCube()) { ret = height + 1; break; @@ -119,23 +120,23 @@ public class SlimeTreeGen extends WorldGenerator this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos - 1, Blocks.air, 0); //Drippers - this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); } void placeDiamondLayer (World world, int xPos, int yPos, int zPos, int range) @@ -146,7 +147,7 @@ public class SlimeTreeGen extends WorldGenerator { if (Math.abs(x) + Math.abs(z) <= range) { - this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TinkerWorld.slimeLeaves, this.metaLeaves); } } } @@ -160,7 +161,7 @@ public class SlimeTreeGen extends WorldGenerator if (blockID == Blocks.air || blockID == null || blockID.isLeaves(world, xPos, yPos + localHeight, zPos)) { - this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TRepo.slimeGel, this.metaWood); + this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TinkerWorld.slimeGel, this.metaWood); } } } diff --git a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java similarity index 99% rename from src/main/java/tconstruct/worldgen/SurfaceOreGen.java rename to src/main/java/tconstruct/world/gen/SurfaceOreGen.java index 97de8434..fc787eb4 100644 --- a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import java.util.Random; diff --git a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java similarity index 93% rename from src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java rename to src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java index 51e5b100..1291549c 100644 --- a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import java.util.Random; @@ -9,27 +9,27 @@ import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; -import tconstruct.common.TRepo; import tconstruct.util.config.PHConstruct; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.common.IWorldGenerator; public class TBaseWorldGenerator implements IWorldGenerator { public TBaseWorldGenerator() { - copper = new WorldGenMinable(TRepo.oreSlag, 3, 8, Blocks.stone); - tin = new WorldGenMinable(TRepo.oreSlag, 4, 8, Blocks.stone); - aluminum = new WorldGenMinable(TRepo.oreSlag, 5, 6, Blocks.stone); + copper = new WorldGenMinable(TinkerWorld.oreSlag, 3, 8, Blocks.stone); + tin = new WorldGenMinable(TinkerWorld.oreSlag, 4, 8, Blocks.stone); + aluminum = new WorldGenMinable(TinkerWorld.oreSlag, 5, 6, Blocks.stone); - cobalt = new WorldGenMinable(TRepo.oreSlag, 1, 3, Blocks.netherrack); - ardite = new WorldGenMinable(TRepo.oreSlag, 2, 3, Blocks.netherrack); + cobalt = new WorldGenMinable(TinkerWorld.oreSlag, 1, 3, Blocks.netherrack); + ardite = new WorldGenMinable(TinkerWorld.oreSlag, 2, 3, Blocks.netherrack); - ironBush = new OreberryBushGen(TRepo.oreBerry, 12, 12); - goldBush = new OreberryBushGen(TRepo.oreBerry, 13, 6); - copperBush = new OreberryBushGen(TRepo.oreBerry, 14, 12); - tinBush = new OreberryBushGen(TRepo.oreBerry, 15, 12); - aluminumBush = new OreberryBushGen(TRepo.oreBerrySecond, 12, 14); - silverBush = new OreberryBushGen(TRepo.oreBerrySecond, 13, 8); + ironBush = new OreberryBushGen(TinkerWorld.oreBerry, 12, 12); + goldBush = new OreberryBushGen(TinkerWorld.oreBerry, 13, 6); + copperBush = new OreberryBushGen(TinkerWorld.oreBerry, 14, 12); + tinBush = new OreberryBushGen(TinkerWorld.oreBerry, 15, 12); + aluminumBush = new OreberryBushGen(TinkerWorld.oreBerrySecond, 12, 14); + silverBush = new OreberryBushGen(TinkerWorld.oreBerrySecond, 13, 8); } @Override diff --git a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java similarity index 92% rename from src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java rename to src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java index 4930dbea..e77ef2e8 100644 --- a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen; +package tconstruct.world.gen; import static net.minecraft.world.biome.BiomeGenBase.extremeHills; import static net.minecraft.world.biome.BiomeGenBase.extremeHillsEdge; @@ -9,8 +9,8 @@ import java.util.Random; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; -import tconstruct.common.TRepo; import tconstruct.util.config.PHConstruct; +import tconstruct.world.TinkerWorld; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; @@ -19,12 +19,12 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TerrainGenEventHandler { - private final SurfaceOreGen ironSurface = new SurfaceOreGen(TRepo.oreGravel, 0, 12, true); - private final SurfaceOreGen goldSurface = new SurfaceOreGen(TRepo.oreGravel, 1, 20, true); - private final SurfaceOreGen copperSurface = new SurfaceOreGen(TRepo.oreGravel, 2, 12, true); - private final SurfaceOreGen tinSurface = new SurfaceOreGen(TRepo.oreGravel, 3, 12, true); - private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TRepo.oreGravel, 4, 12, true); - private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TRepo.oreGravel, 5, 30, true); + private final SurfaceOreGen ironSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 0, 12, true); + private final SurfaceOreGen goldSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 1, 20, true); + private final SurfaceOreGen copperSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 2, 12, true); + private final SurfaceOreGen tinSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 3, 12, true); + private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 4, 12, true); + private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 5, 30, true); private static ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList.of(extremeHills, extremeHillsEdge); diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java similarity index 98% rename from src/main/java/tconstruct/items/blocks/BarricadeItem.java rename to src/main/java/tconstruct/world/itemblocks/BarricadeItem.java index 8af12563..184b18d7 100644 --- a/src/main/java/tconstruct/items/blocks/BarricadeItem.java +++ b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java similarity index 97% rename from src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java rename to src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java index a0dcf5cd..a2c26bd9 100644 --- a/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/GravelOreItem.java b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java similarity index 91% rename from src/main/java/tconstruct/items/blocks/GravelOreItem.java rename to src/main/java/tconstruct/world/itemblocks/GravelOreItem.java index a1e419a0..e8256f61 100644 --- a/src/main/java/tconstruct/items/blocks/GravelOreItem.java +++ b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java similarity index 99% rename from src/main/java/tconstruct/items/blocks/HamboneItemBlock.java rename to src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java index d886e79a..3c80c4b9 100644 --- a/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java similarity index 96% rename from src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java rename to src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java index cf92fd7d..5a2bab3b 100644 --- a/src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java similarity index 93% rename from src/main/java/tconstruct/items/blocks/OreberryBushItem.java rename to src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java index 6b724287..112d3d86 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import java.util.List; @@ -11,7 +11,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.common.TRepo; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -44,7 +44,7 @@ public class OreberryBushItem extends MultiItemBlock { Block block = world.getBlock(x, y, z); - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z)) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java similarity index 93% rename from src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java rename to src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java index be33c1a6..1811b6c3 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import java.util.List; @@ -11,7 +11,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.common.TRepo; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -48,7 +48,7 @@ public class OreberryBushSecondItem extends MultiItemBlock { Block block = world.getBlock(x, y, z); - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z)) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) diff --git a/src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java similarity index 91% rename from src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java rename to src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java index df0b0f32..bd7c66c8 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java similarity index 90% rename from src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java rename to src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java index 83d82f73..015cae81 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java similarity index 90% rename from src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java rename to src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java index 7ec21653..9d5d6737 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java similarity index 90% rename from src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java rename to src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java index 38785b2e..b0c2a57d 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; diff --git a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java similarity index 83% rename from src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java rename to src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java index 030cfed6..6c6beba9 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java @@ -1,10 +1,10 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import tconstruct.common.TRepo; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +24,7 @@ public class SlimeTallGrassItem extends MultiItemBlock public IIcon getIconFromDamage (int meta) { int arr = MathHelper.clamp_int(meta, 0, this.blockTypes.length); - return TRepo.slimeTallGrass.getIcon(0, arr); + return TinkerWorld.slimeTallGrass.getIcon(0, arr); } } diff --git a/src/main/java/tconstruct/items/blocks/SoilSlabItem.java b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java similarity index 96% rename from src/main/java/tconstruct/items/blocks/SoilSlabItem.java rename to src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java index 28a7001d..e5c383a5 100644 --- a/src/main/java/tconstruct/items/blocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import java.util.List; diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java similarity index 98% rename from src/main/java/tconstruct/items/blocks/WoolSlab1Item.java rename to src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java index b478df4a..c7f0e6a1 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java similarity index 98% rename from src/main/java/tconstruct/items/blocks/WoolSlab2Item.java rename to src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java index 257cb3e2..4994fd46 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java @@ -1,4 +1,4 @@ -package tconstruct.items.blocks; +package tconstruct.world.itemblocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/items/GoldenHead.java b/src/main/java/tconstruct/world/items/GoldenHead.java similarity index 98% rename from src/main/java/tconstruct/items/GoldenHead.java rename to src/main/java/tconstruct/world/items/GoldenHead.java index 60677c11..7e06b8ef 100644 --- a/src/main/java/tconstruct/items/GoldenHead.java +++ b/src/main/java/tconstruct/world/items/GoldenHead.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.world.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/OreBerries.java b/src/main/java/tconstruct/world/items/OreBerries.java similarity index 98% rename from src/main/java/tconstruct/items/OreBerries.java rename to src/main/java/tconstruct/world/items/OreBerries.java index a1774403..615aa33d 100644 --- a/src/main/java/tconstruct/items/OreBerries.java +++ b/src/main/java/tconstruct/world/items/OreBerries.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.world.items; import java.util.List; diff --git a/src/main/java/tconstruct/items/SpecialFood.java b/src/main/java/tconstruct/world/items/SpecialFood.java similarity index 91% rename from src/main/java/tconstruct/items/SpecialFood.java rename to src/main/java/tconstruct/world/items/SpecialFood.java index 4e515e64..6fe74af6 100644 --- a/src/main/java/tconstruct/items/SpecialFood.java +++ b/src/main/java/tconstruct/world/items/SpecialFood.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.world.items; import java.util.List; @@ -16,11 +16,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class SpecialFood extends ItemFood { - int[] hunger; - float[] saturation; - String[] unlocalizedNames; - String[] iconNames; - IIcon[] icons; + protected int[] hunger; + protected float[] saturation; + protected String[] unlocalizedNames; + protected String[] iconNames; + protected IIcon[] icons; public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, String[] iconNames) { diff --git a/src/main/java/tconstruct/items/StrangeFood.java b/src/main/java/tconstruct/world/items/StrangeFood.java similarity index 98% rename from src/main/java/tconstruct/items/StrangeFood.java rename to src/main/java/tconstruct/world/items/StrangeFood.java index 1340234a..7e56232a 100644 --- a/src/main/java/tconstruct/items/StrangeFood.java +++ b/src/main/java/tconstruct/world/items/StrangeFood.java @@ -1,4 +1,4 @@ -package tconstruct.items; +package tconstruct.world.items; import java.util.List; diff --git a/src/main/java/tconstruct/client/block/BarricadeRender.java b/src/main/java/tconstruct/world/model/BarricadeRender.java similarity index 99% rename from src/main/java/tconstruct/client/block/BarricadeRender.java rename to src/main/java/tconstruct/world/model/BarricadeRender.java index 09d33cda..1655c1b1 100644 --- a/src/main/java/tconstruct/client/block/BarricadeRender.java +++ b/src/main/java/tconstruct/world/model/BarricadeRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.world.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/entity/CrystalModelSmall.java b/src/main/java/tconstruct/world/model/CrystalModelSmall.java similarity index 97% rename from src/main/java/tconstruct/client/entity/CrystalModelSmall.java rename to src/main/java/tconstruct/world/model/CrystalModelSmall.java index 97402aad..4d5eb55d 100644 --- a/src/main/java/tconstruct/client/entity/CrystalModelSmall.java +++ b/src/main/java/tconstruct/world/model/CrystalModelSmall.java @@ -1,4 +1,4 @@ -package tconstruct.client.entity; +package tconstruct.world.model; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/tconstruct/client/entity/CrystalRender.java b/src/main/java/tconstruct/world/model/CrystalRender.java similarity index 96% rename from src/main/java/tconstruct/client/entity/CrystalRender.java rename to src/main/java/tconstruct/world/model/CrystalRender.java index b5766b7b..45ff6bda 100644 --- a/src/main/java/tconstruct/client/entity/CrystalRender.java +++ b/src/main/java/tconstruct/world/model/CrystalRender.java @@ -1,11 +1,11 @@ -package tconstruct.client.entity; +package tconstruct.world.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.util.ResourceLocation; -import tconstruct.entity.Crystal; +import tconstruct.world.entity.Crystal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/block/OreberryRender.java b/src/main/java/tconstruct/world/model/OreberryRender.java similarity index 98% rename from src/main/java/tconstruct/client/block/OreberryRender.java rename to src/main/java/tconstruct/world/model/OreberryRender.java index aabf6478..c58356b5 100644 --- a/src/main/java/tconstruct/client/block/OreberryRender.java +++ b/src/main/java/tconstruct/world/model/OreberryRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.world.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/block/PunjiRender.java b/src/main/java/tconstruct/world/model/PunjiRender.java similarity index 99% rename from src/main/java/tconstruct/client/block/PunjiRender.java rename to src/main/java/tconstruct/world/model/PunjiRender.java index bbb07548..806b6bb1 100644 --- a/src/main/java/tconstruct/client/block/PunjiRender.java +++ b/src/main/java/tconstruct/world/model/PunjiRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.world.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/block/RenderLandmine.java b/src/main/java/tconstruct/world/model/RenderLandmine.java similarity index 97% rename from src/main/java/tconstruct/client/block/RenderLandmine.java rename to src/main/java/tconstruct/world/model/RenderLandmine.java index e6e97ab4..a6f7db1f 100644 --- a/src/main/java/tconstruct/client/block/RenderLandmine.java +++ b/src/main/java/tconstruct/world/model/RenderLandmine.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.world.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,7 +7,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import tconstruct.util.landmine.Helper; +import tconstruct.mechworks.landmine.Helper; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/SlimeChannelRender.java b/src/main/java/tconstruct/world/model/SlimeChannelRender.java similarity index 99% rename from src/main/java/tconstruct/client/block/SlimeChannelRender.java rename to src/main/java/tconstruct/world/model/SlimeChannelRender.java index 90467fd0..e80bccd2 100644 --- a/src/main/java/tconstruct/client/block/SlimeChannelRender.java +++ b/src/main/java/tconstruct/world/model/SlimeChannelRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.block; +package tconstruct.world.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/entity/SlimeModel.java b/src/main/java/tconstruct/world/model/SlimeModel.java similarity index 98% rename from src/main/java/tconstruct/client/entity/SlimeModel.java rename to src/main/java/tconstruct/world/model/SlimeModel.java index d05f0004..4fc5482e 100644 --- a/src/main/java/tconstruct/client/entity/SlimeModel.java +++ b/src/main/java/tconstruct/world/model/SlimeModel.java @@ -1,4 +1,4 @@ -package tconstruct.client.entity; +package tconstruct.world.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/tconstruct/client/block/SlimePadRender.java b/src/main/java/tconstruct/world/model/SlimePadRender.java similarity index 91% rename from src/main/java/tconstruct/client/block/SlimePadRender.java rename to src/main/java/tconstruct/world/model/SlimePadRender.java index 3c063b83..e9c1c2b0 100644 --- a/src/main/java/tconstruct/client/block/SlimePadRender.java +++ b/src/main/java/tconstruct/world/model/SlimePadRender.java @@ -1,11 +1,12 @@ -package tconstruct.client.block; +package tconstruct.world.model; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import tconstruct.blocks.SlimePad; +import tconstruct.client.BlockSkinRenderHelper; import tconstruct.client.TProxyClient; -import tconstruct.common.TRepo; +import tconstruct.world.TinkerWorld; +import tconstruct.world.blocks.SlimePad; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -18,7 +19,7 @@ public class SlimePadRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - TProxyClient.renderStandardInvBlock(renderer, TRepo.slimeGel, metadata); + TProxyClient.renderStandardInvBlock(renderer, TinkerWorld.slimeGel, metadata); } } diff --git a/src/main/java/tconstruct/client/entity/SlimeRender.java b/src/main/java/tconstruct/world/model/SlimeRender.java similarity index 97% rename from src/main/java/tconstruct/client/entity/SlimeRender.java rename to src/main/java/tconstruct/world/model/SlimeRender.java index 14216260..e3cb9801 100644 --- a/src/main/java/tconstruct/client/entity/SlimeRender.java +++ b/src/main/java/tconstruct/world/model/SlimeRender.java @@ -1,4 +1,4 @@ -package tconstruct.client.entity; +package tconstruct.world.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import tconstruct.entity.BlueSlime; +import tconstruct.world.entity.BlueSlime; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/world/village/ComponentSmeltery.java similarity index 87% rename from src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java rename to src/main/java/tconstruct/world/village/ComponentSmeltery.java index 25dd3fd7..317b1ebc 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/world/village/ComponentSmeltery.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen.village; +package tconstruct.world.village; import java.util.List; import java.util.Random; @@ -10,7 +10,7 @@ import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; -import tconstruct.common.TRepo; +import tconstruct.smeltery.TinkerSmeltery; public class ComponentSmeltery extends StructureVillagePieces.House1 { @@ -63,13 +63,13 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, Blocks.air, Blocks.air, false); - this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TRepo.smeltery, 2, TRepo.smeltery, 2, false); //Basin + this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TinkerSmeltery.smeltery, 2, TinkerSmeltery.smeltery, 2, false); //Basin this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, Blocks.air, Blocks.air, false); - this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 0, 1, 1, 2, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 2, 1, 1, 4, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 0, 7, 1, 2, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 2, 7, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 0, 1, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 2, 1, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 0, 7, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 2, 7, 1, 4, sbb); for (int l = 1; l < 6; ++l) { diff --git a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java similarity index 90% rename from src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java rename to src/main/java/tconstruct/world/village/ComponentToolWorkshop.java index 5ded31f0..94e18299 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen.village; +package tconstruct.world.village; import java.util.List; import java.util.Random; @@ -10,9 +10,10 @@ import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.common.TRepo; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.world.TinkerWorld; public class ComponentToolWorkshop extends StructureVillagePieces.House1 { @@ -123,19 +124,19 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 3, 5, sbb); this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 4, 5, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 0, 1, 1, 1, sbb); // Inside - this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TRepo.tinkerHousePatterns.getItems(random), TRepo.tinkerHousePatterns.getCount(random)); + this.placeBlockAtCurrentPosition(world, TinkerTools.toolStationWood, 0, 1, 1, 1, sbb); // Inside + this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TinkerWorld.tinkerHousePatterns.getItems(random), TinkerWorld.tinkerHousePatterns.getCount(random)); // this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 5, 1, // 1, 2, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 1, 1, 1, 3, sbb); - this.generateStructureCraftingStationContents(world, sbb, random, 1, 1, 4, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random)); + this.placeBlockAtCurrentPosition(world, TinkerTools.toolStationWood, 1, 1, 1, 3, sbb); + this.generateStructureCraftingStationContents(world, sbb, random, 1, 1, 4, TinkerWorld.tinkerHouseChest.getItems(random), TinkerWorld.tinkerHouseChest.getCount(random)); // this.placeBlockAtCurrentPosition(world, TRepo.craftingStationWood, 0, // 1, 1, 4, sbb); - this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 10, 1, 1, 5, sbb); + this.placeBlockAtCurrentPosition(world, TinkerTools.toolStationWood, 10, 1, 1, 5, sbb); // ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse"); - this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random)); + this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TinkerWorld.tinkerHouseChest.getItems(random), TinkerWorld.tinkerHouseChest.getCount(random)); // this.placeBlockAtCurrentPosition(world, Block.chest, i, 4, 1, 5, // sbb); i = this.getMetadataWithOffset(Blocks.piston, 3); @@ -163,7 +164,7 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest) { - world.setBlock(posX, posY, posZ, TRepo.craftingStationWood, 5, 2); + world.setBlock(posX, posY, posZ, TinkerTools.craftingStationWood, 5, 2); CraftingStationLogic logic = (CraftingStationLogic) world.getTileEntity(posX, posY, posZ); if (logic != null) @@ -188,7 +189,7 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest) { - world.setBlock(posX, posY, posZ, TRepo.toolStationWood, 5, 2); + world.setBlock(posX, posY, posZ, TinkerTools.toolStationWood, 5, 2); PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(posX, posY, posZ); if (logic != null) diff --git a/src/main/java/tconstruct/worldgen/village/TVillageTrades.java b/src/main/java/tconstruct/world/village/TVillageTrades.java similarity index 75% rename from src/main/java/tconstruct/worldgen/village/TVillageTrades.java rename to src/main/java/tconstruct/world/village/TVillageTrades.java index 85c6b62a..826ff125 100644 --- a/src/main/java/tconstruct/worldgen/village/TVillageTrades.java +++ b/src/main/java/tconstruct/world/village/TVillageTrades.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen.village; +package tconstruct.world.village; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; -import tconstruct.common.TRepo; +import tconstruct.tools.TinkerTools; +import tconstruct.world.TinkerWorld; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; public class TVillageTrades implements IVillageTradeHandler @@ -28,18 +29,18 @@ public class TVillageTrades implements IVillageTradeHandler allowedIngredients.add(new ItemStack(Blocks.sticky_piston, 64)); // tconstruct blocks - allowedIngredients.add(new ItemStack(TRepo.barricadeBirch, 64)); - allowedIngredients.add(new ItemStack(TRepo.barricadeJungle, 64)); - allowedIngredients.add(new ItemStack(TRepo.barricadeOak, 64)); - allowedIngredients.add(new ItemStack(TRepo.barricadeSpruce, 64)); - allowedIngredients.add(new ItemStack(TRepo.punji, 64)); - allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 0)); - allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 1)); - allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 5)); - allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 10)); + allowedIngredients.add(new ItemStack(TinkerWorld.barricadeBirch, 64)); + allowedIngredients.add(new ItemStack(TinkerWorld.barricadeJungle, 64)); + allowedIngredients.add(new ItemStack(TinkerWorld.barricadeOak, 64)); + allowedIngredients.add(new ItemStack(TinkerWorld.barricadeSpruce, 64)); + allowedIngredients.add(new ItemStack(TinkerWorld.punji, 64)); + allowedIngredients.add(new ItemStack(TinkerTools.toolStationWood, 3, 0)); + allowedIngredients.add(new ItemStack(TinkerTools.toolStationWood, 3, 1)); + allowedIngredients.add(new ItemStack(TinkerTools.toolStationWood, 3, 5)); + allowedIngredients.add(new ItemStack(TinkerTools.toolStationWood, 3, 10)); for (int sc = 0; sc < 4; sc++) { - allowedIngredients.add(new ItemStack(TRepo.landmine, 64, sc)); + allowedIngredients.add(new ItemStack(TinkerWorld.landmine, 64, sc)); } } @@ -65,14 +66,14 @@ public class TVillageTrades implements IVillageTradeHandler { ingredient2 = null; } - result = new ItemStack(TRepo.oreBerry, calcStackSize(ingredient, ingredient2), sc); + result = new ItemStack(TinkerWorld.oreBerry, calcStackSize(ingredient, ingredient2), sc); // adds iron, gold, copper & tin orebushes to the recipe list recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); if (sc == 8) { // adds alumine orebush to the recipe list - result = new ItemStack(TRepo.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc); + result = new ItemStack(TinkerWorld.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc); recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); } } diff --git a/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java similarity index 96% rename from src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java rename to src/main/java/tconstruct/world/village/VillageSmelteryHandler.java index c6d55619..f1caa76c 100644 --- a/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java +++ b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen.village; +package tconstruct.world.village; import java.util.List; import java.util.Random; diff --git a/src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java similarity index 96% rename from src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java rename to src/main/java/tconstruct/world/village/VillageToolStationHandler.java index 4347fbd5..89f62954 100644 --- a/src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java +++ b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java @@ -1,4 +1,4 @@ -package tconstruct.worldgen.village; +package tconstruct.world.village; import java.util.List; import java.util.Random;