diff --git a/build.properties b/build.properties index 9346d00a..e72d22b4 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.6.4 forge_version=9.11.1.964 -mantle_version=caa5f6 +mantle_version=05fabd FMP_version=1.0.0.211 CCLIB_version=1.0.0.44 NEI_version=1.6.1.8 diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 4c3bf679..20038525 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -1,12 +1,19 @@ 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 mantle.client.MProxyClient; +import mantle.client.gui.GuiManual; +import mantle.lib.client.MantleClientRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -23,8 +30,10 @@ 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.*; @@ -293,124 +302,123 @@ public class TProxyClient extends TProxyCommon public void initManualIcons () { - 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 + MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TRepo.manualBook, 1, 2)); + MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TRepo.smeltery)); + MantleClientRegistry.registerManualIcon("blankcast", new ItemStack(TRepo.blankPattern, 1, 1)); + MantleClientRegistry.registerManualIcon("castingtable", new ItemStack(TRepo.searedBlock)); + // MantleClientRegistry.registerManualIcon("liquidiron", new // 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)); + MantleClientRegistry.registerManualIcon("lavatank", new ItemStack(TRepo.lavaTank)); + MantleClientRegistry.registerManualIcon("searedbrick", new ItemStack(TRepo.smeltery, 1, 2)); + MantleClientRegistry.registerManualIcon("drain", new ItemStack(TRepo.smeltery, 1, 1)); + MantleClientRegistry.registerManualIcon("faucet", new ItemStack(TRepo.searedBlock, 1, 1)); + MantleClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TRepo.materials, 1, 13)); + MantleClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TRepo.materials, 1, 14)); + MantleClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TRepo.materials, 1, 5)); + MantleClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TRepo.materials, 1, 15)); + MantleClientRegistry.registerManualIcon("blankpattern", new ItemStack(TRepo.blankPattern, 1, 0)); + MantleClientRegistry.registerManualIcon("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0)); + MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1)); + MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5)); + MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10)); + MantleClientRegistry.registerManualIcon("torch", new ItemStack(Block.torchWood)); + MantleClientRegistry.registerManualIcon("sapling", new ItemStack(Block.sapling)); + MantleClientRegistry.registerManualIcon("workbench", new ItemStack(Block.workbench)); + MantleClientRegistry.registerManualIcon("coal", new ItemStack(Item.coal)); - TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TRepo.materials, 1, 18)); - TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TRepo.materials, 1, 7)); + MantleClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TRepo.materials, 1, 18)); + MantleClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TRepo.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(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)); - + MantleClientRegistry.registerManualIcon("woodplanks", new ItemStack(Block.planks)); + MantleClientRegistry.registerManualIcon("stoneblock", new ItemStack(Block.stone)); + MantleClientRegistry.registerManualIcon("ironingot", new ItemStack(Item.ingotIron)); + MantleClientRegistry.registerManualIcon("flint", new ItemStack(Item.flint)); + MantleClientRegistry.registerManualIcon("cactus", new ItemStack(Block.cactus)); + MantleClientRegistry.registerManualIcon("bone", new ItemStack(Item.bone)); + MantleClientRegistry.registerManualIcon("obsidian", new ItemStack(Block.obsidian)); + MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Block.netherrack)); + MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TRepo.materials, 1, 17)); + MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TRepo.materials, 1, 1)); + MantleClientRegistry.registerManualIcon("paperstack", new ItemStack(TRepo.materials, 1, 0)); + MantleClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TRepo.materials, 1, 3)); + MantleClientRegistry.registerManualIcon("arditeingot", new ItemStack(TRepo.materials, 1, 4)); + MantleClientRegistry.registerManualIcon("copperingot", new ItemStack(TRepo.materials, 1, 9)); + MantleClientRegistry.registerManualIcon("steelingot", new ItemStack(TRepo.materials, 1, 16)); + MantleClientRegistry.registerManualIcon("pigironingot", new ItemStack(TRepo.materials, 1, 34)); // Tool parts - 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)); + MantleClientRegistry.registerManualIcon("pickhead", new ItemStack(TRepo.pickaxeHead, 1, 2)); + MantleClientRegistry.registerManualIcon("shovelhead", new ItemStack(TRepo.shovelHead, 1, 2)); + MantleClientRegistry.registerManualIcon("axehead", new ItemStack(TRepo.hatchetHead, 1, 2)); + MantleClientRegistry.registerManualIcon("swordblade", new ItemStack(TRepo.swordBlade, 1, 2)); + MantleClientRegistry.registerManualIcon("pan", new ItemStack(TRepo.frypanHead, 1, 2)); + MantleClientRegistry.registerManualIcon("board", new ItemStack(TRepo.signHead, 1, 2)); + MantleClientRegistry.registerManualIcon("knifeblade", new ItemStack(TRepo.knifeBlade, 1, 2)); + MantleClientRegistry.registerManualIcon("chiselhead", new ItemStack(TRepo.chiselHead, 1, 2)); - 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)); + MantleClientRegistry.registerManualIcon("hammerhead", new ItemStack(TRepo.hammerHead, 1, 2)); + MantleClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TRepo.excavatorHead, 1, 2)); + MantleClientRegistry.registerManualIcon("scythehead", new ItemStack(TRepo.scytheBlade, 1, 2)); + MantleClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TRepo.broadAxeHead, 1, 2)); + MantleClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TRepo.largeSwordBlade, 1, 2)); - TConstructClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick)); + MantleClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick)); - 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)); + MantleClientRegistry.registerManualIcon("binding", new ItemStack(TRepo.binding, 1, 4)); + MantleClientRegistry.registerManualIcon("wideguard", new ItemStack(TRepo.wideGuard, 1, 4)); + MantleClientRegistry.registerManualIcon("handguard", new ItemStack(TRepo.handGuard, 1, 4)); + MantleClientRegistry.registerManualIcon("crossbar", new ItemStack(TRepo.crossbar, 1, 4)); - 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)); + MantleClientRegistry.registerManualIcon("toughrod", new ItemStack(TRepo.toughRod, 1, 0)); + MantleClientRegistry.registerManualIcon("toughbinding", new ItemStack(TRepo.toughBinding, 1, 17)); + MantleClientRegistry.registerManualIcon("largeplate", new ItemStack(TRepo.largePlate, 1, 17)); - 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(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)); + MantleClientRegistry.registerManualIcon("bowstring", new ItemStack(TRepo.bowstring, 1, 0)); + MantleClientRegistry.registerManualIcon("arrowhead", new ItemStack(TRepo.arrowhead, 1, 2)); + MantleClientRegistry.registerManualIcon("fletching", new ItemStack(TRepo.fletching, 1, 0)); + + MantleClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TRepo.buckets, 1, 16)); + MantleClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TRepo.buckets, 1, 15)); + MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TRepo.buckets, 1, 25)); + MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TRepo.buckets, 1, 24)); + MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TRepo.buckets, 1, 23)); // ToolIcons - TConstructClientRegistry.registerManualIcon("pickicon", + MantleClientRegistry.registerManualIcon("pickicon", 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", + MantleClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.shovelHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("mattockicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.shovelHead, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("swordicon", + MantleClientRegistry.registerManualIcon("swordicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.wideGuard, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("longswordicon", + MantleClientRegistry.registerManualIcon("longswordicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.handGuard, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("rapiericon", + MantleClientRegistry.registerManualIcon("rapiericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("daggerIcon", + MantleClientRegistry.registerManualIcon("daggerIcon", 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", + MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.frypanHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.signHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.chiselHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, "")); + MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.toolRod, 1, 10), new ItemStack(TRepo.bowstring, 1, 0), new ItemStack(TRepo.toolRod, 1, 12), "")); - TConstructClientRegistry.registerManualIcon("arrowIcon", + MantleClientRegistry.registerManualIcon("arrowIcon", 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(TRepo.hammerHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( + MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hammerHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( TRepo.largePlate, 1, 12), new ItemStack(TRepo.largePlate, 8), "")); - TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.broadAxeHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( + MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.broadAxeHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughBinding, 8), "")); - 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( + MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.excavatorHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( + TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.scytheBlade, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( TRepo.toughBinding, 1, 12), new ItemStack(TRepo.toughRod, 8), "")); - 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), "")); + MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.largeSwordBlade, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( + TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughRod, 8), "")); + MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.broadAxeHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack( + TRepo.broadAxeHead, 1, 12), new ItemStack(TRepo.toughBinding, 8), "")); } public void initManualRecipes () @@ -419,7 +427,7 @@ public class TProxyClient extends TProxyCommon ItemStack stick = new ItemStack(Item.stick, 1, 0); ItemStack plank = new ItemStack(Block.planks, 1, 0); - ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); + ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); ItemStack workbench = new ItemStack(Block.workbench, 1, 0); ItemStack chest = new ItemStack(Block.chest, 1, 0); ItemStack log = new ItemStack(Block.wood, 1, 0); @@ -451,64 +459,61 @@ public class TProxyClient extends TProxyCommon 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(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(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( + MantleClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null); + MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TRepo.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null); + MantleClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0), null, null, null); + MantleClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1), null, null, null); + MantleClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank); + MantleClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0), null, pattern, null, workbench); + MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1), null, pattern, null, log); + MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5), null, pattern, null, chest); + MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10), null, pattern, null, plank); + MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null); + MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TRepo.slimePad, 1, 0), new ItemStack(TRepo.slimeChannel), new ItemStack(Item.slimeBall), null, null); + MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TRepo.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( TRepo.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); - TConstructClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); - 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(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(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, + MantleClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); + MantleClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TRepo.materials, 1, 1), slimyMud); + MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TRepo.materials, 1, 0), paper, paper, paper, paper); + MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TRepo.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, + mossycobble, mossycobble); + MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TRepo.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava), firecharge, + blazerod, firecharge, blazerod); + MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TRepo.materials, 1, 24), string, string, string, string); + MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TRepo.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(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); + MantleClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Block.dirt), new ItemStack(Item.rottenFlesh), new ItemStack(Item.dyePowder, 1, 15), null); + MantleClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil); - TConstructClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); - TConstructClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); - 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(TRepo.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, - null); + MantleClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); + MantleClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); + MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TRepo.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TRepo.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, + searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TRepo.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null); - TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TRepo.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, + MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TRepo.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TRepo.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, - searedbrick, searedbrick, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TRepo.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, + MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TRepo.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick, + searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TRepo.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TRepo.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TRepo.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, - glass, searedbrick); - TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TRepo.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, - searedbrick, null, 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(TRepo.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, + MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TRepo.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, + null, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TRepo.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); + MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TRepo.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TRepo.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); //Traps ItemStack reed = new ItemStack(Item.reed); - 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); + MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TRepo.punji), reed, null, reed, null, reed, null, reed, null, reed); + MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TRepo.barricadeOak), null, log, null, log); //Machines ItemStack alubrassIngot = new ItemStack(TRepo.materials, 1, 14); @@ -518,9 +523,9 @@ public class TProxyClient extends TProxyCommon // Modifier recipes ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), ""); - TConstructClientRegistry.registerManualIcon("ironpick", ironpick); + MantleClientRegistry.registerManualIcon("ironpick", ironpick); ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.handGuard, 1, 10), ""); - TConstructClientRegistry.registerManualIcon("ironlongsword", ironlongsword); + MantleClientRegistry.registerManualIcon("ironlongsword", ironlongsword); TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Item.diamond)); TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Item.emerald)); @@ -540,7 +545,7 @@ public class TProxyClient extends TProxyCommon 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)); + 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)); @@ -553,35 +558,14 @@ public class TProxyClient extends TProxyCommon } - 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); + MProxyClient.registerManualPage("materialstats", MaterialPage.class); + MProxyClient.registerManualPage("toolpage", ToolPage.class); + MProxyClient.registerManualPage("modifier", ModifierPage.class); + MProxyClient.registerManualPage("blockcast", BlockCastPage.class); - TProxyClient.registerManualPage("blank", BlankPage.class); } public static Document getManualFromStack (ItemStack stack) diff --git a/src/main/java/tconstruct/client/gui/GuiManual.java b/src/main/java/tconstruct/client/gui/GuiManual.java deleted file mode 100644 index 1c985d93..00000000 --- a/src/main/java/tconstruct/client/gui/GuiManual.java +++ /dev/null @@ -1,193 +0,0 @@ -package tconstruct.client.gui; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import tconstruct.client.RenderItemCopy; -import tconstruct.client.TProxyClient; -import tconstruct.client.block.SmallFontRenderer; -import tconstruct.client.pages.BookPage; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiManual extends GuiScreen -{ - ItemStack itemstackBook; - Document manual; - public RenderItemCopy renderitem = new RenderItemCopy(); - int bookImageWidth = 206; - int bookImageHeight = 200; - int bookTotalPages = 1; - int currentPage; - int maxPages; - - private TurnPageButton buttonNextPage; - private TurnPageButton buttonPreviousPage; - - BookPage pageLeft; - BookPage pageRight; - - public SmallFontRenderer fonts = TProxyClient.smallFontRenderer; - - public GuiManual(ItemStack stack, Document doc) - { - this.mc = Minecraft.getMinecraft(); - this.itemstackBook = stack; - currentPage = 0; //Stack page - manual = doc; - //renderitem.renderInFrame = true; - } - - /*@Override - public void setWorldAndResolution (Minecraft minecraft, int w, int h) - { - this.guiParticles = new GuiParticle(minecraft); - this.mc = minecraft; - this.width = w; - this.height = h; - this.buttonList.clear(); - this.initGui(); - }*/ - - public void initGui () - { - maxPages = manual.getElementsByTagName("page").getLength(); - updateText(); - int xPos = (this.width) / 2; - this.buttonList.add(this.buttonNextPage = new TurnPageButton(1, xPos + bookImageWidth - 50, 180, true)); - this.buttonList.add(this.buttonPreviousPage = new TurnPageButton(2, xPos - bookImageWidth + 24, 180, false)); - } - - protected void actionPerformed (GuiButton button) - { - if (button.enabled) - { - if (button.id == 1) - currentPage += 2; - if (button.id == 2) - currentPage -= 2; - - updateText(); - } - } - - void updateText () - { - if (maxPages % 2 == 1) - { - if (currentPage > maxPages) - currentPage = maxPages; - } - else - { - if (currentPage >= maxPages) - currentPage = maxPages - 2; - } - if (currentPage % 2 == 1) - currentPage--; - if (currentPage < 0) - currentPage = 0; - - NodeList nList = manual.getElementsByTagName("page"); - - Node node = nList.item(currentPage); - if (node.getNodeType() == Node.ELEMENT_NODE) - { - Element element = (Element) node; - Class clazz = TProxyClient.getPageClass(element.getAttribute("type")); - if (clazz != null) - { - try - { - pageLeft = (BookPage) clazz.newInstance(); - pageLeft.init(this, 0); - pageLeft.readPageFromXML(element); - } - catch (Exception e) - { - } - } - else - { - pageLeft = null; - } - } - - node = nList.item(currentPage + 1); - if (node != null && node.getNodeType() == Node.ELEMENT_NODE) - { - Element element = (Element) node; - Class clazz = TProxyClient.getPageClass(element.getAttribute("type")); - if (clazz != null) - { - try - { - pageRight = (BookPage) clazz.newInstance(); - pageRight.init(this, 1); - pageRight.readPageFromXML(element); - } - catch (Exception e) - { - } - } - else - { - pageLeft = null; - } - } - else - { - pageRight = null; - } - } - - private static final ResourceLocation bookRight = new ResourceLocation("tinker", "textures/gui/bookright.png"); - private static final ResourceLocation bookLeft = new ResourceLocation("tinker", "textures/gui/bookleft.png"); - - public void drawScreen (int par1, int par2, float par3) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(bookRight); - int localWidth = (this.width) / 2; - byte localHeight = 8; - this.drawTexturedModalRect(localWidth, localHeight, 0, 0, this.bookImageWidth, this.bookImageHeight); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(bookLeft); - localWidth = localWidth - this.bookImageWidth; - this.drawTexturedModalRect(localWidth, localHeight, 256 - this.bookImageWidth, 0, this.bookImageWidth, this.bookImageHeight); - - super.drawScreen(par1, par2, par3); //16, 12, 220, 12 - - if (pageLeft != null) - pageLeft.renderBackgroundLayer(localWidth + 16, localHeight + 12); - if (pageRight != null) - pageRight.renderBackgroundLayer(localWidth + 220, localHeight + 12); - - if (pageLeft != null) - pageLeft.renderContentLayer(localWidth + 16, localHeight + 12); - if (pageRight != null) - pageRight.renderContentLayer(localWidth + 220, localHeight + 12); - } - - public Minecraft getMC () - { - return mc; - } - - public boolean doesGuiPauseGame () - { - return false; - } -} diff --git a/src/main/java/tconstruct/client/pages/BlankPage.java b/src/main/java/tconstruct/client/pages/BlankPage.java deleted file mode 100644 index 3665dc1d..00000000 --- a/src/main/java/tconstruct/client/pages/BlankPage.java +++ /dev/null @@ -1,18 +0,0 @@ -package tconstruct.client.pages; - -import org.w3c.dom.Element; - -public class BlankPage extends BookPage -{ - - @Override - public void readPageFromXML (Element element) - { - } - - @Override - public void renderContentLayer (int localwidth, int localheight) - { - } - -} diff --git a/src/main/java/tconstruct/client/pages/BlockCastPage.java b/src/main/java/tconstruct/client/pages/BlockCastPage.java index 55439f1c..deb2a910 100644 --- a/src/main/java/tconstruct/client/pages/BlockCastPage.java +++ b/src/main/java/tconstruct/client/pages/BlockCastPage.java @@ -1,5 +1,7 @@ package tconstruct.client.pages; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -25,7 +27,7 @@ public class BlockCastPage extends BookPage nodes = element.getElementsByTagName("recipe"); if (nodes != null) - icons = TConstructClientRegistry.getRecipeIcons(nodes.item(0).getTextContent()); + icons = MantleClientRegistry.getRecipeIcons(nodes.item(0).getTextContent()); } @Override diff --git a/src/main/java/tconstruct/client/pages/BookPage.java b/src/main/java/tconstruct/client/pages/BookPage.java deleted file mode 100644 index b7065aba..00000000 --- a/src/main/java/tconstruct/client/pages/BookPage.java +++ /dev/null @@ -1,25 +0,0 @@ -package tconstruct.client.pages; - -import org.w3c.dom.Element; - -import tconstruct.client.gui.GuiManual; - -public abstract class BookPage -{ - protected GuiManual manual; - protected int side; - - public void init (GuiManual manual, int side) - { - this.manual = manual; - this.side = side; - } - - public abstract void readPageFromXML (Element element); - - public void renderBackgroundLayer (int localwidth, int localheight) - { - } - - public abstract void renderContentLayer (int localwidth, int localheight); -} diff --git a/src/main/java/tconstruct/client/pages/ContentsTablePage.java b/src/main/java/tconstruct/client/pages/ContentsTablePage.java deleted file mode 100644 index 7a1846f2..00000000 --- a/src/main/java/tconstruct/client/pages/ContentsTablePage.java +++ /dev/null @@ -1,57 +0,0 @@ -package tconstruct.client.pages; - -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -import tconstruct.library.client.TConstructClientRegistry; - -public class ContentsTablePage extends BookPage -{ - String text; - String[] iconText; - ItemStack[] icons; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); - - nodes = element.getElementsByTagName("link"); - iconText = new String[nodes.getLength()]; - icons = new ItemStack[nodes.getLength()]; - for (int i = 0; i < nodes.getLength(); i++) - { - NodeList children = nodes.item(i).getChildNodes(); - iconText[i] = children.item(1).getTextContent(); - icons[i] = TConstructClientRegistry.getManualIcon(children.item(3).getTextContent()); - } - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - if (text != null) - manual.fonts.drawString("\u00a7n" + text, localWidth + 25 + manual.fonts.getStringWidth(text) / 2, localHeight + 4, 0); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderHelper.enableGUIStandardItemLighting(); - manual.renderitem.zLevel = 100; - for (int i = 0; i < icons.length; i++) - { - manual.renderitem.renderItemIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[i], localWidth + 16, localHeight + 18 * i + 18); - int yOffset = 18; - if (iconText[i].length() > 40) - yOffset = 13; - manual.fonts.drawString(iconText[i], localWidth + 38, localHeight + 18 * i + yOffset, 0); - } - manual.renderitem.zLevel = 0; - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - } -} diff --git a/src/main/java/tconstruct/client/pages/CraftingPage.java b/src/main/java/tconstruct/client/pages/CraftingPage.java deleted file mode 100644 index ea1fdb6d..00000000 --- a/src/main/java/tconstruct/client/pages/CraftingPage.java +++ /dev/null @@ -1,105 +0,0 @@ -package tconstruct.client.pages; - -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -import tconstruct.library.client.TConstructClientRegistry; - -public class CraftingPage extends BookPage -{ - String text; - String size; - ItemStack[] icons; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); - - nodes = element.getElementsByTagName("name"); - if (nodes != null) - icons = TConstructClientRegistry.getRecipeIcons(nodes.item(0).getTextContent()); - - nodes = element.getElementsByTagName("size"); - if (nodes != null) - size = nodes.item(0).getTextContent(); - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - if (size.equals("two")) - drawCraftingPage(text, icons, 2, localWidth, localHeight + 12); - if (size.equals("three")) - drawCraftingPage(text, icons, 3, localWidth + (side != 1 ? 6 : 0), localHeight + 12); - } - - public void drawCraftingPage (String info, ItemStack[] icons, int recipeSize, int localWidth, int localHeight) - { - if (info != null) - manual.fonts.drawString("\u00a7n" + info, localWidth + 50, localHeight + 4, 0); - - GL11.glScalef(2f, 2f, 2f); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderHelper.enableGUIStandardItemLighting(); - manual.renderitem.zLevel = 100; - - if (recipeSize == 2) - { - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2); - if (icons[0].stackSize > 1) - manual.renderitem.renderItemOverlayIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2, String.valueOf(icons[0].stackSize)); - for (int i = 0; i < icons.length - 1; i++) - { - if (icons[i + 1] != null) - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[i + 1], (localWidth + 14 + 36 * (i % 2)) / 2, (localHeight + 36 * (i / 2) + 52) / 2); - } - } - - if (recipeSize == 3) - { - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 138) / 2, (localHeight + 70) / 2); - if (icons[0].stackSize > 1) - manual.renderitem.renderItemOverlayIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2, String.valueOf(icons[0].stackSize)); - for (int i = 0; i < icons.length - 1; i++) - { - if (icons[i + 1] != null) - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[i + 1], (localWidth - 2 + 36 * (i % 3)) / 2, (localHeight + 36 * (i / 3) + 34) / 2); - } - } - - manual.renderitem.zLevel = 0; - GL11.glScalef(0.5F, 0.5F, 0.5F); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - } - - public void renderBackgroundLayer (int localwidth, int localheight) - { - if (size.equals("two")) - drawBackground(2, localwidth, localheight + 12); - - if (size.equals("three")) - drawBackground(3, localwidth + (side != 1 ? 6 : 0), localheight + 12); - } - - private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookcrafting.png"); - - public void drawBackground (int size, int localWidth, int localHeight) - { - manual.getMC().getTextureManager().bindTexture(background); - if (size == 2) - manual.drawTexturedModalRect(localWidth + 8, localHeight + 46, 0, 116, 154, 78); - if (size == 3) - manual.drawTexturedModalRect(localWidth - 8, localHeight + 28, 0, 0, 183, 114); - } - -} diff --git a/src/main/java/tconstruct/client/pages/FurnacePage.java b/src/main/java/tconstruct/client/pages/FurnacePage.java deleted file mode 100644 index d32f7541..00000000 --- a/src/main/java/tconstruct/client/pages/FurnacePage.java +++ /dev/null @@ -1,62 +0,0 @@ -package tconstruct.client.pages; - -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -import tconstruct.library.client.TConstructClientRegistry; - -public class FurnacePage extends BookPage -{ - String text; - ItemStack[] icons; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); - - nodes = element.getElementsByTagName("recipe"); - if (nodes != null) - icons = TConstructClientRegistry.getRecipeIcons(nodes.item(0).getTextContent()); - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - if (text != null) - manual.fonts.drawString("\u00a7n" + text, localWidth + 50, localHeight + 4, 0); - - GL11.glScalef(2f, 2f, 2f); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderHelper.enableGUIStandardItemLighting(); - manual.renderitem.zLevel = 100; - - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, TConstructClientRegistry.getManualIcon("coal"), (localWidth + 38) / 2, (localHeight + 110) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 106) / 2, (localHeight + 74) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth + 38) / 2, (localHeight + 38) / 2); - - if (icons[0].stackSize > 1) - manual.renderitem.renderItemOverlayIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 106) / 2, (localHeight + 74) / 2, String.valueOf(icons[0].stackSize)); - - manual.renderitem.zLevel = 0; - GL11.glScalef(0.5F, 0.5F, 0.5F); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - } - - private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookfurnace.png"); - - public void renderBackgroundLayer (int localWidth, int localHeight) - { - manual.getMC().getTextureManager().bindTexture(background); - manual.drawTexturedModalRect(localWidth + 32, localHeight + 32, 0, 0, 111, 114); - } -} diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java index 397373f3..c7d47705 100644 --- a/src/main/java/tconstruct/client/pages/MaterialPage.java +++ b/src/main/java/tconstruct/client/pages/MaterialPage.java @@ -1,5 +1,7 @@ package tconstruct.client.pages; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; @@ -36,7 +38,7 @@ public class MaterialPage extends BookPage nodes = element.getElementsByTagName("icon"); if (nodes != null) - icons[0] = TConstructClientRegistry.getManualIcon(nodes.item(0).getTextContent()); + icons[0] = MantleClientRegistry.getManualIcon(nodes.item(0).getTextContent()); nodes = element.getElementsByTagName("toolmaterial"); if (nodes != null && nodes.getLength() > 0) @@ -46,7 +48,7 @@ public class MaterialPage extends BookPage nodes = element.getElementsByTagName("material").item(0).getChildNodes(); - icons[1] = TConstructClientRegistry.getManualIcon(nodes.item(1).getTextContent()); + icons[1] = MantleClientRegistry.getManualIcon(nodes.item(1).getTextContent()); icons[2] = PatternBuilder.instance.getShardFromSet(material.name()); icons[3] = PatternBuilder.instance.getRodFromSet(material.name()); } diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index f156be0b..b411b1a4 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -1,5 +1,7 @@ package tconstruct.client.pages; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -25,7 +27,7 @@ public class ModifierPage extends BookPage nodes = element.getElementsByTagName("recipe"); if (nodes != null) - icons = TConstructClientRegistry.getRecipeIcons(nodes.item(0).getTextContent()); + icons = MantleClientRegistry.getRecipeIcons(nodes.item(0).getTextContent()); } @Override @@ -36,9 +38,9 @@ public class ModifierPage extends BookPage GL11.glEnable(GL12.GL_RESCALE_NORMAL); RenderHelper.enableGUIStandardItemLighting(); - ItemStack toolstack = TConstructClientRegistry.getManualIcon("ironpick"); + ItemStack toolstack = MantleClientRegistry.getManualIcon("ironpick"); if (type.equals("weapon")) - toolstack = TConstructClientRegistry.getManualIcon("ironlongsword"); + toolstack = MantleClientRegistry.getManualIcon("ironlongsword"); manual.renderitem.zLevel = 100; manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, toolstack, (localWidth + 54) / 2, (localHeight + 54) / 2); diff --git a/src/main/java/tconstruct/client/pages/PicturePage.java b/src/main/java/tconstruct/client/pages/PicturePage.java deleted file mode 100644 index d4011434..00000000 --- a/src/main/java/tconstruct/client/pages/PicturePage.java +++ /dev/null @@ -1,41 +0,0 @@ -package tconstruct.client.pages; - -import net.minecraft.util.ResourceLocation; - -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -public class PicturePage extends BookPage -{ - String text; - String location; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); - - nodes = element.getElementsByTagName("location"); - if (nodes != null) - location = nodes.item(0).getTextContent(); - - background = new ResourceLocation(location); - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - manual.fonts.drawSplitString(text, localWidth + 8, localHeight, 178, 0); - } - - ResourceLocation background; - - public void renderBackgroundLayer (int localWidth, int localHeight) - { - manual.getMC().getTextureManager().bindTexture(background); - //manual.getMC().renderEngine.bindTexture(location); - manual.drawTexturedModalRect(localWidth, localHeight + 12, 0, 0, 170, 144); - } -} diff --git a/src/main/java/tconstruct/client/pages/SectionPage.java b/src/main/java/tconstruct/client/pages/SectionPage.java deleted file mode 100644 index e790c894..00000000 --- a/src/main/java/tconstruct/client/pages/SectionPage.java +++ /dev/null @@ -1,29 +0,0 @@ -package tconstruct.client.pages; - -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -public class SectionPage extends BookPage -{ - String title; - String body; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("title"); - if (nodes != null) - title = nodes.item(0).getTextContent(); - - nodes = element.getElementsByTagName("text"); - if (nodes != null) - body = nodes.item(0).getTextContent(); - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - manual.fonts.drawSplitString("\u00a7n" + title, localWidth + 70, localHeight + 4, 178, 0); - manual.fonts.drawSplitString(body, localWidth, localHeight + 16, 190, 0); - } -} diff --git a/src/main/java/tconstruct/client/pages/SidebarPage.java b/src/main/java/tconstruct/client/pages/SidebarPage.java deleted file mode 100644 index 5b83d416..00000000 --- a/src/main/java/tconstruct/client/pages/SidebarPage.java +++ /dev/null @@ -1,57 +0,0 @@ -package tconstruct.client.pages; - -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -import tconstruct.library.client.TConstructClientRegistry; - -public class SidebarPage extends BookPage -{ - String text; - String[] iconText; - ItemStack[] icons; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); - - nodes = element.getElementsByTagName("item"); - iconText = new String[nodes.getLength()]; - icons = new ItemStack[nodes.getLength()]; - for (int i = 0; i < nodes.getLength(); i++) - { - NodeList children = nodes.item(i).getChildNodes(); - iconText[i] = children.item(1).getTextContent(); - icons[i] = TConstructClientRegistry.getManualIcon(children.item(3).getTextContent()); - } - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - manual.fonts.drawSplitString(text, localWidth, localHeight, 178, 0); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderHelper.enableGUIStandardItemLighting(); - manual.renderitem.zLevel = 100; - int offset = text.length() / 4 + 10; - for (int i = 0; i < icons.length; i++) - { - manual.renderitem.renderItemIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[i], localWidth + 8, localHeight + 18 * i + offset); - int yOffset = 39; - if (iconText[i].length() > 40) - yOffset = 34; - manual.fonts.drawSplitString(iconText[i], localWidth + 30, localHeight + 18 * i + offset, 140, 0); - } - manual.renderitem.zLevel = 0; - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - } -} diff --git a/src/main/java/tconstruct/client/pages/TextPage.java b/src/main/java/tconstruct/client/pages/TextPage.java deleted file mode 100644 index 4f795009..00000000 --- a/src/main/java/tconstruct/client/pages/TextPage.java +++ /dev/null @@ -1,23 +0,0 @@ -package tconstruct.client.pages; - -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -public class TextPage extends BookPage -{ - String text; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - manual.fonts.drawSplitString(text, localWidth, localHeight, 178, 0); - } -} diff --git a/src/main/java/tconstruct/client/pages/TitlePage.java b/src/main/java/tconstruct/client/pages/TitlePage.java deleted file mode 100644 index 249f0c81..00000000 --- a/src/main/java/tconstruct/client/pages/TitlePage.java +++ /dev/null @@ -1,23 +0,0 @@ -package tconstruct.client.pages; - -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -public class TitlePage extends BookPage -{ - String text; - - @Override - public void readPageFromXML (Element element) - { - NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); - } - - @Override - public void renderContentLayer (int localWidth, int localHeight) - { - manual.fonts.drawSplitString(text, localWidth, localHeight, 178, 0); - } -} diff --git a/src/main/java/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java index 8911178a..4b83938c 100644 --- a/src/main/java/tconstruct/client/pages/ToolPage.java +++ b/src/main/java/tconstruct/client/pages/ToolPage.java @@ -1,5 +1,7 @@ package tconstruct.client.pages; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; @@ -31,7 +33,7 @@ public class ToolPage extends BookPage { NodeList children = nodes.item(i).getChildNodes(); iconText[i + 2] = children.item(1).getTextContent(); - icons[i + 1] = TConstructClientRegistry.getManualIcon(children.item(3).getTextContent()); + icons[i + 1] = MantleClientRegistry.getManualIcon(children.item(3).getTextContent()); } nodes = element.getElementsByTagName("text"); @@ -43,7 +45,7 @@ public class ToolPage extends BookPage nodes = element.getElementsByTagName("icon"); if (nodes != null) - icons[0] = TConstructClientRegistry.getManualIcon(nodes.item(0).getTextContent()); + icons[0] = MantleClientRegistry.getManualIcon(nodes.item(0).getTextContent()); } @Override diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index e516e59d..a433aa84 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -7,7 +7,6 @@ import java.util.Map; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -80,43 +79,6 @@ public class TConstructClientRegistry tool.registerEffectPath(materialID, icon); } - public static void registerManualIcon (String name, ItemStack stack) - { - manualIcons.put(name, stack); - } - - public static ItemStack getManualIcon (String textContent) - { - ItemStack stack = manualIcons.get(textContent); - if (stack != null) - return stack; - return defaultStack; - } - - public static void registerManualSmallRecipe (String name, ItemStack output, ItemStack... stacks) - { - ItemStack[] recipe = new ItemStack[5]; - recipe[0] = output; - System.arraycopy(stacks, 0, recipe, 1, 4); - recipeIcons.put(name, recipe); - } - - public static void registerManualLargeRecipe (String name, ItemStack output, ItemStack... stacks) - { - ItemStack[] recipe = new ItemStack[10]; - recipe[0] = output; - System.arraycopy(stacks, 0, recipe, 1, 9); - recipeIcons.put(name, recipe); - } - - public static void registerManualFurnaceRecipe (String name, ItemStack output, ItemStack input) - { - ItemStack[] recipe = new ItemStack[2]; - recipe[0] = output; - recipe[1] = input; - recipeIcons.put(name, recipe); - } - public static void registerManualModifier (String name, ItemStack output, ItemStack topinput) { registerManualModifier(name, output, topinput, null); @@ -140,10 +102,6 @@ public class TConstructClientRegistry recipeIcons.put(name, recipe); } - public static ItemStack[] getRecipeIcons (String recipeName) - { - return recipeIcons.get(recipeName); - } //Gui public static void addToolButton (ToolGuiElement element)