diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 4905cf40..4221b88a 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -143,11 +143,10 @@ public class TConstruct MinecraftForge.EVENT_BUS.register(new EventCloakRender()); } - content.intermodCommunication(); TwilightForestConfig.initProps(PHConstruct.cfglocation); BOPConfig.initProps(PHConstruct.cfglocation); DimensionBlacklist.getbaddimensions(); - GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); + GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool.blockID, 0)); PluginController.getController().init(); diff --git a/src/main/java/tconstruct/TConstruct.java.orig b/src/main/java/tconstruct/TConstruct.java.orig deleted file mode 100644 index 07a502c8..00000000 --- a/src/main/java/tconstruct/TConstruct.java.orig +++ /dev/null @@ -1,198 +0,0 @@ -package tconstruct; - -import tconstruct.achievements.TAchievements; - -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.network.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.relauncher.Side; -import java.util.logging.Logger; -import net.minecraft.crash.CallableMinecraftVersion; -import net.minecraft.world.gen.structure.MapGenStructureIO; -import net.minecraftforge.common.MinecraftForge; -import tconstruct.client.event.EventCloakRender; -import tconstruct.common.*; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.*; -import tconstruct.library.util.TabTools; -import tconstruct.plugins.PluginController; -import tconstruct.util.*; -import tconstruct.util.config.*; -import tconstruct.util.landmine.behavior.Behavior; -import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; -import tconstruct.util.player.TPlayerHandler; -import tconstruct.worldgen.*; -import tconstruct.worldgen.village.*; - -/** TConstruct, the tool mod. - * Craft your tools with style, then modify until the original is gone! - * @author mDiyo - */ - -<<<<<<< HEAD:src/tconstruct/TConstruct.java -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") -======= -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_2.0a", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") ->>>>>>> origin/gradle:src/main/java/tconstruct/TConstruct.java -@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) -public class TConstruct -{ - /** The value of one ingot in millibuckets */ - public static final int ingotLiquidValue = 144; - public static final int oreLiquidValue = ingotLiquidValue * 2; - public static final int blockLiquidValue = ingotLiquidValue * 9; - public static final int chunkLiquidValue = ingotLiquidValue / 2; - public static final int nuggetLiquidValue = ingotLiquidValue / 9; - - public static final int liquidUpdateAmount = 6; - - // Shared mod logger - public static final Logger logger = Logger.getLogger("TConstruct"); - - /* Instance of this mod, used for grabbing prototype fields */ - @Instance("TConstruct") - public static TConstruct instance; - /* Proxies for sides, used for graphics processing */ - @SidedProxy(clientSide = "tconstruct.client.TProxyClient", serverSide = "tconstruct.common.TProxyCommon") - public static TProxyCommon proxy; - - public TConstruct() - { - logger.setParent(FMLCommonHandler.instance().getFMLLogger()); - if (Loader.isModLoaded("Natura")) - { - TConstruct.logger.info("[TConstruct] Natura, what are we going to do tomorrow night?"); - TConstruct.logger.info("[Natura] TConstruct, we're going to take over the world!"); - } - else - { - - TConstruct.logger.info("[TConstruct] Preparing to take over the world"); - } - - EnvironmentChecks.verifyEnvironmentSanity(); - - PluginController.getController().registerBuiltins(); - } - - @EventHandler - public void preInit (FMLPreInitializationEvent event) - { - - PHConstruct.initProps(event.getModConfigurationDirectory()); - TConstructRegistry.materialTab = new TabTools("TConstructMaterials"); - TConstructRegistry.toolTab = new TabTools("TConstructTools"); - TConstructRegistry.blockTab = new TabTools("TConstructBlocks"); - - tableCasting = new LiquidCasting(); - basinCasting = new LiquidCasting(); - chiselDetailing = new Detailing(); - - content = new TContent(); - - events = new TEventHandler(); - MinecraftForge.EVENT_BUS.register(events); - MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement()); - content.oreRegistry(); - - proxy.registerRenderer(); - proxy.addNames(); - proxy.readManuals(); - proxy.registerKeys(); - proxy.registerTickHandler(); - - GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); - MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler()); - GameRegistry.registerFuelHandler(content); - GameRegistry.registerCraftingHandler(new TCraftingHandler()); - NetworkRegistry.instance().registerGuiHandler(instance, proxy); - - if (PHConstruct.addToVillages) - { - // adds to the villager spawner egg - VillagerRegistry.instance().registerVillagerId(78943); - // moved down, not needed if 'addToVillages' is false - VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades()); - VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler()); - VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler()); - try - { - if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4")) - { - MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure"); - MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure"); - } - } - catch (Throwable e) - { - - } - } - - playerTracker = new TPlayerHandler(); - GameRegistry.registerPlayerTracker(playerTracker); - MinecraftForge.EVENT_BUS.register(playerTracker); - - PluginController.getController().preInit(); - } - - @EventHandler - public void init (FMLInitializationEvent event) - { - if (event.getSide() == Side.CLIENT) - { - MinecraftForge.EVENT_BUS.register(new EventCloakRender()); - } - - content.intermodCommunication(); - TwilightForestConfig.initProps(PHConstruct.cfglocation); - BOPConfig.initProps(PHConstruct.cfglocation); - DimensionBlacklist.getbaddimensions(); - GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); - - PluginController.getController().init(); - - if(PHConstruct.achievementsEnabled){ - TAchievements.init(); - } - } - - @EventHandler - public void postInit (FMLPostInitializationEvent evt) - { - proxy.postInit(); - Behavior.registerBuiltInBehaviors(); - SpecialStackHandler.registerBuiltInStackHandlers(); - content.modIntegration(); - content.addOreDictionarySmelteryRecipes(); - content.createEntities(); - content.modRecipes(); - - PluginController.getController().postInit(); - } - - public static LiquidCasting getTableCasting () - { - return tableCasting; - } - - public static LiquidCasting getBasinCasting () - { - return basinCasting; - } - - public static Detailing getChiselDetailing () - { - return chiselDetailing; - } - - public static TContent content; - public static TEventHandler events; - public static TPlayerHandler playerTracker; - public static LiquidCasting tableCasting; - public static LiquidCasting basinCasting; - public static Detailing chiselDetailing; -} diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index ae0b2451..0e197746 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -21,6 +21,7 @@ import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.blocks.logic.ToolStationLogic; import tconstruct.common.TContent; import tconstruct.common.TProxyCommon; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.blocks.InventorySlab; import tconstruct.util.config.PHConstruct; @@ -142,9 +143,9 @@ public class CraftingSlab extends InventorySlab PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(x, y, z); for (int i = 1; i <= 13; i++) { - logic.setInventorySlotContents(i - 1, new ItemStack(TContent.woodPattern, 1, i)); + logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i)); } - logic.setInventorySlotContents(13, new ItemStack(TContent.woodPattern, 1, 22)); + logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22)); } } super.onBlockPlacedBy(world, x, y, z, entityliving, stack); diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index 9419400c..99de57b1 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -10,6 +10,7 @@ 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; public class LiquidMetalFinite extends BlockFluidFinite @@ -20,7 +21,7 @@ public class LiquidMetalFinite extends BlockFluidFinite public LiquidMetalFinite(int id, Fluid fluid, String texture) { - super(id, fluid, TContent.liquidMetal); + super(id, fluid, TRepo.liquidMetal); this.texture = texture; this.setCreativeTab(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java index 68b1f64e..e2e9d7c3 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/blocks/OreberryBush.java @@ -5,9 +5,9 @@ import java.util.Random; import tconstruct.client.block.OreberryRender; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; @@ -187,7 +187,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable if (meta >= 12) { world.setBlock(x, y, z, blockID, meta - 4, 3); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, 1, meta % 4 + itemMeat)); + AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, 1, meta % 4 + itemMeat)); } } } @@ -206,7 +206,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable return true; world.setBlock(x, y, z, blockID, meta - 4, 3); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); + AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); return true; } diff --git a/src/main/java/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/blocks/SearedSlab.java index fdda9cad..1d3f237e 100644 --- a/src/main/java/tconstruct/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/blocks/SearedSlab.java @@ -3,8 +3,8 @@ package tconstruct.blocks; import java.util.List; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -34,11 +34,11 @@ public class SearedSlab extends SlabBase { meta = meta % 8; if (meta == 0) - return TContent.smeltery.getIcon(side, 2); + return TRepo.smeltery.getIcon(side, 2); if (meta <= 3) - return TContent.smeltery.getIcon(side, meta + 3); + return TRepo.smeltery.getIcon(side, meta + 3); - return TContent.smeltery.getIcon(side, meta + 4); + return TRepo.smeltery.getIcon(side, meta + 4); } @Override diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java index 116fbb25..bc3a52b3 100644 --- a/src/main/java/tconstruct/blocks/SlimePad.java +++ b/src/main/java/tconstruct/blocks/SlimePad.java @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tconstruct.client.block.SlimePadRender; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -131,16 +132,16 @@ public class SlimePad extends Block @SideOnly(Side.CLIENT) public Icon getIcon (int side, int meta) { - return TContent.slimeGel.getIcon(side, 1); + return TRepo.slimeGel.getIcon(side, 1); } public Icon getFluidIcon (int meta) { - return TContent.slimeChannel.getIcon(2, 0); + return TRepo.slimeChannel.getIcon(2, 0); } public Icon getNubIcon (int meta) { - return TContent.slimeGel.getIcon(0, 0); + return TRepo.slimeGel.getIcon(0, 0); } } diff --git a/src/main/java/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/blocks/SoilSlab.java index 8930b1ee..2e3ee47e 100644 --- a/src/main/java/tconstruct/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/blocks/SoilSlab.java @@ -11,6 +11,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -43,7 +44,7 @@ public class SoilSlab extends SlabBase case 2: return Block.mycelium.getIcon(1, 0); default: - return TContent.craftedSoil.getIcon(side, meta - 3); + return TRepo.craftedSoil.getIcon(side, meta - 3); } } diff --git a/src/main/java/tconstruct/blocks/SpeedSlab.java b/src/main/java/tconstruct/blocks/SpeedSlab.java index 739c287c..816f933d 100644 --- a/src/main/java/tconstruct/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/blocks/SpeedSlab.java @@ -3,8 +3,8 @@ package tconstruct.blocks; import java.util.List; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -35,7 +35,7 @@ public class SpeedSlab extends SlabBase public Icon getIcon (int side, int meta) { meta = meta % 8; - return TContent.speedBlock.getIcon(side, meta); + return TRepo.speedBlock.getIcon(side, meta); } @Override diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java index d2c2cd1f..6280142e 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java @@ -10,9 +10,9 @@ import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.client.block.TableForgeRender; import tconstruct.common.TContent; import tconstruct.common.TProxyCommon; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.blocks.InventoryBlock; - import net.minecraft.block.Block; import net.minecraft.block.BlockFarmland; import net.minecraft.block.BlockHalfSlab; @@ -81,7 +81,7 @@ public class ToolForgeBlock extends InventoryBlock case 3: return Block.blockEmerald.getIcon(side, 0); default: - return TContent.metalBlock.getIcon(side, meta - 4); + return TRepo.metalBlock.getIcon(side, meta - 4); } } diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index 19478be5..1faa4f62 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -9,10 +9,10 @@ import tconstruct.blocks.logic.StencilTableLogic; import tconstruct.blocks.logic.ToolStationLogic; import tconstruct.client.block.TableRender; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.blocks.InventoryBlock; import tconstruct.util.config.PHConstruct; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -204,9 +204,9 @@ public class ToolStationBlock extends InventoryBlock PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(x, y, z); for (int i = 1; i <= 13; i++) { - logic.setInventorySlotContents(i - 1, new ItemStack(TContent.woodPattern, 1, i)); + logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i)); } - logic.setInventorySlotContents(13, new ItemStack(TContent.woodPattern, 1, 22)); + logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22)); } } super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack); diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java index 62319a9f..476d68f1 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryScan.java @@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.component.TankLayerScan; import tconstruct.library.util.CoordTuple; import tconstruct.library.util.IServantLogic; @@ -32,7 +33,7 @@ public class SmelteryScan extends TankLayerScan protected boolean checkAir (int x, int y, int z) { Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block == null || block.isAirBlock(world, x, y, z) || block == TContent.tankAir) + if (block == null || block.isAirBlock(world, x, y, z) || block == TRepo.tankAir) return true; return false; @@ -52,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 == TContent.lavaTank) + if (ret && block == TRepo.lavaTank) lavaTanks.add(new CoordTuple(x, y, z)); return ret; } @@ -70,9 +71,9 @@ public class SmelteryScan extends TankLayerScan { for (CoordTuple coord : airCoords) { - if (world.getBlockId(coord.x, coord.y, coord.z) != TContent.tankAir.blockID) + if (world.getBlockId(coord.x, coord.y, coord.z) != TRepo.tankAir.blockID) { - world.setBlock(coord.x, coord.y, coord.z, TContent.tankAir.blockID); + world.setBlock(coord.x, coord.y, coord.z, TRepo.tankAir.blockID); IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z); servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 365f239a..0d4be928 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -26,6 +26,7 @@ import tconstruct.TConstruct; import tconstruct.blocks.component.SmelteryComponent; import tconstruct.blocks.component.SmelteryScan; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.inventory.AdaptiveSmelteryContainer; import tconstruct.library.blocks.AdaptiveInventoryLogic; import tconstruct.library.component.IComponentHolder; @@ -42,7 +43,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc boolean updateFluids = false; boolean recheckStructure = false; boolean updateAir = false; - SmelteryScan structure = new SmelteryScan(this, TContent.smeltery, TContent.lavaTank); + SmelteryScan structure = new SmelteryScan(this, TRepo.smeltery, TRepo.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/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 97d08f3e..b25e8a21 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -31,6 +31,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.inventory.SmelteryContainer; import tconstruct.library.blocks.InventoryLogic; import tconstruct.library.crafting.Smeltery; @@ -320,7 +321,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (currentLiquid + 40 < maxLiquid) { int amount = villager.isChild() ? 5 : 40; - this.fill(new FluidStack(TContent.moltenEmeraldFluid, amount), true); + this.fill(new FluidStack(TRepo.moltenEmeraldFluid, amount), true); } } } @@ -331,7 +332,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { if (currentLiquid + 125 < maxLiquid) { - this.fill(new FluidStack(TContent.moltenEnderFluid, 125), true); + this.fill(new FluidStack(TRepo.moltenEnderFluid, 125), true); } } } @@ -342,7 +343,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { if (currentLiquid + 40 < maxLiquid) { - this.fill(new FluidStack(TContent.moltenIronFluid, 40), true); + this.fill(new FluidStack(TRepo.moltenIronFluid, 40), true); } } } @@ -353,7 +354,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { if (currentLiquid + 108 < maxLiquid) { - this.fill(new FluidStack(TContent.glueFluid, 108), true); + this.fill(new FluidStack(TRepo.glueFluid, 108), true); } } } @@ -365,7 +366,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(TContent.bloodFluid, amount), true); + this.fill(new FluidStack(TRepo.bloodFluid, amount), true); } } } @@ -673,7 +674,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci //worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); //worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } - + /*@Override public void setInventorySlotContents (int slot, ItemStack itemstack) { @@ -864,7 +865,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci Block block = Block.blocksList[blockID]; if (block != null && !block.isAirBlock(worldObj, xPos, y, zPos)) { - if (blockID == TContent.smeltery.blockID) + if (blockID == TRepo.smeltery.blockID) return validateBottom(x, y, z, count); else return count; @@ -899,7 +900,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - if (worldObj.getBlockId(xPos, y, zPos) == TContent.smeltery.blockID && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2)) + if (worldObj.getBlockId(xPos, y, zPos) == TRepo.smeltery.blockID && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2)) bottomBricks++; } } @@ -919,7 +920,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { int tempBricks = 0; int blockID = worldObj.getBlockId(x, y, z); - if (blockID == TContent.smeltery.blockID || blockID == TContent.lavaTank.blockID) + if (blockID == TRepo.smeltery.blockID || blockID == TRepo.lavaTank.blockID) { TileEntity te = worldObj.getBlockTileEntity(x, y, z); if (te == this) diff --git a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java index d2e8712a..1e47860c 100644 --- a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java @@ -1,6 +1,7 @@ package tconstruct.blocks.logic; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.inventory.PatternShaperContainer; import tconstruct.library.blocks.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; @@ -45,10 +46,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() == TContent.blankPattern)//instanceof tconstruct.items.Pattern) + if (slot == 0 && itemstack != null && itemstack.getItem() == TRepo.blankPattern)//instanceof tconstruct.items.Pattern) { if (itemstack.getItemDamage() == 0) - setInventorySlotContents(1, new ItemStack(TContent.woodPattern, 1, 1)); + setInventorySlotContents(1, new ItemStack(TRepo.woodPattern, 1, 1)); /*else if (itemstack.getItemDamage() == 1) setInventorySlotContents(1, new ItemStack(TContent.metalPattern, 1, 0));*/ } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 3eff225f..80afd355 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -14,6 +14,7 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -93,7 +94,7 @@ public class SlimeGrass extends Block public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) { - world.setBlock(x, y, z, TContent.craftedSoil.blockID, 5, 3); + world.setBlock(x, y, z, TRepo.craftedSoil.blockID, 5, 3); } public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) @@ -102,7 +103,7 @@ public class SlimeGrass extends Block { if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && par1World.getBlockLightOpacity(par2, par3 + 1, par4) > 2) { - par1World.setBlock(par2, par3, par4, TContent.craftedSoil.blockID, 5, 3); + par1World.setBlock(par2, par3, par4, TRepo.craftedSoil.blockID, 5, 3); } else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) { @@ -122,7 +123,7 @@ public class SlimeGrass extends Block return; } int blockMeta = par1World.getBlockMetadata(posX, posY, posZ); - if (blockID == TContent.craftedSoil.blockID) + if (blockID == TRepo.craftedSoil.blockID) { if (blockMeta == 5) par1World.setBlock(posX, posY, posZ, this.blockID, 0, 3); @@ -136,7 +137,7 @@ public class SlimeGrass extends Block public int idDropped (int metadata, Random random, int fortune) { if (metadata == 1) - return TContent.craftedSoil.blockID; + return TRepo.craftedSoil.blockID; else return Block.dirt.blockID; } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index df4ed85b..4874559e 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -11,6 +11,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -96,7 +97,7 @@ public class SlimeLeaves extends BlockLeaves */ public int idDropped (int par1, Random par2Random, int par3) { - return TContent.slimeSapling.blockID; + return TRepo.slimeSapling.blockID; } /** @@ -143,7 +144,7 @@ public class SlimeLeaves extends BlockLeaves if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0) { - this.dropBlockAsItem_do(world, x, y, z, new ItemStack(TContent.strangeFood, 1, 0)); + this.dropBlockAsItem_do(world, x, y, z, new ItemStack(TRepo.strangeFood, 1, 0)); } } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 8cb0b859..1846d551 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -13,6 +13,7 @@ import net.minecraft.util.Icon; 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 cpw.mods.fml.relauncher.Side; @@ -47,7 +48,7 @@ public class SlimeSapling extends BlockSapling public boolean canThisPlantGrowOnThisBlockID (int id) { - return id == Block.grass.blockID || id == Block.dirt.blockID || id == TContent.slimeGrass.blockID || id == TContent.craftedSoil.blockID; + return id == Block.grass.blockID || id == Block.dirt.blockID || id == TRepo.slimeGrass.blockID || id == TRepo.craftedSoil.blockID; } public void updateTick (World world, int x, int y, int z, Random random) diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 52346279..254de41e 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -19,6 +19,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.client.block.PunjiRender; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -59,7 +60,7 @@ public class Punji extends Block if (meta < 4) { ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.itemID == TContent.punji.blockID) + if (stack != null && stack.itemID == TRepo.punji.blockID) { 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.getPlaceSound(), diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java index 5988e4ed..0a0df728 100644 --- a/src/main/java/tconstruct/client/TClientEvents.java +++ b/src/main/java/tconstruct/client/TClientEvents.java @@ -2,7 +2,9 @@ package tconstruct.client; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.*; + import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SoundManager; @@ -24,6 +26,7 @@ import net.minecraftforge.fluids.*; import tconstruct.TConstruct; import tconstruct.client.armor.WingModel; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.util.player.TPlayerStats; @SideOnly(Side.CLIENT) @@ -77,11 +80,11 @@ public class TClientEvents { if (event.map.textureType == 0) { - for (int i = 0; i < TContent.fluidBlocks.length; i++) + for (int i = 0; i < TRepo.fluidBlocks.length; i++) { - TContent.fluids[i].setIcons(TContent.fluidBlocks[i].getIcon(0, 0), TContent.fluidBlocks[i].getIcon(2, 0)); + TRepo.fluids[i].setIcons(TRepo.fluidBlocks[i].getIcon(0, 0), TRepo.fluidBlocks[i].getIcon(2, 0)); } - TContent.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]); + TRepo.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]); } } @@ -216,7 +219,7 @@ public class TClientEvents GuiIngameForge.left_height += 10; if (absorb > 0) GuiIngameForge.left_height += 10; - + event.setCanceled(true); } } diff --git a/src/main/java/tconstruct/client/TClientTickHandler.java b/src/main/java/tconstruct/client/TClientTickHandler.java index 5bbaed5e..59c62a1e 100644 --- a/src/main/java/tconstruct/client/TClientTickHandler.java +++ b/src/main/java/tconstruct/client/TClientTickHandler.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import tconstruct.TConstruct; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; @@ -19,9 +20,9 @@ public class TClientTickHandler implements ITickHandler @Override public void tickEnd (EnumSet type, Object... tickData) { - TContent.oreBerry.setGraphicsLevel(Block.leaves.graphicsLevel); - TContent.oreBerrySecond.setGraphicsLevel(Block.leaves.graphicsLevel); - TContent.slimeLeaves.setGraphicsLevel(Block.leaves.graphicsLevel); + TRepo.oreBerry.setGraphicsLevel(Block.leaves.graphicsLevel); + TRepo.oreBerrySecond.setGraphicsLevel(Block.leaves.graphicsLevel); + TRepo.slimeLeaves.setGraphicsLevel(Block.leaves.graphicsLevel); /*if (mc.thePlayer != null && !mc.thePlayer.isAirBorne) controlInstance.landOnGround();*/ } diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index d07fe374..34c866bb 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -247,12 +247,12 @@ public class TProxyClient extends TProxyCommon // RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, // new PlayerArmorRender()); // <-- Works, woo! - MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, new CustomBowRenderer()); + MinecraftForgeClient.registerItemRenderer(TRepo.shortbow.itemID, new CustomBowRenderer()); VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png")); ToolCoreRenderer renderer = new ToolCoreRenderer(); - MinecraftForgeClient.registerItemRenderer(TContent.arrow.itemID, renderer); - MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TRepo.arrow.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TRepo.dagger.itemID, renderer); addRenderMappings(); addToolButtons(); @@ -294,32 +294,32 @@ public class TProxyClient extends TProxyCommon public void initManualIcons () { - TConstructClientRegistry.registerManualIcon("smelterybook", new ItemStack(TContent.manualBook, 1, 2)); - TConstructClientRegistry.registerManualIcon("smeltery", new ItemStack(TContent.smeltery)); - TConstructClientRegistry.registerManualIcon("blankcast", new ItemStack(TContent.blankPattern, 1, 1)); - TConstructClientRegistry.registerManualIcon("castingtable", new ItemStack(TContent.searedBlock)); + TConstructClientRegistry.registerManualIcon("smelterybook", new ItemStack(TRepo.manualBook, 1, 2)); + TConstructClientRegistry.registerManualIcon("smeltery", new ItemStack(TRepo.smeltery)); + TConstructClientRegistry.registerManualIcon("blankcast", new ItemStack(TRepo.blankPattern, 1, 1)); + TConstructClientRegistry.registerManualIcon("castingtable", new ItemStack(TRepo.searedBlock)); // TConstructClientRegistry.registerManualIcon("liquidiron", new - // ItemStack(TContent.liquidMetalStill)); - TConstructClientRegistry.registerManualIcon("lavatank", new ItemStack(TContent.lavaTank)); - TConstructClientRegistry.registerManualIcon("searedbrick", new ItemStack(TContent.smeltery, 1, 2)); - TConstructClientRegistry.registerManualIcon("drain", new ItemStack(TContent.smeltery, 1, 1)); - TConstructClientRegistry.registerManualIcon("faucet", new ItemStack(TContent.searedBlock, 1, 1)); - TConstructClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TContent.materials, 1, 13)); - TConstructClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TContent.materials, 1, 14)); - TConstructClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TContent.materials, 1, 5)); - TConstructClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TContent.materials, 1, 15)); - TConstructClientRegistry.registerManualIcon("blankpattern", new ItemStack(TContent.blankPattern, 1, 0)); - TConstructClientRegistry.registerManualIcon("toolstation", new ItemStack(TContent.toolStationWood, 1, 0)); - TConstructClientRegistry.registerManualIcon("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1)); - TConstructClientRegistry.registerManualIcon("patternchest", new ItemStack(TContent.toolStationWood, 1, 5)); - TConstructClientRegistry.registerManualIcon("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10)); + // ItemStack(TRepo.liquidMetalStill)); + TConstructClientRegistry.registerManualIcon("lavatank", new ItemStack(TRepo.lavaTank)); + TConstructClientRegistry.registerManualIcon("searedbrick", new ItemStack(TRepo.smeltery, 1, 2)); + TConstructClientRegistry.registerManualIcon("drain", new ItemStack(TRepo.smeltery, 1, 1)); + TConstructClientRegistry.registerManualIcon("faucet", new ItemStack(TRepo.searedBlock, 1, 1)); + TConstructClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TRepo.materials, 1, 13)); + TConstructClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TRepo.materials, 1, 14)); + TConstructClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TRepo.materials, 1, 5)); + TConstructClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TRepo.materials, 1, 15)); + TConstructClientRegistry.registerManualIcon("blankpattern", new ItemStack(TRepo.blankPattern, 1, 0)); + TConstructClientRegistry.registerManualIcon("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0)); + TConstructClientRegistry.registerManualIcon("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1)); + TConstructClientRegistry.registerManualIcon("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5)); + TConstructClientRegistry.registerManualIcon("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10)); TConstructClientRegistry.registerManualIcon("torch", new ItemStack(Block.torchWood)); TConstructClientRegistry.registerManualIcon("sapling", new ItemStack(Block.sapling)); TConstructClientRegistry.registerManualIcon("workbench", new ItemStack(Block.workbench)); TConstructClientRegistry.registerManualIcon("coal", new ItemStack(Item.coal)); - TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TContent.materials, 1, 18)); - TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TContent.materials, 1, 7)); + TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TRepo.materials, 1, 18)); + TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TRepo.materials, 1, 7)); // Tool Materials TConstructClientRegistry.registerManualIcon("woodplanks", new ItemStack(Block.planks)); @@ -330,93 +330,93 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualIcon("bone", new ItemStack(Item.bone)); TConstructClientRegistry.registerManualIcon("obsidian", new ItemStack(Block.obsidian)); TConstructClientRegistry.registerManualIcon("netherrack", new ItemStack(Block.netherrack)); - TConstructClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TContent.materials, 1, 17)); - TConstructClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TContent.materials, 1, 1)); - TConstructClientRegistry.registerManualIcon("paperstack", new ItemStack(TContent.materials, 1, 0)); - TConstructClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TContent.materials, 1, 3)); - TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4)); - TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9)); - TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16)); - TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); + TConstructClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TRepo.materials, 1, 17)); + TConstructClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TRepo.materials, 1, 1)); + TConstructClientRegistry.registerManualIcon("paperstack", new ItemStack(TRepo.materials, 1, 0)); + TConstructClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TRepo.materials, 1, 3)); + TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TRepo.materials, 1, 4)); + TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TRepo.materials, 1, 9)); + TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TRepo.materials, 1, 16)); + TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TRepo.materials, 1, 34)); // Tool parts - TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TContent.shovelHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TContent.hatchetHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TContent.swordBlade, 1, 2)); - TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TContent.frypanHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("board", new ItemStack(TContent.signHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("knifeblade", new ItemStack(TContent.knifeBlade, 1, 2)); - TConstructClientRegistry.registerManualIcon("chiselhead", new ItemStack(TContent.chiselHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TRepo.pickaxeHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TRepo.shovelHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TRepo.hatchetHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TRepo.swordBlade, 1, 2)); + TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TRepo.frypanHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("board", new ItemStack(TRepo.signHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("knifeblade", new ItemStack(TRepo.knifeBlade, 1, 2)); + TConstructClientRegistry.registerManualIcon("chiselhead", new ItemStack(TRepo.chiselHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("hammerhead", new ItemStack(TContent.hammerHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TContent.excavatorHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("scythehead", new ItemStack(TContent.scytheBlade, 1, 2)); - TConstructClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TContent.broadAxeHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TContent.largeSwordBlade, 1, 2)); + TConstructClientRegistry.registerManualIcon("hammerhead", new ItemStack(TRepo.hammerHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TRepo.excavatorHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("scythehead", new ItemStack(TRepo.scytheBlade, 1, 2)); + TConstructClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TRepo.broadAxeHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TRepo.largeSwordBlade, 1, 2)); TConstructClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick)); - TConstructClientRegistry.registerManualIcon("binding", new ItemStack(TContent.binding, 1, 4)); - TConstructClientRegistry.registerManualIcon("wideguard", new ItemStack(TContent.wideGuard, 1, 4)); - TConstructClientRegistry.registerManualIcon("handguard", new ItemStack(TContent.handGuard, 1, 4)); - TConstructClientRegistry.registerManualIcon("crossbar", new ItemStack(TContent.crossbar, 1, 4)); + TConstructClientRegistry.registerManualIcon("binding", new ItemStack(TRepo.binding, 1, 4)); + TConstructClientRegistry.registerManualIcon("wideguard", new ItemStack(TRepo.wideGuard, 1, 4)); + TConstructClientRegistry.registerManualIcon("handguard", new ItemStack(TRepo.handGuard, 1, 4)); + TConstructClientRegistry.registerManualIcon("crossbar", new ItemStack(TRepo.crossbar, 1, 4)); - TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TContent.toughRod, 1, 0)); - TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TContent.toughBinding, 1, 17)); - TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TContent.largePlate, 1, 17)); + TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TRepo.toughRod, 1, 0)); + TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TRepo.toughBinding, 1, 17)); + TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TRepo.largePlate, 1, 17)); - TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0)); - TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2)); - TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0)); + TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TRepo.bowstring, 1, 0)); + TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TRepo.arrowhead, 1, 2)); + TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TRepo.fletching, 1, 0)); - TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16)); - TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15)); - TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25)); - TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TContent.buckets, 1, 24)); - TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TContent.buckets, 1, 23)); + TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TRepo.buckets, 1, 16)); + TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TRepo.buckets, 1, 15)); + TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TRepo.buckets, 1, 25)); + TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TRepo.buckets, 1, 24)); + TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TRepo.buckets, 1, 23)); // ToolIcons TConstructClientRegistry.registerManualIcon("pickicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.binding, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.shovelHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.binding, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.shovelHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); TConstructClientRegistry.registerManualIcon("mattockicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.shovelHead, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.shovelHead, 1, 12), "")); TConstructClientRegistry.registerManualIcon("swordicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.wideGuard, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.wideGuard, 1, 12), "")); TConstructClientRegistry.registerManualIcon("longswordicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.handGuard, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.handGuard, 1, 12), "")); TConstructClientRegistry.registerManualIcon("rapiericon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), "")); TConstructClientRegistry.registerManualIcon("daggerIcon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.knifeBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.frypanHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.signHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.chiselHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.knifeBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.frypanHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.signHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.chiselHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); TConstructClientRegistry.registerManualIcon("shortbowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.toolRod, 1, 10), new ItemStack(TContent.bowstring, 1, 0), new ItemStack(TContent.toolRod, 1, 12), "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.toolRod, 1, 10), new ItemStack(TRepo.bowstring, 1, 0), new ItemStack(TRepo.toolRod, 1, 12), "")); TConstructClientRegistry.registerManualIcon("arrowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.arrowhead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.fletching, 1, 0), "")); + ToolBuilder.instance.buildTool(new ItemStack(TRepo.arrowhead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.fletching, 1, 0), "")); - TConstructClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.largePlate, 1, 12), new ItemStack(TContent.largePlate, 8), "")); - TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); - TConstructClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TContent.excavatorHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), - new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); - TConstructClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.scytheBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.toughBinding, 1, 12), new ItemStack(TContent.toughRod, 8), "")); - TConstructClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.largeSwordBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), - new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughRod, 8), "")); - TConstructClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), - new ItemStack(TContent.broadAxeHead, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); + TConstructClientRegistry.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), "")); + TConstructClientRegistry.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), "")); + TConstructClientRegistry.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), "")); + TConstructClientRegistry.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), "")); + TConstructClientRegistry.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), "")); + TConstructClientRegistry.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), "")); } public void initManualRecipes () { - ItemStack pattern = new ItemStack(TContent.blankPattern, 1, 0); + ItemStack pattern = new ItemStack(TRepo.blankPattern, 1, 0); ItemStack stick = new ItemStack(Item.stick, 1, 0); ItemStack plank = new ItemStack(Block.planks, 1, 0); @@ -434,47 +434,47 @@ public class TProxyClient extends TProxyCommon ItemStack glass = new ItemStack(Block.glass, 1, 0); ItemStack ironblock = new ItemStack(Block.blockIron, 1, 0); - ItemStack grout = new ItemStack(TContent.craftedSoil, 2, 1); - ItemStack searedbrick = new ItemStack(TContent.materials, 1, 2); - ItemStack searedbrickBlock = new ItemStack(TContent.smeltery, 1, 2); + 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 coal = new ItemStack(Item.coal); ItemStack paper = new ItemStack(Item.paper); ItemStack slimeball = new ItemStack(Item.slimeBall); - ItemStack slimyMud = new ItemStack(TContent.craftedSoil); + ItemStack slimyMud = new ItemStack(TRepo.craftedSoil); ItemStack blazerod = new ItemStack(Item.blazeRod); ItemStack firecharge = new ItemStack(Item.fireballCharge); ItemStack string = new ItemStack(Item.silk); - ItemStack silkyCloth = new ItemStack(TContent.materials, 1, 25); + ItemStack silkyCloth = new ItemStack(TRepo.materials, 1, 25); - ItemStack graveyardsoil = new ItemStack(TContent.craftedSoil, 1, 3); - ItemStack consecratedsoil = new ItemStack(TContent.craftedSoil, 1, 4); + ItemStack graveyardsoil = new ItemStack(TRepo.craftedSoil, 1, 3); + ItemStack consecratedsoil = new ItemStack(TRepo.craftedSoil, 1, 4); // TConstruct recipes TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null); - TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TContent.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null); - TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TContent.manualBook, 1, 1), new ItemStack(TContent.manualBook, 1, 0), null, null, null); - TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TContent.manualBook, 1, 2), new ItemStack(TContent.manualBook, 1, 1), null, null, null); + TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TRepo.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null); + TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0), null, null, null); + TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1), null, null, null); TConstructClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank); - TConstructClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TContent.toolStationWood, 1, 0), null, pattern, null, workbench); - TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1), null, pattern, null, log); - TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TContent.toolStationWood, 1, 5), null, pattern, null, chest); - TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10), null, pattern, null, plank); - TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TContent.slimeChannel, 1, 0), new ItemStack(TContent.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null); - TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TContent.slimePad, 1, 0), new ItemStack(TContent.slimeChannel), new ItemStack(Item.slimeBall), null, null); - TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TContent.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( - TContent.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); + TConstructClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0), null, pattern, null, workbench); + TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1), null, pattern, null, log); + TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5), null, pattern, null, chest); + TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10), null, pattern, null, plank); + TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null); + TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TRepo.slimePad, 1, 0), new ItemStack(TRepo.slimeChannel), new ItemStack(Item.slimeBall), null, null); + TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TRepo.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( + TRepo.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); TConstructClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); - TConstructClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TContent.materials, 1, 1), slimyMud); - TConstructClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TContent.materials, 1, 0), paper, paper, paper, paper); - TConstructClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TContent.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, + TConstructClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TRepo.materials, 1, 1), slimyMud); + TConstructClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TRepo.materials, 1, 0), paper, paper, paper, paper); + TConstructClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TRepo.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble); - TConstructClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TContent.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava), + TConstructClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TRepo.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava), firecharge, blazerod, firecharge, blazerod); - TConstructClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TContent.materials, 1, 24), string, string, string, string); - TConstructClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TContent.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null, + TConstructClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TRepo.materials, 1, 24), string, string, string, string); + TConstructClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TRepo.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null, silkyCloth, null); TConstructClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Block.dirt), new ItemStack(Item.rottenFlesh), new ItemStack(Item.dyePowder, 1, 15), null); @@ -482,63 +482,63 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); TConstructClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); - TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TContent.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TContent.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, + TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TRepo.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); + TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TRepo.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TContent.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, + TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TRepo.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null); - TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, + TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TRepo.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TContent.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, + TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TRepo.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TContent.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, + TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TRepo.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TContent.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, + TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TRepo.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TContent.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, + TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TRepo.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TContent.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); - TConstructClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TContent.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, + TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TRepo.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); + TConstructClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TRepo.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, + TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TRepo.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); //Traps ItemStack reed = new ItemStack(Item.reed); - TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TContent.punji), reed, null, reed, null, reed, null, reed, null, reed); - TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log); + TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TRepo.punji), reed, null, reed, null, reed, null, reed, null, reed); + TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TRepo.barricadeOak), null, log, null, log); //Machines - ItemStack alubrassIngot = new ItemStack(TContent.materials, 1, 14); - ItemStack bronzeIngot = new ItemStack(TContent.materials, 1, 13); - ItemStack blankCast = new ItemStack(TContent.blankPattern, 1, 1); + 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 redstone = new ItemStack(Item.redstone); // Modifier recipes - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), ""); + ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), ""); TConstructClientRegistry.registerManualIcon("ironpick", ironpick); - ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.handGuard, 1, 10), ""); + ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.handGuard, 1, 10), ""); TConstructClientRegistry.registerManualIcon("ironlongsword", ironlongsword); TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Item.diamond)); TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Item.emerald)); TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Item.redstone), new ItemStack(Block.blockRedstone)); - TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 7)); + TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 7)); TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis)); - TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 6)); + TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 6)); TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Item.netherQuartz), new ItemStack(Block.blockNetherQuartz)); TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Item.blazePowder)); - TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TContent.materials, 1, 8)); - TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TContent.materials, 1, 26)); - TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TContent.largePlate, 1, 6)); + 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("pistonmod", ironlongsword.copy(), new ItemStack(Block.pistonBase)); TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Item.enderPearl), new ItemStack(Block.obsidian)); TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye)); - TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4)); + TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TRepo.craftedSoil, 1, 4)); TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt)); TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt)); @@ -546,11 +546,11 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold)); TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar)); - TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel)); - TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null); - TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null); - TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian)); - TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TContent.materials, 1, 36), new ItemStack(TContent.glueFluidBlock, 1), null); + TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TRepo.speedBlock), new ItemStack(TRepo.moltenTin, 1), new ItemStack(Block.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(Block.whiteStone), new ItemStack(TRepo.moltenEnder, 1), new ItemStack(Block.obsidian)); + TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TRepo.materials, 1, 36), new ItemStack(TRepo.glueFluidBlock, 1), null); } @@ -721,13 +721,13 @@ public class TProxyClient extends TProxyCommon String[] bowstringTypes = { "string", "magicfabric", "flamestring" }; for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) { - TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); + TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); } String[] fletching = { "feather", "leaf", "slime", "blueslime" }; for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++) { - TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.arrow, arrowIter, "tinker", fletching[arrowIter], true); + TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.arrow, arrowIter, "tinker", fletching[arrowIter], true); } } @@ -929,7 +929,7 @@ public class TProxyClient extends TProxyCommon } else if (par1Str.equals("blueslime")) { - entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TContent.strangeFood); + entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TRepo.strangeFood); } else if (par1Str.equals("heart")) { @@ -966,7 +966,7 @@ public class TProxyClient extends TProxyCommon @Override public void postInit () { - //MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast()); + //MinecraftForgeClient.registerItemRenderer(TRepo.armorPattern.itemID, new RenderArmorCast()); } } diff --git a/src/main/java/tconstruct/client/TProxyClient.java.orig b/src/main/java/tconstruct/client/TProxyClient.java.orig deleted file mode 100644 index ff901cb2..00000000 --- a/src/main/java/tconstruct/client/TProxyClient.java.orig +++ /dev/null @@ -1,996 +0,0 @@ -package tconstruct.client; - -import com.google.common.collect.Lists; -import cpw.mods.fml.client.registry.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.relauncher.Side; -import java.io.InputStream; -import java.util.*; -import javax.xml.parsers.*; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiInventory; -import net.minecraft.client.model.ModelSlime; -import net.minecraft.client.particle.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.client.settings.*; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.util.*; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.RenderBlockFluid; -import org.lwjgl.opengl.GL11; -import org.w3c.dom.Document; -import tconstruct.TConstruct; -import tconstruct.blocks.SlimeExplosive; -import tconstruct.blocks.logic.*; -import tconstruct.client.armor.RenderArmorCast; -import tconstruct.client.block.*; -import tconstruct.client.entity.*; -import tconstruct.client.entity.item.ExplosiveRender; -import tconstruct.client.entity.projectile.*; -import tconstruct.client.gui.*; -import tconstruct.client.pages.*; -import tconstruct.client.tabs.*; -import tconstruct.common.*; -import tconstruct.entity.*; -import tconstruct.entity.item.*; -import tconstruct.entity.item.*; -import tconstruct.entity.projectile.*; -import tconstruct.inventory.ContainerLandmine; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.*; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.ToolCore; -import tconstruct.util.config.PHConstruct; -import tconstruct.util.player.*; - -public class TProxyClient extends TProxyCommon -{ - public static SmallFontRenderer smallFontRenderer; - public static Icon metalBall; - public static Minecraft mc; - public static RenderItem itemRenderer = new RenderItem(); - - public static ArmorExtended armorExtended = new ArmorExtended(); - public static KnapsackInventory knapsack = new KnapsackInventory(); - - @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { - if (ID == toolStationID) - return new ToolStationGui(player.inventory, (ToolStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == partBuilderID) - return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == patternChestID) - return new PatternChestGui(player.inventory, (PatternChestLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == frypanGuiID) - return new FrypanGui(player.inventory, (FrypanLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == smelteryGuiID) - { - if (PHConstruct.newSmeltery) - return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - else - return new SmelteryGui(player.inventory, (SmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - } - if (ID == stencilTableID) - return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == toolForgeID) - return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - - if (ID == landmineID) - return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.getBlockTileEntity(x, y, z))); - if (ID == craftingStationID) - return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), x, y, z); - - if (ID == furnaceID) - return new FurnaceGui(player.inventory, (FurnaceLogic) world.getBlockTileEntity(x, y, z)); - - if (ID == manualGuiID) - { - ItemStack stack = player.getCurrentEquippedItem(); - return new GuiManual(stack, TProxyClient.getManualFromStack(stack)); - } - if (ID == inventoryGui) - { - GuiInventory inventory = new GuiInventory(player); - TabRegistry.addTabsToInventory(inventory); - return inventory; - } - if (ID == armorGuiID) - { - TProxyClient.armorExtended.init(Minecraft.getMinecraft().thePlayer); - return new ArmorExtendedGui(player.inventory, TProxyClient.armorExtended); - } - if (ID == knapsackGuiID) - { - TProxyClient.knapsack.init(Minecraft.getMinecraft().thePlayer); - return new KnapsackGui(player.inventory, TProxyClient.knapsack); - } - return null; - } - - public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta) - { - Tessellator tessellator = Tessellator.instance; - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - - public static void renderInvBlockFace (RenderBlocks renderblocks, Block block, int meta) - { - Tessellator tessellator = Tessellator.instance; - GL11.glScalef(2f, 2f, 2f); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glRotatef(45, 0, 1, 0); - GL11.glRotatef(60, 1, 0, 0); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - - public static boolean classMatches (Object paramObject, String paramString) - { - try - { - return paramObject.getClass().getName().equals(paramString); - } - catch (Exception localException) - { - return false; - } - } - - public void registerTickHandler () - { - TickRegistry.registerTickHandler(new TClientTickHandler(), Side.CLIENT); - // TickRegistry.registerTickHandler(new TimeTicker(), Side.CLIENT); - // TickRegistry.registerTickHandler(new TCommonTickHandler(), - // Side.CLIENT); - } - - /* Registers any rendering code. */ - public void registerRenderer () - { - Minecraft mc = Minecraft.getMinecraft(); - MinecraftForge.EVENT_BUS.register(new TClientEvents()); - smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false); - RenderingRegistry.registerBlockHandler(new TableRender()); - RenderingRegistry.registerBlockHandler(new TableForgeRender()); - RenderingRegistry.registerBlockHandler(new FrypanRender()); - RenderingRegistry.registerBlockHandler(new TankRender()); - RenderingRegistry.registerBlockHandler(new TankAirRender()); - RenderingRegistry.registerBlockHandler(new SearedRender()); - RenderingRegistry.registerBlockHandler(new OreberryRender()); - RenderingRegistry.registerBlockHandler(new BarricadeRender()); - RenderingRegistry.registerBlockHandler(new DryingRackRender()); - RenderingRegistry.registerBlockHandler(new PaneRender()); - RenderingRegistry.registerBlockHandler(new PaneConnectedRender()); - RenderingRegistry.registerBlockHandler(new RenderLandmine()); - RenderingRegistry.registerBlockHandler(new PunjiRender()); - RenderingRegistry.registerBlockHandler(new RenderBlockFluid()); - RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel()); - RenderingRegistry.registerBlockHandler(new SlimeChannelRender()); - RenderingRegistry.registerBlockHandler(new SlimePadRender()); - - if (!PHConstruct.newSmeltery) - RenderingRegistry.registerBlockHandler(new SmelteryRender()); - - // Special Renderers - ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(CastingBasinLogic.class, new CastingBasinSpecialRender()); - ClientRegistry.bindTileEntitySpecialRenderer(DryingRackLogic.class, new DryingRackSpecialRender()); - // ClientRegistry.bindTileEntitySpecialRenderer(GolemCoreLogic.class, - // new GolemCoreSpecialRender()); - - // Entities - RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender()); - RenderingRegistry.registerEntityRenderingHandler(BlueSlime.class, new SlimeRender(new ModelSlime(16), new ModelSlime(0), 0.25F)); - - RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender()); - RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender()); - RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384)); - RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom()); - RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom()); - RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Item.firework)); - RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender()); - // RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, - // new PlayerArmorRender()); // <-- Works, woo! - - MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, new CustomBowRenderer()); - VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png")); - - ToolCoreRenderer renderer = new ToolCoreRenderer(); - MinecraftForgeClient.registerItemRenderer(TContent.arrow.itemID, renderer); - MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer); - - addRenderMappings(); - addToolButtons(); - } - - public static Document diary; - public static Document volume1; - public static Document volume2; - public static Document smelter; - - public void readManuals () - { - DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory); - volume1 = readManual("/assets/tinker/manuals/firstday.xml", dbFactory); - volume2 = readManual("/assets/tinker/manuals/materials.xml", dbFactory); - smelter = readManual("/assets/tinker/manuals/smeltery.xml", dbFactory); - initManualIcons(); - initManualRecipes(); - initManualPages(); - } - - Document readManual (String location, DocumentBuilderFactory dbFactory) - { - try - { - InputStream stream = TConstruct.class.getResourceAsStream(location); - DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); - Document doc = dBuilder.parse(stream); - doc.getDocumentElement().normalize(); - return doc; - } - catch (Exception e) - { - e.printStackTrace(); - return null; - } - } - - public void initManualIcons () - { - TConstructClientRegistry.registerManualIcon("smelterybook", new ItemStack(TContent.manualBook, 1, 2)); - TConstructClientRegistry.registerManualIcon("smeltery", new ItemStack(TContent.smeltery)); - TConstructClientRegistry.registerManualIcon("blankcast", new ItemStack(TContent.blankPattern, 1, 1)); - TConstructClientRegistry.registerManualIcon("castingtable", new ItemStack(TContent.searedBlock)); - // TConstructClientRegistry.registerManualIcon("liquidiron", new - // ItemStack(TContent.liquidMetalStill)); - TConstructClientRegistry.registerManualIcon("lavatank", new ItemStack(TContent.lavaTank)); - TConstructClientRegistry.registerManualIcon("searedbrick", new ItemStack(TContent.smeltery, 1, 2)); - TConstructClientRegistry.registerManualIcon("drain", new ItemStack(TContent.smeltery, 1, 1)); - TConstructClientRegistry.registerManualIcon("faucet", new ItemStack(TContent.searedBlock, 1, 1)); - TConstructClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TContent.materials, 1, 13)); - TConstructClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TContent.materials, 1, 14)); - TConstructClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TContent.materials, 1, 5)); - TConstructClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TContent.materials, 1, 15)); - TConstructClientRegistry.registerManualIcon("blankpattern", new ItemStack(TContent.blankPattern, 1, 0)); - TConstructClientRegistry.registerManualIcon("toolstation", new ItemStack(TContent.toolStationWood, 1, 0)); - TConstructClientRegistry.registerManualIcon("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1)); - TConstructClientRegistry.registerManualIcon("patternchest", new ItemStack(TContent.toolStationWood, 1, 5)); - TConstructClientRegistry.registerManualIcon("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10)); - TConstructClientRegistry.registerManualIcon("torch", new ItemStack(Block.torchWood)); - TConstructClientRegistry.registerManualIcon("sapling", new ItemStack(Block.sapling)); - TConstructClientRegistry.registerManualIcon("workbench", new ItemStack(Block.workbench)); - TConstructClientRegistry.registerManualIcon("coal", new ItemStack(Item.coal)); - - TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TContent.materials, 1, 18)); - TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TContent.materials, 1, 7)); - - // Tool Materials - TConstructClientRegistry.registerManualIcon("woodplanks", new ItemStack(Block.planks)); - TConstructClientRegistry.registerManualIcon("stoneblock", new ItemStack(Block.stone)); - TConstructClientRegistry.registerManualIcon("ironingot", new ItemStack(Item.ingotIron)); - TConstructClientRegistry.registerManualIcon("flint", new ItemStack(Item.flint)); - TConstructClientRegistry.registerManualIcon("cactus", new ItemStack(Block.cactus)); - TConstructClientRegistry.registerManualIcon("bone", new ItemStack(Item.bone)); - TConstructClientRegistry.registerManualIcon("obsidian", new ItemStack(Block.obsidian)); - TConstructClientRegistry.registerManualIcon("netherrack", new ItemStack(Block.netherrack)); - TConstructClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TContent.materials, 1, 17)); - TConstructClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TContent.materials, 1, 1)); - TConstructClientRegistry.registerManualIcon("paperstack", new ItemStack(TContent.materials, 1, 0)); - TConstructClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TContent.materials, 1, 3)); - TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4)); - TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9)); - TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16)); -<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java - TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); -======= - TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); - ->>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java - - // Tool parts - TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TContent.shovelHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TContent.hatchetHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TContent.swordBlade, 1, 2)); - TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TContent.frypanHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("board", new ItemStack(TContent.signHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("knifeblade", new ItemStack(TContent.knifeBlade, 1, 2)); - TConstructClientRegistry.registerManualIcon("chiselhead", new ItemStack(TContent.chiselHead, 1, 2)); - - TConstructClientRegistry.registerManualIcon("hammerhead", new ItemStack(TContent.hammerHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TContent.excavatorHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("scythehead", new ItemStack(TContent.scytheBlade, 1, 2)); - TConstructClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TContent.broadAxeHead, 1, 2)); - TConstructClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TContent.largeSwordBlade, 1, 2)); - - TConstructClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick)); - - TConstructClientRegistry.registerManualIcon("binding", new ItemStack(TContent.binding, 1, 4)); - TConstructClientRegistry.registerManualIcon("wideguard", new ItemStack(TContent.wideGuard, 1, 4)); - TConstructClientRegistry.registerManualIcon("handguard", new ItemStack(TContent.handGuard, 1, 4)); - TConstructClientRegistry.registerManualIcon("crossbar", new ItemStack(TContent.crossbar, 1, 4)); - - TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TContent.toughRod, 1, 0)); - TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TContent.toughBinding, 1, 17)); - TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TContent.largePlate, 1, 17)); - - TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0)); - TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2)); - TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0)); -<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java - -======= - ->>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java - TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16)); - TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15)); - TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25)); - TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TContent.buckets, 1, 24)); - TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TContent.buckets, 1, 23)); - - // ToolIcons - TConstructClientRegistry.registerManualIcon("pickicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.binding, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.shovelHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("mattockicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.shovelHead, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("swordicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.wideGuard, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("longswordicon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.handGuard, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("rapiericon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("daggerIcon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.knifeBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.frypanHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.signHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.chiselHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); - TConstructClientRegistry.registerManualIcon("shortbowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.toolRod, 1, 10), new ItemStack(TContent.bowstring, 1, 0), new ItemStack(TContent.toolRod, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("arrowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TContent.arrowhead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.fletching, 1, 0), "")); - - TConstructClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.largePlate, 1, 12), new ItemStack(TContent.largePlate, 8), "")); - TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); - TConstructClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TContent.excavatorHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), - new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); - TConstructClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.scytheBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.toughBinding, 1, 12), new ItemStack(TContent.toughRod, 8), "")); - TConstructClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.largeSwordBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), - new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughRod, 8), "")); - TConstructClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), - new ItemStack(TContent.broadAxeHead, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); - } - - public void initManualRecipes () - { - ItemStack pattern = new ItemStack(TContent.blankPattern, 1, 0); - - ItemStack stick = new ItemStack(Item.stick, 1, 0); - ItemStack plank = new ItemStack(Block.planks, 1, 0); -<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java - ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); -======= - ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); ->>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java - ItemStack workbench = new ItemStack(Block.workbench, 1, 0); - ItemStack chest = new ItemStack(Block.chest, 1, 0); - ItemStack log = new ItemStack(Block.wood, 1, 0); - ItemStack mossycobble = new ItemStack(Block.cobblestoneMossy); - ItemStack netherrack = new ItemStack(Block.netherrack); - - ItemStack dirt = new ItemStack(Block.dirt, 1, 0); - ItemStack sand = new ItemStack(Block.sand, 1, 0); - ItemStack gravel = new ItemStack(Block.gravel, 1, 0); - ItemStack clay = new ItemStack(Item.clay, 1, 0); - ItemStack glass = new ItemStack(Block.glass, 1, 0); - ItemStack ironblock = new ItemStack(Block.blockIron, 1, 0); - - ItemStack grout = new ItemStack(TContent.craftedSoil, 2, 1); - ItemStack searedbrick = new ItemStack(TContent.materials, 1, 2); - ItemStack searedbrickBlock = new ItemStack(TContent.smeltery, 1, 2); - - ItemStack coal = new ItemStack(Item.coal); - ItemStack paper = new ItemStack(Item.paper); - ItemStack slimeball = new ItemStack(Item.slimeBall); - ItemStack slimyMud = new ItemStack(TContent.craftedSoil); - ItemStack blazerod = new ItemStack(Item.blazeRod); - ItemStack firecharge = new ItemStack(Item.fireballCharge); - ItemStack string = new ItemStack(Item.silk); - - ItemStack silkyCloth = new ItemStack(TContent.materials, 1, 25); - - ItemStack graveyardsoil = new ItemStack(TContent.craftedSoil, 1, 3); - ItemStack consecratedsoil = new ItemStack(TContent.craftedSoil, 1, 4); - - // TConstruct recipes -<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java - TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null); -======= - TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null); ->>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java - TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TContent.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null); - TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TContent.manualBook, 1, 1), new ItemStack(TContent.manualBook, 1, 0), null, null, null); - TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TContent.manualBook, 1, 2), new ItemStack(TContent.manualBook, 1, 1), null, null, null); - TConstructClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank); - TConstructClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TContent.toolStationWood, 1, 0), null, pattern, null, workbench); - TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1), null, pattern, null, log); - TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TContent.toolStationWood, 1, 5), null, pattern, null, chest); - TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10), null, pattern, null, plank); - TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TContent.slimeChannel, 1, 0), new ItemStack(TContent.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null); - TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TContent.slimePad, 1, 0), new ItemStack(TContent.slimeChannel), new ItemStack(Item.slimeBall), null, null); - TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TContent.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( - TContent.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); - - TConstructClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); - TConstructClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TContent.materials, 1, 1), slimyMud); - TConstructClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TContent.materials, 1, 0), paper, paper, paper, paper); - TConstructClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TContent.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, - mossycobble, mossycobble, mossycobble); - TConstructClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TContent.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava), - firecharge, blazerod, firecharge, blazerod); - TConstructClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TContent.materials, 1, 24), string, string, string, string); - TConstructClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TContent.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null, - silkyCloth, null); - - TConstructClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Block.dirt), new ItemStack(Item.rottenFlesh), new ItemStack(Item.dyePowder, 1, 15), null); - TConstructClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil); - - TConstructClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); - TConstructClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); - TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TContent.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TContent.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, - searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TContent.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, - null); -<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java - TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, -======= - - TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, ->>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java - searedbrick); - - TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TContent.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, - searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TContent.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, - searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TContent.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, - glass, searedbrick); - - TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TContent.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, - searedbrick, null, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TContent.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); - TConstructClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TContent.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, - searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, - searedbrick, searedbrick); - - //Traps - ItemStack reed = new ItemStack(Item.reed); - TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TContent.punji), reed, null, reed, null, reed, null, reed, null, reed); - TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log); - - //Machines - ItemStack alubrassIngot = new ItemStack(TContent.materials, 1, 14); - ItemStack bronzeIngot = new ItemStack(TContent.materials, 1, 13); - ItemStack blankCast = new ItemStack(TContent.blankPattern, 1, 1); - ItemStack redstone = new ItemStack(Item.redstone); - - // Modifier recipes - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), ""); - TConstructClientRegistry.registerManualIcon("ironpick", ironpick); - ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.handGuard, 1, 10), ""); - TConstructClientRegistry.registerManualIcon("ironlongsword", ironlongsword); - - TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Item.diamond)); - TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Item.emerald)); - TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Item.redstone), new ItemStack(Block.blockRedstone)); - TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 7)); - TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis)); - TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 6)); - TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Item.netherQuartz), new ItemStack(Block.blockNetherQuartz)); - TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Item.blazePowder)); - TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TContent.materials, 1, 8)); - TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TContent.materials, 1, 26)); - TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TContent.largePlate, 1, 6)); - - TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Block.pistonBase)); - TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Item.enderPearl), new ItemStack(Block.obsidian)); - TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye)); - TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4)); - -<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java - TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), new ItemStack(Block.dirt), new ItemStack(Block.dirt)); -======= ->>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java - TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt)); - TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt)); - - TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold)); - TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar)); - - TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel)); - TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null); - TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null); - TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian)); - TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TContent.materials, 1, 36), new ItemStack(TContent.glueFluidBlock, 1), null); - - } - - public static Map> pageClasses = new HashMap>(); - - public static void registerManualPage (String type, Class clazz) - { - pageClasses.put(type, clazz); - } - - public static Class getPageClass (String type) - { - return pageClasses.get(type); - } - - void initManualPages () - { - TProxyClient.registerManualPage("crafting", CraftingPage.class); - TProxyClient.registerManualPage("picture", PicturePage.class); - TProxyClient.registerManualPage("text", TextPage.class); - TProxyClient.registerManualPage("intro", TextPage.class); - TProxyClient.registerManualPage("sectionpage", SectionPage.class); - TProxyClient.registerManualPage("intro", TitlePage.class); - TProxyClient.registerManualPage("contents", ContentsTablePage.class); - TProxyClient.registerManualPage("furnace", FurnacePage.class); - TProxyClient.registerManualPage("sidebar", SidebarPage.class); - TProxyClient.registerManualPage("materialstats", MaterialPage.class); - TProxyClient.registerManualPage("toolpage", ToolPage.class); - TProxyClient.registerManualPage("modifier", ModifierPage.class); - TProxyClient.registerManualPage("blockcast", BlockCastPage.class); - - TProxyClient.registerManualPage("blank", BlankPage.class); - } - - public static Document getManualFromStack (ItemStack stack) - { - switch (stack.getItemDamage()) - { - case 0: - return volume1; - case 1: - return volume2; - case 2: - return smelter; - case 3: - return diary; - } - - return null; - } - - static int[][] itemIcons = { new int[] { 0, 3, 0 }, // Repair - new int[] { 1, 4, 0 }, // Pickaxe - new int[] { 2, 5, 0 }, // Shovel - new int[] { 2, 6, 0 }, // Axe - // new int[] {2, 9, 0}, //Lumber Axe - // new int[] {1, 7, 0}, //Ice Axe - new int[] { 3, 8, 0 }, // Mattock - new int[] { 1, 0, 1 }, // Broadsword - new int[] { 1, 1, 1 }, // Longsword - new int[] { 1, 2, 1 }, // Rapier - new int[] { 1, 5, 1 }, // Dagger - new int[] { 2, 3, 1 }, // Frying pan - new int[] { 2, 4, 1 }, // Battlesign - new int[] { 2, 6, 1 } // Chisel - }; - - static int[][] iconCoords = { new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, // Repair - new int[] { 0, 0, 1, 13 }, new int[] { 2, 3, 3, 13 }, // Pickaxe - new int[] { 3, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Shovel - new int[] { 2, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Axe - // new int[] { 6, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, //Lumber - // Axe - // new int[] { 0, 0, 5, 13 }, new int[] { 2, 3, 3, 13 }, //Ice Axe - new int[] { 2, 0, 3, 13 }, new int[] { 2, 3, 2, 13 }, // Mattock - new int[] { 1, 0, 2, 13 }, new int[] { 2, 3, 3, 13 }, // Broadsword - new int[] { 1, 0, 3, 13 }, new int[] { 2, 3, 3, 13 }, // Longsword - new int[] { 1, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Rapier - new int[] { 7, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Dagger - new int[] { 4, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Frying - // Pan - new int[] { 5, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Battlesign - new int[] { 7, 0, 13, 13 }, new int[] { 3, 3, 13, 13 } // Chisel - }; - - static String[] toolNames = { "Repair and Modification", "Pickaxe", "Shovel", "Hatchet", - // "Lumber Axe", - // "Ice Axe", - "Mattock", "Broadsword", "Longsword", "Rapier", "Dagger", "Frying Pan", "Battlesign", "Chisel" }; - - static String[] toolDescriptions = { - "The main way to repair or change your tools. Place a tool and a material on the left to get started.", - "The Pickaxe is a precise mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle", - "The Shovel is a precise digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", - "The Hatchet is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", - // "The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle", - // "The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle", - "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", - "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", - "The Longsword is an offensive weapon. It is often used for charging into battle at full speed.\n\nNatural Ability:\n- Charge Boost\nSpecial Ability: Lunge\n\nDamage: Moderate\nDurability: Moderate", - "The Rapier is a special weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nSpecial Ability:\n- Backpedal\n\nDamage: Low\nDurability: Low", - "The Dagger is a short blade that can be thrown.\n\nSpecial Ability:\n- Throw Item\n\nDamage: Low\nDurability: Moderate\n\nRequired parts:\n- Knife Blade\n- Crossbar\n- Handle", - "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Heavy\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle", - // "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle" - "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Sign Board\n- Handle", - "The Chisel is a utility tool that carves shapes into blocks.\n\nCrafting Grid:\n- Shape Items\nSpecial Ability: Chisel\nDurability: Average\n\nRequired parts:\n- Chisel Head\n- Handle" }; - - void addToolButtons () - { - for (int i = 0; i < toolNames.length; i++) - { - addToolButton(itemIcons[i][0], itemIcons[i][1], itemIcons[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]); - } - - addToolButton(3, 9, 1, new int[] { 0, 10, 0, 13 }, new int[] { 3, 3, 3, 13 }, "Shortbow", - "The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Tool Rod\n- Bowstring\n- Tool Rod"); - addToolButton(7, 10, 1, new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, "Arrow", - "Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching"); - addTierTwoButton(6, 13, 0, new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, "Hammer", - "The Hammer is a broad mining tool. It harvests blocks in a wide range and is effective against undead.\n\nNatural Abilities:\nArea of Effect\n- (3x3)\n- Smite\n\nDurability: High"); - addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe", - "The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abilities:\nArea of Effect\n- Fell Trees\n- (3x3x3)\n\nDurability: Average"); - addTierTwoButton(5, 12, 0, new int[] { 10, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Excavator", - "The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Average"); - addTierTwoButton(4, 10, 0, new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Scythe", - "The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Average\nDamage: Low, AoE"); - addTierTwoButton(5, 7, 1, new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, "Cleaver", - "The Cleaver is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: High\nDurability: Average"); - addTierTwoButton(5, 8, 1, new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, "Battleaxe", - "The Battleaxe is a heavy offensive weapon. It is capable of bringing down small trees and can send foes flying.\n\nSpecial Ability: Block\nNatural Abilities:" - + "\n- Knockback\n- Area of Effect\n- (1x9)\n\nDamage: Average\nDurability: Average"); - } - - void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) - { - TConstructClientRegistry.addToolButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); - } - - void addTierTwoButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) - { - TConstructClientRegistry.addTierTwoButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); - } - - void addRenderMappings () - { - String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", - "blueslime", "pigiron" }; - String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider", - "reinforced", "flux" }; - int[] universalEffects = { 0, 1, 4, 9, 16 }; - int[] weaponEffects = { 3, 5, 7, 13, 14, 15 }; - int[] harvestEffects = { 2 }; - int[] nonUtility = { 6, 8, 10, 11, 12 }; - - for (int partIter = 0; partIter < partTypes.length; partIter++) - { - TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true); - } - - for (ToolCore tool : TConstructRegistry.getToolMapping()) - { - for (int i = 0; i < effectTypes.length; i++) - { - TConstructClientRegistry.addEffectRenderMapping(tool, i, "tinker", effectTypes[i], true); - } - } - - String[] bowstringTypes = { "string", "magicfabric", "flamestring" }; - for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) - { - TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); - } - - String[] fletching = { "feather", "leaf", "slime", "blueslime" }; - for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++) - { - TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.arrow, arrowIter, "tinker", fletching[arrowIter], true); - } - } - - /* Keybindings */ - public static TControls controlInstance; - - public void registerKeys () - { - controlInstance = new TControls(); - TickRegistry.registerTickHandler(controlInstance, Side.CLIENT); - uploadKeyBindingsToGame(Minecraft.getMinecraft().gameSettings, controlInstance); - - TabRegistry.registerTab(new InventoryTabVanilla()); - TabRegistry.registerTab(new InventoryTabArmorExtended()); - TabRegistry.registerTab(new InventoryTabKnapsack()); - } - - public void uploadKeyBindingsToGame (GameSettings settings, TKeyHandler keyhandler) - { - ArrayList harvestedBindings = Lists.newArrayList(); - for (KeyBinding kb : keyhandler.keyBindings) - { - harvestedBindings.add(kb); - } - - KeyBinding[] modKeyBindings = harvestedBindings.toArray(new KeyBinding[harvestedBindings.size()]); - KeyBinding[] allKeys = new KeyBinding[settings.keyBindings.length + modKeyBindings.length]; - System.arraycopy(settings.keyBindings, 0, allKeys, 0, settings.keyBindings.length); - System.arraycopy(modKeyBindings, 0, allKeys, settings.keyBindings.length, modKeyBindings.length); - settings.keyBindings = allKeys; - settings.loadOptions(); - } - - public void spawnParticle (String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) - { - this.doSpawnParticle(particle, xPos, yPos, zPos, velX, velY, velZ); - } - - public EntityFX doSpawnParticle (String par1Str, double par2, double par4, double par6, double par8, double par10, double par12) - { - if (this.mc == null) - this.mc = Minecraft.getMinecraft(); - - if (this.mc.renderViewEntity != null && this.mc.effectRenderer != null) - { - int i = this.mc.gameSettings.particleSetting; - - if (i == 1 && mc.theWorld.rand.nextInt(3) == 0) - { - i = 2; - } - - double d6 = this.mc.renderViewEntity.posX - par2; - double d7 = this.mc.renderViewEntity.posY - par4; - double d8 = this.mc.renderViewEntity.posZ - par6; - EntityFX entityfx = null; - - if (par1Str.equals("hugeexplosion")) - { - this.mc.effectRenderer.addEffect(entityfx = new EntityHugeExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12)); - } - else if (par1Str.equals("largeexplode")) - { - this.mc.effectRenderer.addEffect(entityfx = new EntityLargeExplodeFX(mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12)); - } - else if (par1Str.equals("fireworksSpark")) - { - this.mc.effectRenderer.addEffect(entityfx = new EntityFireworkSparkFX(mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer)); - } - - if (entityfx != null) - { - return (EntityFX) entityfx; - } - else - { - double d9 = 16.0D; - - if (d6 * d6 + d7 * d7 + d8 * d8 > d9 * d9) - { - return null; - } - else if (i > 1) - { - return null; - } - else - { - if (par1Str.equals("bubble")) - { - entityfx = new EntityBubbleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("suspended")) - { - entityfx = new EntitySuspendFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("depthsuspend")) - { - entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("townaura")) - { - entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("crit")) - { - entityfx = new EntityCritFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("smoke")) - { - entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("mobSpell")) - { - entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); - ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); - } - else if (par1Str.equals("mobSpellAmbient")) - { - entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); - ((EntityFX) entityfx).setAlphaF(0.15F); - ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); - } - else if (par1Str.equals("spell")) - { - entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("instantSpell")) - { - entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - ((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144); - } - else if (par1Str.equals("witchMagic")) - { - entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - ((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144); - float f = mc.theWorld.rand.nextFloat() * 0.5F + 0.35F; - ((EntityFX) entityfx).setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f); - } - else if (par1Str.equals("note")) - { - entityfx = new EntityNoteFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("portal")) - { - entityfx = new EntityPortalFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("enchantmenttable")) - { - entityfx = new EntityEnchantmentTableParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("explode")) - { - entityfx = new EntityExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("flame")) - { - entityfx = new EntityFlameFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("lava")) - { - entityfx = new EntityLavaFX(mc.theWorld, par2, par4, par6); - } - else if (par1Str.equals("footstep")) - { - entityfx = new EntityFootStepFX(mc.renderEngine, mc.theWorld, par2, par4, par6); - } - else if (par1Str.equals("splash")) - { - entityfx = new EntitySplashFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("largesmoke")) - { - entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12, 2.5F); - } - else if (par1Str.equals("cloud")) - { - entityfx = new EntityCloudFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("reddust")) - { - entityfx = new EntityReddustFX(mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12); - } - else if (par1Str.equals("snowballpoof")) - { - entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Item.snowball); - } - else if (par1Str.equals("dripWater")) - { - entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.water); - } - else if (par1Str.equals("dripLava")) - { - entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.lava); - } - else if (par1Str.equals("snowshovel")) - { - entityfx = new EntitySnowShovelFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("blueslime")) - { - entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TContent.strangeFood); - } - else if (par1Str.equals("heart")) - { - entityfx = new EntityHeartFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("angryVillager")) - { - entityfx = new EntityHeartFX(mc.theWorld, par2, par4 + 0.5D, par6, par8, par10, par12); - ((EntityFX) entityfx).setParticleTextureIndex(81); - ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); - } - else if (par1Str.equals("happyVillager")) - { - entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - ((EntityFX) entityfx).setParticleTextureIndex(82); - ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); - } - - if (entityfx != null) - { - this.mc.effectRenderer.addEffect((EntityFX) entityfx); - } - - return (EntityFX) entityfx; - } - } - } - else - { - return null; - } - } - - @Override - public void postInit () - { - //MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast()); - } - -} diff --git a/src/main/java/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/client/block/SearedRender.java index 054151a2..57def2bc 100644 --- a/src/main/java/tconstruct/client/block/SearedRender.java +++ b/src/main/java/tconstruct/client/block/SearedRender.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.Fluid; import tconstruct.TConstruct; import tconstruct.blocks.logic.*; import tconstruct.client.TProxyClient; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.crafting.CastingRecipe; public class SearedRender implements ISimpleBlockRenderingHandler @@ -252,19 +252,19 @@ public class SearedRender implements ISimpleBlockRenderingHandler float yMin = 0F; int uID = world.getBlockId(x, y - 1, z); int uMeta = world.getBlockMetadata(x, y - 1, z); - if (uID == TContent.searedBlock.blockID && uMeta == 0) + if (uID == TRepo.searedBlock.blockID && uMeta == 0) { yMin = -0.125F; } - else if (uID == TContent.searedBlock.blockID && uMeta == 2) + else if (uID == TRepo.searedBlock.blockID && uMeta == 2) { yMin = -0.75F; } - else if (uID == TContent.lavaTank.blockID) + else if (uID == TRepo.lavaTank.blockID) { yMin = -1F; } - else if (uID == TContent.castingChannel.blockID) + else if (uID == TRepo.castingChannel.blockID) { yMin = -0.5F; } diff --git a/src/main/java/tconstruct/client/block/SlimePadRender.java b/src/main/java/tconstruct/client/block/SlimePadRender.java index 8fe61981..b12b081c 100644 --- a/src/main/java/tconstruct/client/block/SlimePadRender.java +++ b/src/main/java/tconstruct/client/block/SlimePadRender.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import tconstruct.blocks.SlimePad; import tconstruct.client.TProxyClient; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -18,7 +18,7 @@ public class SlimePadRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - TProxyClient.renderStandardInvBlock(renderer, TContent.slimeGel, metadata); + TProxyClient.renderStandardInvBlock(renderer, TRepo.slimeGel, metadata); } } diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index bb5420ef..95aa4813 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.entity.item.ExplosivePrimed; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -53,7 +53,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(TContent.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); + this.blockRenderer.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); if (par1EntityTNTPrimed.fuse / 5 % 2 == 0) { diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index 63bc1dd6..ef095354 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -16,8 +16,8 @@ import org.lwjgl.opengl.GL11; import tconstruct.blocks.logic.StencilTableLogic; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.inventory.PatternShaperContainer; - import cpw.mods.fml.common.network.PacketDispatcher; 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() == TContent.blankPattern) + if (pattern != null && pattern.getItem() == TRepo.blankPattern) { int meta = pattern.getItemDamage(); if (meta == 0) @@ -106,13 +106,13 @@ public class StencilTableGui extends GuiContainer if (patternIndex == 21) patternIndex--; } - ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1); + ItemStack stack = new ItemStack(TRepo.woodPattern, 1, patternIndex + 1); logic.setInventorySlotContents(1, stack); updateServer(stack); } /*else if (meta == 1 || meta == 2) { - ItemStack stack = new ItemStack(TContent.metalPattern, 1, 0); + ItemStack stack = new ItemStack(TRepo.metalPattern, 1, 0); logic.setInventorySlotContents(1, stack); updateServer(stack); }*/ diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java index 2bf80a72..025d92e9 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -3,13 +3,13 @@ package tconstruct.client.tabs; import net.minecraft.item.ItemStack; import tconstruct.client.TControls; import tconstruct.client.TProxyClient; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; public class InventoryTabKnapsack extends AbstractTab { public InventoryTabKnapsack() { - super(0, 0, 0, new ItemStack(TContent.knapsack)); + super(0, 0, 0, new ItemStack(TRepo.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() == TContent.knapsack; + return TProxyClient.armorExtended.inventory[2] != null && TProxyClient.armorExtended.inventory[2].getItem() == TRepo.knapsack; } } diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index d45bf8f7..7ecde083 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -48,261 +48,15 @@ import tconstruct.util.config.*; public class TContent implements IFuelHandler { - // 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 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 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 StepSound 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; - - //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 modF; - public static ModLapis modL; - - //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 EnumArmorMaterial materialWood; - - //Signal & Logic - public static Block signalBus; - public static Block signalTerminal; - - public static Item spoolWire; - public static Item lengthWire; - //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(); @@ -328,524 +82,419 @@ public class TContent implements IFuelHandler //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); } - public static Fluid[] fluids = new Fluid[27]; - public static Block[] fluidBlocks = new Block[26]; - void registerBlocks () { //Tool Station - toolStationWood = new ToolStationBlock(PHConstruct.woodStation, Material.wood).setUnlocalizedName("ToolStation"); - GameRegistry.registerBlock(toolStationWood, ToolStationItemBlock.class, "ToolStationBlock"); - GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation"); - GameRegistry.registerTileEntity(PartBuilderLogic.class, "PartCrafter"); - GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder"); - GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper"); + TRepo.toolStationWood = new ToolStationBlock(PHConstruct.woodStation, Material.wood).setUnlocalizedName("ToolStation"); + TRepo.toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge"); + TRepo.craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation"); + TRepo.craftingSlabWood = new CraftingSlab(PHConstruct.woodCrafterSlab, Material.wood).setUnlocalizedName("CraftingSlab"); + TRepo.furnaceSlab = new FurnaceSlab(PHConstruct.furnaceSlab, Material.rock).setUnlocalizedName("FurnaceSlab"); - toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge"); - GameRegistry.registerBlock(toolForge, MetadataItemBlock.class, "ToolForgeBlock"); - GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge"); + TRepo.heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood).setUnlocalizedName("Frypan"); - craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation"); - GameRegistry.registerBlock(craftingStationWood, "CraftingStation"); - GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation"); + TRepo.craftedSoil = new SoilBlock(PHConstruct.craftedSoil).setLightOpacity(0).setUnlocalizedName("TConstruct.Soil"); + TRepo.craftedSoil.stepSound = Block.soundGravelFootstep; - craftingSlabWood = new CraftingSlab(PHConstruct.woodCrafterSlab, Material.wood).setUnlocalizedName("CraftingSlab"); - GameRegistry.registerBlock(craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab"); + TRepo.searedSlab = new SearedSlab(PHConstruct.searedSlab).setUnlocalizedName("SearedSlab"); + TRepo.searedSlab.stepSound = Block.soundStoneFootstep; - furnaceSlab = new FurnaceSlab(PHConstruct.furnaceSlab, Material.rock).setUnlocalizedName("FurnaceSlab"); - GameRegistry.registerBlock(furnaceSlab, "FurnaceSlab"); - GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace"); + TRepo.speedSlab = new SpeedSlab(PHConstruct.speedSlab).setUnlocalizedName("SpeedSlab"); + TRepo.speedSlab.stepSound = Block.soundStoneFootstep; - heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood).setUnlocalizedName("Frypan"); - GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock"); - GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); + TRepo.metalBlock = new TMetalBlock(PHConstruct.metalBlock, Material.iron, 10.0F).setUnlocalizedName("tconstruct.metalblock"); + TRepo.metalBlock.stepSound = Block.soundMetalFootstep; - craftedSoil = new SoilBlock(PHConstruct.craftedSoil).setLightOpacity(0).setUnlocalizedName("TConstruct.Soil"); - craftedSoil.stepSound = Block.soundGravelFootstep; - GameRegistry.registerBlock(craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); + TRepo.meatBlock = new MeatBlock(PHConstruct.meatBlock).setUnlocalizedName("tconstruct.meatblock"); + TRepo.glueBlock = new GlueBlock(PHConstruct.glueBlock).setUnlocalizedName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); - searedSlab = new SearedSlab(PHConstruct.searedSlab).setUnlocalizedName("SearedSlab"); - searedSlab.stepSound = Block.soundStoneFootstep; - GameRegistry.registerBlock(searedSlab, SearedSlabItem.class, "SearedSlab"); - - speedSlab = new SpeedSlab(PHConstruct.speedSlab).setUnlocalizedName("SpeedSlab"); - speedSlab.stepSound = Block.soundStoneFootstep; - GameRegistry.registerBlock(speedSlab, SpeedSlabItem.class, "SpeedSlab"); - - metalBlock = new TMetalBlock(PHConstruct.metalBlock, Material.iron, 10.0F).setUnlocalizedName("tconstruct.metalblock"); - metalBlock.stepSound = Block.soundMetalFootstep; - GameRegistry.registerBlock(metalBlock, MetalItemBlock.class, "MetalBlock"); - - meatBlock = new MeatBlock(PHConstruct.meatBlock).setUnlocalizedName("tconstruct.meatblock"); - GameRegistry.registerBlock(meatBlock, HamboneItemBlock.class, "MeatBlock"); - - OreDictionary.registerOre("hambone", new ItemStack(meatBlock)); - LanguageRegistry.addName(meatBlock, "Hambone"); - GameRegistry.addRecipe(new ItemStack(meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Item.bone), 'm', new ItemStack(Item.porkRaw)); - - glueBlock = new GlueBlock(PHConstruct.glueBlock).setUnlocalizedName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); - GameRegistry.registerBlock(glueBlock, "GlueBlock"); - OreDictionary.registerOre("blockRubber", new ItemStack(glueBlock)); - - woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Block.cloth, 0, 8).setUnlocalizedName("cloth"); - woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); - GameRegistry.registerBlock(woolSlab1, WoolSlab1Item.class, "WoolSlab1"); - woolSlab2 = new SlabBase(PHConstruct.woolSlab2, Material.cloth, Block.cloth, 8, 8).setUnlocalizedName("cloth"); - woolSlab2.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); - GameRegistry.registerBlock(woolSlab2, WoolSlab2Item.class, "WoolSlab2"); + TRepo.woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Block.cloth, 0, 8).setUnlocalizedName("cloth"); + TRepo.woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); + TRepo.woolSlab2 = new SlabBase(PHConstruct.woolSlab2, Material.cloth, Block.cloth, 8, 8).setUnlocalizedName("cloth"); + TRepo.woolSlab2.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); //Smeltery - smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery"); - GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery"); - 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"); + TRepo.smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery"); + TRepo.lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank"); + TRepo.lavaTank.setStepSound(Block.soundGlassFootstep); - lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank"); - lavaTank.setStepSound(Block.soundGlassFootstep); - GameRegistry.registerBlock(lavaTank, LavaTankItemBlock.class, "LavaTank"); - GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank"); + TRepo.searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock"); - searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock"); - GameRegistry.registerBlock(searedBlock, SearedTableItemBlock.class, "SearedBlock"); - GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable"); - GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet"); - GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin"); + TRepo.castingChannel = (new CastingChannelBlock(PHConstruct.castingChannel)).setUnlocalizedName("CastingChannel"); - castingChannel = (new CastingChannelBlock(PHConstruct.castingChannel)).setUnlocalizedName("CastingChannel"); - GameRegistry.registerBlock(castingChannel, CastingChannelItem.class, "CastingChannel"); - GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel"); - - tankAir = new TankAirBlock(PHConstruct.airTank, Material.leaves).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air"); - GameRegistry.registerBlock(tankAir, "TankAir"); - GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air"); + TRepo.tankAir = new TankAirBlock(PHConstruct.airTank, Material.leaves).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air"); //Traps - landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) + TRepo.landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) .setUnlocalizedName("landmine"); - GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine"); - GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); + TRepo.punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji"); + TRepo.barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak"); + TRepo.barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce"); + TRepo.barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch"); + TRepo.barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle"); + TRepo.slimeExplosive = new SlimeExplosive(PHConstruct.slimeExplosive).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("explosive.slime"); - punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji"); - GameRegistry.registerBlock(punji, "trap.punji"); - - barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak"); - GameRegistry.registerBlock(barricadeOak, BarricadeItem.class, "trap.barricade.oak"); - - barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce"); - GameRegistry.registerBlock(barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce"); - - barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch"); - GameRegistry.registerBlock(barricadeBirch, BarricadeItem.class, "trap.barricade.birch"); - - barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle"); - GameRegistry.registerBlock(barricadeJungle, BarricadeItem.class, "trap.barricade.jungle"); - - slimeExplosive = new SlimeExplosive(PHConstruct.slimeExplosive).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("explosive.slime"); - GameRegistry.registerBlock(slimeExplosive, MetadataItemBlock.class, "explosive.slime"); - - dryingRack = new DryingRack(PHConstruct.dryingRack).setUnlocalizedName("Armor.DryingRack"); - GameRegistry.registerBlock(dryingRack, "Armor.DryingRack"); - GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack"); + TRepo.dryingRack = new DryingRack(PHConstruct.dryingRack).setUnlocalizedName("Armor.DryingRack"); //Liquids - liquidMetal = new MaterialLiquid(MapColor.tntColor); + TRepo.liquidMetal = new MaterialLiquid(MapColor.tntColor); - moltenIronFluid = new Fluid("iron.molten"); - if (!FluidRegistry.registerFluid(moltenIronFluid)) - moltenIronFluid = FluidRegistry.getFluid("iron.molten"); - moltenIron = new TConstructFluid(PHConstruct.moltenIron, moltenIronFluid, Material.lava, "liquid_iron").setUnlocalizedName("metal.molten.iron"); - GameRegistry.registerBlock(moltenIron, "metal.molten.iron"); - fluids[0] = moltenIronFluid; - fluidBlocks[0] = moltenIron; - moltenIronFluid.setBlockID(moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenIronFluid, 1000), new ItemStack(buckets, 1, 0), new ItemStack(Item.bucketEmpty))); + TRepo.moltenIronFluid = new Fluid("iron.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenIronFluid)) + TRepo.moltenIronFluid = FluidRegistry.getFluid("iron.molten"); + TRepo.moltenIron = new TConstructFluid(PHConstruct.moltenIron, TRepo.moltenIronFluid, Material.lava, "liquid_iron").setUnlocalizedName("metal.molten.iron"); + GameRegistry.registerBlock(TRepo.moltenIron, "metal.molten.iron"); + TRepo.fluids[0] = TRepo.moltenIronFluid; + TRepo.fluidBlocks[0] = TRepo.moltenIron; + TRepo.moltenIronFluid.setBlockID(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(Item.bucketEmpty))); - moltenGoldFluid = new Fluid("gold.molten"); - if (!FluidRegistry.registerFluid(moltenGoldFluid)) - moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); - moltenGold = new TConstructFluid(PHConstruct.moltenGold, moltenGoldFluid, Material.lava, "liquid_gold").setUnlocalizedName("metal.molten.gold"); - GameRegistry.registerBlock(moltenGold, "metal.molten.gold"); - fluids[1] = moltenGoldFluid; - fluidBlocks[1] = moltenGold; - moltenGoldFluid.setBlockID(moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGoldFluid, 1000), new ItemStack(buckets, 1, 1), new ItemStack(Item.bucketEmpty))); + TRepo.moltenGoldFluid = new Fluid("gold.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenGoldFluid)) + TRepo.moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); + TRepo.moltenGold = new TConstructFluid(PHConstruct.moltenGold, TRepo.moltenGoldFluid, Material.lava, "liquid_gold").setUnlocalizedName("metal.molten.gold"); + GameRegistry.registerBlock(TRepo.moltenGold, "metal.molten.gold"); + TRepo.fluids[1] = TRepo.moltenGoldFluid; + TRepo.fluidBlocks[1] = TRepo.moltenGold; + TRepo.moltenGoldFluid.setBlockID(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(Item.bucketEmpty))); - moltenCopperFluid = new Fluid("copper.molten"); - if (!FluidRegistry.registerFluid(moltenCopperFluid)) - moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); - moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, moltenCopperFluid, Material.lava, "liquid_copper").setUnlocalizedName("metal.molten.copper"); - GameRegistry.registerBlock(moltenCopper, "metal.molten.copper"); - fluids[2] = moltenCopperFluid; - fluidBlocks[2] = moltenCopper; - moltenCopperFluid.setBlockID(moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCopperFluid, 1000), new ItemStack(buckets, 1, 2), new ItemStack(Item.bucketEmpty))); + TRepo.moltenCopperFluid = new Fluid("copper.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenCopperFluid)) + TRepo.moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); + TRepo.moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, TRepo.moltenCopperFluid, Material.lava, "liquid_copper").setUnlocalizedName("metal.molten.copper"); + GameRegistry.registerBlock(TRepo.moltenCopper, "metal.molten.copper"); + TRepo.fluids[2] = TRepo.moltenCopperFluid; + TRepo.fluidBlocks[2] = TRepo.moltenCopper; + TRepo.moltenCopperFluid.setBlockID(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(Item.bucketEmpty))); - moltenTinFluid = new Fluid("tin.molten"); - if (!FluidRegistry.registerFluid(moltenTinFluid)) - moltenTinFluid = FluidRegistry.getFluid("tin.molten"); - moltenTin = new TConstructFluid(PHConstruct.moltenTin, moltenTinFluid, Material.lava, "liquid_tin").setUnlocalizedName("metal.molten.tin"); - GameRegistry.registerBlock(moltenTin, "metal.molten.tin"); - fluids[3] = moltenTinFluid; - fluidBlocks[3] = moltenTin; - moltenTinFluid.setBlockID(moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenTinFluid, 1000), new ItemStack(buckets, 1, 3), new ItemStack(Item.bucketEmpty))); + TRepo.moltenTinFluid = new Fluid("tin.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenTinFluid)) + TRepo.moltenTinFluid = FluidRegistry.getFluid("tin.molten"); + TRepo.moltenTin = new TConstructFluid(PHConstruct.moltenTin, TRepo.moltenTinFluid, Material.lava, "liquid_tin").setUnlocalizedName("metal.molten.tin"); + GameRegistry.registerBlock(TRepo.moltenTin, "metal.molten.tin"); + TRepo.fluids[3] = TRepo.moltenTinFluid; + TRepo.fluidBlocks[3] = TRepo.moltenTin; + TRepo.moltenTinFluid.setBlockID(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(Item.bucketEmpty))); - moltenAluminumFluid = new Fluid("aluminum.molten"); - if (!FluidRegistry.registerFluid(moltenAluminumFluid)) - moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); - moltenAluminum = new TConstructFluid(PHConstruct.moltenAluminum, moltenAluminumFluid, Material.lava, "liquid_aluminum").setUnlocalizedName("metal.molten.aluminum"); - GameRegistry.registerBlock(moltenAluminum, "metal.molten.aluminum"); - fluids[4] = moltenAluminumFluid; - fluidBlocks[4] = moltenAluminum; - moltenAluminumFluid.setBlockID(moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAluminumFluid, 1000), new ItemStack(buckets, 1, 4), new ItemStack(Item.bucketEmpty))); + TRepo.moltenAluminumFluid = new Fluid("aluminum.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenAluminumFluid)) + TRepo.moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); + TRepo.moltenAluminum = new TConstructFluid(PHConstruct.moltenAluminum, TRepo.moltenAluminumFluid, Material.lava, "liquid_aluminum").setUnlocalizedName("metal.molten.aluminum"); + GameRegistry.registerBlock(TRepo.moltenAluminum, "metal.molten.aluminum"); + TRepo.fluids[4] = TRepo.moltenAluminumFluid; + TRepo.fluidBlocks[4] = TRepo.moltenAluminum; + TRepo.moltenAluminumFluid.setBlockID(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(Item.bucketEmpty))); - moltenCobaltFluid = new Fluid("cobalt.molten"); - if (!FluidRegistry.registerFluid(moltenCobaltFluid)) - moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); - moltenCobalt = new TConstructFluid(PHConstruct.moltenCobalt, moltenCobaltFluid, Material.lava, "liquid_cobalt").setUnlocalizedName("metal.molten.cobalt"); - GameRegistry.registerBlock(moltenCobalt, "metal.molten.cobalt"); - fluids[5] = moltenCobaltFluid; - fluidBlocks[5] = moltenCobalt; - moltenCobaltFluid.setBlockID(moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCobaltFluid, 1000), new ItemStack(buckets, 1, 5), new ItemStack(Item.bucketEmpty))); + TRepo.moltenCobaltFluid = new Fluid("cobalt.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenCobaltFluid)) + TRepo.moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); + TRepo.moltenCobalt = new TConstructFluid(PHConstruct.moltenCobalt, TRepo.moltenCobaltFluid, Material.lava, "liquid_cobalt").setUnlocalizedName("metal.molten.cobalt"); + GameRegistry.registerBlock(TRepo.moltenCobalt, "metal.molten.cobalt"); + TRepo.fluids[5] = TRepo.moltenCobaltFluid; + TRepo.fluidBlocks[5] = TRepo.moltenCobalt; + TRepo.moltenCobaltFluid.setBlockID(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(Item.bucketEmpty))); - moltenArditeFluid = new Fluid("ardite.molten"); - if (!FluidRegistry.registerFluid(moltenArditeFluid)) - moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); - moltenArdite = new TConstructFluid(PHConstruct.moltenArdite, moltenArditeFluid, Material.lava, "liquid_ardite").setUnlocalizedName("metal.molten.ardite"); - GameRegistry.registerBlock(moltenArdite, "metal.molten.ardite"); - fluids[6] = moltenArditeFluid; - fluidBlocks[6] = moltenArdite; - moltenArditeFluid.setBlockID(moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenArditeFluid, 1000), new ItemStack(buckets, 1, 6), new ItemStack(Item.bucketEmpty))); + TRepo.moltenArditeFluid = new Fluid("ardite.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenArditeFluid)) + TRepo.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); + TRepo.moltenArdite = new TConstructFluid(PHConstruct.moltenArdite, TRepo.moltenArditeFluid, Material.lava, "liquid_ardite").setUnlocalizedName("metal.molten.ardite"); + GameRegistry.registerBlock(TRepo.moltenArdite, "metal.molten.ardite"); + TRepo.fluids[6] = TRepo.moltenArditeFluid; + TRepo.fluidBlocks[6] = TRepo.moltenArdite; + TRepo.moltenArditeFluid.setBlockID(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(Item.bucketEmpty))); - moltenBronzeFluid = new Fluid("bronze.molten"); - if (!FluidRegistry.registerFluid(moltenBronzeFluid)) - moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); - moltenBronze = new TConstructFluid(PHConstruct.moltenBronze, moltenBronzeFluid, Material.lava, "liquid_bronze").setUnlocalizedName("metal.molten.bronze"); - GameRegistry.registerBlock(moltenBronze, "metal.molten.bronze"); - fluids[7] = moltenBronzeFluid; - fluidBlocks[7] = moltenBronze; - moltenBronzeFluid.setBlockID(moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenBronzeFluid, 1000), new ItemStack(buckets, 1, 7), new ItemStack(Item.bucketEmpty))); + TRepo.moltenBronzeFluid = new Fluid("bronze.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenBronzeFluid)) + TRepo.moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); + TRepo.moltenBronze = new TConstructFluid(PHConstruct.moltenBronze, TRepo.moltenBronzeFluid, Material.lava, "liquid_bronze").setUnlocalizedName("metal.molten.bronze"); + GameRegistry.registerBlock(TRepo.moltenBronze, "metal.molten.bronze"); + TRepo.fluids[7] = TRepo.moltenBronzeFluid; + TRepo.fluidBlocks[7] = TRepo.moltenBronze; + TRepo.moltenBronzeFluid.setBlockID(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(Item.bucketEmpty))); - moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); - if (!FluidRegistry.registerFluid(moltenAlubrassFluid)) - moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); - moltenAlubrass = new TConstructFluid(PHConstruct.moltenAlubrass, moltenAlubrassFluid, Material.lava, "liquid_alubrass").setUnlocalizedName("metal.molten.alubrass"); - GameRegistry.registerBlock(moltenAlubrass, "metal.molten.alubrass"); - fluids[8] = moltenAlubrassFluid; - fluidBlocks[8] = moltenAlubrass; - moltenAlubrassFluid.setBlockID(moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlubrassFluid, 1000), new ItemStack(buckets, 1, 8), new ItemStack(Item.bucketEmpty))); + TRepo.moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenAlubrassFluid)) + TRepo.moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); + TRepo.moltenAlubrass = new TConstructFluid(PHConstruct.moltenAlubrass, TRepo.moltenAlubrassFluid, Material.lava, "liquid_alubrass").setUnlocalizedName("metal.molten.alubrass"); + GameRegistry.registerBlock(TRepo.moltenAlubrass, "metal.molten.alubrass"); + TRepo.fluids[8] = TRepo.moltenAlubrassFluid; + TRepo.fluidBlocks[8] = TRepo.moltenAlubrass; + TRepo.moltenAlubrassFluid.setBlockID(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(Item.bucketEmpty))); - moltenManyullynFluid = new Fluid("manyullyn.molten"); - if (!FluidRegistry.registerFluid(moltenManyullynFluid)) - moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); - moltenManyullyn = new TConstructFluid(PHConstruct.moltenManyullyn, moltenManyullynFluid, Material.lava, "liquid_manyullyn").setUnlocalizedName("metal.molten.manyullyn"); - GameRegistry.registerBlock(moltenManyullyn, "metal.molten.manyullyn"); - fluids[9] = moltenManyullynFluid; - fluidBlocks[9] = moltenManyullyn; - moltenManyullynFluid.setBlockID(moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenManyullynFluid, 1000), new ItemStack(buckets, 1, 9), new ItemStack(Item.bucketEmpty))); + TRepo.moltenManyullynFluid = new Fluid("manyullyn.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenManyullynFluid)) + TRepo.moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); + TRepo.moltenManyullyn = new TConstructFluid(PHConstruct.moltenManyullyn, TRepo.moltenManyullynFluid, Material.lava, "liquid_manyullyn").setUnlocalizedName("metal.molten.manyullyn"); + GameRegistry.registerBlock(TRepo.moltenManyullyn, "metal.molten.manyullyn"); + TRepo.fluids[9] = TRepo.moltenManyullynFluid; + TRepo.fluidBlocks[9] = TRepo.moltenManyullyn; + TRepo.moltenManyullynFluid.setBlockID(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(Item.bucketEmpty))); - moltenAlumiteFluid = new Fluid("alumite.molten"); - if (!FluidRegistry.registerFluid(moltenAlumiteFluid)) - moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); - moltenAlumite = new TConstructFluid(PHConstruct.moltenAlumite, moltenAlumiteFluid, Material.lava, "liquid_alumite").setUnlocalizedName("metal.molten.alumite"); - GameRegistry.registerBlock(moltenAlumite, "metal.molten.alumite"); - fluids[10] = moltenAlumiteFluid; - fluidBlocks[10] = moltenAlumite; - moltenAlumiteFluid.setBlockID(moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlumiteFluid, 1000), new ItemStack(buckets, 1, 10), new ItemStack(Item.bucketEmpty))); + TRepo.moltenAlumiteFluid = new Fluid("alumite.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenAlumiteFluid)) + TRepo.moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); + TRepo.moltenAlumite = new TConstructFluid(PHConstruct.moltenAlumite, TRepo.moltenAlumiteFluid, Material.lava, "liquid_alumite").setUnlocalizedName("metal.molten.alumite"); + GameRegistry.registerBlock(TRepo.moltenAlumite, "metal.molten.alumite"); + TRepo.fluids[10] = TRepo.moltenAlumiteFluid; + TRepo.fluidBlocks[10] = TRepo.moltenAlumite; + TRepo.moltenAlumiteFluid.setBlockID(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(Item.bucketEmpty))); - moltenObsidianFluid = new Fluid("obsidian.molten"); - if (!FluidRegistry.registerFluid(moltenObsidianFluid)) - moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); - moltenObsidian = new TConstructFluid(PHConstruct.moltenObsidian, moltenObsidianFluid, Material.lava, "liquid_obsidian").setUnlocalizedName("metal.molten.obsidian"); - GameRegistry.registerBlock(moltenObsidian, "metal.molten.obsidian"); - fluids[11] = moltenObsidianFluid; - fluidBlocks[11] = moltenObsidian; - moltenObsidianFluid.setBlockID(moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenObsidianFluid, 1000), new ItemStack(buckets, 1, 11), new ItemStack(Item.bucketEmpty))); + TRepo.moltenObsidianFluid = new Fluid("obsidian.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenObsidianFluid)) + TRepo.moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); + TRepo.moltenObsidian = new TConstructFluid(PHConstruct.moltenObsidian, TRepo.moltenObsidianFluid, Material.lava, "liquid_obsidian").setUnlocalizedName("metal.molten.obsidian"); + GameRegistry.registerBlock(TRepo.moltenObsidian, "metal.molten.obsidian"); + TRepo.fluids[11] = TRepo.moltenObsidianFluid; + TRepo.fluidBlocks[11] = TRepo.moltenObsidian; + TRepo.moltenObsidianFluid.setBlockID(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(Item.bucketEmpty))); - moltenSteelFluid = new Fluid("steel.molten"); - if (!FluidRegistry.registerFluid(moltenSteelFluid)) - moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); - moltenSteel = new TConstructFluid(PHConstruct.moltenSteel, moltenSteelFluid, Material.lava, "liquid_steel").setUnlocalizedName("metal.molten.steel"); - GameRegistry.registerBlock(moltenSteel, "metal.molten.steel"); - fluids[12] = moltenSteelFluid; - fluidBlocks[12] = moltenSteel; - moltenSteelFluid.setBlockID(moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSteelFluid, 1000), new ItemStack(buckets, 1, 12), new ItemStack(Item.bucketEmpty))); + TRepo.moltenSteelFluid = new Fluid("steel.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenSteelFluid)) + TRepo.moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); + TRepo.moltenSteel = new TConstructFluid(PHConstruct.moltenSteel, TRepo.moltenSteelFluid, Material.lava, "liquid_steel").setUnlocalizedName("metal.molten.steel"); + GameRegistry.registerBlock(TRepo.moltenSteel, "metal.molten.steel"); + TRepo.fluids[12] = TRepo.moltenSteelFluid; + TRepo.fluidBlocks[12] = TRepo.moltenSteel; + TRepo.moltenSteelFluid.setBlockID(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(Item.bucketEmpty))); - moltenGlassFluid = new Fluid("glass.molten"); - if (!FluidRegistry.registerFluid(moltenGlassFluid)) - moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); - moltenGlass = new TConstructFluid(PHConstruct.moltenGlass, moltenGlassFluid, Material.lava, "liquid_glass", true).setUnlocalizedName("metal.molten.glass"); - GameRegistry.registerBlock(moltenGlass, "metal.molten.glass"); - fluids[13] = moltenGlassFluid; - fluidBlocks[13] = moltenGlass; - moltenGlassFluid.setBlockID(moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGlassFluid, 1000), new ItemStack(buckets, 1, 13), new ItemStack(Item.bucketEmpty))); + TRepo.moltenGlassFluid = new Fluid("glass.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenGlassFluid)) + TRepo.moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); + TRepo.moltenGlass = new TConstructFluid(PHConstruct.moltenGlass, TRepo.moltenGlassFluid, Material.lava, "liquid_glass", true).setUnlocalizedName("metal.molten.glass"); + GameRegistry.registerBlock(TRepo.moltenGlass, "metal.molten.glass"); + TRepo.fluids[13] = TRepo.moltenGlassFluid; + TRepo.fluidBlocks[13] = TRepo.moltenGlass; + TRepo.moltenGlassFluid.setBlockID(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(Item.bucketEmpty))); - moltenStoneFluid = new Fluid("stone.seared"); - if (!FluidRegistry.registerFluid(moltenStoneFluid)) - moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); - moltenStone = new TConstructFluid(PHConstruct.moltenStone, moltenStoneFluid, Material.lava, "liquid_stone").setUnlocalizedName("molten.stone"); - GameRegistry.registerBlock(moltenStone, "molten.stone"); - fluids[14] = moltenStoneFluid; - fluidBlocks[14] = moltenStone; - moltenStoneFluid.setBlockID(moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenStoneFluid, 1000), new ItemStack(buckets, 1, 14), new ItemStack(Item.bucketEmpty))); + TRepo.moltenStoneFluid = new Fluid("stone.seared"); + if (!FluidRegistry.registerFluid(TRepo.moltenStoneFluid)) + TRepo.moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); + TRepo.moltenStone = new TConstructFluid(PHConstruct.moltenStone, TRepo.moltenStoneFluid, Material.lava, "liquid_stone").setUnlocalizedName("molten.stone"); + GameRegistry.registerBlock(TRepo.moltenStone, "molten.stone"); + TRepo.fluids[14] = TRepo.moltenStoneFluid; + TRepo.fluidBlocks[14] = TRepo.moltenStone; + TRepo.moltenStoneFluid.setBlockID(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(Item.bucketEmpty))); - moltenEmeraldFluid = new Fluid("emerald.liquid"); - if (!FluidRegistry.registerFluid(moltenEmeraldFluid)) - moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); - moltenEmerald = new TConstructFluid(PHConstruct.moltenEmerald, moltenEmeraldFluid, Material.water, "liquid_villager").setUnlocalizedName("molten.emerald"); - GameRegistry.registerBlock(moltenEmerald, "molten.emerald"); - fluids[15] = moltenEmeraldFluid; - fluidBlocks[15] = moltenEmerald; - moltenEmeraldFluid.setBlockID(moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEmeraldFluid, 1000), new ItemStack(buckets, 1, 15), new ItemStack(Item.bucketEmpty))); + TRepo.moltenEmeraldFluid = new Fluid("emerald.liquid"); + if (!FluidRegistry.registerFluid(TRepo.moltenEmeraldFluid)) + TRepo.moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); + TRepo.moltenEmerald = new TConstructFluid(PHConstruct.moltenEmerald, TRepo.moltenEmeraldFluid, Material.water, "liquid_villager").setUnlocalizedName("molten.emerald"); + GameRegistry.registerBlock(TRepo.moltenEmerald, "molten.emerald"); + TRepo.fluids[15] = TRepo.moltenEmeraldFluid; + TRepo.fluidBlocks[15] = TRepo.moltenEmerald; + TRepo.moltenEmeraldFluid.setBlockID(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(Item.bucketEmpty))); - bloodFluid = new Fluid("blood"); - if (!FluidRegistry.registerFluid(bloodFluid)) - bloodFluid = FluidRegistry.getFluid("blood"); - blood = new BloodBlock(PHConstruct.blood, bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); - GameRegistry.registerBlock(blood, "liquid.blood"); - fluids[16] = bloodFluid; - fluidBlocks[16] = blood; - bloodFluid.setBlockID(blood).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(bloodFluid, 1000), new ItemStack(buckets, 1, 16), new ItemStack(Item.bucketEmpty))); + TRepo.bloodFluid = new Fluid("blood"); + if (!FluidRegistry.registerFluid(TRepo.bloodFluid)) + TRepo.bloodFluid = FluidRegistry.getFluid("blood"); + TRepo.blood = new BloodBlock(PHConstruct.blood, TRepo.bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); + GameRegistry.registerBlock(TRepo.blood, "liquid.blood"); + TRepo.fluids[16] = TRepo.bloodFluid; + TRepo.fluidBlocks[16] = TRepo.blood; + TRepo.bloodFluid.setBlockID(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(Item.bucketEmpty))); - moltenNickelFluid = new Fluid("nickel.molten"); - if (!FluidRegistry.registerFluid(moltenNickelFluid)) - moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); - moltenNickel = new TConstructFluid(PHConstruct.moltenNickel, moltenNickelFluid, Material.lava, "liquid_ferrous").setUnlocalizedName("metal.molten.nickel"); - GameRegistry.registerBlock(moltenNickel, "metal.molten.nickel"); - fluids[17] = moltenNickelFluid; - fluidBlocks[17] = moltenNickel; - moltenNickelFluid.setBlockID(moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenNickelFluid, 1000), new ItemStack(buckets, 1, 17), new ItemStack(Item.bucketEmpty))); + TRepo.moltenNickelFluid = new Fluid("nickel.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenNickelFluid)) + TRepo.moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); + TRepo.moltenNickel = new TConstructFluid(PHConstruct.moltenNickel, TRepo.moltenNickelFluid, Material.lava, "liquid_ferrous").setUnlocalizedName("metal.molten.nickel"); + GameRegistry.registerBlock(TRepo.moltenNickel, "metal.molten.nickel"); + TRepo.fluids[17] = TRepo.moltenNickelFluid; + TRepo.fluidBlocks[17] = TRepo.moltenNickel; + TRepo.moltenNickelFluid.setBlockID(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(Item.bucketEmpty))); - moltenLeadFluid = new Fluid("lead.molten"); - if (!FluidRegistry.registerFluid(moltenLeadFluid)) - moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); - moltenLead = new TConstructFluid(PHConstruct.moltenLead, moltenLeadFluid, Material.lava, "liquid_lead").setUnlocalizedName("metal.molten.lead"); - GameRegistry.registerBlock(moltenLead, "metal.molten.lead"); - fluids[18] = moltenLeadFluid; - fluidBlocks[18] = moltenLead; - moltenLeadFluid.setBlockID(moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenLeadFluid, 1000), new ItemStack(buckets, 1, 18), new ItemStack(Item.bucketEmpty))); + TRepo.moltenLeadFluid = new Fluid("lead.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenLeadFluid)) + TRepo.moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); + TRepo.moltenLead = new TConstructFluid(PHConstruct.moltenLead, TRepo.moltenLeadFluid, Material.lava, "liquid_lead").setUnlocalizedName("metal.molten.lead"); + GameRegistry.registerBlock(TRepo.moltenLead, "metal.molten.lead"); + TRepo.fluids[18] = TRepo.moltenLeadFluid; + TRepo.fluidBlocks[18] = TRepo.moltenLead; + TRepo.moltenLeadFluid.setBlockID(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(Item.bucketEmpty))); - moltenSilverFluid = new Fluid("silver.molten"); - if (!FluidRegistry.registerFluid(moltenSilverFluid)) - moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); - moltenSilver = new TConstructFluid(PHConstruct.moltenSilver, moltenSilverFluid, Material.lava, "liquid_silver").setUnlocalizedName("metal.molten.silver"); - GameRegistry.registerBlock(moltenSilver, "metal.molten.silver"); - fluids[19] = moltenSilverFluid; - fluidBlocks[19] = moltenSilver; - moltenSilverFluid.setBlockID(moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSilverFluid, 1000), new ItemStack(buckets, 1, 19), new ItemStack(Item.bucketEmpty))); + TRepo.moltenSilverFluid = new Fluid("silver.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenSilverFluid)) + TRepo.moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); + TRepo.moltenSilver = new TConstructFluid(PHConstruct.moltenSilver, TRepo.moltenSilverFluid, Material.lava, "liquid_silver").setUnlocalizedName("metal.molten.silver"); + GameRegistry.registerBlock(TRepo.moltenSilver, "metal.molten.silver"); + TRepo.fluids[19] = TRepo.moltenSilverFluid; + TRepo.fluidBlocks[19] = TRepo.moltenSilver; + TRepo.moltenSilverFluid.setBlockID(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(Item.bucketEmpty))); - moltenShinyFluid = new Fluid("platinum.molten"); - if (!FluidRegistry.registerFluid(moltenShinyFluid)) - moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); - moltenShiny = new TConstructFluid(PHConstruct.moltenShiny, moltenShinyFluid, Material.lava, "liquid_shiny").setUnlocalizedName("metal.molten.shiny"); - GameRegistry.registerBlock(moltenShiny, "metal.molten.shiny"); - fluids[20] = moltenShinyFluid; - fluidBlocks[20] = moltenShiny; - moltenShinyFluid.setBlockID(moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenShinyFluid, 1000), new ItemStack(buckets, 1, 20), new ItemStack(Item.bucketEmpty))); + TRepo.moltenShinyFluid = new Fluid("platinum.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenShinyFluid)) + TRepo.moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); + TRepo.moltenShiny = new TConstructFluid(PHConstruct.moltenShiny, TRepo.moltenShinyFluid, Material.lava, "liquid_shiny").setUnlocalizedName("metal.molten.shiny"); + GameRegistry.registerBlock(TRepo.moltenShiny, "metal.molten.shiny"); + TRepo.fluids[20] = TRepo.moltenShinyFluid; + TRepo.fluidBlocks[20] = TRepo.moltenShiny; + TRepo.moltenShinyFluid.setBlockID(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(Item.bucketEmpty))); - moltenInvarFluid = new Fluid("invar.molten"); - if (!FluidRegistry.registerFluid(moltenInvarFluid)) - moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); - moltenInvar = new TConstructFluid(PHConstruct.moltenInvar, moltenInvarFluid, Material.lava, "liquid_invar").setUnlocalizedName("metal.molten.invar"); - GameRegistry.registerBlock(moltenInvar, "metal.molten.invar"); - fluids[21] = moltenInvarFluid; - fluidBlocks[21] = moltenInvar; - moltenInvarFluid.setBlockID(moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenInvarFluid, 1000), new ItemStack(buckets, 1, 21), new ItemStack(Item.bucketEmpty))); + TRepo.moltenInvarFluid = new Fluid("invar.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenInvarFluid)) + TRepo.moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); + TRepo.moltenInvar = new TConstructFluid(PHConstruct.moltenInvar, TRepo.moltenInvarFluid, Material.lava, "liquid_invar").setUnlocalizedName("metal.molten.invar"); + GameRegistry.registerBlock(TRepo.moltenInvar, "metal.molten.invar"); + TRepo.fluids[21] = TRepo.moltenInvarFluid; + TRepo.fluidBlocks[21] = TRepo.moltenInvar; + TRepo.moltenInvarFluid.setBlockID(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(Item.bucketEmpty))); - moltenElectrumFluid = new Fluid("electrum.molten"); - if (!FluidRegistry.registerFluid(moltenElectrumFluid)) - moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); - moltenElectrum = new TConstructFluid(PHConstruct.moltenElectrum, moltenElectrumFluid, Material.lava, "liquid_electrum").setUnlocalizedName("metal.molten.electrum"); - GameRegistry.registerBlock(moltenElectrum, "metal.molten.electrum"); - fluids[22] = moltenElectrumFluid; - fluidBlocks[22] = moltenElectrum; - moltenElectrumFluid.setBlockID(moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenElectrumFluid, 1000), new ItemStack(buckets, 1, 22), new ItemStack(Item.bucketEmpty))); + TRepo.moltenElectrumFluid = new Fluid("electrum.molten"); + if (!FluidRegistry.registerFluid(TRepo.moltenElectrumFluid)) + TRepo.moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); + TRepo.moltenElectrum = new TConstructFluid(PHConstruct.moltenElectrum, TRepo.moltenElectrumFluid, Material.lava, "liquid_electrum").setUnlocalizedName("metal.molten.electrum"); + GameRegistry.registerBlock(TRepo.moltenElectrum, "metal.molten.electrum"); + TRepo.fluids[22] = TRepo.moltenElectrumFluid; + TRepo.fluidBlocks[22] = TRepo.moltenElectrum; + TRepo.moltenElectrumFluid.setBlockID(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(Item.bucketEmpty))); - moltenEnderFluid = new Fluid("ender"); - if (!FluidRegistry.registerFluid(moltenEnderFluid)) + TRepo.moltenEnderFluid = new Fluid("ender"); + if (!FluidRegistry.registerFluid(TRepo.moltenEnderFluid)) { - moltenEnderFluid = FluidRegistry.getFluid("ender"); - moltenEnder = Block.blocksList[moltenEnderFluid.getBlockID()]; - if (moltenEnder == null) + TRepo.moltenEnderFluid = FluidRegistry.getFluid("ender"); + TRepo.moltenEnder = Block.blocksList[TRepo.moltenEnderFluid.getBlockID()]; + if (TRepo.moltenEnder == null) TConstruct.logger.info("Molten ender block missing!"); } else { - moltenEnder = new TConstructFluid(PHConstruct.moltenEnder, moltenEnderFluid, Material.water, "liquid_ender").setUnlocalizedName("fluid.ender"); - GameRegistry.registerBlock(moltenEnder, "fluid.ender"); - moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1000), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); + TRepo.moltenEnder = new TConstructFluid(PHConstruct.moltenEnder, TRepo.moltenEnderFluid, Material.water, "liquid_ender").setUnlocalizedName("fluid.ender"); + GameRegistry.registerBlock(TRepo.moltenEnder, "fluid.ender"); + TRepo.moltenEnderFluid.setBlockID(TRepo.moltenEnder).setDensity(3000).setViscosity(6000); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEnderFluid, 1000), new ItemStack(TRepo.buckets, 1, 23), new ItemStack(Item.bucketEmpty))); } - fluids[23] = moltenEnderFluid; - fluidBlocks[23] = moltenEnder; + TRepo.fluids[23] = TRepo.moltenEnderFluid; + TRepo.fluidBlocks[23] = TRepo.moltenEnder; //Slime - slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); + TRepo.slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); - blueSlimeFluid = new Fluid("slime.blue"); - if (!FluidRegistry.registerFluid(blueSlimeFluid)) - blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); - slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.slime"); - GameRegistry.registerBlock(slimePool, "liquid.slime"); - fluids[24] = blueSlimeFluid; - fluidBlocks[24] = slimePool; - blueSlimeFluid.setBlockID(slimePool); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(blueSlimeFluid, 1000), new ItemStack(buckets, 1, 24), new ItemStack(Item.bucketEmpty))); + TRepo.blueSlimeFluid = new Fluid("slime.blue"); + if (!FluidRegistry.registerFluid(TRepo.blueSlimeFluid)) + TRepo.blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); + TRepo.slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, TRepo.blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep) + .setUnlocalizedName("liquid.slime"); + GameRegistry.registerBlock(TRepo.slimePool, "liquid.slime"); + TRepo.fluids[24] = TRepo.blueSlimeFluid; + TRepo.fluidBlocks[24] = TRepo.slimePool; + TRepo.blueSlimeFluid.setBlockID(TRepo.slimePool); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.blueSlimeFluid, 1000), new ItemStack(TRepo.buckets, 1, 24), new ItemStack(Item.bucketEmpty))); //Glue - glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); - if (!FluidRegistry.registerFluid(glueFluid)) - glueFluid = FluidRegistry.getFluid("glue"); - glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.glue"); - GameRegistry.registerBlock(glueFluidBlock, "liquid.glue"); - fluids[25] = glueFluid; - fluidBlocks[25] = glueFluidBlock; - glueFluid.setBlockID(glueFluidBlock); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(glueFluid, 1000), new ItemStack(buckets, 1, 26), new ItemStack(Item.bucketEmpty))); + 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(PHConstruct.glueFluidBlock, TRepo.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep) + .setUnlocalizedName("liquid.glue"); + GameRegistry.registerBlock(TRepo.glueFluidBlock, "liquid.glue"); + TRepo.fluids[25] = TRepo.glueFluid; + TRepo.fluidBlocks[25] = TRepo.glueFluidBlock; + TRepo.glueFluid.setBlockID(TRepo.glueFluidBlock); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.glueFluid, 1000), new ItemStack(TRepo.buckets, 1, 26), new ItemStack(Item.bucketEmpty))); - pigIronFluid = new Fluid("pigiron.molten"); - if (!FluidRegistry.registerFluid(pigIronFluid)) - pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); + TRepo.pigIronFluid = new Fluid("pigiron.molten"); + if (!FluidRegistry.registerFluid(TRepo.pigIronFluid)) + TRepo.pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); else - pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); - fluids[26] = pigIronFluid; - - slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.gel"); - GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel"); - - slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).setLightOpacity(0).setUnlocalizedName("slime.grass"); - GameRegistry.registerBlock(slimeGrass, SlimeGrassItemBlock.class, "slime.grass"); - - slimeTallGrass = new SlimeTallGrass(PHConstruct.slimeTallGrass).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("slime.grass.tall"); - GameRegistry.registerBlock(slimeTallGrass, SlimeTallGrassItem.class, "slime.grass.tall"); - - slimeLeaves = (SlimeLeaves) new SlimeLeaves(PHConstruct.slimeLeaves).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.leaves"); - GameRegistry.registerBlock(slimeLeaves, SlimeLeavesItemBlock.class, "slime.leaves"); - - slimeSapling = (SlimeSapling) new SlimeSapling(PHConstruct.slimeSapling).setStepSound(slimeStep).setUnlocalizedName("slime.sapling"); - GameRegistry.registerBlock(slimeSapling, SlimeSaplingItemBlock.class, "slime.sapling"); - - slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water).setStepSound(slimeStep).setUnlocalizedName("slime.channel"); - GameRegistry.registerBlock(slimeChannel, "slime.channel"); - TConstructRegistry.drawbridgeState[slimeChannel.blockID] = 1; - - slimePad = new SlimePad(PHConstruct.slimePad, Material.cloth).setStepSound(slimeStep).setUnlocalizedName("slime.pad"); - GameRegistry.registerBlock(slimePad, "slime.pad"); - TConstructRegistry.drawbridgeState[slimePad.blockID] = 1; + TRepo.pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); + TRepo.fluids[26] = TRepo.pigIronFluid; + //Slime Islands + TRepo.slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(TRepo.slimeStep).setLightOpacity(0).setUnlocalizedName("slime.gel"); + TRepo.slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).setLightOpacity(0).setUnlocalizedName("slime.grass"); + TRepo.slimeTallGrass = new SlimeTallGrass(PHConstruct.slimeTallGrass).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("slime.grass.tall"); + TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves(PHConstruct.slimeLeaves).setStepSound(TRepo.slimeStep).setLightOpacity(0).setUnlocalizedName("slime.leaves"); + TRepo.slimeSapling = (SlimeSapling) new SlimeSapling(PHConstruct.slimeSapling).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.sapling"); + TRepo.slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.channel"); + TRepo.slimePad = new SlimePad(PHConstruct.slimePad, Material.cloth).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.pad"); //Decoration - stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); - GameRegistry.registerBlock(stoneTorch, "decoration.stonetorch"); - stoneLadder = new StoneLadder(PHConstruct.stoneLadder).setUnlocalizedName("decoration.stoneladder"); - GameRegistry.registerBlock(stoneLadder, "decoration.stoneladder"); - - multiBrick = new MultiBrick(PHConstruct.multiBrick).setUnlocalizedName("Decoration.Brick"); - GameRegistry.registerBlock(multiBrick, MultiBrickItem.class, "decoration.multibrick"); - multiBrickFancy = new MultiBrickFancy(PHConstruct.multiBrickFancy).setUnlocalizedName("Decoration.BrickFancy"); - GameRegistry.registerBlock(multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); + TRepo.stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); + TRepo.stoneLadder = new StoneLadder(PHConstruct.stoneLadder).setUnlocalizedName("decoration.stoneladder"); + TRepo.multiBrick = new MultiBrick(PHConstruct.multiBrick).setUnlocalizedName("Decoration.Brick"); + TRepo.multiBrickFancy = new MultiBrickFancy(PHConstruct.multiBrickFancy).setUnlocalizedName("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" }; - oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setUnlocalizedName("ore.berries.one"); - GameRegistry.registerBlock(oreBerry, OreberryBushItem.class, "ore.berries.one"); + TRepo.oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setUnlocalizedName("ore.berries.one"); String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; - oreBerrySecond = (OreberryBush) new OreberryBushEssence(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setUnlocalizedName("ore.berries.two"); - GameRegistry.registerBlock(oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two"); + TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }) + .setUnlocalizedName("ore.berries.two"); String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; - oreSlag = new MetalOre(PHConstruct.oreSlag, Material.rock, 10.0F, oreTypes).setUnlocalizedName("tconstruct.stoneore"); - GameRegistry.registerBlock(oreSlag, MetalOreItemBlock.class, "SearedBrick"); - MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4); - MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4); - MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1); + TRepo.oreSlag = new MetalOre(PHConstruct.oreSlag, Material.rock, 10.0F, oreTypes).setUnlocalizedName("tconstruct.stoneore"); + MinecraftForge.setBlockHarvestLevel(TRepo.oreSlag, 1, "pickaxe", 4); + MinecraftForge.setBlockHarvestLevel(TRepo.oreSlag, 2, "pickaxe", 4); + MinecraftForge.setBlockHarvestLevel(TRepo.oreSlag, 3, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(TRepo.oreSlag, 4, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(TRepo.oreSlag, 5, "pickaxe", 1); - oreGravel = new GravelOre(PHConstruct.oreGravel).setUnlocalizedName("GravelOre").setUnlocalizedName("tconstruct.gravelore"); - GameRegistry.registerBlock(oreGravel, GravelOreItem.class, "GravelOre"); + TRepo.oreGravel = new GravelOre(PHConstruct.oreGravel).setUnlocalizedName("GravelOre").setUnlocalizedName("tconstruct.gravelore"); + MinecraftForge.setBlockHarvestLevel(TRepo.oreGravel, 0, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(TRepo.oreGravel, 1, "shovel", 2); + MinecraftForge.setBlockHarvestLevel(TRepo.oreGravel, 2, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(TRepo.oreGravel, 3, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(TRepo.oreGravel, 4, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(TRepo.oreGravel, 5, "shovel", 4); - MinecraftForge.setBlockHarvestLevel(oreGravel, 0, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 1, "shovel", 2); - MinecraftForge.setBlockHarvestLevel(oreGravel, 2, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 3, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 4, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 5, "shovel", 4); - - speedBlock = new SpeedBlock(PHConstruct.speedBlock).setUnlocalizedName("SpeedBlock"); - GameRegistry.registerBlock(speedBlock, SpeedBlockItem.class, "SpeedBlock"); + TRepo.speedBlock = new SpeedBlock(PHConstruct.speedBlock).setUnlocalizedName("SpeedBlock"); //Glass - clearGlass = new GlassBlockConnected(PHConstruct.glass, "clear", false).setUnlocalizedName("GlassBlock"); - clearGlass.stepSound = Block.soundGlassFootstep; - GameRegistry.registerBlock(clearGlass, GlassBlockItem.class, "GlassBlock"); - - glassPane = new GlassPaneConnected(PHConstruct.glassPane, "clear", false); - GameRegistry.registerBlock(glassPane, GlassPaneItem.class, "GlassPane"); - - stainedGlassClear = new GlassBlockConnectedMeta(PHConstruct.stainedGlassClear, "stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", - "cyan", "purple", "blue", "brown", "green", "red", "black").setUnlocalizedName("GlassBlock.StainedClear"); - stainedGlassClear.stepSound = Block.soundGlassFootstep; - GameRegistry.registerBlock(stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); - - stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); - GameRegistry.registerBlock(stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); + TRepo.clearGlass = new GlassBlockConnected(PHConstruct.glass, "clear", false).setUnlocalizedName("GlassBlock"); + TRepo.clearGlass.stepSound = Block.soundGlassFootstep; + TRepo.glassPane = new GlassPaneConnected(PHConstruct.glassPane, "clear", false); + TRepo.stainedGlassClear = new GlassBlockConnectedMeta(PHConstruct.stainedGlassClear, "stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", + "light_gray", "cyan", "purple", "blue", "brown", "green", "red", "black").setUnlocalizedName("GlassBlock.StainedClear"); + TRepo.stainedGlassClear.stepSound = Block.soundGlassFootstep; + TRepo.stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); //Rail - woodenRail = new WoodRail(PHConstruct.woodenRail).setStepSound(Block.soundWoodFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); - GameRegistry.registerBlock(woodenRail, "rail.wood"); + TRepo.woodenRail = new WoodRail(PHConstruct.woodenRail).setStepSound(Block.soundWoodFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); } void registerItems () { - titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); - GameRegistry.registerItem(titleIcon, "titleIcon"); + TRepo.titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); + GameRegistry.registerItem(TRepo.titleIcon, "titleIcon"); String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; - blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); - GameRegistry.registerItem(blankPattern, "blankPattern"); + TRepo.blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); + GameRegistry.registerItem(TRepo.blankPattern, "blankPattern"); - materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); - toolRod = new ToolPart(PHConstruct.toolRod, "_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); - toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard"); - woodPattern = new Pattern(PHConstruct.woodPattern, "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); - metalPattern = new MetalPattern(PHConstruct.metalPattern, "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + TRepo.materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); + TRepo.toolRod = new ToolPart(PHConstruct.toolRod, "_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); + TRepo.toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard"); + TRepo.woodPattern = new Pattern(PHConstruct.woodPattern, "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); + TRepo.metalPattern = new MetalPattern(PHConstruct.metalPattern, "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); //armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); - GameRegistry.registerItem(materials, "materials"); - GameRegistry.registerItem(woodPattern, "woodPattern"); - GameRegistry.registerItem(metalPattern, "metalPattern"); - //GameRegistry.registerItem(armorPattern, "armorPattern"); + GameRegistry.registerItem(TRepo.materials, "materials"); + GameRegistry.registerItem(TRepo.woodPattern, "woodPattern"); + GameRegistry.registerItem(TRepo.metalPattern, "metalPattern"); + //GameRegistry.registerItem(TRepo.armorPattern, "armorPattern"); - TConstructRegistry.addItemToDirectory("blankPattern", blankPattern); - TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); - TConstructRegistry.addItemToDirectory("metalPattern", metalPattern); + 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", @@ -853,11 +502,11 @@ public class TContent implements IFuelHandler for (int i = 1; i < patternTypes.length; i++) { - TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Pattern", new ItemStack(woodPattern, 1, 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(metalPattern, 1, 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++) @@ -865,37 +514,37 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemStackToDirectory(armorPartTypes[i] + "Cast", new ItemStack(armorPattern, 1, i)); }*/ - manualBook = new Manual(PHConstruct.manual); - GameRegistry.registerItem(manualBook, "manualBook"); - buckets = new FilledBucket(PHConstruct.buckets); - GameRegistry.registerItem(buckets, "buckets"); + TRepo.manualBook = new Manual(PHConstruct.manual); + GameRegistry.registerItem(TRepo.manualBook, "manualBook"); + TRepo.buckets = new FilledBucket(PHConstruct.buckets); + GameRegistry.registerItem(TRepo.buckets, "buckets"); - pickaxe = new Pickaxe(PHConstruct.pickaxe); - shovel = new Shovel(PHConstruct.shovel); - hatchet = new Hatchet(PHConstruct.axe); - broadsword = new Broadsword(PHConstruct.broadsword); - longsword = new Longsword(PHConstruct.longsword); - rapier = new Rapier(PHConstruct.rapier); - dagger = new Dagger(PHConstruct.dagger); - cutlass = new Cutlass(PHConstruct.cutlass); + TRepo.pickaxe = new Pickaxe(PHConstruct.pickaxe); + TRepo.shovel = new Shovel(PHConstruct.shovel); + TRepo.hatchet = new Hatchet(PHConstruct.axe); + TRepo.broadsword = new Broadsword(PHConstruct.broadsword); + TRepo.longsword = new Longsword(PHConstruct.longsword); + TRepo.rapier = new Rapier(PHConstruct.rapier); + TRepo.dagger = new Dagger(PHConstruct.dagger); + TRepo.cutlass = new Cutlass(PHConstruct.cutlass); - frypan = new FryingPan(PHConstruct.frypan); - battlesign = new BattleSign(PHConstruct.battlesign); - mattock = new Mattock(PHConstruct.mattock); - chisel = new Chisel(PHConstruct.chisel); + TRepo.frypan = new FryingPan(PHConstruct.frypan); + TRepo.battlesign = new BattleSign(PHConstruct.battlesign); + TRepo.mattock = new Mattock(PHConstruct.mattock); + TRepo.chisel = new Chisel(PHConstruct.chisel); - lumberaxe = new LumberAxe(PHConstruct.lumberaxe); - cleaver = new Cleaver(PHConstruct.cleaver); - scythe = new Scythe(PHConstruct.scythe); - excavator = new Excavator(PHConstruct.excavator); - hammer = new Hammer(PHConstruct.hammer); - battleaxe = new Battleaxe(PHConstruct.battleaxe); + TRepo.lumberaxe = new LumberAxe(PHConstruct.lumberaxe); + TRepo.cleaver = new Cleaver(PHConstruct.cleaver); + TRepo.scythe = new Scythe(PHConstruct.scythe); + TRepo.excavator = new Excavator(PHConstruct.excavator); + TRepo.hammer = new Hammer(PHConstruct.hammer); + TRepo.battleaxe = new Battleaxe(PHConstruct.battleaxe); - shortbow = new Shortbow(PHConstruct.shortbow); - arrow = new Arrow(PHConstruct.arrow); + TRepo.shortbow = new Shortbow(PHConstruct.shortbow); + TRepo.arrow = new Arrow(PHConstruct.arrow); - Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe, - shortbow, 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" }; @@ -905,40 +554,41 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); } - potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).setUnlocalizedName("tconstruct.PotionLauncher"); - GameRegistry.registerItem(potionLauncher, "potionLauncher"); + TRepo.potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).setUnlocalizedName("tconstruct.PotionLauncher"); + GameRegistry.registerItem(TRepo.potionLauncher, "potionLauncher"); - pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); - shovelHead = new ToolPart(PHConstruct.shovelHead, "_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); - hatchetHead = new ToolPart(PHConstruct.axeHead, "_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead"); - binding = new ToolPart(PHConstruct.binding, "_binding", "Binding").setUnlocalizedName("tconstruct.Binding"); - toughBinding = new ToolPart(PHConstruct.toughBinding, "_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding"); - toughRod = new ToolPart(PHConstruct.toughRod, "_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod"); - largePlate = new ToolPart(PHConstruct.largePlate, "_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate"); + TRepo.pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); + TRepo.shovelHead = new ToolPart(PHConstruct.shovelHead, "_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); + TRepo.hatchetHead = new ToolPart(PHConstruct.axeHead, "_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead"); + TRepo.binding = new ToolPart(PHConstruct.binding, "_binding", "Binding").setUnlocalizedName("tconstruct.Binding"); + TRepo.toughBinding = new ToolPart(PHConstruct.toughBinding, "_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding"); + TRepo.toughRod = new ToolPart(PHConstruct.toughRod, "_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod"); + TRepo.largePlate = new ToolPart(PHConstruct.largePlate, "_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate"); - swordBlade = new ToolPart(PHConstruct.swordBlade, "_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade"); - wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard"); - handGuard = new ToolPart(PHConstruct.medGuard, "_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard"); - crossbar = new ToolPart(PHConstruct.crossbar, "_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar"); - knifeBlade = new ToolPart(PHConstruct.knifeBlade, "_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade"); - fullGuard = new ToolPartHidden(PHConstruct.fullGuard, "_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); + TRepo.swordBlade = new ToolPart(PHConstruct.swordBlade, "_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade"); + TRepo.wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard"); + TRepo.handGuard = new ToolPart(PHConstruct.medGuard, "_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard"); + TRepo.crossbar = new ToolPart(PHConstruct.crossbar, "_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar"); + TRepo.knifeBlade = new ToolPart(PHConstruct.knifeBlade, "_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade"); + TRepo.fullGuard = new ToolPartHidden(PHConstruct.fullGuard, "_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); - frypanHead = new ToolPart(PHConstruct.frypanHead, "_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead"); - signHead = new ToolPart(PHConstruct.signHead, "_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead"); - chiselHead = new ToolPart(PHConstruct.chiselHead, "_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead"); + TRepo.frypanHead = new ToolPart(PHConstruct.frypanHead, "_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead"); + TRepo.signHead = new ToolPart(PHConstruct.signHead, "_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead"); + TRepo.chiselHead = new ToolPart(PHConstruct.chiselHead, "_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead"); - scytheBlade = new ToolPart(PHConstruct.scytheBlade, "_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade"); - broadAxeHead = new ToolPart(PHConstruct.lumberHead, "_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead"); - excavatorHead = new ToolPart(PHConstruct.excavatorHead, "_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead"); - largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade"); - hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead"); + TRepo.scytheBlade = new ToolPart(PHConstruct.scytheBlade, "_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade"); + TRepo.broadAxeHead = new ToolPart(PHConstruct.lumberHead, "_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead"); + TRepo.excavatorHead = new ToolPart(PHConstruct.excavatorHead, "_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead"); + TRepo.largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade"); + TRepo.hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead"); - bowstring = new Bowstring(PHConstruct.bowstring).setUnlocalizedName("tconstruct.Bowstring"); - arrowhead = new ToolPart(PHConstruct.arrowhead, "_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); - fletching = new Fletching(PHConstruct.fletching).setUnlocalizedName("tconstruct.Fletching"); + TRepo.bowstring = new Bowstring(PHConstruct.bowstring).setUnlocalizedName("tconstruct.Bowstring"); + TRepo.arrowhead = new ToolPart(PHConstruct.arrowhead, "_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); + TRepo.fletching = new Fletching(PHConstruct.fletching).setUnlocalizedName("tconstruct.Fletching"); - Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, largePlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard, - frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead, bowstring, fletching, arrowhead }; + 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" }; @@ -949,40 +599,40 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]); } - diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond"); - strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood"); - oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry"); - GameRegistry.registerItem(diamondApple, "diamondApple"); - GameRegistry.registerItem(strangeFood, "strangeFood"); - GameRegistry.registerItem(oreBerries, "oreBerries"); + TRepo.diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond"); + TRepo.strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood"); + TRepo.oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry"); + GameRegistry.registerItem(TRepo.diamondApple, "diamondApple"); + GameRegistry.registerItem(TRepo.strangeFood, "strangeFood"); + GameRegistry.registerItem(TRepo.oreBerries, "oreBerries"); - jerky = new Jerky(PHConstruct.jerky, Loader.isModLoaded("HungerOverhaul")).setUnlocalizedName("tconstruct.jerky"); - GameRegistry.registerItem(jerky, "jerky"); + TRepo.jerky = new Jerky(PHConstruct.jerky, Loader.isModLoaded("HungerOverhaul")).setUnlocalizedName("tconstruct.jerky"); + GameRegistry.registerItem(TRepo.jerky, "jerky"); //Wearables //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); - heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister"); + TRepo.heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister"); //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); - knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); - goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); - //GameRegistry.registerItem(heavyHelmet, "heavyHelmet"); - GameRegistry.registerItem(heartCanister, "heartCanister"); - //GameRegistry.registerItem(heavyBoots, "heavyBoots"); - //GameRegistry.registerItem(glove, "glove"); - GameRegistry.registerItem(knapsack, "knapsack"); - GameRegistry.registerItem(goldHead, "goldHead"); + TRepo.knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); + TRepo.goldHead = new GoldenHead(PHConstruct.goldHead, 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"); LiquidCasting basinCasting = TConstruct.getBasinCasting(); - materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); - helmetWood = new ArmorBasic(PHConstruct.woodHelmet, materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); - chestplateWood = new ArmorBasic(PHConstruct.woodChestplate, materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); - leggingsWood = new ArmorBasic(PHConstruct.woodPants, materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); - bootsWood = new ArmorBasic(PHConstruct.woodBoots, materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); - GameRegistry.registerItem(helmetWood, "helmetWood"); - GameRegistry.registerItem(chestplateWood, "chestplateWood"); - GameRegistry.registerItem(leggingsWood, "leggingsWood"); - GameRegistry.registerItem(bootsWood, "bootsWood"); + TRepo.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); + TRepo.helmetWood = new ArmorBasic(PHConstruct.woodHelmet, TRepo.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); + TRepo.chestplateWood = new ArmorBasic(PHConstruct.woodChestplate, TRepo.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); + TRepo.leggingsWood = new ArmorBasic(PHConstruct.woodPants, TRepo.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); + TRepo.bootsWood = new ArmorBasic(PHConstruct.woodBoots, 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"); // essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); @@ -993,22 +643,22 @@ public class TContent implements IFuelHandler for (int i = 0; i < materialStrings.length; i++) { - TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(materials, 1, 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(oreBerries, 1, i)); + TConstructRegistry.addItemStackToDirectory("oreberry" + oreberries[i], new ItemStack(TRepo.oreBerries, 1, i)); } - TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(diamondApple, 1, 0)); - TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(strangeFood, 1, 0)); + TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(TRepo.diamondApple, 1, 0)); + TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(TRepo.strangeFood, 1, 0)); - TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(heartCanister, 1, 0)); - TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(heartCanister, 1, 1)); - TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(heartCanister, 1, 2)); + 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 Item.doorWood.setMaxStackSize(16); @@ -1085,12 +735,12 @@ public class TContent implements IFuelHandler 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(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String - TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Item.feather), new ItemStack(fletching, 1, 0), 100F, 0F, 0.05F); //Feather + TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Item.silk), new ItemStack(TRepo.bowstring, 1, 0), 1F, 1F, 1f); //String + TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Item.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(Block.leaves, 1, i), new ItemStack(fletching, 1, 1), 75F, 0F, 0.2F); //All four vanialla Leaves - TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(materials, 1, 1), new ItemStack(fletching, 1, 2), 100F, 0F, 0.12F); //Slime - TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(materials, 1, 17), new ItemStack(fletching, 1, 3), 100F, 0F, 0.12F); //BlueSlime + TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.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) @@ -1099,52 +749,52 @@ public class TContent implements IFuelHandler pb.registerMaterialSet("Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0); if (PHConstruct.enableTStone) { - pb.registerFullMaterial(Block.stone, 2, "Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1); + pb.registerFullMaterial(Block.stone, 2, "Stone", new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 1); pb.registerMaterial(Block.cobblestone, 2, "Stone"); } else - pb.registerMaterialSet("Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 0); - pb.registerFullMaterial(Item.ingotIron, 2, "Iron", new ItemStack(TContent.toolShard, 1, 2), new ItemStack(TContent.toolRod, 1, 2), 2); + pb.registerMaterialSet("Stone", new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 0); + pb.registerFullMaterial(Item.ingotIron, 2, "Iron", new ItemStack(TRepo.toolShard, 1, 2), new ItemStack(TRepo.toolRod, 1, 2), 2); if (PHConstruct.enableTFlint) - pb.registerFullMaterial(Item.flint, 2, "Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3); + pb.registerFullMaterial(Item.flint, 2, "Flint", new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); else - pb.registerMaterialSet("Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3); + pb.registerMaterialSet("Flint", new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); if (PHConstruct.enableTCactus) - pb.registerFullMaterial(Block.cactus, 2, "Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4); + pb.registerFullMaterial(Block.cactus, 2, "Cactus", new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); else - pb.registerMaterialSet("Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4); + pb.registerMaterialSet("Cactus", new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); if (PHConstruct.enableTBone) pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); else pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); - pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", new ItemStack(TContent.toolShard, 1, 6), new ItemStack(TContent.toolRod, 1, 6), 6); - pb.registerMaterial(new ItemStack(materials, 1, 18), 2, "Obsidian"); + pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", new ItemStack(TRepo.toolShard, 1, 6), new ItemStack(TRepo.toolRod, 1, 6), 6); + pb.registerMaterial(new ItemStack(TRepo.materials, 1, 18), 2, "Obsidian"); if (PHConstruct.enableTNetherrack) - pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7); + pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); else - pb.registerMaterialSet("Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7); + pb.registerMaterialSet("Netherrack", new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); if (PHConstruct.enableTSlime) - pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 1), 2, "Slime", new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 8), 8); else - pb.registerMaterialSet("Slime", new ItemStack(TContent.toolShard, 1, 8), new ItemStack(TContent.toolRod, 1, 17), 8); + pb.registerMaterialSet("Slime", new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 17), 8); if (PHConstruct.enableTPaper) - pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Item.paper, 2), new ItemStack(toolRod, 1, 9), 9); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 0), 2, "Paper", new ItemStack(Item.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); else - pb.registerMaterialSet("BlueSlime", new ItemStack(Item.paper, 2), new ItemStack(TContent.toolRod, 1, 9), 9); - pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10); - pb.registerMaterialSet("Ardite", new ItemStack(toolShard, 1, 11), new ItemStack(toolRod, 1, 11), 11); - pb.registerMaterialSet("Manyullyn", new ItemStack(toolShard, 1, 12), new ItemStack(toolRod, 1, 12), 12); - pb.registerMaterialSet("Copper", new ItemStack(toolShard, 1, 13), new ItemStack(toolRod, 1, 13), 13); - pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14); - pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15); - pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16); + pb.registerMaterialSet("BlueSlime", new ItemStack(Item.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); + pb.registerMaterialSet("Cobalt", new ItemStack(TRepo.toolShard, 1, 10), new ItemStack(TRepo.toolRod, 1, 10), 10); + pb.registerMaterialSet("Ardite", new ItemStack(TRepo.toolShard, 1, 11), new ItemStack(TRepo.toolRod, 1, 11), 11); + pb.registerMaterialSet("Manyullyn", new ItemStack(TRepo.toolShard, 1, 12), new ItemStack(TRepo.toolRod, 1, 12), 12); + pb.registerMaterialSet("Copper", new ItemStack(TRepo.toolShard, 1, 13), new ItemStack(TRepo.toolRod, 1, 13), 13); + pb.registerMaterialSet("Bronze", new ItemStack(TRepo.toolShard, 1, 14), new ItemStack(TRepo.toolRod, 1, 14), 14); + pb.registerMaterialSet("Alumite", new ItemStack(TRepo.toolShard, 1, 15), new ItemStack(TRepo.toolRod, 1, 15), 15); + pb.registerMaterialSet("Steel", new ItemStack(TRepo.toolShard, 1, 16), new ItemStack(TRepo.toolRod, 1, 16), 16); if (PHConstruct.enableTBlueSlime) - pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 17), 2, "BlueSlime", new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); else - pb.registerMaterialSet("BlueSlime", new ItemStack(TContent.toolShard, 1, 17), new ItemStack(TContent.toolRod, 1, 17), 17); - pb.registerFullMaterial(new ItemStack(materials, 1, 34), 2, "PigIron", new ItemStack(toolShard, 1, 18), new ItemStack(toolRod, 1, 18), 18); + pb.registerMaterialSet("BlueSlime", new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 34), 2, "PigIron", new ItemStack(TRepo.toolShard, 1, 18), new ItemStack(TRepo.toolRod, 1, 18), 18); - pb.addToolPattern((IPattern) woodPattern); + pb.addToolPattern((IPattern) TRepo.woodPattern); } public static Item[] patternOutputs; @@ -1175,122 +825,122 @@ public class TContent implements IFuelHandler // ToolForge Recipes (Metal Version) for (int sc = 0; sc < toolForgeBlocks.length; sc++) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - toolForgeBlocks[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(craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(craftingSlabWood, 1, 1), 'm', - toolForgeBlocks[sc])); + 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(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingSlabWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.chest); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood")); + 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(Block.wood, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', Block.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(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); + GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.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(furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Block.stoneSingleSlab, 1, 3)); + GameRegistry.addRecipe(new ItemStack(TRepo.furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Block.stoneSingleSlab, 1, 3)); // Blank Pattern Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); // Manual Book Recipes - GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 1), new ItemStack(manualBook, 1, 0)); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 1), new ItemStack(manualBook, 1, 1), Item.book); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 3), new ItemStack(manualBook, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TRepo.manualBook), "wp", 'w', new ItemStack(TRepo.blankPattern, 1, 0), 'p', Item.paper); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 0), new ItemStack(TRepo.manualBook, 1, 0), Item.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), Item.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), Item.book); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 1, 3), new ItemStack(TRepo.manualBook, 1, 2)); // alternative Vanilla Book Recipe - GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, blankPattern, blankPattern); + GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, TRepo.blankPattern, TRepo.blankPattern); // Paperstack Recipe - GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 0), "pp", "pp", 'p', Item.paper); // Mossball Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 6), patBlock, '#', "stoneMossy")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 6), patBlock, '#', "stoneMossy")); // LavaCrystal Recipes -Auto-smelt - GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.fireballCharge, 'x', Item.blazeRod); - GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'x', Item.fireballCharge, 'c', Item.blazeRod); + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.fireballCharge, 'x', Item.blazeRod); + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'x', Item.fireballCharge, 'c', Item.blazeRod); // Slimy sand Recipes - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 2), strangeFood, strangeFood, strangeFood, strangeFood, Block.sand, Block.dirt); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 2), TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, Block.sand, Block.dirt); // Grout Recipes - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel); - GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.stainedClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); - GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.blockClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel); + GameRegistry.addRecipe(new ItemStack(TRepo.craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.stainedClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); + GameRegistry.addRecipe(new ItemStack(TRepo.craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.blockClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); // Graveyard Soil Recipes - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 3), Block.dirt, Item.rottenFlesh, new ItemStack(Item.dyePowder, 1, 15)); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 3), Block.dirt, Item.rottenFlesh, new ItemStack(Item.dyePowder, 1, 15)); // Silky Cloth Recipes - GameRegistry.addRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', new ItemStack(materials, 1, 24), '#', new ItemStack(Item.silk)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Item.silk))); + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', new ItemStack(TRepo.materials, 1, 24), '#', new ItemStack(Item.silk)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Item.silk))); // Silky Jewel Recipes - GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); - // Wooden Armor Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(helmetWood, new Object[] { "www", "w w", 'w', "logWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(bootsWood, new Object[] { "w w", "w w", 'w', "logWood" })); + GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(TRepo.materials, 1, 25), 'e', new ItemStack(Item.emerald)); + // Wooden Armor Recipes + GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.helmetWood, new Object[] { "www", "w w", 'w', "logWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.bootsWood, new Object[] { "w w", "w w", 'w', "logWood" })); // Metal conversion Recipes - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 3), patBlock, '#', new ItemStack(materials, 1, 9)); // Copper - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 5), patBlock, '#', new ItemStack(materials, 1, 10)); // Tin - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 11)); // Aluminum - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 12)); // Aluminum - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 4), patBlock, '#', new ItemStack(materials, 1, 13)); // Bronze - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 7), patBlock, '#', new ItemStack(materials, 1, 14)); // AluBrass - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 0), patBlock, '#', new ItemStack(materials, 1, 3)); // Cobalt - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 1), patBlock, '#', new ItemStack(materials, 1, 4)); // Ardite - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 2), patBlock, '#', new ItemStack(materials, 1, 5)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 8), patBlock, '#', new ItemStack(materials, 1, 15)); // Alumite - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 9), patBlock, '#', new ItemStack(materials, 1, 16)); // Steel - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 11), patBlock, '#', new ItemStack(materials, 1, 12)); //Aluminum raw -> ingot - - GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 9, 13), "m", 'm', new ItemStack(metalBlock, 1, 4)); //Bronze - GameRegistry.addRecipe(new ItemStack(materials, 9, 14), "m", 'm', new ItemStack(metalBlock, 1, 7)); //AluBrass - GameRegistry.addRecipe(new ItemStack(materials, 9, 3), "m", 'm', new ItemStack(metalBlock, 1, 0)); //Cobalt - GameRegistry.addRecipe(new ItemStack(materials, 9, 4), "m", 'm', new ItemStack(metalBlock, 1, 1)); //Ardite - GameRegistry.addRecipe(new ItemStack(materials, 9, 5), "m", 'm', new ItemStack(metalBlock, 1, 2)); //Manyullyn - GameRegistry.addRecipe(new ItemStack(materials, 9, 15), "m", 'm', new ItemStack(metalBlock, 1, 8)); //Alumite - GameRegistry.addRecipe(new ItemStack(materials, 9, 16), "m", 'm', new ItemStack(metalBlock, 1, 9)); //Steel + 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.metalBlock, 1, 11), patBlock, '#', new ItemStack(TRepo.materials, 1, 12)); //Aluminum raw -> ingot - GameRegistry.addRecipe(new ItemStack(Item.ingotIron), patBlock, '#', new ItemStack(materials, 1, 19)); //Iron - GameRegistry.addRecipe(new ItemStack(materials, 1, 9), patBlock, '#', new ItemStack(materials, 1, 20)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 1, 10), patBlock, '#', new ItemStack(materials, 1, 21)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 1, 11), patBlock, '#', new ItemStack(materials, 1, 22)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 1, 14), patBlock, '#', new ItemStack(materials, 1, 24)); //Aluminum Brass - GameRegistry.addRecipe(new ItemStack(materials, 1, 18), patBlock, '#', new ItemStack(materials, 1, 27)); //Obsidian - GameRegistry.addRecipe(new ItemStack(materials, 1, 3), patBlock, '#', new ItemStack(materials, 1, 28)); //Cobalt - GameRegistry.addRecipe(new ItemStack(materials, 1, 4), patBlock, '#', new ItemStack(materials, 1, 29)); //Ardite - GameRegistry.addRecipe(new ItemStack(materials, 1, 5), patBlock, '#', new ItemStack(materials, 1, 30)); //Manyullyn - GameRegistry.addRecipe(new ItemStack(materials, 1, 13), patBlock, '#', new ItemStack(materials, 1, 31)); //Bronze - GameRegistry.addRecipe(new ItemStack(materials, 1, 15), patBlock, '#', new ItemStack(materials, 1, 32)); //Alumite - GameRegistry.addRecipe(new ItemStack(materials, 1, 16), patBlock, '#', new ItemStack(materials, 1, 33)); //Steel + 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, 12), "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(materials, 9, 19), "m", 'm', new ItemStack(Item.ingotIron)); //Iron - GameRegistry.addRecipe(new ItemStack(materials, 9, 20), "m", 'm', new ItemStack(materials, 1, 9)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 9, 21), "m", 'm', new ItemStack(materials, 1, 10)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 11)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 12)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 9, 24), "m", 'm', new ItemStack(materials, 1, 14)); //Aluminum Brass - GameRegistry.addRecipe(new ItemStack(materials, 9, 27), "m", 'm', new ItemStack(materials, 1, 18)); //Obsidian - GameRegistry.addRecipe(new ItemStack(materials, 9, 28), "m", 'm', new ItemStack(materials, 1, 3)); //Cobalt - GameRegistry.addRecipe(new ItemStack(materials, 9, 29), "m", 'm', new ItemStack(materials, 1, 4)); //Ardite - GameRegistry.addRecipe(new ItemStack(materials, 9, 30), "m", 'm', new ItemStack(materials, 1, 5)); //Manyullyn - GameRegistry.addRecipe(new ItemStack(materials, 9, 31), "m", 'm', new ItemStack(materials, 1, 13)); //Bronze - GameRegistry.addRecipe(new ItemStack(materials, 9, 32), "m", 'm', new ItemStack(materials, 1, 15)); //Alumite - GameRegistry.addRecipe(new ItemStack(materials, 9, 33), "m", 'm', new ItemStack(materials, 1, 16)); //Steel + GameRegistry.addRecipe(new ItemStack(Item.ingotIron), 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(Item.ingotIron)); //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", @@ -1300,172 +950,175 @@ public class TContent implements IFuelHandler { color = dyeTypes[15 - i]; GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.cloth, 8, i), patSurround, 'm', color, '#', new ItemStack(Block.cloth, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClear, 8, i), patSurround, 'm', color, '#', clearGlass)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClear, 1, i), color, clearGlass)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClear, 1, i), color, new ItemStack(stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', glassPane)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClearPane, 1, i), color, glassPane)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(stainedGlassClearPane, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClearPane, 1, i), color, new ItemStack(stainedGlassClearPane, 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(Item.glassBottle, 3), new Object[] { "# #", " # ", '#', clearGlass }); + GameRegistry.addRecipe(new ItemStack(Item.glassBottle, 3), new Object[] { "# #", " # ", '#', TRepo.clearGlass }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.daylightSensor), new Object[] { "GGG", "QQQ", "WWW", 'G', "glass", 'Q', Item.netherQuartz, 'W', "slabWood" })); - GameRegistry.addRecipe(new ItemStack(Block.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', clearGlass, 'S', Item.netherStar, 'O', Block.obsidian }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(glassPane, 16, 0), "GGG", "GGG", 'G', clearGlass)); + GameRegistry.addRecipe(new ItemStack(Block.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', TRepo.clearGlass, 'S', Item.netherStar, 'O', Block.obsidian }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.glassPane, 16, 0), "GGG", "GGG", 'G', TRepo.clearGlass)); // Smeltery Components Recipes - ItemStack searedBrick = new ItemStack(materials, 1, 2); - GameRegistry.addRecipe(new ItemStack(smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); //Controller - GameRegistry.addRecipe(new ItemStack(smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); //Drain - GameRegistry.addRecipe(new ItemStack(smeltery, 1, 2), "bb", "bb", 'b', searedBrick); //Bricks - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 0), patSurround, '#', searedBrick, 'm', "glass")); //Tank - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "glass")); //Glass - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "glass")); //Window - GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); //Table - GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet - GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin - GameRegistry.addRecipe(new ItemStack(castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); //Channel + 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', "glass")); //Tank + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "glass")); //Glass + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "glass")); //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 // Jack o'Latern Recipe - Stone Torch - GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 's', new ItemStack(stoneTorch)); + GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 's', new ItemStack(TRepo.stoneTorch)); // Stone Torch Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', "stoneRod")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', "stoneRod")); // Stone Ladder Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stoneLadder, 3), "w w", "www", "w w", 'w', "stoneRod")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stoneLadder, 3), "w w", "www", "w w", 'w', "stoneRod")); // Wooden Rail Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); + 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(toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone)); - GameRegistry.addRecipe(new ItemStack(toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone)); + GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone)); // - ItemStack aluBrass = new ItemStack(materials, 1, 14); + ItemStack aluBrass = new ItemStack(TRepo.materials, 1, 14); // Clock Recipe - Vanilla alternativ GameRegistry.addRecipe(new ItemStack(Item.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Item.redstone)); // Gold Pressure Plate - Vanilla alternativ GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass); //Accessories - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum")); - GameRegistry.addRecipe(new ItemStack(diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed)); - GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 2), new ItemStack(diamondApple), new ItemStack(materials, 1, 8), new ItemStack(heartCanister, 1, 0), new ItemStack( - heartCanister, 1, 1)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', "ingotGold")); - GameRegistry.addRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', aluBrass); + 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 ItemStack(TRepo.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed)); + 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.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm', + "ingotGold")); + GameRegistry.addRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm', aluBrass); // Drying Rack Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.dryingRack, 1, 0), "bbb", 'b', "slabWood")); //Landmine Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone, 'p', Block.pressurePlateStone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 1), "mcm", "rpr", 'm', Block.stone, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 1), "mcm", "rpr", 'm', Block.stone, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone, 'p', Block.pressurePlateStone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 2), "mcm", "rpr", 'm', Block.obsidian, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', - Block.pressurePlateStone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 3), "mcm", "rpr", 'm', Item.redstoneRepeater, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 2), "mcm", "rpr", 'm', Block.obsidian, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone, 'p', Block.pressurePlateStone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 3), "mcm", "rpr", 'm', Item.redstoneRepeater, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone, + 'p', Block.pressurePlateStone)); //Ultra hardcore recipes - GameRegistry.addRecipe(new ItemStack(goldHead), patSurround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.skull, 1, 3)); + GameRegistry.addRecipe(new ItemStack(TRepo.goldHead), patSurround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.skull, 1, 3)); // Slab Smeltery Components Recipes for (int i = 0; i < 7; i++) { - GameRegistry.addRecipe(new ItemStack(speedSlab, 6, i), "bbb", 'b', new ItemStack(speedBlock, 1, i)); + GameRegistry.addRecipe(new ItemStack(TRepo.speedSlab, 6, i), "bbb", 'b', new ItemStack(TRepo.speedBlock, 1, i)); } - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 0), "bbb", 'b', new ItemStack(smeltery, 1, 2)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 1), "bbb", 'b', new ItemStack(smeltery, 1, 4)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 2), "bbb", 'b', new ItemStack(smeltery, 1, 5)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 3), "bbb", 'b', new ItemStack(smeltery, 1, 6)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 4), "bbb", 'b', new ItemStack(smeltery, 1, 8)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 5), "bbb", 'b', new ItemStack(smeltery, 1, 9)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 6), "bbb", 'b', new ItemStack(smeltery, 1, 10)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 7), "bbb", 'b', new ItemStack(smeltery, 1, 11)); + 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(woolSlab1, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc)); - GameRegistry.addRecipe(new ItemStack(woolSlab2, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc + 8)); + GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab1, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc)); + GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab2, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc + 8)); - GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(woolSlab1, 1, sc), new ItemStack(woolSlab1, 1, sc)); - GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(woolSlab2, 1, sc), new ItemStack(woolSlab2, 1, sc)); + GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc)); + GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(TRepo.woolSlab2, 1, sc), new ItemStack(TRepo.woolSlab2, 1, sc)); } GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth")); //Trap Recipes - GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); - GameRegistry.addRecipe(new ItemStack(barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(barricadeOak, 1, 0), "b", "b", 'b', "logWood")); + GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); + GameRegistry.addRecipe(new ItemStack(TRepo.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1)); + GameRegistry.addRecipe(new ItemStack(TRepo.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2)); + GameRegistry.addRecipe(new ItemStack(TRepo.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 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(craftingStationWood, 1, 0), "b", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); + 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(craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 3)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 4)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 4), "b", 'b', new ItemStack(toolStationWood, 1, 5)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 10)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 11)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 12)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 13)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE)); + 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(slimeGel, 1, 0), "##", "##", '#', strangeFood); - GameRegistry.addRecipe(new ItemStack(strangeFood, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 0)); - GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 1), "##", "##", '#', Item.slimeBall); - GameRegistry.addRecipe(new ItemStack(Item.slimeBall, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 1)); + 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), "##", "##", '#', Item.slimeBall); + GameRegistry.addRecipe(new ItemStack(Item.slimeBall, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 1)); //slimeExplosive - GameRegistry.addShapelessRecipe(new ItemStack(slimeExplosive, 1, 0), Item.slimeBall, Block.tnt); - GameRegistry.addShapelessRecipe(new ItemStack(slimeExplosive, 1, 2), strangeFood, Block.tnt); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimeExplosive, 1, 0), "slimeball", Block.tnt)); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), Item.slimeBall, Block.tnt); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 2), TRepo.strangeFood, Block.tnt); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), "slimeball", Block.tnt)); - GameRegistry.addShapelessRecipe(new ItemStack(slimeChannel, 1, 0), new ItemStack(slimeGel, 1, Short.MAX_VALUE), new ItemStack(Item.redstone)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimePad, 1, 0), slimeChannel, "slimeBall")); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, Short.MAX_VALUE), new ItemStack(Item.redstone)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimePad, 1, 0), TRepo.slimeChannel, "slimeBall")); } private void addRecipesForFurnace () { - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 3, new ItemStack(craftedSoil, 1, 4), 0.2f); //Concecrated Soil + FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 3, new ItemStack(TRepo.craftedSoil, 1, 4), 0.2f); //Concecrated Soil - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime - //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); - //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 11), 0.5f); + FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 0, new ItemStack(TRepo.materials, 1, 1), 2f); //Slime + FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 1, new ItemStack(TRepo.materials, 1, 2), 2f); //Seared brick item + FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 2, new ItemStack(TRepo.materials, 1, 17), 2f); //Blue Slime + //FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 1, new ItemStack(TRepo.materials, 1, 3), 3f); + //FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 2, new ItemStack(TRepo.materials, 1, 4), 3f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 3, new ItemStack(TRepo.materials, 1, 9), 0.5f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 4, new ItemStack(TRepo.materials, 1, 10), 0.5f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 5, new ItemStack(TRepo.materials, 1, 11), 0.5f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 2, new ItemStack(materials, 1, 20), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 3, new ItemStack(materials, 1, 21), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 4, new ItemStack(materials, 1, 22), 0.2f); - //FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 0, new ItemStack(TRepo.materials, 1, 19), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 2, new ItemStack(TRepo.materials, 1, 20), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 3, new ItemStack(TRepo.materials, 1, 21), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 4, new ItemStack(TRepo.materials, 1, 22), 0.2f); + //FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 5, new ItemStack(TRepo.materials, 1, 23), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 2, new ItemStack(materials, 1, 9), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 3, new ItemStack(materials, 1, 10), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 4, new ItemStack(materials, 1, 12), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 2, new ItemStack(TRepo.materials, 1, 9), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 3, new ItemStack(TRepo.materials, 1, 10), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 4, new ItemStack(TRepo.materials, 1, 12), 0.2f); - FurnaceRecipes.smelting().addSmelting(speedBlock.blockID, 0, new ItemStack(speedBlock, 1, 2), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.speedBlock.blockID, 0, new ItemStack(TRepo.speedBlock, 1, 2), 0.2f); } private void addPartMapping () { /* Tools */ - patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod, - toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead, null }; + 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 }; @@ -1476,7 +1129,7 @@ public class TContent implements IFuelHandler for (int meta = 0; meta < patternOutputs.length; meta++) { if (patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, mat, new ItemStack(patternOutputs[meta], 1, mat)); + TConstructRegistry.addPartMapping(TRepo.woodPattern.itemID, meta + 1, mat, new ItemStack(patternOutputs[meta], 1, mat)); } } } @@ -1487,7 +1140,7 @@ public class TContent implements IFuelHandler for (int meta = 0; meta < patternOutputs.length; meta++) { if (patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(patternOutputs[meta], 1, nonMetals[mat])); + TConstructRegistry.addPartMapping(TRepo.woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(patternOutputs[meta], 1, nonMetals[mat])); } } } @@ -1496,38 +1149,38 @@ public class TContent implements IFuelHandler private void addRecipesForToolBuilder () { ToolBuilder tb = ToolBuilder.instance; - tb.addNormalToolRecipe(pickaxe, pickaxeHead, toolRod, binding); - tb.addNormalToolRecipe(broadsword, swordBlade, toolRod, wideGuard); - tb.addNormalToolRecipe(hatchet, hatchetHead, toolRod); - tb.addNormalToolRecipe(shovel, shovelHead, toolRod); - tb.addNormalToolRecipe(longsword, swordBlade, toolRod, handGuard); - tb.addNormalToolRecipe(rapier, swordBlade, toolRod, crossbar); - tb.addNormalToolRecipe(frypan, frypanHead, toolRod); - tb.addNormalToolRecipe(battlesign, signHead, toolRod); - tb.addNormalToolRecipe(mattock, hatchetHead, toolRod, shovelHead); - tb.addNormalToolRecipe(dagger, knifeBlade, toolRod, crossbar); - tb.addNormalToolRecipe(cutlass, swordBlade, toolRod, fullGuard); - tb.addNormalToolRecipe(chisel, chiselHead, toolRod); + 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(scythe, scytheBlade, toughRod, toughBinding, toughRod); - tb.addNormalToolRecipe(lumberaxe, broadAxeHead, toughRod, largePlate, toughBinding); - tb.addNormalToolRecipe(cleaver, largeSwordBlade, toughRod, largePlate, toughRod); - tb.addNormalToolRecipe(excavator, excavatorHead, toughRod, largePlate, toughBinding); - tb.addNormalToolRecipe(hammer, hammerHead, toughRod, largePlate, largePlate); - tb.addNormalToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding); + 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); - //tb.addNormalToolRecipe(shortbow, toolRod, bowstring, toolRod); - BowRecipe recipe = new BowRecipe(toolRod, bowstring, toolRod, shortbow); + //tb.addNormalToolRecipe(TRepo.shortbow, TRepo.toolRod, TRepo.bowstring, TRepo.toolRod); + BowRecipe recipe = new BowRecipe(TRepo.toolRod, TRepo.bowstring, TRepo.toolRod, TRepo.shortbow); tb.addCustomToolRecipe(recipe); - tb.addNormalToolRecipe(arrow, arrowhead, toolRod, fletching); + tb.addNormalToolRecipe(TRepo.arrow, TRepo.arrowhead, TRepo.toolRod, TRepo.fletching); ItemStack diamond = new ItemStack(Item.diamond); tb.registerToolMod(new ModRepair()); tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); - modF = new ModFlux(); - tb.registerToolMod(modF); + TRepo.modF = new ModFlux(); + tb.registerToolMod(TRepo.modF); ItemStack redstoneItem = new ItemStack(Item.redstone); ItemStack redstoneBlock = new ItemStack(Block.blockRedstone); @@ -1539,19 +1192,19 @@ public class TContent implements IFuelHandler ItemStack lapisItem = new ItemStack(Item.dyePowder, 1, 4); ItemStack lapisBlock = new ItemStack(Block.blockLapis); - modL = new ModLapis(new ItemStack[] { lapisItem }, 10, 1); - tb.registerToolMod(modL); + TRepo.modL = new ModLapis(new ItemStack[] { lapisItem }, 10, 1); + tb.registerToolMod(TRepo.modL); tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisItem }, 10, 2)); tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock }, 10, 9)); tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisBlock }, 10, 10)); tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock, lapisBlock }, 10, 18)); - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair")); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair")); ItemStack blazePowder = new ItemStack(Item.blazePowder); tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder }, 7, 1)); tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder, blazePowder }, 7, 2)); - tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt")); - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal")); + tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(TRepo.materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt")); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal")); ItemStack quartzItem = new ItemStack(Item.netherQuartz); ItemStack quartzBlock = new ItemStack(Block.blockNetherQuartz, 1, Short.MAX_VALUE); @@ -1564,7 +1217,7 @@ public class TContent implements IFuelHandler tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Block.blockGold) }, "Tier1Free")); tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Item.netherStar) }, "Tier2Free")); - ItemStack silkyJewel = new ItemStack(materials, 1, 26); + ItemStack silkyJewel = new ItemStack(TRepo.materials, 1, 26); tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12)); ItemStack piston = new ItemStack(Block.pistonBase); @@ -1573,7 +1226,7 @@ public class TContent implements IFuelHandler tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Block.obsidian), new ItemStack(Item.enderPearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading")); - ItemStack holySoil = new ItemStack(craftedSoil, 1, 4); + ItemStack holySoil = new ItemStack(TRepo.craftedSoil, 1, 4); tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil }, 14, 1)); tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil, holySoil }, 14, 2)); @@ -1581,7 +1234,7 @@ public class TContent implements IFuelHandler tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball }, 15, 1)); tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball, spidereyeball }, 15, 2)); - ItemStack obsidianPlate = new ItemStack(largePlate, 1, 6); + ItemStack obsidianPlate = new ItemStack(TRepo.largePlate, 1, 6); tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); @@ -1590,38 +1243,38 @@ public class TContent implements IFuelHandler private void addRecipesForTableCasting () { /* Smeltery */ - ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); - ItemStack gemcast = new ItemStack(metalPattern, 1, 26); + 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(blankPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); - tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Item.emerald), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80); + 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(Item.emerald), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80); //Ingots - tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); //stone + tableCasting.addCastingRecipe(new ItemStack(TRepo.materials, 1, 2), new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); //stone //Misc - tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(moltenEmeraldFluid, 640), gemcast, 80); - tableCasting.addCastingRecipe(new ItemStack(materials, 1, 36), new FluidStack(glueFluid, TConstruct.ingotLiquidValue), null, 50); + tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(TRepo.moltenEmeraldFluid, 640), gemcast, 80); + tableCasting.addCastingRecipe(new ItemStack(TRepo.materials, 1, 36), new FluidStack(TRepo.glueFluid, TConstruct.ingotLiquidValue), null, 50); //Buckets ItemStack bucket = new ItemStack(Item.bucketEmpty); for (int sc = 0; sc < 24; sc++) { - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, sc), new FluidStack(fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + tableCasting.addCastingRecipe(new ItemStack(TRepo.buckets, 1, sc), new FluidStack(TRepo.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); } - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 26), new FluidStack(fluids[26], 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(glassPane), new FluidStack(moltenGlassFluid, 250), null, 80); + tableCasting.addCastingRecipe(new ItemStack(TRepo.glassPane), new FluidStack(TRepo.moltenGlassFluid, 250), null, 80); // Metal toolpart casting - liquids = new FluidStack[] { new FluidStack(moltenIronFluid, 1), new FluidStack(moltenCopperFluid, 1), new FluidStack(moltenCobaltFluid, 1), new FluidStack(moltenArditeFluid, 1), - new FluidStack(moltenManyullynFluid, 1), new FluidStack(moltenBronzeFluid, 1), new FluidStack(moltenAlumiteFluid, 1), new FluidStack(moltenObsidianFluid, 1), - new FluidStack(moltenSteelFluid, 1), new FluidStack(pigIronFluid, 1) }; + 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; @@ -1630,15 +1283,15 @@ public class TContent implements IFuelHandler { if (patternOutputs[iter] != null) { - ItemStack cast = new ItemStack(metalPattern, 1, iter + 1); + ItemStack cast = new ItemStack(TRepo.metalPattern, 1, iter + 1); - tableCasting.addCastingRecipe(cast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++) { fs = liquids[iterTwo].getFluid(); - fluidAmount = ((IPattern) metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; + fluidAmount = ((IPattern) TRepo.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; ItemStack metalCast = new ItemStack(patternOutputs[iter], 1, liquidDamage[iterTwo]); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount); @@ -1646,65 +1299,65 @@ public class TContent implements IFuelHandler } } - ItemStack[] ingotShapes = { new ItemStack(Item.brick), new ItemStack(Item.netherrackBrick), new ItemStack(materials, 1, 2) }; + ItemStack[] ingotShapes = { new ItemStack(Item.brick), new ItemStack(Item.netherrackBrick), new ItemStack(TRepo.materials, 1, 2) }; for (int i = 0; i < ingotShapes.length; i++) { - tableCasting.addCastingRecipe(ingotcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50); - tableCasting.addCastingRecipe(ingotcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); + 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(metalPattern, 1, 22); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(fullGuard, 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(fullGuard, 1, Short.MAX_VALUE), 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(moltenGoldFluid, TConstruct.ingotLiquidValue * 8); + goldAmount = new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 8); } else { - goldAmount = new FluidStack(moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); + goldAmount = new FluidStack(TRepo.moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); } tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), goldAmount, new ItemStack(Item.appleRed), true, 50); tableCasting.addCastingRecipe(new ItemStack(Item.goldenCarrot, 1), goldAmount, new ItemStack(Item.carrot), true, 50); tableCasting.addCastingRecipe(new ItemStack(Item.speckledMelon, 1), goldAmount, new ItemStack(Item.melon), true, 50); - tableCasting.addCastingRecipe(new ItemStack(goldHead), goldAmount, new ItemStack(Item.skull, 1, 3), true, 50); + tableCasting.addCastingRecipe(new ItemStack(TRepo.goldHead), goldAmount, new ItemStack(Item.skull, 1, 3), true, 50); } private void addRecipesForBasinCasting () { LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); // Block Casting - basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), new FluidStack(moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); //Iron - basinCasting.addCastingRecipe(new ItemStack(Block.blockGold), new FluidStack(moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); //gold - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 3), new FluidStack(moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); //copper - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 5), new FluidStack(moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); //tin - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 6), new FluidStack(moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); //aluminum - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 0), new FluidStack(moltenCobaltFluid, TConstruct.blockLiquidValue), null, true, 100); //cobalt - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 1), new FluidStack(moltenArditeFluid, TConstruct.blockLiquidValue), null, true, 100); //ardite - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 4), new FluidStack(moltenBronzeFluid, TConstruct.blockLiquidValue), null, true, 100); //bronze - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 7), new FluidStack(moltenAlubrassFluid, TConstruct.blockLiquidValue), null, true, 100); //albrass - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 2), new FluidStack(moltenManyullynFluid, TConstruct.blockLiquidValue), null, true, 100); //manyullyn - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 8), new FluidStack(moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); //alumite - basinCasting.addCastingRecipe(new ItemStack(Block.obsidian), new FluidStack(moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 9), new FluidStack(moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); //steel - basinCasting.addCastingRecipe(new ItemStack(clearGlass, 1, 0), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass - basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone - basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald - basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone - basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone - basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender - basinCasting.addCastingRecipe(new ItemStack(glueBlock), new FluidStack(glueFluid, TConstruct.blockLiquidValue), null, true, 100); //glue + basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), new FluidStack(TRepo.moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); //Iron + basinCasting.addCastingRecipe(new ItemStack(Block.blockGold), 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(Block.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(Block.cobblestone), true, 100); + basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), 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(Block.gravel), true, 100); //brownstone + basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(TRepo.moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone + basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock.blockID, 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(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10); - FluidStack gloFlu = new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10); + 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++) { @@ -1716,46 +1369,46 @@ public class TContent implements IFuelHandler private void addRecipesForSmeltery () { //Alloy Smelting - Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), - new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze - Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy), new FluidStack(moltenAluminumFluid, - TConstruct.ingotLiquidValue * 3), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), - new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite - Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), - new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn - Smeltery.addAlloyMixing(new FluidStack(pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue), - new FluidStack(moltenEmeraldFluid, 640), new FluidStack(bloodFluid, 80)); //Pigiron + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenBronzeFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy), new FluidStack(TRepo.moltenCopperFluid, + TConstruct.ingotLiquidValue * 3), new FluidStack(TRepo.moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenAlubrassFluid, 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, 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, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(TRepo.moltenCobaltFluid, + TConstruct.ingotLiquidValue), new FluidStack(TRepo.moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn + Smeltery.addAlloyMixing(new FluidStack(TRepo.pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue), + new FluidStack(TRepo.moltenEmeraldFluid, 640), new FluidStack(TRepo.bloodFluid, 80)); //Pigiron // Stone parts for (int sc = 0; sc < patternOutputs.length; sc++) { if (patternOutputs[sc] != null) { - Smeltery.addMelting(FluidType.Stone, new ItemStack(patternOutputs[sc], 1, 1), 1, (8 * ((IPattern) woodPattern).getPatternCost(new ItemStack(woodPattern, 1, sc + 1))) / 2); + Smeltery.addMelting(FluidType.Stone, new ItemStack(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(toolShard, 1, 1), 0, 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Cobalt, new ItemStack(toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Ardite, new ItemStack(toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Copper, new ItemStack(toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Bronze, new ItemStack(toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Alumite, new ItemStack(toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); + 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(blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Glue, new ItemStack(materials, 1, 36), 0, TConstruct.ingotLiquidValue); + 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(Item.enderPearl, 4), 0, 250); - Smeltery.addMelting(metalBlock, 10, 50, new FluidStack(moltenEnderFluid, 1000)); + Smeltery.addMelting(TRepo.metalBlock, 10, 50, new FluidStack(TRepo.moltenEnderFluid, 1000)); Smeltery.addMelting(FluidType.Water, new ItemStack(Item.snowball, 1, 0), 0, 125); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.flintAndSteel, 1, 0), 0, TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); @@ -1771,43 +1424,43 @@ public class TContent implements IFuelHandler //Blocks melt as themselves! //Ore - Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Block.oreGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(oreGravel, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(oreGravel, 1, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Block.oreGold, 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(Block.blockIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Block.blockGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Block.obsidian, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(TRepo.moltenIronFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Block.blockGold, 0, 400, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Block.obsidian, 0, 800, new FluidStack(TRepo.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); Smeltery.addMelting(Block.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); Smeltery.addMelting(Block.blockSnow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); Smeltery.addMelting(Block.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); - Smeltery.addMelting(Block.sand, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Block.glass, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); - Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640 * 9)); - Smeltery.addMelting(glueBlock, 0, 250, new FluidStack(glueFluid, TConstruct.blockLiquidValue)); - Smeltery.addMelting(craftedSoil, 1, 600, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); + Smeltery.addMelting(Block.sand, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Block.glass, 0, 625, new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(TRepo.moltenGlassFluid, 250)); + Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Block.blockEmerald, 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(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); - Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); + 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(stainedGlassClear, i, 500, new FluidStack(moltenGlassFluid, 1000)); - Smeltery.addMelting(stainedGlassClearPane, i, 350, new FluidStack(moltenGlassFluid, 250)); + 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(multiBrick, 4, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrickFancy, 4, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrick, 5, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrickFancy, 5, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrick, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(multiBrickFancy, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + 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(Block.fenceIron), 0, TConstruct.ingotLiquidValue * 6 / 16); @@ -1860,69 +1513,69 @@ public class TContent implements IFuelHandler private void addRecipesForDryingRack () { //Drying rack - DryingRackRecipes.addDryingRecipe(Item.beefRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 0)); - DryingRackRecipes.addDryingRecipe(Item.chickenRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 1)); - DryingRackRecipes.addDryingRecipe(Item.porkRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 2)); - //DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 3)); - DryingRackRecipes.addDryingRecipe(Item.fishRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 4)); - DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, new ItemStack(jerky, 1, 5)); + DryingRackRecipes.addDryingRecipe(Item.beefRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 0)); + DryingRackRecipes.addDryingRecipe(Item.chickenRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 1)); + DryingRackRecipes.addDryingRecipe(Item.porkRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 2)); + //DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 3)); + DryingRackRecipes.addDryingRecipe(Item.fishRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 4)); + DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 5)); - //DryingRackRecipes.addDryingRecipe(new ItemStack(jerky, 1, 5), 20 * 60 * 10, Item.leather); + //DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.jerky, 1, 5), 20 * 60 * 10, Item.leather); } private void addRecipesForChisel () { /* Detailing */ Detailing chiseling = TConstructRegistry.getChiselDetailing(); - chiseling.addDetailing(Block.stone, 0, Block.stoneBrick, 0, chisel); - chiseling.addDetailing(speedBlock, 0, speedBlock, 1, chisel); - chiseling.addDetailing(speedBlock, 2, speedBlock, 3, chisel); - chiseling.addDetailing(speedBlock, 3, speedBlock, 4, chisel); - chiseling.addDetailing(speedBlock, 4, speedBlock, 5, chisel); - chiseling.addDetailing(speedBlock, 5, speedBlock, 6, chisel); + chiseling.addDetailing(Block.stone, 0, Block.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(Block.obsidian, 0, multiBrick, 0, chisel); - chiseling.addDetailing(Block.sandStone, 0, Block.sandStone, 2, chisel); - chiseling.addDetailing(Block.sandStone, 2, Block.sandStone, 1, chisel); - chiseling.addDetailing(Block.sandStone, 1, multiBrick, 1, chisel); - //chiseling.addDetailing(Block.netherrack, 0, multiBrick, 2, chisel); - //chiseling.addDetailing(Block.stone_refined, 0, multiBrick, 3, chisel); - chiseling.addDetailing(Item.ingotIron, 0, multiBrick, 4, chisel); - chiseling.addDetailing(Item.ingotGold, 0, multiBrick, 5, chisel); - chiseling.addDetailing(Item.dyePowder, 4, multiBrick, 6, chisel); - chiseling.addDetailing(Item.diamond, 0, multiBrick, 7, chisel); - chiseling.addDetailing(Item.redstone, 0, multiBrick, 8, chisel); - chiseling.addDetailing(Item.bone, 0, multiBrick, 9, chisel); - chiseling.addDetailing(Item.slimeBall, 0, multiBrick, 10, chisel); - chiseling.addDetailing(strangeFood, 0, multiBrick, 11, chisel); - chiseling.addDetailing(Block.whiteStone, 0, multiBrick, 12, chisel); - chiseling.addDetailing(materials, 18, multiBrick, 13, chisel); + chiseling.addDetailing(Block.obsidian, 0, TRepo.multiBrick, 0, TRepo.chisel); + chiseling.addDetailing(Block.sandStone, 0, Block.sandStone, 2, TRepo.chisel); + chiseling.addDetailing(Block.sandStone, 2, Block.sandStone, 1, TRepo.chisel); + chiseling.addDetailing(Block.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(Item.ingotIron, 0, TRepo.multiBrick, 4, TRepo.chisel); + chiseling.addDetailing(Item.ingotGold, 0, TRepo.multiBrick, 5, TRepo.chisel); + chiseling.addDetailing(Item.dyePowder, 4, TRepo.multiBrick, 6, TRepo.chisel); + chiseling.addDetailing(Item.diamond, 0, TRepo.multiBrick, 7, TRepo.chisel); + chiseling.addDetailing(Item.redstone, 0, TRepo.multiBrick, 8, TRepo.chisel); + chiseling.addDetailing(Item.bone, 0, TRepo.multiBrick, 9, TRepo.chisel); + chiseling.addDetailing(Item.slimeBall, 0, TRepo.multiBrick, 10, TRepo.chisel); + chiseling.addDetailing(TRepo.strangeFood, 0, TRepo.multiBrick, 11, TRepo.chisel); + chiseling.addDetailing(Block.whiteStone, 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(multiBrick, sc, multiBrickFancy, sc, chisel); + chiseling.addDetailing(TRepo.multiBrick, sc, TRepo.multiBrickFancy, sc, TRepo.chisel); } - chiseling.addDetailing(Block.stoneBrick, 0, multiBrickFancy, 15, chisel); - chiseling.addDetailing(multiBrickFancy, 15, multiBrickFancy, 14, chisel); - chiseling.addDetailing(multiBrickFancy, 14, Block.stoneBrick, 3, chisel); - /*chiseling.addDetailing(multiBrick, 14, multiBrickFancy, 14, chisel); - chiseling.addDetailing(multiBrick, 15, multiBrickFancy, 15, chisel);*/ + chiseling.addDetailing(Block.stoneBrick, 0, TRepo.multiBrickFancy, 15, TRepo.chisel); + chiseling.addDetailing(TRepo.multiBrickFancy, 15, TRepo.multiBrickFancy, 14, TRepo.chisel); + chiseling.addDetailing(TRepo.multiBrickFancy, 14, Block.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(smeltery, 4, smeltery, 6, chisel); - chiseling.addDetailing(smeltery, 6, smeltery, 11, chisel); - chiseling.addDetailing(smeltery, 11, smeltery, 2, chisel); - chiseling.addDetailing(smeltery, 2, smeltery, 8, chisel); - chiseling.addDetailing(smeltery, 8, smeltery, 9, chisel); - chiseling.addDetailing(smeltery, 9, smeltery, 10, 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); } void setupToolTabs () { - TConstructRegistry.materialTab.init(new ItemStack(titleIcon, 1, 255)); - TConstructRegistry.blockTab.init(new ItemStack(toolStationWood)); - ItemStack tool = new ItemStack(longsword, 1, 0); + TConstructRegistry.materialTab.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.setCompoundTag("InfiTool", new NBTTagCompound()); @@ -1938,108 +1591,109 @@ public class TContent implements IFuelHandler public void addLoot () { //Item, min, max, weight - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10)); + 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)); - tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); - tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 1)); + 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 = { pickaxeHead, shovelHead, hatchetHead, binding, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, frypanHead, signHead, chiselHead }; + 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++) { - tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); + TRepo.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); } } - tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30); + TRepo.tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30); for (int i = 0; i < 13; i++) { - tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, i + 1), 1, 3, 20)); + TRepo.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.woodPattern, 1, i + 1), 1, 3, 20)); } - tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, 22), 1, 3, 40)); + TRepo.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.woodPattern, 1, 22), 1, 3, 40)); } public static String[] liquidNames; public void oreRegistry () { - OreDictionary.registerOre("oreCobalt", new ItemStack(oreSlag, 1, 1)); - OreDictionary.registerOre("oreArdite", new ItemStack(oreSlag, 1, 2)); - OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3)); - OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4)); - OreDictionary.registerOre("oreAluminum", new ItemStack(oreSlag, 1, 5)); - OreDictionary.registerOre("oreAluminium", new ItemStack(oreSlag, 1, 5)); + 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(oreGravel, 1, 0)); - OreDictionary.registerOre("oreGold", new ItemStack(oreGravel, 1, 1)); - OreDictionary.registerOre("oreCobalt", new ItemStack(oreGravel, 1, 5)); - OreDictionary.registerOre("oreCopper", new ItemStack(oreGravel, 1, 2)); - OreDictionary.registerOre("oreTin", new ItemStack(oreGravel, 1, 3)); - OreDictionary.registerOre("oreAluminum", new ItemStack(oreGravel, 1, 4)); - OreDictionary.registerOre("oreAluminium", new ItemStack(oreGravel, 1, 4)); + 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(materials, 1, 3)); - OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4)); - OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5)); - OreDictionary.registerOre("ingotCopper", new ItemStack(materials, 1, 9)); - OreDictionary.registerOre("ingotTin", new ItemStack(materials, 1, 10)); - OreDictionary.registerOre("ingotAluminum", new ItemStack(materials, 1, 11)); - OreDictionary.registerOre("ingotAluminium", new ItemStack(materials, 1, 11)); - OreDictionary.registerOre("ingotBronze", new ItemStack(materials, 1, 13)); - OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14)); - OreDictionary.registerOre("ingotAluminiumBrass", new ItemStack(materials, 1, 14)); - OreDictionary.registerOre("ingotAlumite", new ItemStack(materials, 1, 15)); - OreDictionary.registerOre("ingotSteel", new ItemStack(materials, 1, 16)); + 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(Item.ingotIron)); ensureOreIsRegistered("ingotGold", new ItemStack(Item.ingotGold)); - OreDictionary.registerOre("ingotObsidian", new ItemStack(materials, 1, 18)); - OreDictionary.registerOre("ingotPigIron", new ItemStack(materials, 1, 34)); - OreDictionary.registerOre("itemRawRubber", new ItemStack(materials, 1, 36)); + 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(metalBlock, 1, 0)); - OreDictionary.registerOre("blockArdite", new ItemStack(metalBlock, 1, 1)); - OreDictionary.registerOre("blockManyullyn", new ItemStack(metalBlock, 1, 2)); - OreDictionary.registerOre("blockCopper", new ItemStack(metalBlock, 1, 3)); - OreDictionary.registerOre("blockBronze", new ItemStack(metalBlock, 1, 4)); - OreDictionary.registerOre("blockTin", new ItemStack(metalBlock, 1, 5)); - OreDictionary.registerOre("blockAluminum", new ItemStack(metalBlock, 1, 6)); - OreDictionary.registerOre("blockAluminium", new ItemStack(metalBlock, 1, 6)); - OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7)); - OreDictionary.registerOre("blockAluminiumBrass", new ItemStack(metalBlock, 1, 7)); - OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8)); - OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9)); + 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)); ensureOreIsRegistered("blockIron", new ItemStack(Block.blockIron)); ensureOreIsRegistered("blockGold", new ItemStack(Block.blockGold)); - OreDictionary.registerOre("nuggetIron", new ItemStack(materials, 1, 19)); - OreDictionary.registerOre("nuggetIron", new ItemStack(oreBerries, 1, 0)); - OreDictionary.registerOre("nuggetCopper", new ItemStack(materials, 1, 20)); - OreDictionary.registerOre("nuggetCopper", new ItemStack(oreBerries, 1, 2)); - OreDictionary.registerOre("nuggetTin", new ItemStack(materials, 1, 21)); - OreDictionary.registerOre("nuggetTin", new ItemStack(oreBerries, 1, 3)); - OreDictionary.registerOre("nuggetAluminum", new ItemStack(materials, 1, 22)); - OreDictionary.registerOre("nuggetAluminum", new ItemStack(oreBerries, 1, 4)); - OreDictionary.registerOre("nuggetAluminium", new ItemStack(materials, 1, 22)); - OreDictionary.registerOre("nuggetAluminium", new ItemStack(oreBerries, 1, 4)); - OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24)); - OreDictionary.registerOre("nuggetAluminiumBrass", new ItemStack(materials, 1, 24)); - OreDictionary.registerOre("nuggetObsidian", new ItemStack(materials, 1, 27)); - OreDictionary.registerOre("nuggetCobalt", new ItemStack(materials, 1, 28)); - OreDictionary.registerOre("nuggetArdite", new ItemStack(materials, 1, 29)); - OreDictionary.registerOre("nuggetManyullyn", new ItemStack(materials, 1, 30)); - OreDictionary.registerOre("nuggetBronze", new ItemStack(materials, 1, 31)); - OreDictionary.registerOre("nuggetAlumite", new ItemStack(materials, 1, 32)); - OreDictionary.registerOre("nuggetSteel", new ItemStack(materials, 1, 33)); - OreDictionary.registerOre("nuggetGold", new ItemStack(oreBerries, 1, 1)); + 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(Item.goldNugget)); - OreDictionary.registerOre("nuggetPigIron", new ItemStack(materials, 1, 35)); + OreDictionary.registerOre("nuggetPigIron", new ItemStack(TRepo.materials, 1, 35)); - OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab1, 1, Short.MAX_VALUE)); - OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab2, 1, Short.MAX_VALUE)); + 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(Block.stoneBrick, 1, 1)); ensureOreIsRegistered("stoneMossy", new ItemStack(Block.cobblestoneMossy)); @@ -2047,30 +1701,30 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("crafterWood", new ItemStack(Block.workbench, 1)); OreDictionary.registerOre("craftingTableWood", new ItemStack(Block.workbench, 1)); - OreDictionary.registerOre("torchStone", new ItemStack(stoneTorch)); + 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++) - OreDictionary.registerOre(matNames[i] + "Rod", new ItemStack(toolRod, 1, i)); - OreDictionary.registerOre("thaumiumRod", new ItemStack(toolRod, 1, 31)); + OreDictionary.registerOre(matNames[i] + "Rod", 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(stainedGlassClear, 1, i)); + OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TRepo.stainedGlassClear, 1, i)); } - BlockDispenser.dispenseBehaviorRegistry.putObject(titleIcon, new TDispenserBehaviorSpawnEgg()); + BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.titleIcon, new TDispenserBehaviorSpawnEgg()); - BlockDispenser.dispenseBehaviorRegistry.putObject(arrow, new TDispenserBehaviorArrow()); + BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.arrow, new TDispenserBehaviorArrow()); //Vanilla stuff OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall)); - OreDictionary.registerOre("slimeball", new ItemStack(strangeFood, 1, 0)); - OreDictionary.registerOre("slimeball", new ItemStack(materials, 1, 36)); - OreDictionary.registerOre("glass", new ItemStack(clearGlass)); + OreDictionary.registerOre("slimeball", new ItemStack(TRepo.strangeFood, 1, 0)); + OreDictionary.registerOre("slimeball", new ItemStack(TRepo.materials, 1, 36)); + OreDictionary.registerOre("glass", new ItemStack(TRepo.clearGlass)); OreDictionary.registerOre("glass", new ItemStack(Block.glass)); RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase)); RecipeRemover.removeShapedRecipe(new ItemStack(Item.magmaCream)); @@ -2090,43 +1744,6 @@ public class TContent implements IFuelHandler } public static boolean thaumcraftAvailable; - - public void intermodCommunication () - { - if (Loader.isModLoaded("Thaumcraft")) - { - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 12)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 13)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 14)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 15)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 12)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 13)); - } - if (Loader.isModLoaded("Mystcraft")) - { - MystImcHandler.blacklistFluids(); - } - if (Loader.isModLoaded("BuildCraft|Transport")) - { - BCImcHandler.registerFacades(); - } - /* FORESTRY - * Edit these strings to change what items are added to the backpacks - * Format info: "[backpack ID]@[item ID].[metadata or *]:[next item]" and so on - * Avaliable backpack IDs: forester, miner, digger, hunter, adventurer, builder - * May add more backpack items later - Spyboticsguy - */ - if (Loader.isModLoaded("Forestry")) - { - String builderItems = "builder@" + String.valueOf(stoneTorch.blockID) + ":*"; - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", builderItems); - } - if (!Loader.isModLoaded("AppliedEnergistics")) - { - AEImcHandler.registerForSpatialIO(); - } - } - private static boolean initRecipes; public static void modRecipes () @@ -2244,24 +1861,23 @@ public class TContent implements IFuelHandler public void modIntegration () { - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), ""); + 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) { - modF.batteries.add(batHardened); + TRepo.modF.batteries.add(batHardened); } ItemStack basicCell = GameRegistry.findItemStack("ThermalExpansion", "cellBasic", 1); if (basicCell != null) { - modF.batteries.add(basicCell); + TRepo.modF.batteries.add(basicCell); } - if (batHardened != null) + if (batHardened != null) TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); - if (basicCell != null) + if (basicCell != null) TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); - /* Thaumcraft */ Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); if (obj != null) @@ -2270,14 +1886,14 @@ public class TContent implements IFuelHandler thaumcraftAvailable = true; TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", "Thaumic"); - PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(toolShard, 1, 31), new ItemStack(toolRod, 1, 31), 31); + PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(TRepo.toolShard, 1, 31), new ItemStack(TRepo.toolRod, 1, 31), 31); for (int meta = 0; meta < patternOutputs.length; meta++) { if (patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31)); + TConstructRegistry.addPartMapping(TRepo.woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31)); } - TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(bowstring, 1, 1), 1F, 1F, 0.9f); + 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); } @@ -2291,14 +1907,14 @@ public class TContent implements IFuelHandler try { Object plantItem = getStaticItem("plantItem", "mods.natura.common.NContent"); - TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item) plantItem, 1, 7), new ItemStack(bowstring, 1, 2), 1.2F, 0.8F, 1.3f); + 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(metalPattern, 1, 0); + ItemStack ingotcast = new ItemStack(TRepo.metalPattern, 1, 0); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); LiquidCasting basinCasting = TConstructRegistry.instance.getBasinCasting(); @@ -2306,86 +1922,86 @@ public class TContent implements IFuelHandler ArrayList ores = OreDictionary.getOres("ingotNickel"); if (ores.size() > 0) { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenNickelFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + 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(moltenLeadFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + 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(moltenSilverFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + 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(moltenShinyFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + 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(moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(moltenInvarFluid, 24), new FluidStack(moltenIronFluid, 16), new FluidStack(moltenNickelFluid, 8)); //Invar + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenInvarFluid, 24), new FluidStack(TRepo.moltenIronFluid, 16), new FluidStack(TRepo.moltenNickelFluid, 8)); //Invar } ores = OreDictionary.getOres("ingotElectrum"); if (ores.size() > 0) { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(moltenElectrumFluid, 16), new FluidStack(moltenGoldFluid, 8), new FluidStack(moltenSilverFluid, 8)); //Electrum + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TRepo.moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(TRepo.moltenElectrumFluid, 16), new FluidStack(TRepo.moltenGoldFluid, 8), new FluidStack(TRepo.moltenSilverFluid, 8)); //Electrum } ores = OreDictionary.getOres("blockNickel"); if (ores.size() > 0) { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenNickelFluid, TConstruct.blockLiquidValue), null, 100); + 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(moltenLeadFluid, TConstruct.blockLiquidValue), null, 100); + 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(moltenSilverFluid, TConstruct.blockLiquidValue), null, 100); + 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(moltenShinyFluid, TConstruct.blockLiquidValue), null, 100); + 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(moltenInvarFluid, TConstruct.blockLiquidValue), null, 100); + 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(moltenElectrumFluid, TConstruct.blockLiquidValue), null, 100); + 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(speedBlock, 9), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue), ores.get(0), 100); + 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(speedBlock, 81), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue * 9), ores.get(0), 100); + 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().addSmelting(materials.itemID, 36, ores.get(0), 0.2f); + FurnaceRecipes.smelting().addSmelting(TRepo.materials.itemID, 36, ores.get(0), 0.2f); } - //new ItemStack(materials, 1, 36) + //new ItemStack(TRepo.materials, 1, 36) } public static Object getStaticItem (String name, String classPackage) @@ -2409,7 +2025,7 @@ public class TContent implements IFuelHandler @Override public int getBurnTime (ItemStack fuel) { - if (fuel.itemID == materials.itemID && fuel.getItemDamage() == 7) + if (fuel.itemID == TRepo.materials.itemID && fuel.getItemDamage() == 7) return 26400; return 0; } @@ -2472,12 +2088,12 @@ public class TContent implements IFuelHandler private void registerIngotCasting (FluidType ft) { - ItemStack pattern = new ItemStack(TContent.metalPattern, 1, 0); + 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(TContent.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(pattern, new FluidStack(TContent.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); tableCasting.addCastingRecipe(new ItemStack(ore.itemID, 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); } @@ -2487,17 +2103,18 @@ public class TContent implements IFuelHandler { HashMap achievements = TAchievements.achievements; - achievements.put("tconstruct.beginner", new Achievement(2741, "tconstruct.beginner", 0, 0, manualBook, null).setIndependent().registerAchievement()); - achievements.put("tconstruct.pattern", new Achievement(2742, "tconstruct.pattern", 2, 1, blankPattern, achievements.get("tconstruct.beginner")).registerAchievement()); - achievements.put("tconstruct.tinkerer", new Achievement(2743, "tconstruct.tinkerer", 2, 2, new ItemStack(titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); + achievements.put("tconstruct.beginner", new Achievement(2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null).setIndependent().registerAchievement()); + achievements.put("tconstruct.pattern", new Achievement(2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")).registerAchievement()); + achievements.put("tconstruct.tinkerer", + new Achievement(2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); achievements.put("tconstruct.preparedFight", - new Achievement(2744, "tconstruct.preparedFight", 1, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); - achievements.put("tconstruct.proTinkerer", new Achievement(2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial() + new Achievement(2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); + achievements.put("tconstruct.proTinkerer", new Achievement(2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial() .registerAchievement()); - achievements.put("tconstruct.smelteryMaker", new Achievement(2746, "tconstruct.smelteryMaker", -2, -1, smeltery, achievements.get("tconstruct.beginner")).registerAchievement()); + achievements.put("tconstruct.smelteryMaker", new Achievement(2746, "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct.beginner")).registerAchievement()); achievements.put("tconstruct.enemySlayer", - new Achievement(2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); - achievements.put("tconstruct.dualConvenience", new Achievement(2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")) + new Achievement(2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); + achievements.put("tconstruct.dualConvenience", new Achievement(2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")) .setSpecial().registerAchievement()); } } diff --git a/src/main/java/tconstruct/common/TContent.java.orig b/src/main/java/tconstruct/common/TContent.java.orig deleted file mode 100644 index 229ee491..00000000 --- a/src/main/java/tconstruct/common/TContent.java.orig +++ /dev/null @@ -1,2533 +0,0 @@ -package tconstruct.common; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import tconstruct.library.crafting.ToolBuilder; - -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.*; -import java.lang.reflect.Field; -import java.util.*; -import net.minecraft.block.*; -import net.minecraft.block.material.*; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; -import net.minecraft.item.crafting.*; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.stats.Achievement; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.*; -import net.minecraftforge.fluids.*; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.oredict.*; -import tconstruct.TConstruct; -import tconstruct.achievements.TAchievements; -import tconstruct.blocks.*; -import tconstruct.blocks.logic.*; -import tconstruct.blocks.slime.*; -import tconstruct.blocks.traps.*; -import tconstruct.client.StepSoundSlime; -import tconstruct.entity.*; -import tconstruct.entity.item.*; -import tconstruct.entity.projectile.*; -import tconstruct.items.*; -import tconstruct.items.armor.*; -import tconstruct.items.blocks.*; -import tconstruct.items.tools.*; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.*; -import tconstruct.library.client.FluidRenderProperties.Applications; -import tconstruct.library.crafting.*; -import tconstruct.library.tools.ToolCore; -import tconstruct.library.util.IPattern; -import tconstruct.modifiers.*; -import tconstruct.util.*; -import tconstruct.util.config.*; - -public class TContent implements IFuelHandler -{ - // 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 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 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 StepSound 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; - - //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 modF; - public static ModLapis modL; - - //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 EnumArmorMaterial materialWood; - - //Signal & Logic - public static Block signalBus; - public static Block signalTerminal; - - public static Item spoolWire; - public static Item lengthWire; - - //Temporary items - //public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch); - - public TContent() - { - registerItems(); - registerBlocks(); - 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); - } - - public static Fluid[] fluids = new Fluid[27]; - public static Block[] fluidBlocks = new Block[26]; - - void registerBlocks () - { - //Tool Station - toolStationWood = new ToolStationBlock(PHConstruct.woodStation, Material.wood).setUnlocalizedName("ToolStation"); - GameRegistry.registerBlock(toolStationWood, ToolStationItemBlock.class, "ToolStationBlock"); - GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation"); - GameRegistry.registerTileEntity(PartBuilderLogic.class, "PartCrafter"); - GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder"); - GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper"); - - toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge"); - GameRegistry.registerBlock(toolForge, MetadataItemBlock.class, "ToolForgeBlock"); - GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge"); - - craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation"); - GameRegistry.registerBlock(craftingStationWood, "CraftingStation"); - GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation"); - - craftingSlabWood = new CraftingSlab(PHConstruct.woodCrafterSlab, Material.wood).setUnlocalizedName("CraftingSlab"); - GameRegistry.registerBlock(craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab"); - - furnaceSlab = new FurnaceSlab(PHConstruct.furnaceSlab, Material.rock).setUnlocalizedName("FurnaceSlab"); - GameRegistry.registerBlock(furnaceSlab, "FurnaceSlab"); - GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace"); - - heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood).setUnlocalizedName("Frypan"); - GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock"); - GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); - - craftedSoil = new SoilBlock(PHConstruct.craftedSoil).setLightOpacity(0).setUnlocalizedName("TConstruct.Soil"); - craftedSoil.stepSound = Block.soundGravelFootstep; - GameRegistry.registerBlock(craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); - - searedSlab = new SearedSlab(PHConstruct.searedSlab).setUnlocalizedName("SearedSlab"); - searedSlab.stepSound = Block.soundStoneFootstep; - GameRegistry.registerBlock(searedSlab, SearedSlabItem.class, "SearedSlab"); - - speedSlab = new SpeedSlab(PHConstruct.speedSlab).setUnlocalizedName("SpeedSlab"); - speedSlab.stepSound = Block.soundStoneFootstep; - GameRegistry.registerBlock(speedSlab, SpeedSlabItem.class, "SpeedSlab"); - - metalBlock = new TMetalBlock(PHConstruct.metalBlock, Material.iron, 10.0F).setUnlocalizedName("tconstruct.metalblock"); - metalBlock.stepSound = Block.soundMetalFootstep; - GameRegistry.registerBlock(metalBlock, MetalItemBlock.class, "MetalBlock"); - - meatBlock = new MeatBlock(PHConstruct.meatBlock).setUnlocalizedName("tconstruct.meatblock"); - GameRegistry.registerBlock(meatBlock, HamboneItemBlock.class, "MeatBlock"); - - OreDictionary.registerOre("hambone", new ItemStack(meatBlock)); - LanguageRegistry.addName(meatBlock, "Hambone"); - GameRegistry.addRecipe(new ItemStack(meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Item.bone), 'm', new ItemStack(Item.porkRaw)); - - glueBlock = new GlueBlock(PHConstruct.glueBlock).setUnlocalizedName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); - GameRegistry.registerBlock(glueBlock, "GlueBlock"); - OreDictionary.registerOre("blockRubber", new ItemStack(glueBlock)); - - woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Block.cloth, 0, 8).setUnlocalizedName("cloth"); - woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); - GameRegistry.registerBlock(woolSlab1, WoolSlab1Item.class, "WoolSlab1"); - woolSlab2 = new SlabBase(PHConstruct.woolSlab2, Material.cloth, Block.cloth, 8, 8).setUnlocalizedName("cloth"); - woolSlab2.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); - GameRegistry.registerBlock(woolSlab2, WoolSlab2Item.class, "WoolSlab2"); - - //Smeltery - smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery"); - GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery"); - 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"); - - lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank"); - lavaTank.setStepSound(Block.soundGlassFootstep); - GameRegistry.registerBlock(lavaTank, LavaTankItemBlock.class, "LavaTank"); - GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank"); - - searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock"); - GameRegistry.registerBlock(searedBlock, SearedTableItemBlock.class, "SearedBlock"); - GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable"); - GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet"); - GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin"); - - castingChannel = (new CastingChannelBlock(PHConstruct.castingChannel)).setUnlocalizedName("CastingChannel"); - GameRegistry.registerBlock(castingChannel, CastingChannelItem.class, "CastingChannel"); - GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel"); - - tankAir = new TankAirBlock(PHConstruct.airTank, Material.leaves).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air"); - GameRegistry.registerBlock(tankAir, "TankAir"); - GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air"); - - //Traps - landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) - .setUnlocalizedName("landmine"); - GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine"); - GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); - - punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji"); - GameRegistry.registerBlock(punji, "trap.punji"); - - barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak"); - GameRegistry.registerBlock(barricadeOak, BarricadeItem.class, "trap.barricade.oak"); - - barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce"); - GameRegistry.registerBlock(barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce"); - - barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch"); - GameRegistry.registerBlock(barricadeBirch, BarricadeItem.class, "trap.barricade.birch"); - - barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle"); - GameRegistry.registerBlock(barricadeJungle, BarricadeItem.class, "trap.barricade.jungle"); - - slimeExplosive = new SlimeExplosive(PHConstruct.slimeExplosive).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("explosive.slime"); - GameRegistry.registerBlock(slimeExplosive, MetadataItemBlock.class, "explosive.slime"); - - dryingRack = new DryingRack(PHConstruct.dryingRack).setUnlocalizedName("Armor.DryingRack"); - GameRegistry.registerBlock(dryingRack, "Armor.DryingRack"); - GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack"); - - //Liquids - liquidMetal = new MaterialLiquid(MapColor.tntColor); - - moltenIronFluid = new Fluid("iron.molten"); - if (!FluidRegistry.registerFluid(moltenIronFluid)) - moltenIronFluid = FluidRegistry.getFluid("iron.molten"); - moltenIron = new TConstructFluid(PHConstruct.moltenIron, moltenIronFluid, Material.lava, "liquid_iron").setUnlocalizedName("metal.molten.iron"); - GameRegistry.registerBlock(moltenIron, "metal.molten.iron"); - fluids[0] = moltenIronFluid; - fluidBlocks[0] = moltenIron; - moltenIronFluid.setBlockID(moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenIronFluid, 1000), new ItemStack(buckets, 1, 0), new ItemStack(Item.bucketEmpty))); - - moltenGoldFluid = new Fluid("gold.molten"); - if (!FluidRegistry.registerFluid(moltenGoldFluid)) - moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); - moltenGold = new TConstructFluid(PHConstruct.moltenGold, moltenGoldFluid, Material.lava, "liquid_gold").setUnlocalizedName("metal.molten.gold"); - GameRegistry.registerBlock(moltenGold, "metal.molten.gold"); - fluids[1] = moltenGoldFluid; - fluidBlocks[1] = moltenGold; - moltenGoldFluid.setBlockID(moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGoldFluid, 1000), new ItemStack(buckets, 1, 1), new ItemStack(Item.bucketEmpty))); - - moltenCopperFluid = new Fluid("copper.molten"); - if (!FluidRegistry.registerFluid(moltenCopperFluid)) - moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); - moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, moltenCopperFluid, Material.lava, "liquid_copper").setUnlocalizedName("metal.molten.copper"); - GameRegistry.registerBlock(moltenCopper, "metal.molten.copper"); - fluids[2] = moltenCopperFluid; - fluidBlocks[2] = moltenCopper; - moltenCopperFluid.setBlockID(moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCopperFluid, 1000), new ItemStack(buckets, 1, 2), new ItemStack(Item.bucketEmpty))); - - moltenTinFluid = new Fluid("tin.molten"); - if (!FluidRegistry.registerFluid(moltenTinFluid)) - moltenTinFluid = FluidRegistry.getFluid("tin.molten"); - moltenTin = new TConstructFluid(PHConstruct.moltenTin, moltenTinFluid, Material.lava, "liquid_tin").setUnlocalizedName("metal.molten.tin"); - GameRegistry.registerBlock(moltenTin, "metal.molten.tin"); - fluids[3] = moltenTinFluid; - fluidBlocks[3] = moltenTin; - moltenTinFluid.setBlockID(moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenTinFluid, 1000), new ItemStack(buckets, 1, 3), new ItemStack(Item.bucketEmpty))); - - moltenAluminumFluid = new Fluid("aluminum.molten"); - if (!FluidRegistry.registerFluid(moltenAluminumFluid)) - moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); - moltenAluminum = new TConstructFluid(PHConstruct.moltenAluminum, moltenAluminumFluid, Material.lava, "liquid_aluminum").setUnlocalizedName("metal.molten.aluminum"); - GameRegistry.registerBlock(moltenAluminum, "metal.molten.aluminum"); - fluids[4] = moltenAluminumFluid; - fluidBlocks[4] = moltenAluminum; - moltenAluminumFluid.setBlockID(moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAluminumFluid, 1000), new ItemStack(buckets, 1, 4), new ItemStack(Item.bucketEmpty))); - - moltenCobaltFluid = new Fluid("cobalt.molten"); - if (!FluidRegistry.registerFluid(moltenCobaltFluid)) - moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); - moltenCobalt = new TConstructFluid(PHConstruct.moltenCobalt, moltenCobaltFluid, Material.lava, "liquid_cobalt").setUnlocalizedName("metal.molten.cobalt"); - GameRegistry.registerBlock(moltenCobalt, "metal.molten.cobalt"); - fluids[5] = moltenCobaltFluid; - fluidBlocks[5] = moltenCobalt; - moltenCobaltFluid.setBlockID(moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCobaltFluid, 1000), new ItemStack(buckets, 1, 5), new ItemStack(Item.bucketEmpty))); - - moltenArditeFluid = new Fluid("ardite.molten"); - if (!FluidRegistry.registerFluid(moltenArditeFluid)) - moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); - moltenArdite = new TConstructFluid(PHConstruct.moltenArdite, moltenArditeFluid, Material.lava, "liquid_ardite").setUnlocalizedName("metal.molten.ardite"); - GameRegistry.registerBlock(moltenArdite, "metal.molten.ardite"); - fluids[6] = moltenArditeFluid; - fluidBlocks[6] = moltenArdite; - moltenArditeFluid.setBlockID(moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenArditeFluid, 1000), new ItemStack(buckets, 1, 6), new ItemStack(Item.bucketEmpty))); - - moltenBronzeFluid = new Fluid("bronze.molten"); - if (!FluidRegistry.registerFluid(moltenBronzeFluid)) - moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); - moltenBronze = new TConstructFluid(PHConstruct.moltenBronze, moltenBronzeFluid, Material.lava, "liquid_bronze").setUnlocalizedName("metal.molten.bronze"); - GameRegistry.registerBlock(moltenBronze, "metal.molten.bronze"); - fluids[7] = moltenBronzeFluid; - fluidBlocks[7] = moltenBronze; - moltenBronzeFluid.setBlockID(moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenBronzeFluid, 1000), new ItemStack(buckets, 1, 7), new ItemStack(Item.bucketEmpty))); - - moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); - if (!FluidRegistry.registerFluid(moltenAlubrassFluid)) - moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); - moltenAlubrass = new TConstructFluid(PHConstruct.moltenAlubrass, moltenAlubrassFluid, Material.lava, "liquid_alubrass").setUnlocalizedName("metal.molten.alubrass"); - GameRegistry.registerBlock(moltenAlubrass, "metal.molten.alubrass"); - fluids[8] = moltenAlubrassFluid; - fluidBlocks[8] = moltenAlubrass; - moltenAlubrassFluid.setBlockID(moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlubrassFluid, 1000), new ItemStack(buckets, 1, 8), new ItemStack(Item.bucketEmpty))); - - moltenManyullynFluid = new Fluid("manyullyn.molten"); - if (!FluidRegistry.registerFluid(moltenManyullynFluid)) - moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); - moltenManyullyn = new TConstructFluid(PHConstruct.moltenManyullyn, moltenManyullynFluid, Material.lava, "liquid_manyullyn").setUnlocalizedName("metal.molten.manyullyn"); - GameRegistry.registerBlock(moltenManyullyn, "metal.molten.manyullyn"); - fluids[9] = moltenManyullynFluid; - fluidBlocks[9] = moltenManyullyn; - moltenManyullynFluid.setBlockID(moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenManyullynFluid, 1000), new ItemStack(buckets, 1, 9), new ItemStack(Item.bucketEmpty))); - - moltenAlumiteFluid = new Fluid("alumite.molten"); - if (!FluidRegistry.registerFluid(moltenAlumiteFluid)) - moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); - moltenAlumite = new TConstructFluid(PHConstruct.moltenAlumite, moltenAlumiteFluid, Material.lava, "liquid_alumite").setUnlocalizedName("metal.molten.alumite"); - GameRegistry.registerBlock(moltenAlumite, "metal.molten.alumite"); - fluids[10] = moltenAlumiteFluid; - fluidBlocks[10] = moltenAlumite; - moltenAlumiteFluid.setBlockID(moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlumiteFluid, 1000), new ItemStack(buckets, 1, 10), new ItemStack(Item.bucketEmpty))); - - moltenObsidianFluid = new Fluid("obsidian.molten"); - if (!FluidRegistry.registerFluid(moltenObsidianFluid)) - moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); - moltenObsidian = new TConstructFluid(PHConstruct.moltenObsidian, moltenObsidianFluid, Material.lava, "liquid_obsidian").setUnlocalizedName("metal.molten.obsidian"); - GameRegistry.registerBlock(moltenObsidian, "metal.molten.obsidian"); - fluids[11] = moltenObsidianFluid; - fluidBlocks[11] = moltenObsidian; - moltenObsidianFluid.setBlockID(moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenObsidianFluid, 1000), new ItemStack(buckets, 1, 11), new ItemStack(Item.bucketEmpty))); - - moltenSteelFluid = new Fluid("steel.molten"); - if (!FluidRegistry.registerFluid(moltenSteelFluid)) - moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); - moltenSteel = new TConstructFluid(PHConstruct.moltenSteel, moltenSteelFluid, Material.lava, "liquid_steel").setUnlocalizedName("metal.molten.steel"); - GameRegistry.registerBlock(moltenSteel, "metal.molten.steel"); - fluids[12] = moltenSteelFluid; - fluidBlocks[12] = moltenSteel; - moltenSteelFluid.setBlockID(moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSteelFluid, 1000), new ItemStack(buckets, 1, 12), new ItemStack(Item.bucketEmpty))); - - moltenGlassFluid = new Fluid("glass.molten"); - if (!FluidRegistry.registerFluid(moltenGlassFluid)) - moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); - moltenGlass = new TConstructFluid(PHConstruct.moltenGlass, moltenGlassFluid, Material.lava, "liquid_glass", true).setUnlocalizedName("metal.molten.glass"); - GameRegistry.registerBlock(moltenGlass, "metal.molten.glass"); - fluids[13] = moltenGlassFluid; - fluidBlocks[13] = moltenGlass; - moltenGlassFluid.setBlockID(moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGlassFluid, 1000), new ItemStack(buckets, 1, 13), new ItemStack(Item.bucketEmpty))); - - moltenStoneFluid = new Fluid("stone.seared"); - if (!FluidRegistry.registerFluid(moltenStoneFluid)) - moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); - moltenStone = new TConstructFluid(PHConstruct.moltenStone, moltenStoneFluid, Material.lava, "liquid_stone").setUnlocalizedName("molten.stone"); - GameRegistry.registerBlock(moltenStone, "molten.stone"); - fluids[14] = moltenStoneFluid; - fluidBlocks[14] = moltenStone; - moltenStoneFluid.setBlockID(moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenStoneFluid, 1000), new ItemStack(buckets, 1, 14), new ItemStack(Item.bucketEmpty))); - - moltenEmeraldFluid = new Fluid("emerald.liquid"); - if (!FluidRegistry.registerFluid(moltenEmeraldFluid)) - moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); - moltenEmerald = new TConstructFluid(PHConstruct.moltenEmerald, moltenEmeraldFluid, Material.water, "liquid_villager").setUnlocalizedName("molten.emerald"); - GameRegistry.registerBlock(moltenEmerald, "molten.emerald"); - fluids[15] = moltenEmeraldFluid; - fluidBlocks[15] = moltenEmerald; - moltenEmeraldFluid.setBlockID(moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEmeraldFluid, 1000), new ItemStack(buckets, 1, 15), new ItemStack(Item.bucketEmpty))); - - bloodFluid = new Fluid("blood"); - if (!FluidRegistry.registerFluid(bloodFluid)) - bloodFluid = FluidRegistry.getFluid("blood"); - blood = new BloodBlock(PHConstruct.blood, bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); - GameRegistry.registerBlock(blood, "liquid.blood"); - fluids[16] = bloodFluid; - fluidBlocks[16] = blood; - bloodFluid.setBlockID(blood).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(bloodFluid, 1000), new ItemStack(buckets, 1, 16), new ItemStack(Item.bucketEmpty))); - - moltenNickelFluid = new Fluid("nickel.molten"); - if (!FluidRegistry.registerFluid(moltenNickelFluid)) - moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); - moltenNickel = new TConstructFluid(PHConstruct.moltenNickel, moltenNickelFluid, Material.lava, "liquid_ferrous").setUnlocalizedName("metal.molten.nickel"); - GameRegistry.registerBlock(moltenNickel, "metal.molten.nickel"); - fluids[17] = moltenNickelFluid; - fluidBlocks[17] = moltenNickel; - moltenNickelFluid.setBlockID(moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenNickelFluid, 1000), new ItemStack(buckets, 1, 17), new ItemStack(Item.bucketEmpty))); - - moltenLeadFluid = new Fluid("lead.molten"); - if (!FluidRegistry.registerFluid(moltenLeadFluid)) - moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); - moltenLead = new TConstructFluid(PHConstruct.moltenLead, moltenLeadFluid, Material.lava, "liquid_lead").setUnlocalizedName("metal.molten.lead"); - GameRegistry.registerBlock(moltenLead, "metal.molten.lead"); - fluids[18] = moltenLeadFluid; - fluidBlocks[18] = moltenLead; - moltenLeadFluid.setBlockID(moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenLeadFluid, 1000), new ItemStack(buckets, 1, 18), new ItemStack(Item.bucketEmpty))); - - moltenSilverFluid = new Fluid("silver.molten"); - if (!FluidRegistry.registerFluid(moltenSilverFluid)) - moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); - moltenSilver = new TConstructFluid(PHConstruct.moltenSilver, moltenSilverFluid, Material.lava, "liquid_silver").setUnlocalizedName("metal.molten.silver"); - GameRegistry.registerBlock(moltenSilver, "metal.molten.silver"); - fluids[19] = moltenSilverFluid; - fluidBlocks[19] = moltenSilver; - moltenSilverFluid.setBlockID(moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSilverFluid, 1000), new ItemStack(buckets, 1, 19), new ItemStack(Item.bucketEmpty))); - - moltenShinyFluid = new Fluid("platinum.molten"); - if (!FluidRegistry.registerFluid(moltenShinyFluid)) - moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); - moltenShiny = new TConstructFluid(PHConstruct.moltenShiny, moltenShinyFluid, Material.lava, "liquid_shiny").setUnlocalizedName("metal.molten.shiny"); - GameRegistry.registerBlock(moltenShiny, "metal.molten.shiny"); - fluids[20] = moltenShinyFluid; - fluidBlocks[20] = moltenShiny; - moltenShinyFluid.setBlockID(moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenShinyFluid, 1000), new ItemStack(buckets, 1, 20), new ItemStack(Item.bucketEmpty))); - - moltenInvarFluid = new Fluid("invar.molten"); - if (!FluidRegistry.registerFluid(moltenInvarFluid)) - moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); - moltenInvar = new TConstructFluid(PHConstruct.moltenInvar, moltenInvarFluid, Material.lava, "liquid_invar").setUnlocalizedName("metal.molten.invar"); - GameRegistry.registerBlock(moltenInvar, "metal.molten.invar"); - fluids[21] = moltenInvarFluid; - fluidBlocks[21] = moltenInvar; - moltenInvarFluid.setBlockID(moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenInvarFluid, 1000), new ItemStack(buckets, 1, 21), new ItemStack(Item.bucketEmpty))); - - moltenElectrumFluid = new Fluid("electrum.molten"); - if (!FluidRegistry.registerFluid(moltenElectrumFluid)) - moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); - moltenElectrum = new TConstructFluid(PHConstruct.moltenElectrum, moltenElectrumFluid, Material.lava, "liquid_electrum").setUnlocalizedName("metal.molten.electrum"); - GameRegistry.registerBlock(moltenElectrum, "metal.molten.electrum"); - fluids[22] = moltenElectrumFluid; - fluidBlocks[22] = moltenElectrum; - moltenElectrumFluid.setBlockID(moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenElectrumFluid, 1000), new ItemStack(buckets, 1, 22), new ItemStack(Item.bucketEmpty))); - - moltenEnderFluid = new Fluid("ender"); - if (!FluidRegistry.registerFluid(moltenEnderFluid)) - { - moltenEnderFluid = FluidRegistry.getFluid("ender"); - moltenEnder = Block.blocksList[moltenEnderFluid.getBlockID()]; - if (moltenEnder == null) - TConstruct.logger.info("Molten ender block missing!"); - } - else - { - moltenEnder = new TConstructFluid(PHConstruct.moltenEnder, moltenEnderFluid, Material.water, "liquid_ender").setUnlocalizedName("fluid.ender"); - GameRegistry.registerBlock(moltenEnder, "fluid.ender"); - moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1000), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); - } - fluids[23] = moltenEnderFluid; - fluidBlocks[23] = moltenEnder; - - //Slime - slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); - - blueSlimeFluid = new Fluid("slime.blue"); - if (!FluidRegistry.registerFluid(blueSlimeFluid)) - blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); - slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.slime"); - GameRegistry.registerBlock(slimePool, "liquid.slime"); - fluids[24] = blueSlimeFluid; - fluidBlocks[24] = slimePool; - blueSlimeFluid.setBlockID(slimePool); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(blueSlimeFluid, 1000), new ItemStack(buckets, 1, 24), new ItemStack(Item.bucketEmpty))); - - //Glue - glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); - if (!FluidRegistry.registerFluid(glueFluid)) - glueFluid = FluidRegistry.getFluid("glue"); - glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.glue"); - GameRegistry.registerBlock(glueFluidBlock, "liquid.glue"); - fluids[25] = glueFluid; - fluidBlocks[25] = glueFluidBlock; - glueFluid.setBlockID(glueFluidBlock); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(glueFluid, 1000), new ItemStack(buckets, 1, 26), new ItemStack(Item.bucketEmpty))); - - pigIronFluid = new Fluid("pigiron.molten"); - if (!FluidRegistry.registerFluid(pigIronFluid)) - pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); - else - pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); - fluids[26] = pigIronFluid; - - slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.gel"); - GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel"); - - slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).setLightOpacity(0).setUnlocalizedName("slime.grass"); - GameRegistry.registerBlock(slimeGrass, SlimeGrassItemBlock.class, "slime.grass"); - - slimeTallGrass = new SlimeTallGrass(PHConstruct.slimeTallGrass).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("slime.grass.tall"); - GameRegistry.registerBlock(slimeTallGrass, SlimeTallGrassItem.class, "slime.grass.tall"); - - slimeLeaves = (SlimeLeaves) new SlimeLeaves(PHConstruct.slimeLeaves).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.leaves"); - GameRegistry.registerBlock(slimeLeaves, SlimeLeavesItemBlock.class, "slime.leaves"); - - slimeSapling = (SlimeSapling) new SlimeSapling(PHConstruct.slimeSapling).setStepSound(slimeStep).setUnlocalizedName("slime.sapling"); - GameRegistry.registerBlock(slimeSapling, SlimeSaplingItemBlock.class, "slime.sapling"); - - slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water).setStepSound(slimeStep).setUnlocalizedName("slime.channel"); - GameRegistry.registerBlock(slimeChannel, "slime.channel"); - TConstructRegistry.drawbridgeState[slimeChannel.blockID] = 1; - - slimePad = new SlimePad(PHConstruct.slimePad, Material.cloth).setStepSound(slimeStep).setUnlocalizedName("slime.pad"); - GameRegistry.registerBlock(slimePad, "slime.pad"); - TConstructRegistry.drawbridgeState[slimePad.blockID] = 1; - - //Decoration - stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); - GameRegistry.registerBlock(stoneTorch, "decoration.stonetorch"); - stoneLadder = new StoneLadder(PHConstruct.stoneLadder).setUnlocalizedName("decoration.stoneladder"); - GameRegistry.registerBlock(stoneLadder, "decoration.stoneladder"); - - multiBrick = new MultiBrick(PHConstruct.multiBrick).setUnlocalizedName("Decoration.Brick"); - GameRegistry.registerBlock(multiBrick, MultiBrickItem.class, "decoration.multibrick"); - multiBrickFancy = new MultiBrickFancy(PHConstruct.multiBrickFancy).setUnlocalizedName("Decoration.BrickFancy"); - GameRegistry.registerBlock(multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); - - //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" }; - oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setUnlocalizedName("ore.berries.one"); - GameRegistry.registerBlock(oreBerry, OreberryBushItem.class, "ore.berries.one"); - String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; - oreBerrySecond = (OreberryBush) new OreberryBushEssence(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setUnlocalizedName("ore.berries.two"); - GameRegistry.registerBlock(oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two"); - - String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; - oreSlag = new MetalOre(PHConstruct.oreSlag, Material.rock, 10.0F, oreTypes).setUnlocalizedName("tconstruct.stoneore"); - GameRegistry.registerBlock(oreSlag, MetalOreItemBlock.class, "SearedBrick"); - MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4); - MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4); - MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1); - - oreGravel = new GravelOre(PHConstruct.oreGravel).setUnlocalizedName("GravelOre").setUnlocalizedName("tconstruct.gravelore"); - GameRegistry.registerBlock(oreGravel, GravelOreItem.class, "GravelOre"); - - MinecraftForge.setBlockHarvestLevel(oreGravel, 0, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 1, "shovel", 2); - MinecraftForge.setBlockHarvestLevel(oreGravel, 2, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 3, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 4, "shovel", 1); - MinecraftForge.setBlockHarvestLevel(oreGravel, 5, "shovel", 4); - - speedBlock = new SpeedBlock(PHConstruct.speedBlock).setUnlocalizedName("SpeedBlock"); - GameRegistry.registerBlock(speedBlock, SpeedBlockItem.class, "SpeedBlock"); - - //Glass - clearGlass = new GlassBlockConnected(PHConstruct.glass, "clear", false).setUnlocalizedName("GlassBlock"); - clearGlass.stepSound = Block.soundGlassFootstep; - GameRegistry.registerBlock(clearGlass, GlassBlockItem.class, "GlassBlock"); - - glassPane = new GlassPaneConnected(PHConstruct.glassPane, "clear", false); - GameRegistry.registerBlock(glassPane, GlassPaneItem.class, "GlassPane"); - - stainedGlassClear = new GlassBlockConnectedMeta(PHConstruct.stainedGlassClear, "stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", - "cyan", "purple", "blue", "brown", "green", "red", "black").setUnlocalizedName("GlassBlock.StainedClear"); - stainedGlassClear.stepSound = Block.soundGlassFootstep; - GameRegistry.registerBlock(stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); - - stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); - GameRegistry.registerBlock(stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); - - //Rail - woodenRail = new WoodRail(PHConstruct.woodenRail).setStepSound(Block.soundWoodFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); - GameRegistry.registerBlock(woodenRail, "rail.wood"); - - } - - void registerItems () - { - titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); - GameRegistry.registerItem(titleIcon, "titleIcon"); - String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; - blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); - GameRegistry.registerItem(blankPattern, "blankPattern"); - - materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); - toolRod = new ToolPart(PHConstruct.toolRod, "_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); - toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard"); - woodPattern = new Pattern(PHConstruct.woodPattern, "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); - metalPattern = new MetalPattern(PHConstruct.metalPattern, "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); - //armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); - GameRegistry.registerItem(materials, "materials"); - GameRegistry.registerItem(woodPattern, "woodPattern"); - GameRegistry.registerItem(metalPattern, "metalPattern"); - //GameRegistry.registerItem(armorPattern, "armorPattern"); - - TConstructRegistry.addItemToDirectory("blankPattern", blankPattern); - TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); - TConstructRegistry.addItemToDirectory("metalPattern", 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(woodPattern, 1, i)); - } - for (int i = 0; i < patternTypes.length; i++) - { - TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(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)); - }*/ - - manualBook = new Manual(PHConstruct.manual); - GameRegistry.registerItem(manualBook, "manualBook"); - buckets = new FilledBucket(PHConstruct.buckets); - GameRegistry.registerItem(buckets, "buckets"); - - pickaxe = new Pickaxe(PHConstruct.pickaxe); - shovel = new Shovel(PHConstruct.shovel); - hatchet = new Hatchet(PHConstruct.axe); - broadsword = new Broadsword(PHConstruct.broadsword); - longsword = new Longsword(PHConstruct.longsword); - rapier = new Rapier(PHConstruct.rapier); - dagger = new Dagger(PHConstruct.dagger); - cutlass = new Cutlass(PHConstruct.cutlass); - - frypan = new FryingPan(PHConstruct.frypan); - battlesign = new BattleSign(PHConstruct.battlesign); - mattock = new Mattock(PHConstruct.mattock); - chisel = new Chisel(PHConstruct.chisel); - - lumberaxe = new LumberAxe(PHConstruct.lumberaxe); - cleaver = new Cleaver(PHConstruct.cleaver); - scythe = new Scythe(PHConstruct.scythe); - excavator = new Excavator(PHConstruct.excavator); - hammer = new Hammer(PHConstruct.hammer); - battleaxe = new Battleaxe(PHConstruct.battleaxe); - - shortbow = new Shortbow(PHConstruct.shortbow); - arrow = new Arrow(PHConstruct.arrow); - - Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe, - shortbow, 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]); - } - - potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).setUnlocalizedName("tconstruct.PotionLauncher"); - GameRegistry.registerItem(potionLauncher, "potionLauncher"); - - pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); - shovelHead = new ToolPart(PHConstruct.shovelHead, "_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); - hatchetHead = new ToolPart(PHConstruct.axeHead, "_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead"); - binding = new ToolPart(PHConstruct.binding, "_binding", "Binding").setUnlocalizedName("tconstruct.Binding"); - toughBinding = new ToolPart(PHConstruct.toughBinding, "_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding"); - toughRod = new ToolPart(PHConstruct.toughRod, "_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod"); - largePlate = new ToolPart(PHConstruct.largePlate, "_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate"); - - swordBlade = new ToolPart(PHConstruct.swordBlade, "_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade"); - wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard"); - handGuard = new ToolPart(PHConstruct.medGuard, "_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard"); - crossbar = new ToolPart(PHConstruct.crossbar, "_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar"); - knifeBlade = new ToolPart(PHConstruct.knifeBlade, "_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade"); - fullGuard = new ToolPartHidden(PHConstruct.fullGuard, "_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); - - frypanHead = new ToolPart(PHConstruct.frypanHead, "_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead"); - signHead = new ToolPart(PHConstruct.signHead, "_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead"); - chiselHead = new ToolPart(PHConstruct.chiselHead, "_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead"); - - scytheBlade = new ToolPart(PHConstruct.scytheBlade, "_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade"); - broadAxeHead = new ToolPart(PHConstruct.lumberHead, "_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead"); - excavatorHead = new ToolPart(PHConstruct.excavatorHead, "_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead"); - largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade"); - hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead"); - - bowstring = new Bowstring(PHConstruct.bowstring).setUnlocalizedName("tconstruct.Bowstring"); - arrowhead = new ToolPart(PHConstruct.arrowhead, "_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); - fletching = new Fletching(PHConstruct.fletching).setUnlocalizedName("tconstruct.Fletching"); - - Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, largePlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard, - frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead, bowstring, fletching, 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]); - } - - diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond"); - strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood"); - oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry"); - GameRegistry.registerItem(diamondApple, "diamondApple"); - GameRegistry.registerItem(strangeFood, "strangeFood"); - GameRegistry.registerItem(oreBerries, "oreBerries"); - - jerky = new Jerky(PHConstruct.jerky, Loader.isModLoaded("HungerOverhaul")).setUnlocalizedName("tconstruct.jerky"); - GameRegistry.registerItem(jerky, "jerky"); - - //Wearables - //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); - heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister"); - //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); - //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); - knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); - goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); - //GameRegistry.registerItem(heavyHelmet, "heavyHelmet"); - GameRegistry.registerItem(heartCanister, "heartCanister"); - //GameRegistry.registerItem(heavyBoots, "heavyBoots"); - //GameRegistry.registerItem(glove, "glove"); - GameRegistry.registerItem(knapsack, "knapsack"); - GameRegistry.registerItem(goldHead, "goldHead"); - - LiquidCasting basinCasting = TConstruct.getBasinCasting(); - materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); - helmetWood = new ArmorBasic(PHConstruct.woodHelmet, materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); - chestplateWood = new ArmorBasic(PHConstruct.woodChestplate, materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); - leggingsWood = new ArmorBasic(PHConstruct.woodPants, materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); - bootsWood = new ArmorBasic(PHConstruct.woodBoots, materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); - GameRegistry.registerItem(helmetWood, "helmetWood"); - GameRegistry.registerItem(chestplateWood, "chestplateWood"); - GameRegistry.registerItem(leggingsWood, "leggingsWood"); - GameRegistry.registerItem(bootsWood, "bootsWood"); - - // essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); - - 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(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(oreBerries, 1, i)); - } - - TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(diamondApple, 1, 0)); - TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(strangeFood, 1, 0)); - - TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(heartCanister, 1, 0)); - TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(heartCanister, 1, 1)); - TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(heartCanister, 1, 2)); - - //Vanilla stack sizes - Item.doorWood.setMaxStackSize(16); - Item.doorIron.setMaxStackSize(16); - Item.snowball.setMaxStackSize(64); - Item.boat.setMaxStackSize(16); - Item.minecartEmpty.setMaxStackSize(3); - Item.minecartCrate.setMaxStackSize(3); - Item.minecartPowered.setMaxStackSize(3); - Item.itemsList[Block.cake.blockID].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, "", "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", "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", "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", "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", "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", "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(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String - TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Item.feather), new ItemStack(fletching, 1, 0), 100F, 0F, 0.05F); //Feather - for (int i = 0; i < 4; i++) - TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.leaves, 1, i), new ItemStack(fletching, 1, 1), 75F, 0F, 0.2F); //All four vanialla Leaves - TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(materials, 1, 1), new ItemStack(fletching, 1, 2), 100F, 0F, 0.12F); //Slime - TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(materials, 1, 17), new ItemStack(fletching, 1, 3), 100F, 0F, 0.12F); //BlueSlime - - PatternBuilder pb = PatternBuilder.instance; - if (PHConstruct.enableTWood) - pb.registerFullMaterial(Block.planks, 2, "Wood", new ItemStack(Item.stick), new ItemStack(Item.stick), 0); - else - pb.registerMaterialSet("Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0); - if (PHConstruct.enableTStone) - { - pb.registerFullMaterial(Block.stone, 2, "Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1); - pb.registerMaterial(Block.cobblestone, 2, "Stone"); - } - else - pb.registerMaterialSet("Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 0); - pb.registerFullMaterial(Item.ingotIron, 2, "Iron", new ItemStack(TContent.toolShard, 1, 2), new ItemStack(TContent.toolRod, 1, 2), 2); - if (PHConstruct.enableTFlint) - pb.registerFullMaterial(Item.flint, 2, "Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3); - else - pb.registerMaterialSet("Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3); - if (PHConstruct.enableTCactus) - pb.registerFullMaterial(Block.cactus, 2, "Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4); - else - pb.registerMaterialSet("Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4); - if (PHConstruct.enableTBone) - pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); - else - pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); - pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", new ItemStack(TContent.toolShard, 1, 6), new ItemStack(TContent.toolRod, 1, 6), 6); - pb.registerMaterial(new ItemStack(materials, 1, 18), 2, "Obsidian"); - if (PHConstruct.enableTNetherrack) - pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7); - else - pb.registerMaterialSet("Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7); - if (PHConstruct.enableTSlime) - pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8); - else - pb.registerMaterialSet("Slime", new ItemStack(TContent.toolShard, 1, 8), new ItemStack(TContent.toolRod, 1, 17), 8); - if (PHConstruct.enableTPaper) - pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Item.paper, 2), new ItemStack(toolRod, 1, 9), 9); - else - pb.registerMaterialSet("BlueSlime", new ItemStack(Item.paper, 2), new ItemStack(TContent.toolRod, 1, 9), 9); - pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10); - pb.registerMaterialSet("Ardite", new ItemStack(toolShard, 1, 11), new ItemStack(toolRod, 1, 11), 11); - pb.registerMaterialSet("Manyullyn", new ItemStack(toolShard, 1, 12), new ItemStack(toolRod, 1, 12), 12); - pb.registerMaterialSet("Copper", new ItemStack(toolShard, 1, 13), new ItemStack(toolRod, 1, 13), 13); - pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14); - pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15); - pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16); - if (PHConstruct.enableTBlueSlime) - pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17); - else - pb.registerMaterialSet("BlueSlime", new ItemStack(TContent.toolShard, 1, 17), new ItemStack(TContent.toolRod, 1, 17), 17); - pb.registerFullMaterial(new ItemStack(materials, 1, 34), 2, "PigIron", new ItemStack(toolShard, 1, 18), new ItemStack(toolRod, 1, 18), 18); - - pb.addToolPattern((IPattern) woodPattern); - } - - public static Item[] patternOutputs; - public static FluidStack[] liquids; - - void addCraftingRecipes () - { - addPartMapping(); - - addRecipesForToolBuilder(); - addRecipesForTableCasting(); - addRecipesForBasinCasting(); - addRecipesForSmeltery(); - addRecipesForChisel(); - addRecipesForFurnace(); - addRecipesForCraftingTable(); - addRecipesForDryingRack(); - } - - private void addRecipesForCraftingTable () - { - String[] patBlock = { "###", "###", "###" }; - String[] patSurround = { "###", "#m#", "###" }; - - Object[] toolForgeBlocks = { "blockIron", "blockGold", Block.blockDiamond, Block.blockEmerald, "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(toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', - toolForgeBlocks[sc])); - // adding slab version recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(craftingSlabWood, 1, 1), 'm', - toolForgeBlocks[sc])); - } - - // ToolStation Recipes (Wooden Version) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "craftingTableWood")); -<<<<<<< HEAD:src/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); -======= - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); ->>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingSlabWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.chest); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood")); - if (PHConstruct.stencilTableCrafting) - { - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); - } - GameRegistry.addRecipe(new ItemStack(furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Block.stoneSingleSlab, 1, 3)); - - // Blank Pattern Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); - // Manual Book Recipes - GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 1), new ItemStack(manualBook, 1, 0)); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 1), new ItemStack(manualBook, 1, 1), Item.book); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book); - GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 3), new ItemStack(manualBook, 1, 2)); -<<<<<<< HEAD:src/tconstruct/common/TContent.java - // alternativ Vanilla Book Recipe -======= - // alternative Vanilla Book Recipe ->>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java - GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, blankPattern, blankPattern); - // Paperstack Recipe - GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); - // Mossball Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 6), patBlock, '#', "stoneMossy")); - // LavaCrystal Recipes -Auto-smelt - GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.fireballCharge, 'x', Item.blazeRod); - GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'x', Item.fireballCharge, 'c', Item.blazeRod); - // Slimy sand Recipes - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 2), strangeFood, strangeFood, strangeFood, strangeFood, Block.sand, Block.dirt); - // Grout Recipes - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel); - GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.stainedClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); - GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.blockClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); - // Graveyard Soil Recipes - GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 3), Block.dirt, Item.rottenFlesh, new ItemStack(Item.dyePowder, 1, 15)); - // Silky Cloth Recipes - GameRegistry.addRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', new ItemStack(materials, 1, 24), '#', new ItemStack(Item.silk)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Item.silk))); - // Silky Jewel Recipes - GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); -<<<<<<< HEAD:src/tconstruct/common/TContent.java - // Wooden Armor Recipes -======= - // Wooden Armor Recipes ->>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ShapedOreRecipe(helmetWood, new Object[] { "www", "w w", 'w', "logWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(bootsWood, new Object[] { "w w", "w w", 'w', "logWood" })); - // Metal conversion Recipes - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 3), patBlock, '#', new ItemStack(materials, 1, 9)); // Copper - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 5), patBlock, '#', new ItemStack(materials, 1, 10)); // Tin - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 11)); // Aluminum - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 12)); // Aluminum - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 4), patBlock, '#', new ItemStack(materials, 1, 13)); // Bronze - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 7), patBlock, '#', new ItemStack(materials, 1, 14)); // AluBrass - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 0), patBlock, '#', new ItemStack(materials, 1, 3)); // Cobalt - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 1), patBlock, '#', new ItemStack(materials, 1, 4)); // Ardite - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 2), patBlock, '#', new ItemStack(materials, 1, 5)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 8), patBlock, '#', new ItemStack(materials, 1, 15)); // Alumite - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 9), patBlock, '#', new ItemStack(materials, 1, 16)); // Steel - GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 11), patBlock, '#', new ItemStack(materials, 1, 12)); //Aluminum raw -> ingot -<<<<<<< HEAD:src/tconstruct/common/TContent.java - -======= - ->>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 9, 13), "m", 'm', new ItemStack(metalBlock, 1, 4)); //Bronze - GameRegistry.addRecipe(new ItemStack(materials, 9, 14), "m", 'm', new ItemStack(metalBlock, 1, 7)); //AluBrass - GameRegistry.addRecipe(new ItemStack(materials, 9, 3), "m", 'm', new ItemStack(metalBlock, 1, 0)); //Cobalt - GameRegistry.addRecipe(new ItemStack(materials, 9, 4), "m", 'm', new ItemStack(metalBlock, 1, 1)); //Ardite - GameRegistry.addRecipe(new ItemStack(materials, 9, 5), "m", 'm', new ItemStack(metalBlock, 1, 2)); //Manyullyn - GameRegistry.addRecipe(new ItemStack(materials, 9, 15), "m", 'm', new ItemStack(metalBlock, 1, 8)); //Alumite - GameRegistry.addRecipe(new ItemStack(materials, 9, 16), "m", 'm', new ItemStack(metalBlock, 1, 9)); //Steel - - GameRegistry.addRecipe(new ItemStack(Item.ingotIron), patBlock, '#', new ItemStack(materials, 1, 19)); //Iron - GameRegistry.addRecipe(new ItemStack(materials, 1, 9), patBlock, '#', new ItemStack(materials, 1, 20)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 1, 10), patBlock, '#', new ItemStack(materials, 1, 21)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 1, 11), patBlock, '#', new ItemStack(materials, 1, 22)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 1, 14), patBlock, '#', new ItemStack(materials, 1, 24)); //Aluminum Brass - GameRegistry.addRecipe(new ItemStack(materials, 1, 18), patBlock, '#', new ItemStack(materials, 1, 27)); //Obsidian - GameRegistry.addRecipe(new ItemStack(materials, 1, 3), patBlock, '#', new ItemStack(materials, 1, 28)); //Cobalt - GameRegistry.addRecipe(new ItemStack(materials, 1, 4), patBlock, '#', new ItemStack(materials, 1, 29)); //Ardite - GameRegistry.addRecipe(new ItemStack(materials, 1, 5), patBlock, '#', new ItemStack(materials, 1, 30)); //Manyullyn - GameRegistry.addRecipe(new ItemStack(materials, 1, 13), patBlock, '#', new ItemStack(materials, 1, 31)); //Bronze - GameRegistry.addRecipe(new ItemStack(materials, 1, 15), patBlock, '#', new ItemStack(materials, 1, 32)); //Alumite - GameRegistry.addRecipe(new ItemStack(materials, 1, 16), patBlock, '#', new ItemStack(materials, 1, 33)); //Steel - - GameRegistry.addRecipe(new ItemStack(materials, 9, 19), "m", 'm', new ItemStack(Item.ingotIron)); //Iron - GameRegistry.addRecipe(new ItemStack(materials, 9, 20), "m", 'm', new ItemStack(materials, 1, 9)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 9, 21), "m", 'm', new ItemStack(materials, 1, 10)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 11)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 12)); //Aluminum - GameRegistry.addRecipe(new ItemStack(materials, 9, 24), "m", 'm', new ItemStack(materials, 1, 14)); //Aluminum Brass - GameRegistry.addRecipe(new ItemStack(materials, 9, 27), "m", 'm', new ItemStack(materials, 1, 18)); //Obsidian - GameRegistry.addRecipe(new ItemStack(materials, 9, 28), "m", 'm', new ItemStack(materials, 1, 3)); //Cobalt - GameRegistry.addRecipe(new ItemStack(materials, 9, 29), "m", 'm', new ItemStack(materials, 1, 4)); //Ardite - GameRegistry.addRecipe(new ItemStack(materials, 9, 30), "m", 'm', new ItemStack(materials, 1, 5)); //Manyullyn - GameRegistry.addRecipe(new ItemStack(materials, 9, 31), "m", 'm', new ItemStack(materials, 1, 13)); //Bronze - GameRegistry.addRecipe(new ItemStack(materials, 9, 32), "m", 'm', new ItemStack(materials, 1, 15)); //Alumite - GameRegistry.addRecipe(new ItemStack(materials, 9, 33), "m", 'm', new ItemStack(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(Block.cloth, 8, i), patSurround, 'm', color, '#', new ItemStack(Block.cloth, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClear, 8, i), patSurround, 'm', color, '#', clearGlass)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClear, 1, i), color, clearGlass)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClear, 1, i), color, new ItemStack(stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', glassPane)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClearPane, 1, i), color, glassPane)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(stainedGlassClearPane, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClearPane, 1, i), color, new ItemStack(stainedGlassClearPane, 1, Short.MAX_VALUE))); - } - - // Glass Recipes - GameRegistry.addRecipe(new ItemStack(Item.glassBottle, 3), new Object[] { "# #", " # ", '#', clearGlass }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.daylightSensor), new Object[] { "GGG", "QQQ", "WWW", 'G', "glass", 'Q', Item.netherQuartz, 'W', "slabWood" })); - GameRegistry.addRecipe(new ItemStack(Block.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', clearGlass, 'S', Item.netherStar, 'O', Block.obsidian }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(glassPane, 16, 0), "GGG", "GGG", 'G', clearGlass)); - - // Smeltery Components Recipes - ItemStack searedBrick = new ItemStack(materials, 1, 2); - GameRegistry.addRecipe(new ItemStack(smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); //Controller - GameRegistry.addRecipe(new ItemStack(smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); //Drain - GameRegistry.addRecipe(new ItemStack(smeltery, 1, 2), "bb", "bb", 'b', searedBrick); //Bricks - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 0), patSurround, '#', searedBrick, 'm', "glass")); //Tank - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "glass")); //Glass - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "glass")); //Window - GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); //Table - GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet - GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin - GameRegistry.addRecipe(new ItemStack(castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); //Channel - - // Jack o'Latern Recipe - Stone Torch - GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 's', new ItemStack(stoneTorch)); - // Stone Torch Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', "stoneRod")); - // Stone Ladder Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stoneLadder, 3), "w w", "www", "w w", 'w', "stoneRod")); - // Wooden Rail Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); - // Stonesticks Recipes - GameRegistry.addRecipe(new ItemStack(toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone)); - GameRegistry.addRecipe(new ItemStack(toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone)); - // - ItemStack aluBrass = new ItemStack(materials, 1, 14); - // Clock Recipe - Vanilla alternativ - GameRegistry.addRecipe(new ItemStack(Item.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Item.redstone)); - // Gold Pressure Plate - Vanilla alternativ - GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass); - //Accessories -<<<<<<< HEAD:src/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); -======= - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); ->>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum")); - GameRegistry.addRecipe(new ItemStack(diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed)); - GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 2), new ItemStack(diamondApple), new ItemStack(materials, 1, 8), new ItemStack(heartCanister, 1, 0), new ItemStack( - heartCanister, 1, 1)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', "ingotGold")); - GameRegistry.addRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', aluBrass); - // Drying Rack Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood")); - //Landmine Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', - Block.pressurePlateStone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 1), "mcm", "rpr", 'm', Block.stone, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', - Block.pressurePlateStone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 2), "mcm", "rpr", 'm', Block.obsidian, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', - Block.pressurePlateStone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 3), "mcm", "rpr", 'm', Item.redstoneRepeater, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', - Block.pressurePlateStone)); - - //Ultra hardcore recipes - GameRegistry.addRecipe(new ItemStack(goldHead), patSurround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.skull, 1, 3)); - - // Slab Smeltery Components Recipes - for (int i = 0; i < 7; i++) - { - GameRegistry.addRecipe(new ItemStack(speedSlab, 6, i), "bbb", 'b', new ItemStack(speedBlock, 1, i)); - } - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 0), "bbb", 'b', new ItemStack(smeltery, 1, 2)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 1), "bbb", 'b', new ItemStack(smeltery, 1, 4)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 2), "bbb", 'b', new ItemStack(smeltery, 1, 5)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 3), "bbb", 'b', new ItemStack(smeltery, 1, 6)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 4), "bbb", 'b', new ItemStack(smeltery, 1, 8)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 5), "bbb", 'b', new ItemStack(smeltery, 1, 9)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 6), "bbb", 'b', new ItemStack(smeltery, 1, 10)); - GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 7), "bbb", 'b', new ItemStack(smeltery, 1, 11)); - - // Wool Slab Recipes - for (int sc = 0; sc <= 7; sc++) - { - GameRegistry.addRecipe(new ItemStack(woolSlab1, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc)); - GameRegistry.addRecipe(new ItemStack(woolSlab2, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc + 8)); - - GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(woolSlab1, 1, sc), new ItemStack(woolSlab1, 1, sc)); - GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(woolSlab2, 1, sc), new ItemStack(woolSlab2, 1, sc)); - } - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth")); - //Trap Recipes - GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); - GameRegistry.addRecipe(new ItemStack(barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(barricadeOak, 1, 0), "b", "b", 'b', "logWood")); - // Advanced WorkBench Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); - //Slab crafters - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); -<<<<<<< HEAD:src/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); -======= - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); ->>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 3)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 4)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 4), "b", 'b', new ItemStack(toolStationWood, 1, 5)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 10)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 11)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 12)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 13)); - GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE)); - // EssenceExtractor Recipe - //Slime Recipes - GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 0), "##", "##", '#', strangeFood); - GameRegistry.addRecipe(new ItemStack(strangeFood, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 0)); - GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 1), "##", "##", '#', Item.slimeBall); - GameRegistry.addRecipe(new ItemStack(Item.slimeBall, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 1)); - //slimeExplosive - GameRegistry.addShapelessRecipe(new ItemStack(slimeExplosive, 1, 0), Item.slimeBall, Block.tnt); - GameRegistry.addShapelessRecipe(new ItemStack(slimeExplosive, 1, 2), strangeFood, Block.tnt); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimeExplosive, 1, 0), "slimeball", Block.tnt)); - - GameRegistry.addShapelessRecipe(new ItemStack(slimeChannel, 1, 0), new ItemStack(slimeGel, 1, Short.MAX_VALUE), new ItemStack(Item.redstone)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimePad, 1, 0), slimeChannel, "slimeBall")); - } - - private void addRecipesForFurnace () - { - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 3, new ItemStack(craftedSoil, 1, 4), 0.2f); //Concecrated Soil - - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item - FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime - //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); - //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 11), 0.5f); - - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 2, new ItemStack(materials, 1, 20), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 3, new ItemStack(materials, 1, 21), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 4, new ItemStack(materials, 1, 22), 0.2f); - //FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f); - - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 2, new ItemStack(materials, 1, 9), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 3, new ItemStack(materials, 1, 10), 0.2f); - FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 4, new ItemStack(materials, 1, 12), 0.2f); - - FurnaceRecipes.smelting().addSmelting(speedBlock.blockID, 0, new ItemStack(speedBlock, 1, 2), 0.2f); - } - - private void addPartMapping () - { - /* Tools */ - patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod, - toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, 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 < patternOutputs.length; meta++) - { - if (patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, mat, new ItemStack(patternOutputs[meta], 1, mat)); - } - } - } - else - { - for (int mat = 0; mat < nonMetals.length; mat++) - { - for (int meta = 0; meta < patternOutputs.length; meta++) - { - if (patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(patternOutputs[meta], 1, nonMetals[mat])); - } - } - } - } - - private void addRecipesForToolBuilder () - { - ToolBuilder tb = ToolBuilder.instance; - tb.addNormalToolRecipe(pickaxe, pickaxeHead, toolRod, binding); - tb.addNormalToolRecipe(broadsword, swordBlade, toolRod, wideGuard); - tb.addNormalToolRecipe(hatchet, hatchetHead, toolRod); - tb.addNormalToolRecipe(shovel, shovelHead, toolRod); - tb.addNormalToolRecipe(longsword, swordBlade, toolRod, handGuard); - tb.addNormalToolRecipe(rapier, swordBlade, toolRod, crossbar); - tb.addNormalToolRecipe(frypan, frypanHead, toolRod); - tb.addNormalToolRecipe(battlesign, signHead, toolRod); - tb.addNormalToolRecipe(mattock, hatchetHead, toolRod, shovelHead); - tb.addNormalToolRecipe(dagger, knifeBlade, toolRod, crossbar); - tb.addNormalToolRecipe(cutlass, swordBlade, toolRod, fullGuard); - tb.addNormalToolRecipe(chisel, chiselHead, toolRod); - - tb.addNormalToolRecipe(scythe, scytheBlade, toughRod, toughBinding, toughRod); - tb.addNormalToolRecipe(lumberaxe, broadAxeHead, toughRod, largePlate, toughBinding); - tb.addNormalToolRecipe(cleaver, largeSwordBlade, toughRod, largePlate, toughRod); - tb.addNormalToolRecipe(excavator, excavatorHead, toughRod, largePlate, toughBinding); - tb.addNormalToolRecipe(hammer, hammerHead, toughRod, largePlate, largePlate); - tb.addNormalToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding); - - //tb.addNormalToolRecipe(shortbow, toolRod, bowstring, toolRod); - BowRecipe recipe = new BowRecipe(toolRod, bowstring, toolRod, shortbow); - tb.addCustomToolRecipe(recipe); - tb.addNormalToolRecipe(arrow, arrowhead, toolRod, fletching); - - ItemStack diamond = new ItemStack(Item.diamond); - tb.registerToolMod(new ModRepair()); - tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); - tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); - - modF = new ModFlux(); - tb.registerToolMod(modF); - - ItemStack redstoneItem = new ItemStack(Item.redstone); - ItemStack redstoneBlock = new ItemStack(Block.blockRedstone); - tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem }, 2, 1)); - tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneItem }, 2, 2)); - tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock }, 2, 9)); - tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneBlock }, 2, 10)); - tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock, redstoneBlock }, 2, 18)); - - ItemStack lapisItem = new ItemStack(Item.dyePowder, 1, 4); - ItemStack lapisBlock = new ItemStack(Block.blockLapis); - modL = new ModLapis(new ItemStack[] { lapisItem }, 10, 1); - tb.registerToolMod(modL); - tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisItem }, 10, 2)); - tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock }, 10, 9)); - tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisBlock }, 10, 10)); - tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock, lapisBlock }, 10, 18)); - - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair")); - ItemStack blazePowder = new ItemStack(Item.blazePowder); - tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder }, 7, 1)); - tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder, blazePowder }, 7, 2)); - tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt")); - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal")); - - ItemStack quartzItem = new ItemStack(Item.netherQuartz); - ItemStack quartzBlock = new ItemStack(Block.blockNetherQuartz, 1, Short.MAX_VALUE); - tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem }, 11, 1)); - tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzItem }, 11, 2)); - tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock }, 11, 4)); - tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzBlock }, 11, 5)); - tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock, quartzBlock }, 11, 8)); - - tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Block.blockGold) }, "Tier1Free")); - tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Item.netherStar) }, "Tier2Free")); - - ItemStack silkyJewel = new ItemStack(materials, 1, 26); - tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12)); - - ItemStack piston = new ItemStack(Block.pistonBase); - tb.registerToolMod(new ModPiston(new ItemStack[] { piston }, 3, 1)); - tb.registerToolMod(new ModPiston(new ItemStack[] { piston, piston }, 3, 2)); - - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Block.obsidian), new ItemStack(Item.enderPearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading")); - - ItemStack holySoil = new ItemStack(craftedSoil, 1, 4); - tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil }, 14, 1)); - tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil, holySoil }, 14, 2)); - - ItemStack spidereyeball = new ItemStack(Item.fermentedSpiderEye); - tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball }, 15, 1)); - tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball, spidereyeball }, 15, 2)); - - ItemStack obsidianPlate = new ItemStack(largePlate, 1, 6); - tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); - - TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); - } - - private void addRecipesForTableCasting () - { - /* Smeltery */ - ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); - ItemStack gemcast = new ItemStack(metalPattern, 1, 26); - LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - //Blank - tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); - tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Item.emerald), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80); - - //Ingots - tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); //stone - - //Misc - tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(moltenEmeraldFluid, 640), gemcast, 80); - tableCasting.addCastingRecipe(new ItemStack(materials, 1, 36), new FluidStack(glueFluid, TConstruct.ingotLiquidValue), null, 50); - - //Buckets - ItemStack bucket = new ItemStack(Item.bucketEmpty); - - for (int sc = 0; sc < 24; sc++) - { - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, sc), new FluidStack(fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); - } - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 26), new FluidStack(fluids[26], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); - - // Clear glass pane casting - tableCasting.addCastingRecipe(new ItemStack(glassPane), new FluidStack(moltenGlassFluid, 250), null, 80); - - // Metal toolpart casting - liquids = new FluidStack[] { new FluidStack(moltenIronFluid, 1), new FluidStack(moltenCopperFluid, 1), new FluidStack(moltenCobaltFluid, 1), new FluidStack(moltenArditeFluid, 1), - new FluidStack(moltenManyullynFluid, 1), new FluidStack(moltenBronzeFluid, 1), new FluidStack(moltenAlumiteFluid, 1), new FluidStack(moltenObsidianFluid, 1), - new FluidStack(moltenSteelFluid, 1), new FluidStack(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 < patternOutputs.length; iter++) - { - if (patternOutputs[iter] != null) - { - ItemStack cast = new ItemStack(metalPattern, 1, iter + 1); - - tableCasting.addCastingRecipe(cast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - - for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++) - { - fs = liquids[iterTwo].getFluid(); - fluidAmount = ((IPattern) metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; - ItemStack metalCast = new ItemStack(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(Item.brick), new ItemStack(Item.netherrackBrick), new ItemStack(materials, 1, 2) }; - for (int i = 0; i < ingotShapes.length; i++) - { - tableCasting.addCastingRecipe(ingotcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50); - tableCasting.addCastingRecipe(ingotcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); - } - - ItemStack fullguardCast = new ItemStack(metalPattern, 1, 22); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(fullGuard, 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(fullGuard, 1, Short.MAX_VALUE), false, 50); - - // Golden Food Stuff - FluidStack goldAmount = null; - if (PHConstruct.goldAppleRecipe) - { - goldAmount = new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 8); - } - else - { - goldAmount = new FluidStack(moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); - } - tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), goldAmount, new ItemStack(Item.appleRed), true, 50); - tableCasting.addCastingRecipe(new ItemStack(Item.goldenCarrot, 1), goldAmount, new ItemStack(Item.carrot), true, 50); - tableCasting.addCastingRecipe(new ItemStack(Item.speckledMelon, 1), goldAmount, new ItemStack(Item.melon), true, 50); - tableCasting.addCastingRecipe(new ItemStack(goldHead), goldAmount, new ItemStack(Item.skull, 1, 3), true, 50); - } - - private void addRecipesForBasinCasting () - { - LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); - // Block Casting - basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), new FluidStack(moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); //Iron - basinCasting.addCastingRecipe(new ItemStack(Block.blockGold), new FluidStack(moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); //gold - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 3), new FluidStack(moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); //copper - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 5), new FluidStack(moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); //tin - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 6), new FluidStack(moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); //aluminum - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 0), new FluidStack(moltenCobaltFluid, TConstruct.blockLiquidValue), null, true, 100); //cobalt - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 1), new FluidStack(moltenArditeFluid, TConstruct.blockLiquidValue), null, true, 100); //ardite - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 4), new FluidStack(moltenBronzeFluid, TConstruct.blockLiquidValue), null, true, 100); //bronze - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 7), new FluidStack(moltenAlubrassFluid, TConstruct.blockLiquidValue), null, true, 100); //albrass - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 2), new FluidStack(moltenManyullynFluid, TConstruct.blockLiquidValue), null, true, 100); //manyullyn - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 8), new FluidStack(moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); //alumite - basinCasting.addCastingRecipe(new ItemStack(Block.obsidian), new FluidStack(moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian - basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 9), new FluidStack(moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); //steel - basinCasting.addCastingRecipe(new ItemStack(clearGlass, 1, 0), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass - basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone - basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald - basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone - basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone - basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender - basinCasting.addCastingRecipe(new ItemStack(glueBlock), new FluidStack(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(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10); - FluidStack gloFlu = new FluidStack(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); - }*/ - } - - private void addRecipesForSmeltery () - { - //Alloy Smelting - Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), - new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze - Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy), new FluidStack(moltenAluminumFluid, - TConstruct.ingotLiquidValue * 3), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), - new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite - Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), - new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn - Smeltery.addAlloyMixing(new FluidStack(pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue), - new FluidStack(moltenEmeraldFluid, 640), new FluidStack(bloodFluid, 80)); //Pigiron - - // Stone parts - for (int sc = 0; sc < patternOutputs.length; sc++) - { - if (patternOutputs[sc] != null) - { - Smeltery.addMelting(FluidType.Stone, new ItemStack(patternOutputs[sc], 1, 1), 1, (8 * ((IPattern) woodPattern).getPatternCost(new ItemStack(woodPattern, 1, sc + 1))) / 2); - } - } - - // Chunks - Smeltery.addMelting(FluidType.Stone, new ItemStack(toolShard, 1, 1), 0, 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Cobalt, new ItemStack(toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Ardite, new ItemStack(toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Copper, new ItemStack(toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Bronze, new ItemStack(toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Alumite, new ItemStack(toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); - - // Items - - Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Glue, new ItemStack(materials, 1, 36), 0, TConstruct.ingotLiquidValue); - - Smeltery.addMelting(FluidType.Ender, new ItemStack(Item.enderPearl, 4), 0, 250); - Smeltery.addMelting(metalBlock, 10, 50, new FluidStack(moltenEnderFluid, 1000)); - Smeltery.addMelting(FluidType.Water, new ItemStack(Item.snowball, 1, 0), 0, 125); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.flintAndSteel, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.bucketEmpty), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartEmpty), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartCrate), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartPowered), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartHopper), 50, TConstruct.ingotLiquidValue * 10); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.doorIron), 0, TConstruct.ingotLiquidValue * 6); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.cauldron), 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Emerald, new ItemStack(Item.emerald), -50, 640); - - //Blocks melt as themselves! - //Ore - Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Block.oreGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(oreGravel, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(oreGravel, 1, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); - - //Blocks - Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Block.blockGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Block.obsidian, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Block.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); - Smeltery.addMelting(Block.blockSnow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); - Smeltery.addMelting(Block.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); - Smeltery.addMelting(Block.sand, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Block.glass, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); - Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640 * 9)); - Smeltery.addMelting(glueBlock, 0, 250, new FluidStack(glueFluid, TConstruct.blockLiquidValue)); - Smeltery.addMelting(craftedSoil, 1, 600, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); - - Smeltery.addMelting(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); - Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); - - for (int i = 0; i < 16; i++) - { - Smeltery.addMelting(stainedGlassClear, i, 500, new FluidStack(moltenGlassFluid, 1000)); - Smeltery.addMelting(stainedGlassClearPane, i, 350, new FluidStack(moltenGlassFluid, 250)); - } - - //Bricks - Smeltery.addMelting(multiBrick, 4, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrickFancy, 4, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrick, 5, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrickFancy, 5, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(multiBrick, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(multiBrickFancy, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - - //Vanilla blocks - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.fenceIron), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.pressurePlateIron), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Block.pressurePlateGold, 4), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Block.railPowered), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.railDetector), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.railActivator), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Block.enchantmentTable), 0, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.cauldron), 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.hopperBlock), 0, TConstruct.ingotLiquidValue * 5); - - //Vanilla Armor - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.helmetIron, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.plateIron, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.legsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.bootsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.helmetGold, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.plateGold, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.legsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.bootsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - - Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.helmetChain, 1, 0), 25, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.plateChain, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.legsChain, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.bootsChain, 1, 0), 25, TConstruct.ingotLiquidValue); - - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.horseArmorIron, 1), 100, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.horseArmorGold, 1), 100, TConstruct.ingotLiquidValue * 8); - - //Vanilla tools - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.hoeIron, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.swordIron, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shovelIron, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.pickaxeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.axeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.hoeGold, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.swordGold, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.shovelGold, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.pickaxeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.axeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - } - - private void addRecipesForDryingRack () - { - //Drying rack - DryingRackRecipes.addDryingRecipe(Item.beefRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 0)); - DryingRackRecipes.addDryingRecipe(Item.chickenRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 1)); - DryingRackRecipes.addDryingRecipe(Item.porkRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 2)); - //DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 3)); - DryingRackRecipes.addDryingRecipe(Item.fishRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 4)); - DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, new ItemStack(jerky, 1, 5)); - - //DryingRackRecipes.addDryingRecipe(new ItemStack(jerky, 1, 5), 20 * 60 * 10, Item.leather); - } - - private void addRecipesForChisel () - { - /* Detailing */ - Detailing chiseling = TConstructRegistry.getChiselDetailing(); - chiseling.addDetailing(Block.stone, 0, Block.stoneBrick, 0, chisel); - chiseling.addDetailing(speedBlock, 0, speedBlock, 1, chisel); - chiseling.addDetailing(speedBlock, 2, speedBlock, 3, chisel); - chiseling.addDetailing(speedBlock, 3, speedBlock, 4, chisel); - chiseling.addDetailing(speedBlock, 4, speedBlock, 5, chisel); - chiseling.addDetailing(speedBlock, 5, speedBlock, 6, chisel); - - chiseling.addDetailing(Block.obsidian, 0, multiBrick, 0, chisel); - chiseling.addDetailing(Block.sandStone, 0, Block.sandStone, 2, chisel); - chiseling.addDetailing(Block.sandStone, 2, Block.sandStone, 1, chisel); - chiseling.addDetailing(Block.sandStone, 1, multiBrick, 1, chisel); - //chiseling.addDetailing(Block.netherrack, 0, multiBrick, 2, chisel); - //chiseling.addDetailing(Block.stone_refined, 0, multiBrick, 3, chisel); - chiseling.addDetailing(Item.ingotIron, 0, multiBrick, 4, chisel); - chiseling.addDetailing(Item.ingotGold, 0, multiBrick, 5, chisel); - chiseling.addDetailing(Item.dyePowder, 4, multiBrick, 6, chisel); - chiseling.addDetailing(Item.diamond, 0, multiBrick, 7, chisel); - chiseling.addDetailing(Item.redstone, 0, multiBrick, 8, chisel); - chiseling.addDetailing(Item.bone, 0, multiBrick, 9, chisel); - chiseling.addDetailing(Item.slimeBall, 0, multiBrick, 10, chisel); - chiseling.addDetailing(strangeFood, 0, multiBrick, 11, chisel); - chiseling.addDetailing(Block.whiteStone, 0, multiBrick, 12, chisel); - chiseling.addDetailing(materials, 18, multiBrick, 13, chisel); - - // adding multiBrick / multiBrickFanxy meta 0-13 to list - for (int sc = 0; sc < 14; sc++) - { - chiseling.addDetailing(multiBrick, sc, multiBrickFancy, sc, chisel); - } - - chiseling.addDetailing(Block.stoneBrick, 0, multiBrickFancy, 15, chisel); - chiseling.addDetailing(multiBrickFancy, 15, multiBrickFancy, 14, chisel); - chiseling.addDetailing(multiBrickFancy, 14, Block.stoneBrick, 3, chisel); - /*chiseling.addDetailing(multiBrick, 14, multiBrickFancy, 14, chisel); - chiseling.addDetailing(multiBrick, 15, multiBrickFancy, 15, chisel);*/ - - chiseling.addDetailing(smeltery, 4, smeltery, 6, chisel); - chiseling.addDetailing(smeltery, 6, smeltery, 11, chisel); - chiseling.addDetailing(smeltery, 11, smeltery, 2, chisel); - chiseling.addDetailing(smeltery, 2, smeltery, 8, chisel); - chiseling.addDetailing(smeltery, 8, smeltery, 9, chisel); - chiseling.addDetailing(smeltery, 9, smeltery, 10, chisel); - } - - void setupToolTabs () - { - TConstructRegistry.materialTab.init(new ItemStack(titleIcon, 1, 255)); - TConstructRegistry.blockTab.init(new ItemStack(toolStationWood)); - ItemStack tool = new ItemStack(longsword, 1, 0); - - NBTTagCompound compound = new NBTTagCompound(); - compound.setCompoundTag("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(heartCanister, 1, 1), 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10)); - - tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); - tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 1)); - int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 }; - Item[] partTypes = { pickaxeHead, shovelHead, hatchetHead, binding, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, frypanHead, signHead, chiselHead }; - - for (int partIter = 0; partIter < partTypes.length; partIter++) - { - for (int typeIter = 0; typeIter < validTypes.length; typeIter++) - { - tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); - } - } - - tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30); - for (int i = 0; i < 13; i++) - { - tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, i + 1), 1, 3, 20)); - } - tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, 22), 1, 3, 40)); - } - - public static String[] liquidNames; - - public void oreRegistry () - { - OreDictionary.registerOre("oreCobalt", new ItemStack(oreSlag, 1, 1)); - OreDictionary.registerOre("oreArdite", new ItemStack(oreSlag, 1, 2)); - OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3)); - OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4)); - OreDictionary.registerOre("oreAluminum", new ItemStack(oreSlag, 1, 5)); - OreDictionary.registerOre("oreAluminium", new ItemStack(oreSlag, 1, 5)); - - OreDictionary.registerOre("oreIron", new ItemStack(oreGravel, 1, 0)); - OreDictionary.registerOre("oreGold", new ItemStack(oreGravel, 1, 1)); - OreDictionary.registerOre("oreCobalt", new ItemStack(oreGravel, 1, 5)); - OreDictionary.registerOre("oreCopper", new ItemStack(oreGravel, 1, 2)); - OreDictionary.registerOre("oreTin", new ItemStack(oreGravel, 1, 3)); - OreDictionary.registerOre("oreAluminum", new ItemStack(oreGravel, 1, 4)); - OreDictionary.registerOre("oreAluminium", new ItemStack(oreGravel, 1, 4)); - - OreDictionary.registerOre("ingotCobalt", new ItemStack(materials, 1, 3)); - OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4)); - OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5)); - OreDictionary.registerOre("ingotCopper", new ItemStack(materials, 1, 9)); - OreDictionary.registerOre("ingotTin", new ItemStack(materials, 1, 10)); - OreDictionary.registerOre("ingotAluminum", new ItemStack(materials, 1, 11)); - OreDictionary.registerOre("ingotAluminium", new ItemStack(materials, 1, 11)); - OreDictionary.registerOre("ingotBronze", new ItemStack(materials, 1, 13)); - OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14)); - OreDictionary.registerOre("ingotAluminiumBrass", new ItemStack(materials, 1, 14)); - OreDictionary.registerOre("ingotAlumite", new ItemStack(materials, 1, 15)); - OreDictionary.registerOre("ingotSteel", new ItemStack(materials, 1, 16)); - ensureOreIsRegistered("ingotIron", new ItemStack(Item.ingotIron)); - ensureOreIsRegistered("ingotGold", new ItemStack(Item.ingotGold)); - OreDictionary.registerOre("ingotObsidian", new ItemStack(materials, 1, 18)); - OreDictionary.registerOre("ingotPigIron", new ItemStack(materials, 1, 34)); - OreDictionary.registerOre("itemRawRubber", new ItemStack(materials, 1, 36)); - - OreDictionary.registerOre("blockCobalt", new ItemStack(metalBlock, 1, 0)); - OreDictionary.registerOre("blockArdite", new ItemStack(metalBlock, 1, 1)); - OreDictionary.registerOre("blockManyullyn", new ItemStack(metalBlock, 1, 2)); - OreDictionary.registerOre("blockCopper", new ItemStack(metalBlock, 1, 3)); - OreDictionary.registerOre("blockBronze", new ItemStack(metalBlock, 1, 4)); - OreDictionary.registerOre("blockTin", new ItemStack(metalBlock, 1, 5)); - OreDictionary.registerOre("blockAluminum", new ItemStack(metalBlock, 1, 6)); - OreDictionary.registerOre("blockAluminium", new ItemStack(metalBlock, 1, 6)); - OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7)); - OreDictionary.registerOre("blockAluminiumBrass", new ItemStack(metalBlock, 1, 7)); - OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8)); - OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9)); - ensureOreIsRegistered("blockIron", new ItemStack(Block.blockIron)); - ensureOreIsRegistered("blockGold", new ItemStack(Block.blockGold)); - - OreDictionary.registerOre("nuggetIron", new ItemStack(materials, 1, 19)); - OreDictionary.registerOre("nuggetIron", new ItemStack(oreBerries, 1, 0)); - OreDictionary.registerOre("nuggetCopper", new ItemStack(materials, 1, 20)); - OreDictionary.registerOre("nuggetCopper", new ItemStack(oreBerries, 1, 2)); - OreDictionary.registerOre("nuggetTin", new ItemStack(materials, 1, 21)); - OreDictionary.registerOre("nuggetTin", new ItemStack(oreBerries, 1, 3)); - OreDictionary.registerOre("nuggetAluminum", new ItemStack(materials, 1, 22)); - OreDictionary.registerOre("nuggetAluminum", new ItemStack(oreBerries, 1, 4)); - OreDictionary.registerOre("nuggetAluminium", new ItemStack(materials, 1, 22)); - OreDictionary.registerOre("nuggetAluminium", new ItemStack(oreBerries, 1, 4)); - OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24)); - OreDictionary.registerOre("nuggetAluminiumBrass", new ItemStack(materials, 1, 24)); - OreDictionary.registerOre("nuggetObsidian", new ItemStack(materials, 1, 27)); - OreDictionary.registerOre("nuggetCobalt", new ItemStack(materials, 1, 28)); - OreDictionary.registerOre("nuggetArdite", new ItemStack(materials, 1, 29)); - OreDictionary.registerOre("nuggetManyullyn", new ItemStack(materials, 1, 30)); - OreDictionary.registerOre("nuggetBronze", new ItemStack(materials, 1, 31)); - OreDictionary.registerOre("nuggetAlumite", new ItemStack(materials, 1, 32)); - OreDictionary.registerOre("nuggetSteel", new ItemStack(materials, 1, 33)); - OreDictionary.registerOre("nuggetGold", new ItemStack(oreBerries, 1, 1)); - ensureOreIsRegistered("nuggetGold", new ItemStack(Item.goldNugget)); - OreDictionary.registerOre("nuggetPigIron", new ItemStack(materials, 1, 35)); - - OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab1, 1, Short.MAX_VALUE)); - OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab2, 1, Short.MAX_VALUE)); - - ensureOreIsRegistered("stoneMossy", new ItemStack(Block.stoneBrick, 1, 1)); - ensureOreIsRegistered("stoneMossy", new ItemStack(Block.cobblestoneMossy)); - - OreDictionary.registerOre("crafterWood", new ItemStack(Block.workbench, 1)); - OreDictionary.registerOre("craftingTableWood", new ItemStack(Block.workbench, 1)); - - OreDictionary.registerOre("torchStone", new ItemStack(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++) - OreDictionary.registerOre(matNames[i] + "Rod", new ItemStack(toolRod, 1, i)); - OreDictionary.registerOre("thaumiumRod", new ItemStack(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(stainedGlassClear, 1, i)); - } - - BlockDispenser.dispenseBehaviorRegistry.putObject(titleIcon, new TDispenserBehaviorSpawnEgg()); - - BlockDispenser.dispenseBehaviorRegistry.putObject(arrow, new TDispenserBehaviorArrow()); - - //Vanilla stuff - OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall)); - OreDictionary.registerOre("slimeball", new ItemStack(strangeFood, 1, 0)); - OreDictionary.registerOre("slimeball", new ItemStack(materials, 1, 36)); - OreDictionary.registerOre("glass", new ItemStack(clearGlass)); - OreDictionary.registerOre("glass", new ItemStack(Block.glass)); - RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.magmaCream)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.leash)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Item.magmaCream), "slimeball", Item.blazePowder)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.leash, 2), "ss ", "sS ", " s", 's', Item.silk, 'S', "slimeball")); - } - - private void ensureOreIsRegistered (String oreName, ItemStack is) - { - int oreId = OreDictionary.getOreID(is); - if (oreId == -1) - { - OreDictionary.registerOre(oreName, is); - } - } - - public static boolean thaumcraftAvailable; - - public void intermodCommunication () - { - if (Loader.isModLoaded("Thaumcraft")) - { - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 12)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 13)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 14)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 15)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 12)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 13)); - } - if (Loader.isModLoaded("Mystcraft")) - { - MystImcHandler.blacklistFluids(); - } - if (Loader.isModLoaded("BuildCraft|Transport")) - { - BCImcHandler.registerFacades(); - } - /* FORESTRY - * Edit these strings to change what items are added to the backpacks - * Format info: "[backpack ID]@[item ID].[metadata or *]:[next item]" and so on - * Avaliable backpack IDs: forester, miner, digger, hunter, adventurer, builder - * May add more backpack items later - Spyboticsguy - */ - if (Loader.isModLoaded("Forestry")) - { - String builderItems = "builder@" + String.valueOf(stoneTorch.blockID) + ":*"; - FMLInterModComms.sendMessage("Forestry", "add-backpack-items", builderItems); - } - if (!Loader.isModLoaded("AppliedEnergistics")) - { - AEImcHandler.registerForSpatialIO(); - } - } - - private static boolean initRecipes; - - public static void modRecipes () - { - if (!initRecipes) - { - initRecipes = true; - if (PHConstruct.removeVanillaToolRecipes) - { - RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeWood)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeWood)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelWood)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeWood)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordWood)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeStone)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeStone)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelStone)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeStone)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordStone)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeIron)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeIron)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelIron)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeIron)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordIron)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeDiamond)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeDiamond)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelDiamond)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeDiamond)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordDiamond)); - - RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeGold)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeGold)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelGold)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeGold)); - RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordGold)); - } - } - } - - 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); - } - - public void modIntegration () - { - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), ""); - /*TE3 Flux*/ - ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1); - if (batHardened != null) - { - modF.batteries.add(batHardened); - } - ItemStack basicCell = GameRegistry.findItemStack("ThermalExpansion", "cellBasic", 1); - if (basicCell != null) - { - modF.batteries.add(basicCell); - } - if (batHardened != null) - TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); - if (basicCell != null) - TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); -<<<<<<< HEAD:src/tconstruct/common/TContent.java - - /* IC2 */ -======= ->>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java - - - /* Thaumcraft */ - Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); - if (obj != null) - { - TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); - thaumcraftAvailable = true; - TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); - TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", "Thaumic"); - PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(toolShard, 1, 31), new ItemStack(toolRod, 1, 31), 31); - for (int meta = 0; meta < patternOutputs.length; meta++) - { - if (patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31)); - } - - TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(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.warning("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(bowstring, 1, 2), 1.2F, 0.8F, 1.3f); - } - catch (Exception e) - { - } //No need to handle - } - - ItemStack ingotcast = new ItemStack(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(moltenNickelFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotLead"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenLeadFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotSilver"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenSilverFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotPlatinum"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenShinyFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - } - ores = OreDictionary.getOres("ingotInvar"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(moltenInvarFluid, 24), new FluidStack(moltenIronFluid, 16), new FluidStack(moltenNickelFluid, 8)); //Invar - } - ores = OreDictionary.getOres("ingotElectrum"); - if (ores.size() > 0) - { - tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(moltenElectrumFluid, 16), new FluidStack(moltenGoldFluid, 8), new FluidStack(moltenSilverFluid, 8)); //Electrum - } - - ores = OreDictionary.getOres("blockNickel"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenNickelFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockLead"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenLeadFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockSilver"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenSilverFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockPlatinum"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenShinyFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockInvar"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenInvarFluid, TConstruct.blockLiquidValue), null, 100); - } - ores = OreDictionary.getOres("blockElectrum"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue), null, 100); - } - - /* Extra Utilities */ - ores = OreDictionary.getOres("compressedGravel1x"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(new ItemStack(speedBlock, 9), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue), ores.get(0), 100); - } - ores = OreDictionary.getOres("compressedGravel2x"); //Higher won't save properly - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(new ItemStack(speedBlock, 81), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue * 9), ores.get(0), 100); - } - - /* Rubber */ - ores = OreDictionary.getOres("itemRubber"); - if (ores.size() > 0) - { - FurnaceRecipes.smelting().addSmelting(materials.itemID, 36, ores.get(0), 0.2f); - } - //new ItemStack(materials, 1, 36) - } - - 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.warning("Could not find " + name); - return null; - } - } - - @Override - public int getBurnTime (ItemStack fuel) - { - if (fuel.itemID == materials.itemID && fuel.getItemDamage() == 7) - return 26400; - return 0; - } - - public void addOreDictionarySmelteryRecipes () - { - List exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime }); - 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, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre); - - // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, 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()); - } - } - - //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"); - } - - private void registerPatternMaterial (String oreName, int value, String materialName) - { - for (ItemStack ore : OreDictionary.getOres(oreName)) - { - PatternBuilder.instance.registerMaterial(ore, value, materialName); - } - } - - private void registerIngotCasting (FluidType ft) - { - ItemStack pattern = new ItemStack(TContent.metalPattern, 1, 0); - LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - for (ItemStack ore : OreDictionary.getOres("ingot" + ft.toString())) - { - tableCasting.addCastingRecipe(pattern, new FluidStack(TContent.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(pattern, new FluidStack(TContent.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); - tableCasting.addCastingRecipe(new ItemStack(ore.itemID, 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); - } - - } - - public void addAchievements () - { - HashMap achievements = TAchievements.achievements; - - achievements.put("tconstruct.beginner", new Achievement(2741, "tconstruct.beginner", 0, 0, manualBook, null).setIndependent().registerAchievement()); - achievements.put("tconstruct.pattern", new Achievement(2742, "tconstruct.pattern", 2, 1, blankPattern, achievements.get("tconstruct.beginner")).registerAchievement()); - achievements.put("tconstruct.tinkerer", new Achievement(2743, "tconstruct.tinkerer", 2, 2, new ItemStack(titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); - achievements.put("tconstruct.preparedFight", - new Achievement(2744, "tconstruct.preparedFight", 1, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); - achievements.put("tconstruct.proTinkerer", new Achievement(2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial() - .registerAchievement()); - achievements.put("tconstruct.smelteryMaker", new Achievement(2746, "tconstruct.smelteryMaker", -2, -1, smeltery, achievements.get("tconstruct.beginner")).registerAchievement()); - achievements.put("tconstruct.enemySlayer", - new Achievement(2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); - achievements.put("tconstruct.dualConvenience", new Achievement(2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")) - .setSpecial().registerAchievement()); - } -} diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index f8ec6605..8f930922 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -28,10 +28,10 @@ public class TProxyCommon implements IGuiHandler public static int smelteryGuiID = 7; public static int furnaceID = 8; -// public static int drawbridgeID = 9; // Moved to TMechworks + // public static int drawbridgeID = 9; // Moved to TMechworks public static int landmineID = 10; public static int craftingStationID = 11; -// public static int advDrawbridgeID = 12; // Moved to TMechworks + // public static int advDrawbridgeID = 12; // Moved to TMechworks public static int inventoryGui = 100; public static int armorGuiID = 101; public static int knapsackGuiID = 102; @@ -99,10 +99,10 @@ public class TProxyCommon implements IGuiHandler { // As of 1.6.x, this is now handled by Minecraft itself for the most part. - LanguageRegistry.addName(TContent.potionLauncher, "Potion Launcher"); - LanguageRegistry.addName(TContent.knapsack, "Knapsack"); + LanguageRegistry.addName(TRepo.potionLauncher, "Potion Launcher"); + LanguageRegistry.addName(TRepo.knapsack, "Knapsack"); - LanguageRegistry.addName(TContent.meatBlock, "Hambone"); + LanguageRegistry.addName(TRepo.meatBlock, "Hambone"); } public void readManuals () diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java new file mode 100644 index 00000000..5e594873 --- /dev/null +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -0,0 +1,187 @@ +package tconstruct.common; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +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 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.MultiServantLogic; +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.util.config.PHConstruct; +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.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(Item.bone), 'm', new ItemStack(Item.porkRaw)); + + 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"); + 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.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank"); + + GameRegistry.registerBlock(TRepo.searedBlock, SearedTableItemBlock.class, "SearedBlock"); + 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.slimePad, "slime.pad"); + TConstructRegistry.drawbridgeState[TRepo.slimePad.blockID] = 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 () + { + + } + +} diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java new file mode 100644 index 00000000..0c3b9643 --- /dev/null +++ b/src/main/java/tconstruct/common/TRepo.java @@ -0,0 +1,265 @@ +package tconstruct.common; + +import tconstruct.blocks.OreberryBush; +import tconstruct.blocks.slime.SlimeLeaves; +import tconstruct.blocks.slime.SlimeSapling; +import tconstruct.library.tools.ToolCore; +import tconstruct.modifiers.ModFlux; +import tconstruct.modifiers.ModLapis; +import net.minecraft.block.Block; +import net.minecraft.block.StepSound; +import net.minecraft.block.material.Material; +import net.minecraft.item.EnumArmorMaterial; +import net.minecraft.item.Item; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.fluids.Fluid; + +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 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 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 StepSound 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; + + //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 modF; + public static ModLapis modL; + + //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 EnumArmorMaterial materialWood; + + + public static Fluid[] fluids = new Fluid[27]; + public static Block[] fluidBlocks = new Block[26]; + + +} diff --git a/src/main/java/tconstruct/entity/BlueSlime.java b/src/main/java/tconstruct/entity/BlueSlime.java index d07ed596..def2e529 100644 --- a/src/main/java/tconstruct/entity/BlueSlime.java +++ b/src/main/java/tconstruct/entity/BlueSlime.java @@ -21,6 +21,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import tconstruct.TConstruct; import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; @@ -452,7 +453,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData this.entityDropItem(toolStack, 0f); if (rand.nextInt(5) == 0) { - ItemStack dropStack = new ItemStack(TContent.heartCanister, 1, 1); + ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1); this.entityDropItem(dropStack, 0f); } } @@ -520,7 +521,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData */ protected int getDropItemId () { - return TContent.strangeFood.itemID; + return TRepo.strangeFood.itemID; } /** diff --git a/src/main/java/tconstruct/items/CraftingItem.java b/src/main/java/tconstruct/items/CraftingItem.java index 52ca0ba8..68df2dce 100644 --- a/src/main/java/tconstruct/items/CraftingItem.java +++ b/src/main/java/tconstruct/items/CraftingItem.java @@ -1,6 +1,6 @@ package tconstruct.items; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -74,7 +74,7 @@ public class CraftingItem extends Item @Override public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(par1ItemStack.itemID == TContent.blankPattern.itemID){ + if(par1ItemStack.itemID == TRepo.blankPattern.itemID){ par3EntityPlayer.addStat(TAchievements.achievements.get("tconstruct.pattern"), 1); } } diff --git a/src/main/java/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/items/FilledBucket.java index 76b88b08..e129c68f 100644 --- a/src/main/java/tconstruct/items/FilledBucket.java +++ b/src/main/java/tconstruct/items/FilledBucket.java @@ -5,7 +5,7 @@ import java.util.List; import net.minecraftforge.fluids.BlockFluidFinite; import tconstruct.TConstruct; import tconstruct.blocks.logic.LiquidTextureLogic; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -27,7 +27,7 @@ public class FilledBucket extends ItemBucket public FilledBucket(int id) { super(id, 0); - //setTextureFile(TContent.craftingTexture); + //setTextureFile(TRepo.craftingTexture); //setIconIndex(224); setUnlocalizedName("tconstruct.bucket"); setContainerItem(Item.bucketEmpty); @@ -141,10 +141,10 @@ public class FilledBucket extends ItemBucket { try { int metadata = 0; - if (TContent.fluidBlocks[type] instanceof BlockFluidFinite) + if (TRepo.fluidBlocks[type] instanceof BlockFluidFinite) metadata = 7; - world.setBlock(clickX, clickY, clickZ, TContent.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids + world.setBlock(clickX, clickY, clickZ, TRepo.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids } catch (ArrayIndexOutOfBoundsException ex) { TConstruct.logger.warning("AIOBE occured when placing bucket into world; " + ex); return false; diff --git a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java index 3c3e038d..8b8ad724 100644 --- a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.util.StatCollector; import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; /** * @@ -58,25 +58,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, TContent.landmine.blockID, metadata, 3)) + if (!world.setBlock(x, y, z, TRepo.landmine.blockID, metadata, 3)) { return false; } - if (world.getBlockId(x, y, z) == TContent.landmine.blockID) + if (world.getBlockId(x, y, z) == TRepo.landmine.blockID) { - TContent.landmine.onBlockPlacedBy(world, x, y, z, player, stack); + TRepo.landmine.onBlockPlacedBy(world, x, y, z, player, stack); TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z); if (te == null) { - te = (TileEntityLandmine) TContent.landmine.createTileEntity(world, metadata); + te = (TileEntityLandmine) TRepo.landmine.createTileEntity(world, metadata); } te.triggerType = stack.getItemDamage(); world.setBlockTileEntity(x, y, z, te); - TContent.landmine.onPostBlockPlaced(world, x, y, z, metadata); + TRepo.landmine.onPostBlockPlaced(world, x, y, z, metadata); } return true; diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java index 4c874192..7f64b0f1 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java @@ -2,7 +2,7 @@ package tconstruct.items.blocks; import java.util.List; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -44,7 +44,7 @@ public class OreberryBushItem extends ItemBlock { Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerry) && world.isAirBlock(x, y + 1, z)) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && world.isAirBlock(x, y + 1, z)) { world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java index 690bcb61..40cc3b0c 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -2,7 +2,7 @@ package tconstruct.items.blocks; import java.util.List; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -48,7 +48,7 @@ public class OreberryBushSecondItem extends ItemBlock { Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerrySecond) && world.isAirBlock(x, y + 1, z)) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && world.isAirBlock(x, y + 1, z)) { world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) diff --git a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java index f0c36293..5a39e4e3 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,7 +28,7 @@ public class SlimeTallGrassItem extends ItemBlock public Icon getIconFromDamage (int meta) { int arr = MathHelper.clamp_int(meta, 0, blockType.length); - return TContent.slimeTallGrass.getIcon(0, arr); + return TRepo.slimeTallGrass.getIcon(0, arr); } public String getUnlocalizedName (ItemStack itemstack) diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 655e38ae..682877a5 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -3,7 +3,7 @@ package tconstruct.items.tools; import java.util.List; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; @@ -73,13 +73,13 @@ public class Arrow extends ToolCore @Override public Item getHeadItem () { - return TContent.arrowhead; + return TRepo.arrowhead; } @Override public Item getAccessoryItem () { - return TContent.fletching; + return TRepo.fletching; } @Override @@ -125,7 +125,7 @@ public class Arrow extends ToolCore if (tool == null) { - if (!TContent.supressMissingToolLogs) + if (!TRepo.supressMissingToolLogs) { TConstruct.logger.warning("Creative builder failed tool for Vanilla style" + this.getToolName()); TConstruct.logger.warning("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 5dc71435..70bea930 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; @@ -99,7 +99,7 @@ public class BattleSign extends Weapon @Override public Item getHeadItem () { - return TContent.signHead; + return TRepo.signHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index fe98e10a..43066a0e 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -58,25 +58,25 @@ public class Battleaxe extends HarvestTool @Override public Item getHeadItem () { - return TContent.broadAxeHead; + return TRepo.broadAxeHead; } @Override public Item getHandleItem () { - return TContent.toughRod; + return TRepo.toughRod; } @Override public Item getAccessoryItem () { - return TContent.broadAxeHead; + return TRepo.broadAxeHead; } @Override public Item getExtraItem () { - return TContent.toughBinding; + return TRepo.toughBinding; } @Override diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 31b2d1d3..17cfb58a 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.entity.projectile.ArrowEntity; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; @@ -63,7 +63,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(TContent.arrow.itemID, player.inventory); + int slotID = getInventorySlotContainItem(TRepo.arrow.itemID, player.inventory); int arrowID = getInventorySlotContainItem(Item.arrow.itemID, player.inventory); int arrowState = 0; ItemStack tinkerArrow = null; @@ -149,7 +149,7 @@ public abstract class BowBase extends ToolCore //if (tinkerArrow != null) if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) { - player.inventory.consumeInventoryItem(TContent.arrow.itemID); + player.inventory.consumeInventoryItem(TRepo.arrow.itemID); } else { @@ -215,7 +215,7 @@ public abstract class BowBase extends ToolCore return event.result; } - if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TContent.arrow.itemID)) + if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TRepo.arrow.itemID)) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } @@ -771,7 +771,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 (!TContent.supressMissingToolLogs) + if (!TRepo.supressMissingToolLogs) { TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); TConstruct.logger.warning("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 6e9baef0..aa848f14 100644 --- a/src/main/java/tconstruct/items/tools/Broadsword.java +++ b/src/main/java/tconstruct/items/tools/Broadsword.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; import net.minecraft.item.Item; @@ -15,13 +15,13 @@ public class Broadsword extends Weapon @Override public Item getHeadItem () { - return TContent.swordBlade; + return TRepo.swordBlade; } @Override public Item getAccessoryItem () { - return TContent.wideGuard; + return TRepo.wideGuard; } public float getDurabilityModifier () diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index b9c0b761..1223c849 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -1,7 +1,7 @@ package tconstruct.items.tools; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.crafting.Detailing.DetailInput; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; @@ -211,7 +211,7 @@ public class Chisel extends ToolCore @Override public Item getHeadItem () { - return TContent.chiselHead; + return TRepo.chiselHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index d0948202..71b78485 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.Weapon; import tconstruct.util.config.PHConstruct; @@ -25,25 +25,25 @@ public class Cleaver extends Weapon @Override public Item getHeadItem () { - return TContent.largeSwordBlade; + return TRepo.largeSwordBlade; } @Override public Item getHandleItem () { - return TContent.toughRod; + return TRepo.toughRod; } @Override public Item getAccessoryItem () { - return TContent.largePlate; + return TRepo.largePlate; } @Override public Item getExtraItem () { - return TContent.toughRod; + return TRepo.toughRod; } @Override diff --git a/src/main/java/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java index e053ec29..e57a500c 100644 --- a/src/main/java/tconstruct/items/tools/Cutlass.java +++ b/src/main/java/tconstruct/items/tools/Cutlass.java @@ -2,7 +2,7 @@ package tconstruct.items.tools; import java.util.List; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; import net.minecraft.creativetab.CreativeTabs; @@ -19,13 +19,13 @@ public class Cutlass extends Weapon @Override public Item getHeadItem () { - return TContent.swordBlade; + return TRepo.swordBlade; } @Override public Item getAccessoryItem () { - return TContent.fullGuard; + return TRepo.fullGuard; } @Override diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java index 960d344c..d839e0ff 100644 --- a/src/main/java/tconstruct/items/tools/Dagger.java +++ b/src/main/java/tconstruct/items/tools/Dagger.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.entity.projectile.DaggerEntity; import tconstruct.library.tools.Weapon; import net.minecraft.entity.player.EntityPlayer; @@ -97,12 +97,12 @@ public class Dagger extends Weapon @Override public Item getHeadItem () { - return TContent.knifeBlade; + return TRepo.knifeBlade; } @Override public Item getAccessoryItem () { - return TContent.crossbar; + return TRepo.crossbar; } } diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 1ccdfe72..4b5f90c0 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -42,25 +42,25 @@ public class Excavator extends HarvestTool @Override public Item getHeadItem () { - return TContent.excavatorHead; + return TRepo.excavatorHead; } @Override public Item getHandleItem () { - return TContent.toughRod; + return TRepo.toughRod; } @Override public Item getAccessoryItem () { - return TContent.largePlate; + return TRepo.largePlate; } @Override public Item getExtraItem () { - return TContent.toughBinding; + return TRepo.toughBinding; } @Override diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index b88fce17..9111c38c 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -3,7 +3,7 @@ package tconstruct.items.tools; import java.util.List; import tconstruct.blocks.logic.EquipLogic; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.Weapon; @@ -121,14 +121,14 @@ public class FryingPan extends Weapon { return false; } - else if (!TContent.heldItemBlock.canPlaceBlockAt(world, x, y, z)) + else if (!TRepo.heldItemBlock.canPlaceBlockAt(world, x, y, z)) { return false; } else { - world.setBlock(x, y, z, TContent.heldItemBlock.blockID, 0, 3); - TContent.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack); + world.setBlock(x, y, z, TRepo.heldItemBlock.blockID, 0, 3); + TRepo.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.getBlockTileEntity(x, y, z); @@ -143,7 +143,7 @@ public class FryingPan extends Weapon @Override public Item getHeadItem () { - return TContent.frypanHead; + return TRepo.frypanHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 61957ba8..18d0bc88 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -3,7 +3,7 @@ package tconstruct.items.tools; import java.util.ArrayList; import java.util.List; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; @@ -72,25 +72,25 @@ public class Hammer extends HarvestTool @Override public Item getHeadItem () { - return TContent.hammerHead; + return TRepo.hammerHead; } @Override public Item getHandleItem () { - return TContent.toughRod; + return TRepo.toughRod; } @Override public Item getAccessoryItem () { - return TContent.largePlate; + return TRepo.largePlate; } @Override public Item getExtraItem () { - return TContent.largePlate; + return TRepo.largePlate; } public float getDurabilityModifier () diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index abf57990..3072e5b9 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.HarvestTool; import tconstruct.util.config.PHConstruct; @@ -48,7 +48,7 @@ public class Hatchet extends HarvestTool @Override public Item getHeadItem () { - return TContent.hatchetHead; + return TRepo.hatchetHead; } @Override diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index cb01e5bb..9c13a0e3 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; @@ -102,13 +102,13 @@ public class Longsword extends Weapon @Override public Item getHeadItem () { - return TContent.swordBlade; + return TRepo.swordBlade; } @Override public Item getAccessoryItem () { - return TContent.handGuard; + return TRepo.handGuard; } @Override diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 6087ad2d..8e7a4446 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -323,25 +323,25 @@ public class LumberAxe extends HarvestTool @Override public Item getHeadItem () { - return TContent.broadAxeHead; + return TRepo.broadAxeHead; } @Override public Item getHandleItem () { - return TContent.toughRod; + return TRepo.toughRod; } @Override public Item getAccessoryItem () { - return TContent.largePlate; + return TRepo.largePlate; } @Override public Item getExtraItem () { - return TContent.toughBinding; + return TRepo.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 c6bb9513..08b03c34 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.DualHarvestTool; @@ -53,13 +53,13 @@ public class Mattock extends DualHarvestTool @Override public Item getHeadItem () { - return TContent.hatchetHead; + return TRepo.hatchetHead; } @Override public Item getAccessoryItem () { - return TContent.shovelHead; + return TRepo.shovelHead; } public int durabilityTypeAccessory () @@ -120,7 +120,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 (!TContent.supressMissingToolLogs) + if (!TRepo.supressMissingToolLogs) { TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName()); TConstruct.logger.warning("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 6388c83d..a685882e 100644 --- a/src/main/java/tconstruct/items/tools/Pickaxe.java +++ b/src/main/java/tconstruct/items/tools/Pickaxe.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -30,13 +30,13 @@ public class Pickaxe extends HarvestTool @Override public Item getHeadItem () { - return TContent.pickaxeHead; + return TRepo.pickaxeHead; } @Override public Item getAccessoryItem () { - return TContent.binding; + return TRepo.binding; } @Override diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index d33597a6..a0da0023 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -73,13 +73,13 @@ public class Rapier extends Weapon @Override public Item getHeadItem () { - return TContent.swordBlade; + return TRepo.swordBlade; } @Override public Item getAccessoryItem () { - return TContent.crossbar; + return TRepo.crossbar; } @Override diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 75619d91..3d18b071 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -2,7 +2,7 @@ package tconstruct.items.tools; import java.util.List; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -45,25 +45,25 @@ public class Scythe extends Weapon @Override public Item getHeadItem () { - return TContent.scytheBlade; + return TRepo.scytheBlade; } @Override public Item getHandleItem () { - return TContent.toughRod; + return TRepo.toughRod; } @Override public Item getAccessoryItem () { - return TContent.toughBinding; + return TRepo.toughBinding; } @Override public Item getExtraItem () { - return TContent.toughRod; + return TRepo.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 30462825..f6ba3c51 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -9,7 +9,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -54,19 +54,19 @@ public class Shortbow extends BowBase @Override public Item getHeadItem () { - return TContent.toolRod; + return TRepo.toolRod; } @Override public Item getHandleItem () { - return TContent.bowstring; + return TRepo.bowstring; } @Override public Item getAccessoryItem () { - return TContent.toolRod; + return TRepo.toolRod; } @Override diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index 78ebbc14..2e77fa67 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -1,6 +1,6 @@ package tconstruct.items.tools; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -32,7 +32,7 @@ public class Shovel extends HarvestTool @Override public Item getHeadItem () { - return TContent.shovelHead; + return TRepo.shovelHead; } @Override diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index 6bd6a857..ca878d67 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -2,66 +2,66 @@ package tconstruct.library.crafting; import net.minecraft.block.Block; import net.minecraftforge.fluids.*; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; public enum FluidType { /** Vanilla Water Smelting **/ Water(Block.snow.blockID, 0, 20, FluidRegistry.getFluid("water"), false), /** Iron Smelting **/ - Iron(Block.blockIron.blockID, 0, 600, TContent.moltenIronFluid, true), + Iron(Block.blockIron.blockID, 0, 600, TRepo.moltenIronFluid, true), /** Gold Smelting **/ - Gold(Block.blockGold.blockID, 0, 400, TContent.moltenGoldFluid, false), + Gold(Block.blockGold.blockID, 0, 400, TRepo.moltenGoldFluid, false), /** Tin Smelting **/ - Tin(TContent.metalBlock.blockID, 5, 400, TContent.moltenTinFluid, false), + Tin(TRepo.metalBlock.blockID, 5, 400, TRepo.moltenTinFluid, false), /** Copper Smelting **/ - Copper(TContent.metalBlock.blockID, 3, 550, TContent.moltenCopperFluid, true), + Copper(TRepo.metalBlock.blockID, 3, 550, TRepo.moltenCopperFluid, true), /** Aluminum Smelting **/ - Aluminum(TContent.metalBlock.blockID, 6, 350, TContent.moltenAluminumFluid, false), + Aluminum(TRepo.metalBlock.blockID, 6, 350, TRepo.moltenAluminumFluid, false), /** Natural Aluminum Smelting **/ - NaturalAluminum(TContent.oreSlag.blockID, 6, 350, TContent.moltenAluminumFluid, false), + NaturalAluminum(TRepo.oreSlag.blockID, 6, 350, TRepo.moltenAluminumFluid, false), /** Cobalt Smelting **/ - Cobalt(TContent.metalBlock.blockID, 0, 650, TContent.moltenCobaltFluid, true), + Cobalt(TRepo.metalBlock.blockID, 0, 650, TRepo.moltenCobaltFluid, true), /** Ardite Smelting **/ - Ardite(TContent.metalBlock.blockID, 1, 650, TContent.moltenArditeFluid, true), + Ardite(TRepo.metalBlock.blockID, 1, 650, TRepo.moltenArditeFluid, true), /** AluminumBrass Smelting **/ - AluminumBrass(TContent.metalBlock.blockID, 7, 350, TContent.moltenAlubrassFluid, false), + AluminumBrass(TRepo.metalBlock.blockID, 7, 350, TRepo.moltenAlubrassFluid, false), /** Alumite Smelting **/ - Alumite(TContent.metalBlock.blockID, 8, 800, TContent.moltenAlumiteFluid, true), + Alumite(TRepo.metalBlock.blockID, 8, 800, TRepo.moltenAlumiteFluid, true), /** Manyullyn Smelting **/ - Manyullyn(TContent.metalBlock.blockID, 2, 750, TContent.moltenManyullynFluid, true), + Manyullyn(TRepo.metalBlock.blockID, 2, 750, TRepo.moltenManyullynFluid, true), /** Bronze Smelting **/ - Bronze(TContent.metalBlock.blockID, 4, 500, TContent.moltenBronzeFluid, true), + Bronze(TRepo.metalBlock.blockID, 4, 500, TRepo.moltenBronzeFluid, true), /** Steel Smelting **/ - Steel(TContent.metalBlock.blockID, 9, 700, TContent.moltenSteelFluid, true), + Steel(TRepo.metalBlock.blockID, 9, 700, TRepo.moltenSteelFluid, true), /** Nickel Smelting **/ - Nickel(TContent.metalBlock.blockID, 0, 400, TContent.moltenNickelFluid, false), + Nickel(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenNickelFluid, false), /** Lead Smelting **/ - Lead(TContent.metalBlock.blockID, 0, 400, TContent.moltenLeadFluid, false), + Lead(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenLeadFluid, false), /** Silver Smelting **/ - Silver(TContent.metalBlock.blockID, 0, 400, TContent.moltenSilverFluid, false), + Silver(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenSilverFluid, false), /** Platinum Smelting **/ - Platinum(TContent.metalBlock.blockID, 0, 400, TContent.moltenShinyFluid, false), + Platinum(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenShinyFluid, false), /** Invar Smelting **/ - Invar(TContent.metalBlock.blockID, 0, 400, TContent.moltenInvarFluid, false), + Invar(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenInvarFluid, false), /** Electrum Smelting **/ - Electrum(TContent.metalBlock.blockID, 0, 400, TContent.moltenElectrumFluid, false), + Electrum(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenElectrumFluid, false), /** Obsidian Smelting **/ - Obsidian(Block.obsidian.blockID, 0, 750, TContent.moltenObsidianFluid, true), + Obsidian(Block.obsidian.blockID, 0, 750, TRepo.moltenObsidianFluid, true), /** Ender Smelting **/ - Ender(TContent.metalBlock.blockID, 10, 500, TContent.moltenEnderFluid, false), + Ender(TRepo.metalBlock.blockID, 10, 500, TRepo.moltenEnderFluid, false), /** Glass Smelting **/ - Glass(Block.sand.blockID, 0, 625, TContent.moltenGlassFluid, false), + Glass(Block.sand.blockID, 0, 625, TRepo.moltenGlassFluid, false), /** Stone Smelting **/ - Stone(Block.stone.blockID, 0, 800, TContent.moltenStoneFluid, true), + Stone(Block.stone.blockID, 0, 800, TRepo.moltenStoneFluid, true), /** Emerald Smelting **/ - Emerald(Block.oreEmerald.blockID, 0, 575, TContent.moltenEmeraldFluid, false), + Emerald(Block.oreEmerald.blockID, 0, 575, TRepo.moltenEmeraldFluid, false), /** Slime Smelting **/ - Slime(TContent.slimeGel.blockID, 0, 250, TContent.blueSlimeFluid, false), + Slime(TRepo.slimeGel.blockID, 0, 250, TRepo.blueSlimeFluid, false), /** Pigiron Smelting **/ - PigIron(TContent.meatBlock.blockID, 0, 610, TContent.pigIronFluid, true), + PigIron(TRepo.meatBlock.blockID, 0, 610, TRepo.pigIronFluid, true), /** Glue Smelting **/ - Glue(TContent.glueBlock.blockID, 0, 125, TContent.glueFluid, false); + Glue(TRepo.glueBlock.blockID, 0, 125, TRepo.glueFluid, false); public final int renderBlockID; public final int renderMeta; diff --git a/src/main/java/tconstruct/modifiers/TActiveOmniMod.java b/src/main/java/tconstruct/modifiers/TActiveOmniMod.java index 798ad874..9ccba19b 100644 --- a/src/main/java/tconstruct/modifiers/TActiveOmniMod.java +++ b/src/main/java/tconstruct/modifiers/TActiveOmniMod.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.ActiveToolMod; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; @@ -55,7 +55,7 @@ public class TActiveOmniMod extends ActiveToolMod { if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) return false; - TContent.modL.midStreamModify(stack, tool); + TRepo.modL.midStreamModify(stack, tool); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = entity.worldObj; @@ -151,7 +151,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) { - TContent.modL.midStreamModify(stack, tool); + TRepo.modL.midStreamModify(stack, tool); return 0; } @@ -164,7 +164,7 @@ public class TActiveOmniMod extends ActiveToolMod EnumCreatureAttribute attribute = ((EntityLivingBase) entity).getCreatureAttribute(); if (attribute == EnumCreatureAttribute.UNDEAD) { - if (tool == TContent.hammer) + if (tool == TRepo.hammer) { int level = 2; bonus += random.nextInt(level * 2 + 1) + level * 2; @@ -203,7 +203,7 @@ public class TActiveOmniMod extends ActiveToolMod public boolean doesCriticalHit (ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { - if (tool == TContent.cutlass && random.nextInt(10) == 0) + if (tool == TRepo.cutlass && random.nextInt(10) == 0) return true; return false; } diff --git a/src/main/java/tconstruct/util/TCraftingHandler.java b/src/main/java/tconstruct/util/TCraftingHandler.java index a632d75a..4bdc5037 100644 --- a/src/main/java/tconstruct/util/TCraftingHandler.java +++ b/src/main/java/tconstruct/util/TCraftingHandler.java @@ -3,7 +3,7 @@ package tconstruct.util; import tconstruct.achievements.TAchievements; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; import tconstruct.util.player.TPlayerStats; import net.minecraft.entity.player.EntityPlayer; @@ -21,7 +21,7 @@ public class TCraftingHandler implements ICraftingHandler int itemID = item.getItem().itemID; if (!player.worldObj.isRemote) { - if (itemID == TContent.toolStationWood.blockID) + if (itemID == TRepo.toolStationWood.blockID) { TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct"); @@ -29,10 +29,10 @@ public class TCraftingHandler implements ICraftingHandler { stats.materialManual = true; tags.setBoolean("materialManual", true); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.manualBook, 1, 1)); + AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.manualBook, 1, 1)); } } - if (itemID == TContent.smeltery.blockID || itemID == TContent.lavaTank.blockID) + if (itemID == TRepo.smeltery.blockID || itemID == TRepo.lavaTank.blockID) { TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct"); @@ -40,7 +40,7 @@ public class TCraftingHandler implements ICraftingHandler { stats.smelteryManual = true; tags.setBoolean("smelteryManual", true); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.manualBook, 1, 2)); + AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.manualBook, 1, 2)); } player.addStat(TAchievements.achievements.get("tconstruct.smelteryMaker"), 1); } diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 272f438f..67d50b24 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -44,7 +44,7 @@ import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; import tconstruct.blocks.LiquidMetalFinite; import tconstruct.blocks.TankAirBlock; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.items.tools.FryingPan; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; @@ -70,7 +70,7 @@ public class TEventHandler public void craftTool (ToolCraftEvent.NormalTool event) { NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool"); - if (PHConstruct.denyMattock && event.tool == TContent.mattock) + if (PHConstruct.denyMattock && event.tool == TRepo.mattock) { int head = toolTag.getInteger("Head"); int handle = toolTag.getInteger("Handle"); @@ -106,7 +106,7 @@ public class TEventHandler toolTag.setInteger("Modifiers", modifiers); } - if (event.tool == TContent.shortbow) + if (event.tool == TRepo.shortbow) { BowMaterial top = TConstructRegistry.getBowMaterial(toolTag.getInteger("Head")); BowMaterial bottom = TConstructRegistry.getBowMaterial(toolTag.getInteger("Accessory")); @@ -134,7 +134,7 @@ public class TEventHandler } } - if (event.tool == TContent.arrow) + if (event.tool == TRepo.arrow) { ArrowMaterial head = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Head")); ArrowMaterial shaft = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Handle")); @@ -172,7 +172,7 @@ public class TEventHandler @ForgeSubscribe public void craftPart (PartBuilderEvent.NormalPart event) { - if (event.pattern.getItem() == TContent.woodPattern && event.pattern.getItemDamage() == 23) + if (event.pattern.getItem() == TRepo.woodPattern && event.pattern.getItemDamage() == 23) { ItemStack result = craftBowString(event.material); if (result != null) @@ -181,7 +181,7 @@ public class TEventHandler } } - if (event.pattern.getItem() == TContent.woodPattern && event.pattern.getItemDamage() == 24) + if (event.pattern.getItem() == TRepo.woodPattern && event.pattern.getItemDamage() == 24) { ItemStack result = craftFletching(event.material); if (result != null) @@ -239,7 +239,7 @@ public class TEventHandler EntityPlayer player = (EntityPlayer) event.entityLiving; //Cutlass ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.getItem() == TContent.cutlass && player.isUsingItem()) + if (stack != null && stack.getItem() == TRepo.cutlass && player.isUsingItem()) { player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 3 * 20, 1)); } @@ -277,7 +277,7 @@ public class TEventHandler if (random.nextInt(500) == 0 && event.entityLiving instanceof IMob && event.entityLiving.dimension == 0) { - ItemStack dropStack = new ItemStack(TContent.heartCanister, 1, 1); + ItemStack dropStack = new ItemStack(TRepo.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); @@ -285,7 +285,7 @@ public class TEventHandler if (event.entityLiving instanceof EntityWither && random.nextInt(5) == 0) { - ItemStack dropStack = new ItemStack(TContent.heartCanister, 1, 1); + ItemStack dropStack = new ItemStack(TRepo.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); @@ -329,7 +329,7 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TContent.cleaver) + if (stack.getItem() == TRepo.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 10) { @@ -339,7 +339,7 @@ public class TEventHandler } if (enemy.getSkeletonType() == 1 && random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0) { - addDrops(event, new ItemStack(TContent.materials, 1, 8)); + addDrops(event, new ItemStack(TRepo.materials, 1, 8)); } } @@ -355,14 +355,14 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TContent.cleaver) + if (stack.getItem() == TRepo.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 10) { addDrops(event, new ItemStack(Item.skull.itemID, 1, 2)); } } - /*if (stack.getItem() == TContent.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading + /*if (stack.getItem() == TRepo.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading { addDrops(event, new ItemStack(Item.skull.itemID, 1, 2)); }*/ @@ -380,7 +380,7 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TContent.cleaver) + if (stack.getItem() == TRepo.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 5) { @@ -429,7 +429,7 @@ public class TEventHandler if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TContent.cleaver) + if (stack.getItem() == TRepo.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 50) { @@ -520,9 +520,9 @@ public class TEventHandler { if (!event.world.isRemote) { - if (event.ID == TContent.slimeSapling.blockID) + if (event.ID == TRepo.slimeSapling.blockID) { - if (TContent.slimeSapling.boneFertilize(event.world, event.X, event.Y, event.Z, event.world.rand, event.entityPlayer)) + if (TRepo.slimeSapling.boneFertilize(event.world, event.X, event.Y, event.Z, event.world.rand, event.entityPlayer)) event.setResult(Event.Result.ALLOW); } } @@ -559,9 +559,9 @@ public class TEventHandler } int bID = evt.world.getBlockId(hitX, hitY, hitZ); - for (int id = 0; id < TContent.fluidBlocks.length; id++) + for (int id = 0; id < TRepo.fluidBlocks.length; id++) { - if (bID == TContent.fluidBlocks[id].blockID) + if (bID == TRepo.fluidBlocks[id].blockID) { if (evt.entityPlayer.capabilities.isCreativeMode) { @@ -569,7 +569,7 @@ public class TEventHandler } else { - if (TContent.fluidBlocks[id] instanceof LiquidMetalFinite) + if (TRepo.fluidBlocks[id] instanceof LiquidMetalFinite) { evt.world.setBlockToAir(hitX, hitY, hitZ); /*int quanta = 0; @@ -614,7 +614,7 @@ public class TEventHandler } evt.setResult(Result.ALLOW); - evt.result = new ItemStack(TContent.buckets, 1, id); + evt.result = new ItemStack(TRepo.buckets, 1, id); } } } diff --git a/src/main/java/tconstruct/util/config/AEImcHandler.java b/src/main/java/tconstruct/util/config/AEImcHandler.java deleted file mode 100644 index c0424667..00000000 --- a/src/main/java/tconstruct/util/config/AEImcHandler.java +++ /dev/null @@ -1,22 +0,0 @@ -package tconstruct.util.config; - -import java.util.Arrays; -import java.util.List; - -import cpw.mods.fml.common.event.FMLInterModComms; - -public class AEImcHandler -{ - private static List spatialIOLogics = Arrays.asList("AdaptiveSmelteryLogic", "AdvancedDrawbridgeLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", "CastingTableLogic", - "CraftingStationLogic", "DrawbridgeLogic", "DryingRackLogic", "EssenceExtractorLogic", "FaucetLogic", "FirestarterLogic", "FrypanLogic", "GolemPedestalLogic", "LavaTankLogic", - "PartBuilderLogic", "PatternChestLogic", "RedwireLogic", "SmelteryDrainLogic", "SmelteryLogic", "StencilTableLogic", "TankAirLogic", "TileEntityLandmine", "ToolForgeLogic", - "ToolStationLogic", "TowerFurnaceLogic", "MultiServantLogic"); - - public static void registerForSpatialIO () - { - for (String s : spatialIOLogics) - { - FMLInterModComms.sendMessage("AppliedEnergistics", "movabletile", "tconstruct.blocks.logic." + s); - } - } -} diff --git a/src/main/java/tconstruct/util/config/BCImcHandler.java b/src/main/java/tconstruct/util/config/BCImcHandler.java deleted file mode 100644 index 978852a1..00000000 --- a/src/main/java/tconstruct/util/config/BCImcHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package tconstruct.util.config; - -import cpw.mods.fml.common.event.FMLInterModComms; -import tconstruct.common.TContent; - -public class BCImcHandler -{ - public static void registerFacades () - { - // Smeltery Blocks - addFacade(TContent.smeltery.blockID, 2); - for (int sc = 4; sc < 11; sc++) - { - addFacade(TContent.smeltery.blockID, sc); - } - // Multi Brick + Fancy - for (int sc = 0; sc < 13; sc++) - { - addFacade(TContent.multiBrick.blockID, sc); - } - for (int sc = 0; sc < 16; sc++) - { - addFacade(TContent.multiBrickFancy.blockID, sc); - } - // Special Soil - for (int sc = 0; sc < 6; sc++) - { - addFacade(TContent.craftedSoil.blockID, sc); - } - // Metal Storage - for (int sc = 0; sc < 11; sc++) - { - addFacade(TContent.metalBlock.blockID, sc); - } - // Speed Block - for (int sc = 0; sc < 7; sc++) - { - addFacade(TContent.speedBlock.blockID, sc); - } - // Hambone - addFacade(TContent.meatBlock.blockID, 4); - addFacade(TContent.meatBlock.blockID, 8); - - // Slime Gel - addFacade(TContent.slimeGel.blockID, 0); - addFacade(TContent.slimeGel.blockID, 1); - } - - private static void addFacade (int blockId, int meta) - { - FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", String.format("%d@%d", blockId, meta)); - } -} diff --git a/src/main/java/tconstruct/util/config/MystImcHandler.java b/src/main/java/tconstruct/util/config/MystImcHandler.java deleted file mode 100644 index bcaef50a..00000000 --- a/src/main/java/tconstruct/util/config/MystImcHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -package tconstruct.util.config; - -import java.util.ArrayList; - -import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.event.FMLInterModComms; -import net.minecraft.nbt.NBTTagCompound; -import tconstruct.common.TContent; - -public class MystImcHandler -{ - private static String[] FluidBlackList = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten", - "moltenArdite", "ender", "steel.molten", "platinum.molten" };// = new String[](); - private static ArrayList additionalFluids = new ArrayList(); - - public static void addFluidToBlacklist (String fluidName) - { - additionalFluids.add(fluidName); - } - - public static void blacklistFluids () - { - for (String nm : additionalFluids) - { - // check if exists?? - SendFluidIMCBLMsg(nm); - } - for (String nm : FluidBlackList) - { - // check if exists?? - SendFluidIMCBLMsg(nm); - } - } - - public static void SendFluidIMCBLMsg (String FluidName) - { - NBTTagCompound NBTMsg = new NBTTagCompound(); - NBTMsg.setCompoundTag("fluidsymbol", new NBTTagCompound()); - NBTMsg.getCompoundTag("fluidsymbol").setFloat("rarity", 0.0F); - NBTMsg.getCompoundTag("fluidsymbol").setFloat("grammarweight", 0.0F); - NBTMsg.getCompoundTag("fluidsymbol").setFloat("instabilityPerBlock", 10000F);// renders creative symbol useless - NBTMsg.getCompoundTag("fluidsymbol").setString("fluidname", FluidName); - FMLInterModComms.sendMessage("Mystcraft", "fluidsymbol", NBTMsg); - } - -} diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java index 25fc848a..1abaa727 100644 --- a/src/main/java/tconstruct/util/player/ArmorExtended.java +++ b/src/main/java/tconstruct/util/player/ArmorExtended.java @@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.MathHelper; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; @@ -128,7 +128,7 @@ public class ArmorExtended implements IInventory /*public void recalculateSkills(EntityPlayer player, TPlayerStats stats) { - if (inventory[1] != null && inventory[1].getItem() == TContent.glove) + if (inventory[1] != null && inventory[1].getItem() == TRepo.glove) { if (stats.skillList.size() < 1) { @@ -155,7 +155,7 @@ public class ArmorExtended implements IInventory { Side side = FMLCommonHandler.instance().getEffectiveSide(); - if (inventory[6] != null && inventory[6].getItem() == TContent.heartCanister) + if (inventory[6] != null && inventory[6].getItem() == TRepo.heartCanister) { ItemStack stack = inventory[6]; int meta = stack.getItemDamage(); diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index 54cff819..fc919758 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -17,7 +17,7 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraftforge.event.ForgeSubscribe; 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.util.config.PHConstruct; import cpw.mods.fml.common.FMLCommonHandler; @@ -67,7 +67,7 @@ public class TPlayerHandler implements IPlayerTracker tags.getCompoundTag("TConstruct").setBoolean("beginnerManual", true); if (PHConstruct.beginnerBook) { - ItemStack diary = new ItemStack(TContent.manualBook); + ItemStack diary = new ItemStack(TRepo.manualBook); if (!entityplayer.inventory.addItemStackToInventory(diary)) { AbilityHelper.spawnItemAtPlayer(entityplayer, diary); @@ -76,7 +76,7 @@ public class TPlayerHandler implements IPlayerTracker if (entityplayer.username.toLowerCase().equals("fudgy_fetus")) { - ItemStack pattern = new ItemStack(TContent.woodPattern, 1, 22); + ItemStack pattern = new ItemStack(TRepo.woodPattern, 1, 22); NBTTagCompound compound = new NBTTagCompound(); compound.setCompoundTag("display", new NBTTagCompound()); diff --git a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java index 82f51a5c..050239cb 100644 --- a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java @@ -11,7 +11,7 @@ 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.TContent; +import tconstruct.common.TRepo; import tconstruct.util.config.DimensionBlacklist; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.common.IWorldGenerator; @@ -22,8 +22,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator private int gelMeta; int randomness = 2; Random random = new Random(); - int baseID = TContent.craftedSoil.blockID;//Block.dirt.blockID; - int topID = TContent.slimeGrass.blockID; + int baseID = TRepo.craftedSoil.blockID;//Block.dirt.blockID; + int topID = TRepo.slimeGrass.blockID; SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0); public SlimeIslandGen(int id, int meta) @@ -145,7 +145,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { generateSlimePool(world, rand, xChunk + xRange / 2, yCenter + initialHeight, zChunk + zRange / 2); } - PlantGen tallGrass = new PlantGen(TContent.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false); + PlantGen tallGrass = new PlantGen(TRepo.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false); tallGrass.generate(world, rand, xChunk, yCenter + initialHeight + 1, zChunk); for (int i = 0; i < 3; i++) { @@ -287,7 +287,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlockMaterial(x + xPos, y + yPos, z + zPos).isSolid() && world.getBlockMaterial(x + xPos, y + yPos + 1, z + zPos) != Material.water) { - world.setBlock(x + xPos, y + yPos, z + zPos, TContent.slimeGel.blockID, gelMeta, 2); + world.setBlock(x + xPos, y + yPos, z + zPos, TRepo.slimeGel.blockID, gelMeta, 2); } } } diff --git a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java index c2fc4b1e..0a63b574 100644 --- a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.ForgeDirection; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; public class SlimeTreeGen extends WorldGenerator { @@ -42,7 +42,7 @@ public class SlimeTreeGen extends WorldGenerator if (yPos >= 1 && yPos + height + 1 <= 256) { Block soil = Block.blocksList[world.getBlockId(xPos, yPos - 1, zPos)]; - boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TContent.slimeSapling)); + boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TRepo.slimeSapling)); if (isSoil) { @@ -75,7 +75,7 @@ public class SlimeTreeGen extends WorldGenerator { int blockID = world.getBlockId(x + xPos, y + yPos, z + zPos); Block block = Block.blocksList[blockID]; - if (block != null && blockID != TContent.slimeSapling.blockID && !block.isLeaves(world, x + xPos, y + yPos, z + zPos)) + if (block != null && blockID != TRepo.slimeSapling.blockID && !block.isLeaves(world, x + xPos, y + yPos, z + zPos)) return false; } } @@ -90,7 +90,7 @@ public class SlimeTreeGen extends WorldGenerator do { int heightID = world.getBlockId(x, height, z); - if ((heightID == TContent.craftedSoil.blockID || heightID == TContent.slimeGrass.blockID) && !Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)]) + if ((heightID == TRepo.craftedSoil.blockID || heightID == TRepo.slimeGrass.blockID) && !Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)]) { ret = height + 1; break; @@ -117,23 +117,23 @@ public class SlimeTreeGen extends WorldGenerator this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos - 1, 0, 0); //Drippers - this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); } void placeDiamondLayer (World world, int xPos, int yPos, int zPos, int range) @@ -144,7 +144,7 @@ public class SlimeTreeGen extends WorldGenerator { if (Math.abs(x) + Math.abs(z) <= range) { - this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TContent.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); } } } @@ -160,7 +160,7 @@ public class SlimeTreeGen extends WorldGenerator if (blockID == 0 || block == null || block.isLeaves(world, xPos, yPos + localHeight, zPos)) { - this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TContent.slimeGel.blockID, this.metaWood); + this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TRepo.slimeGel.blockID, this.metaWood); } } } diff --git a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java b/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java index b6ff9a54..14eb4f48 100644 --- a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java @@ -8,7 +8,7 @@ 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.TContent; +import tconstruct.common.TRepo; import tconstruct.util.config.PHConstruct; import cpw.mods.fml.common.IWorldGenerator; @@ -16,19 +16,19 @@ public class TBaseWorldGenerator implements IWorldGenerator { public TBaseWorldGenerator() { - copper = new WorldGenMinable(TContent.oreSlag.blockID, 3, 8, Block.stone.blockID); - tin = new WorldGenMinable(TContent.oreSlag.blockID, 4, 8, Block.stone.blockID); - aluminum = new WorldGenMinable(TContent.oreSlag.blockID, 5, 6, Block.stone.blockID); + copper = new WorldGenMinable(TRepo.oreSlag.blockID, 3, 8, Block.stone.blockID); + tin = new WorldGenMinable(TRepo.oreSlag.blockID, 4, 8, Block.stone.blockID); + aluminum = new WorldGenMinable(TRepo.oreSlag.blockID, 5, 6, Block.stone.blockID); - cobalt = new WorldGenMinable(TContent.oreSlag.blockID, 1, 3, Block.netherrack.blockID); - ardite = new WorldGenMinable(TContent.oreSlag.blockID, 2, 3, Block.netherrack.blockID); + cobalt = new WorldGenMinable(TRepo.oreSlag.blockID, 1, 3, Block.netherrack.blockID); + ardite = new WorldGenMinable(TRepo.oreSlag.blockID, 2, 3, Block.netherrack.blockID); - ironBush = new OreberryBushGen(TContent.oreBerry.blockID, 12, 12); - goldBush = new OreberryBushGen(TContent.oreBerry.blockID, 13, 6); - copperBush = new OreberryBushGen(TContent.oreBerry.blockID, 14, 12); - tinBush = new OreberryBushGen(TContent.oreBerry.blockID, 15, 12); - aluminumBush = new OreberryBushGen(TContent.oreBerrySecond.blockID, 12, 14); - silverBush = new OreberryBushGen(TContent.oreBerrySecond.blockID, 13, 8); + ironBush = new OreberryBushGen(TRepo.oreBerry.blockID, 12, 12); + goldBush = new OreberryBushGen(TRepo.oreBerry.blockID, 13, 6); + copperBush = new OreberryBushGen(TRepo.oreBerry.blockID, 14, 12); + tinBush = new OreberryBushGen(TRepo.oreBerry.blockID, 15, 12); + aluminumBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 12, 14); + silverBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 13, 8); } @Override diff --git a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java b/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java index 4ec1f400..2c987540 100644 --- a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java @@ -6,7 +6,7 @@ import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.Ev import java.util.Random; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.util.config.PHConstruct; import net.minecraft.world.World; @@ -19,12 +19,12 @@ import com.google.common.collect.ImmutableList; public class TerrainGenEventHandler { - private final SurfaceOreGen ironSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 0, 12, true); - private final SurfaceOreGen goldSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 1, 20, true); - private final SurfaceOreGen copperSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 2, 12, true); - private final SurfaceOreGen tinSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 3, 12, true); - private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 4, 12, true); - private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 5, 30, true); + private final SurfaceOreGen ironSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 0, 12, true); + private final SurfaceOreGen goldSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 1, 20, true); + private final SurfaceOreGen copperSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 2, 12, true); + private final SurfaceOreGen tinSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 3, 12, true); + private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 4, 12, true); + private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 5, 30, true); private static ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList.of(extremeHills, extremeHillsEdge); diff --git a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java index 714207e6..47a30b41 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Random; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import net.minecraft.block.Block; import net.minecraft.world.World; @@ -64,13 +64,13 @@ public class ComponentSmeltery extends ComponentVillage this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 0, 5, Block.stoneBrick.blockID, Block.stoneBrick.blockID, false); this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, 0, 0, false); - this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TContent.smeltery.blockID, 2, TContent.smeltery.blockID, 2, false); //Basin + this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TRepo.smeltery.blockID, 2, TRepo.smeltery.blockID, 2, false); //Basin this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, 0, 0, false); - this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 0, 1, 1, 2, sbb); - this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 2, 1, 1, 4, sbb); - this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 0, 7, 1, 2, sbb); - this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 2, 7, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 0, 1, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 2, 1, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 0, 7, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 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/worldgen/village/ComponentToolWorkshop.java index d4f53c54..6ee73441 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Random; import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import net.minecraft.block.Block; import net.minecraft.util.WeightedRandomChestContent; @@ -121,16 +121,16 @@ public class ComponentToolWorkshop extends ComponentVillage this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 3, 5, sbb); this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 4, 5, sbb); - this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 0, 1, 1, 1, sbb); //Inside - this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TContent.tinkerHousePatterns.getItems(random), TContent.tinkerHousePatterns.getCount(random)); - //this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 5, 1, 1, 2, sbb); - this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 1, 1, 1, 3, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 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, TRepo.toolStationWood.blockID, 5, 1, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 1, 1, 1, 3, sbb); this.placeBlockAtCurrentPosition(world, Block.workbench.blockID, 0, 1, 1, 4, sbb); - this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 10, 1, 1, 5, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 10, 1, 1, 5, sbb); //ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse"); - this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TContent.tinkerHouseChest.getItems(random), TContent.tinkerHouseChest.getCount(random)); + this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random)); //this.placeBlockAtCurrentPosition(world, Block.chest.blockID, i, 4, 1, 5, sbb); i = this.getMetadataWithOffset(Block.pistonBase.blockID, 3); this.placeBlockAtCurrentPosition(world, Block.pistonBase.blockID, i, 5, 1, 5, sbb); @@ -157,7 +157,7 @@ public class ComponentToolWorkshop extends ComponentVillage if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Block.chest.blockID) { - world.setBlock(posX, posY, posZ, TContent.toolStationWood.blockID, 5, 2); + world.setBlock(posX, posY, posZ, TRepo.toolStationWood.blockID, 5, 2); PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(posX, posY, posZ); if (logic != null) diff --git a/src/main/java/tconstruct/worldgen/village/TVillageTrades.java b/src/main/java/tconstruct/worldgen/village/TVillageTrades.java index d76e2a2f..721eb0f2 100644 --- a/src/main/java/tconstruct/worldgen/village/TVillageTrades.java +++ b/src/main/java/tconstruct/worldgen/village/TVillageTrades.java @@ -9,7 +9,7 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; public class TVillageTrades implements IVillageTradeHandler @@ -28,18 +28,18 @@ public class TVillageTrades implements IVillageTradeHandler allowedIngredients.add(new ItemStack(Block.pistonStickyBase, 64)); // tconstruct blocks - allowedIngredients.add(new ItemStack(TContent.barricadeBirch, 64)); - allowedIngredients.add(new ItemStack(TContent.barricadeJungle, 64)); - allowedIngredients.add(new ItemStack(TContent.barricadeOak, 64)); - allowedIngredients.add(new ItemStack(TContent.barricadeSpruce, 64)); - allowedIngredients.add(new ItemStack(TContent.punji, 64)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 0)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 1)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 5)); - allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 10)); + 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)); for (int sc = 0; sc < 4; sc++) { - allowedIngredients.add(new ItemStack(TContent.landmine, 64, sc)); + allowedIngredients.add(new ItemStack(TRepo.landmine, 64, sc)); } } @@ -65,14 +65,14 @@ public class TVillageTrades implements IVillageTradeHandler { ingredient2 = null; } - result = new ItemStack(TContent.oreBerry, calcStackSize(ingredient, ingredient2), sc); + result = new ItemStack(TRepo.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(TContent.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc); + result = new ItemStack(TRepo.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc); recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); } }