From 8a248c0f347e1804551b314ce5d30270e99ce5c8 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Mon, 12 Aug 2013 00:19:27 +1000 Subject: [PATCH 1/3] Fixed the tabs not working in obfuscated... ...environment --- tconstruct/client/TProxyClient.java | 1885 ++++++++++++--------------- 1 file changed, 820 insertions(+), 1065 deletions(-) diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java index 189c1ee7..076d1dbc 100644 --- a/tconstruct/client/TProxyClient.java +++ b/tconstruct/client/TProxyClient.java @@ -2,1082 +2,837 @@ package tconstruct.client; import java.io.InputStream; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; +import java.util.*; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiInventory; -import net.minecraft.client.model.ModelSlime; -import net.minecraft.client.particle.EntityAuraFX; -import net.minecraft.client.particle.EntityBreakingFX; -import net.minecraft.client.particle.EntityBubbleFX; -import net.minecraft.client.particle.EntityCloudFX; -import net.minecraft.client.particle.EntityCritFX; -import net.minecraft.client.particle.EntityDropParticleFX; -import net.minecraft.client.particle.EntityEnchantmentTableParticleFX; -import net.minecraft.client.particle.EntityExplodeFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.particle.EntityFireworkSparkFX; -import net.minecraft.client.particle.EntityFlameFX; -import net.minecraft.client.particle.EntityFootStepFX; -import net.minecraft.client.particle.EntityHeartFX; -import net.minecraft.client.particle.EntityHugeExplodeFX; -import net.minecraft.client.particle.EntityLargeExplodeFX; -import net.minecraft.client.particle.EntityLavaFX; -import net.minecraft.client.particle.EntityNoteFX; -import net.minecraft.client.particle.EntityPortalFX; -import net.minecraft.client.particle.EntityReddustFX; -import net.minecraft.client.particle.EntitySmokeFX; -import net.minecraft.client.particle.EntitySnowShovelFX; -import net.minecraft.client.particle.EntitySpellParticleFX; -import net.minecraft.client.particle.EntitySplashFX; -import net.minecraft.client.particle.EntitySuspendFX; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.settings.GameSettings; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; +import javax.xml.parsers.*; import org.lwjgl.opengl.GL11; import org.w3c.dom.Document; +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 tconstruct.TConstruct; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.DrawbridgeLogic; -import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.blocks.logic.GlowstoneAggregator; -import tconstruct.blocks.logic.PartCrafterLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.client.block.BarricadeRender; -import tconstruct.client.block.CastingBasinSpecialRender; -import tconstruct.client.block.CastingTableSpecialRenderer; -import tconstruct.client.block.CrystalBlockRender; -import tconstruct.client.block.DryingRackRender; -import tconstruct.client.block.DryingRackSpecialRender; -import tconstruct.client.block.FrypanRender; -import tconstruct.client.block.MachineRender; -import tconstruct.client.block.OreberryRender; -import tconstruct.client.block.PaneConnectedRender; -import tconstruct.client.block.PaneRender; -import tconstruct.client.block.PunjiRender; -import tconstruct.client.block.SearedRender; -import tconstruct.client.block.SmallFontRenderer; -import tconstruct.client.block.SmelteryRender; -import tconstruct.client.block.TableForgeRender; -import tconstruct.client.block.TableRender; -import tconstruct.client.block.TankRender; -import tconstruct.client.entity.CartRender; -import tconstruct.client.entity.CloneHeadModel; -import tconstruct.client.entity.CrystalGuardianRender; -import tconstruct.client.entity.CrystalRender; -import tconstruct.client.entity.FancyItemRender; -import tconstruct.client.entity.MiniGardyRender; -import tconstruct.client.entity.SlimeCloneRender; -import tconstruct.client.entity.SlimeRender; -import tconstruct.client.entity.projectile.ArrowRender; -import tconstruct.client.entity.projectile.DaggerRender; -import tconstruct.client.entity.projectile.LaunchedItemRender; -import tconstruct.client.gui.ArmorExtendedGui; -import tconstruct.client.gui.CraftingStationGui; -import tconstruct.client.gui.DrawbridgeGui; -import tconstruct.client.gui.FrypanGui; -import tconstruct.client.gui.GlowstoneAggregatorGui; -import tconstruct.client.gui.GuiManual; -import tconstruct.client.gui.InventoryTab; -import tconstruct.client.gui.KnapsackGui; -import tconstruct.client.gui.MiniGardyGui; -import tconstruct.client.gui.PartCrafterGui; -import tconstruct.client.gui.PatternChestGui; -import tconstruct.client.gui.SmelteryGui; -import tconstruct.client.gui.StencilTableGui; -import tconstruct.client.gui.ToolForgeGui; -import tconstruct.client.gui.ToolStationGui; -import tconstruct.client.pages.BlankPage; -import tconstruct.client.pages.BlockCastPage; -import tconstruct.client.pages.BookPage; -import tconstruct.client.pages.ContentsTablePage; -import tconstruct.client.pages.CraftingPage; -import tconstruct.client.pages.FurnacePage; -import tconstruct.client.pages.MaterialPage; -import tconstruct.client.pages.ModifierPage; -import tconstruct.client.pages.PicturePage; -import tconstruct.client.pages.SectionPage; -import tconstruct.client.pages.SidebarPage; -import tconstruct.client.pages.TextPage; -import tconstruct.client.pages.TitlePage; -import tconstruct.client.pages.ToolPage; -import tconstruct.common.TContent; -import tconstruct.common.TProxyCommon; -import tconstruct.entity.Automaton; -import tconstruct.entity.BlueSlime; -import tconstruct.entity.CartEntity; -import tconstruct.entity.Crystal; -import tconstruct.entity.FancyEntityItem; -import tconstruct.entity.MiniGardy; -import tconstruct.entity.SlimeClone; -import tconstruct.entity.projectile.ArrowEntity; -import tconstruct.entity.projectile.DaggerEntity; -import tconstruct.entity.projectile.LaunchedPotion; +import tconstruct.blocks.logic.*; +import tconstruct.client.block.*; +import tconstruct.client.entity.*; +import tconstruct.client.entity.projectile.*; +import tconstruct.client.gui.*; +import tconstruct.client.pages.*; +import tconstruct.common.*; +import tconstruct.entity.*; +import tconstruct.entity.projectile.*; import tconstruct.landmine.client.gui.GuiLandmine; import tconstruct.landmine.client.render.RenderLandmine; import tconstruct.landmine.inventory.ContainerLandmine; import tconstruct.landmine.tileentity.TileEntityLandmine; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.client.ToolGuiElement; +import tconstruct.library.client.*; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; -import tconstruct.util.player.ArmorExtended; -import tconstruct.util.player.KnapsackInventory; - -import com.google.common.collect.Lists; - -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.TickRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; -import cpw.mods.fml.relauncher.Side; - -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 == stationGuiID) - return new ToolStationGui(player.inventory, (ToolStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == partGuiID) - return new PartCrafterGui(player.inventory, (PartCrafterLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == pchestGuiID) - 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) - return new SmelteryGui(player.inventory, (SmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == pshaperGuiID) - return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == toolForge) - return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == glowstoneAggregatorGui) - return new GlowstoneAggregatorGui(player.inventory, (GlowstoneAggregator) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == drawbridgeGui) - return new DrawbridgeGui(player.inventory, (DrawbridgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == landmineGui) - 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 == manualGuiID) - { - ItemStack stack = player.getCurrentEquippedItem(); - return new GuiManual(stack, TProxyClient.getManualFromStack(stack)); - } - if (ID == inventoryGui) - { - GuiInventory inventory = new GuiInventory(player); - 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); - } - if (ID == miniGardyGui) - { - for (Object o : world.loadedEntityList) - { - Entity entity = (Entity) o; - if (entity.entityId == x) - { - return new MiniGardyGui(player.inventory, (MiniGardy) entity); - } - } - return null; - } - 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 void openInventoryGui () - { - //controlInstance.openInventoryGui(); - if (mc == null) - mc = Minecraft.getMinecraft(); - GuiInventory inventory = new GuiInventory(mc.thePlayer); - mc.displayGuiScreen(inventory); - addTabsToInventory(inventory); - } - - public static void addTabsToInventory (GuiContainer gui) - { - /*if (mc == null) - mc = Minecraft.getMinecraft();*/ - if (gui.getClass() == GuiInventory.class || classMatches(gui, "micdoodle8.mods.galacticraft.core.client.gui.GCCoreGuiInventory")) - { - try{ - Field guiLeft = GuiContainer.class.getDeclaredField("guiLeft"); - guiLeft.setAccessible(true); - int cornerX = (Integer)guiLeft.get(gui); - Field ySize = GuiContainer.class.getDeclaredField("ySize"); - ySize.setAccessible(true); - int cornerY = (gui.height - (Integer)ySize.get(gui)) / 2; - Field buttonList = GuiScreen.class.getDeclaredField("buttonList"); - buttonList.setAccessible(true); - ArrayList listOfButtons = (ArrayList)buttonList.get(gui); - listOfButtons.clear(); - - InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); - tab.enabled = false; - listOfButtons.add(tab); - tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); - listOfButtons.add(tab); - if (armorExtended.inventory[2] != null && armorExtended.inventory[2].getItem() == TContent.knapsack) - { - if (listOfButtons.size() < 3) - { - tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); - listOfButtons.add(tab); - } - } - }catch(Exception e){ - e.printStackTrace(); - } - } - } - - 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("font/default.png"), mc.renderEngine, false); - RenderingRegistry.registerBlockHandler(new TableRender()); - RenderingRegistry.registerBlockHandler(new TableForgeRender()); - RenderingRegistry.registerBlockHandler(new FrypanRender()); - RenderingRegistry.registerBlockHandler(new SmelteryRender()); - RenderingRegistry.registerBlockHandler(new TankRender()); - RenderingRegistry.registerBlockHandler(new SearedRender()); - //RenderingRegistry.registerBlockHandler(new GolemCoreRender()); - RenderingRegistry.registerBlockHandler(new OreberryRender()); - RenderingRegistry.registerBlockHandler(new BarricadeRender()); - RenderingRegistry.registerBlockHandler(new CrystalBlockRender()); - RenderingRegistry.registerBlockHandler(new MachineRender()); - RenderingRegistry.registerBlockHandler(new DryingRackRender()); - RenderingRegistry.registerBlockHandler(new PaneRender()); - RenderingRegistry.registerBlockHandler(new PaneConnectedRender()); - RenderingRegistry.registerBlockHandler(new RenderLandmine()); - RenderingRegistry.registerBlockHandler(new PunjiRender()); - //RenderingRegistry.registerBlockHandler(new BrickRender()); - - //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(SlimeClone.class, new SlimeCloneRender(new CloneHeadModel(0), new CloneHeadModel(1f), 0.25F)); - - RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender()); - RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRender()); - RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender()); - // RenderingRegistry.registerEntityRenderingHandler(Skyla.class, new SkylaRender()); - RenderingRegistry.registerEntityRenderingHandler(MiniGardy.class, new MiniGardyRender()); - RenderingRegistry.registerEntityRenderingHandler(Automaton.class, new CrystalGuardianRender()); - RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384)); - RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRender()); - //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")); - - 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)); - - //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.heavyPlate, 1, 17)); - - //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("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.heavyPlate, 1, 12), new ItemStack(TContent.heavyPlate, 8), "")); - TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( - TContent.heavyPlate, 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.heavyPlate, 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.heavyPlate, 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); - 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 - 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.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("smelterydrain", new ItemStack(TContent.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, - 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("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, - searedbrick, searedbrick); - - //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.heavyPlate, 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("electricmod", ironpick.copy(), new ItemStack(Block.dirt), 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.glass), new ItemStack(TContent.moltenGlass, 1), null); - TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 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, "tinker", title, "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, "tinker", title, "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" }; - //String[] modPartTypes = { "thaumium" }; - String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis", "quartz", "silk", "beheading", "smite", "spider", - "reinforced" }; - 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 (int iter = 0; iter < modPartTypes.length; iter++) - { - TConstructClientRegistry.addMaterialRenderMapping(31 + iter, "tinker", modPartTypes[iter], 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" }; - 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); - } - - 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; - } - } +import tconstruct.util.player.*; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.inventory.*; +import net.minecraft.client.model.ModelSlime; +import net.minecraft.client.particle.*; +import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.settings.*; +import net.minecraft.entity.Entity; +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; + +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 == stationGuiID) + return new ToolStationGui(player.inventory, (ToolStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == partGuiID) + return new PartCrafterGui(player.inventory, (PartCrafterLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == pchestGuiID) + 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) + return new SmelteryGui(player.inventory, (SmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == pshaperGuiID) + return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == toolForge) + return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == glowstoneAggregatorGui) + return new GlowstoneAggregatorGui(player.inventory, (GlowstoneAggregator) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == drawbridgeGui) + return new DrawbridgeGui(player.inventory, (DrawbridgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == landmineGui) + 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 == manualGuiID) { + ItemStack stack = player.getCurrentEquippedItem(); + return new GuiManual(stack, TProxyClient.getManualFromStack(stack)); + } + if (ID == inventoryGui) { + GuiInventory inventory = new GuiInventory(player); + 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); + } + if (ID == miniGardyGui) { + for (Object o : world.loadedEntityList) { + Entity entity = (Entity) o; + if (entity.entityId == x) { + return new MiniGardyGui(player.inventory, (MiniGardy) entity); + } + } + return null; + } + 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 void openInventoryGui() { + // controlInstance.openInventoryGui(); + if (mc == null) + mc = Minecraft.getMinecraft(); + GuiInventory inventory = new GuiInventory(mc.thePlayer); + mc.displayGuiScreen(inventory); + addTabsToInventory(inventory); + } + + public static void addTabsToInventory(GuiContainer gui) { + /* + * if (mc == null) mc = Minecraft.getMinecraft(); + */ + if (gui.getClass() == GuiInventory.class || classMatches(gui, "micdoodle8.mods.galacticraft.core.client.gui.GCCoreGuiInventory")) { + try { + Field guiLeft = GuiContainer.class.getDeclaredField("p"); + guiLeft.setAccessible(true); + int cornerX = (Integer) guiLeft.get(gui); + Field ySize = GuiContainer.class.getDeclaredField("d"); + ySize.setAccessible(true); + int cornerY = (gui.height - (Integer) ySize.get(gui)) / 2; + Field buttonList = GuiScreen.class.getDeclaredField("i"); + buttonList.setAccessible(true); + ArrayList listOfButtons = (ArrayList) buttonList.get(gui); + listOfButtons.clear(); + + InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); + tab.enabled = false; + listOfButtons.add(tab); + tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); + listOfButtons.add(tab); + if (armorExtended.inventory[2] != null && armorExtended.inventory[2].getItem() == TContent.knapsack) { + if (listOfButtons.size() < 3) { + tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); + listOfButtons.add(tab); + } + } + } catch (Exception e) { + try { + Field guiLeft = GuiContainer.class.getDeclaredField("guiLeft"); + guiLeft.setAccessible(true); + int cornerX = (Integer) guiLeft.get(gui); + Field ySize = GuiContainer.class.getDeclaredField("ySize"); + ySize.setAccessible(true); + int cornerY = (gui.height - (Integer) ySize.get(gui)) / 2; + Field buttonList = GuiScreen.class.getDeclaredField("buttonList"); + buttonList.setAccessible(true); + ArrayList listOfButtons = (ArrayList) buttonList.get(gui); + listOfButtons.clear(); + + InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); + tab.enabled = false; + listOfButtons.add(tab); + tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); + listOfButtons.add(tab); + if (armorExtended.inventory[2] != null && armorExtended.inventory[2].getItem() == TContent.knapsack) { + if (listOfButtons.size() < 3) { + tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); + listOfButtons.add(tab); + } + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } + } + } + + 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("font/default.png"), mc.renderEngine, false); + RenderingRegistry.registerBlockHandler(new TableRender()); + RenderingRegistry.registerBlockHandler(new TableForgeRender()); + RenderingRegistry.registerBlockHandler(new FrypanRender()); + RenderingRegistry.registerBlockHandler(new SmelteryRender()); + RenderingRegistry.registerBlockHandler(new TankRender()); + RenderingRegistry.registerBlockHandler(new SearedRender()); + // RenderingRegistry.registerBlockHandler(new GolemCoreRender()); + RenderingRegistry.registerBlockHandler(new OreberryRender()); + RenderingRegistry.registerBlockHandler(new BarricadeRender()); + RenderingRegistry.registerBlockHandler(new CrystalBlockRender()); + RenderingRegistry.registerBlockHandler(new MachineRender()); + RenderingRegistry.registerBlockHandler(new DryingRackRender()); + RenderingRegistry.registerBlockHandler(new PaneRender()); + RenderingRegistry.registerBlockHandler(new PaneConnectedRender()); + RenderingRegistry.registerBlockHandler(new RenderLandmine()); + RenderingRegistry.registerBlockHandler(new PunjiRender()); + // RenderingRegistry.registerBlockHandler(new BrickRender()); + + // 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(SlimeClone.class, new SlimeCloneRender(new CloneHeadModel(0), new CloneHeadModel(1f), 0.25F)); + + RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender()); + RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRender()); + RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender()); + // RenderingRegistry.registerEntityRenderingHandler(Skyla.class, new + // SkylaRender()); + RenderingRegistry.registerEntityRenderingHandler(MiniGardy.class, new MiniGardyRender()); + RenderingRegistry.registerEntityRenderingHandler(Automaton.class, new CrystalGuardianRender()); + RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384)); + RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRender()); + // 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")); + + 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)); + + // 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.heavyPlate, 1, 17)); + + // 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("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(TContent.heavyPlate, 1, 12), new ItemStack(TContent.heavyPlate, 8), "")); + TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(TContent.heavyPlate, 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.heavyPlate, 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.heavyPlate, 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); + 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 + 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.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("smelterydrain", new ItemStack(TContent.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, 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("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); + + // 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.heavyPlate, 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("electricmod", ironpick.copy(), new ItemStack(Block.dirt), 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.glass), new ItemStack(TContent.moltenGlass, 1), null); + TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 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, "tinker", title, "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, "tinker", title, "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" }; + // String[] modPartTypes = { "thaumium" }; + String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis", "quartz", "silk", "beheading", "smite", "spider", "reinforced" }; + 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 (int iter = 0; iter < modPartTypes.length; iter++) { + * TConstructClientRegistry.addMaterialRenderMapping(31 + iter, + * "tinker", modPartTypes[iter], 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" }; + 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); + } + + 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; + } + } } From aeb1fdb6a36c35323f5754237dd481f2d988a2f6 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sun, 11 Aug 2013 12:23:49 -0700 Subject: [PATCH 2/3] ToolCoreRenderer --- .../tinker/{sounds => sound}/frypan_hit.ogg | Bin .../{sounds => sound}/launcher_clank.ogg | Bin .../tinker/{sounds => sound}/little_saw.ogg | Bin tconstruct/client/TClientEvents.java | 4 +- tconstruct/client/TProxyClient.java | 22 + tconstruct/client/ToolCoreRenderer.java | 251 +++++++ .../client/entity/projectile/ArrowRender.java | 665 ++---------------- .../entity/projectile/DaggerRender.java | 609 ++-------------- tconstruct/dimension/TinkerChunkProvider.java | 4 +- 9 files changed, 386 insertions(+), 1169 deletions(-) rename assets/tinker/{sounds => sound}/frypan_hit.ogg (100%) rename assets/tinker/{sounds => sound}/launcher_clank.ogg (100%) rename assets/tinker/{sounds => sound}/little_saw.ogg (100%) create mode 100644 tconstruct/client/ToolCoreRenderer.java diff --git a/assets/tinker/sounds/frypan_hit.ogg b/assets/tinker/sound/frypan_hit.ogg similarity index 100% rename from assets/tinker/sounds/frypan_hit.ogg rename to assets/tinker/sound/frypan_hit.ogg diff --git a/assets/tinker/sounds/launcher_clank.ogg b/assets/tinker/sound/launcher_clank.ogg similarity index 100% rename from assets/tinker/sounds/launcher_clank.ogg rename to assets/tinker/sound/launcher_clank.ogg diff --git a/assets/tinker/sounds/little_saw.ogg b/assets/tinker/sound/little_saw.ogg similarity index 100% rename from assets/tinker/sounds/little_saw.ogg rename to assets/tinker/sound/little_saw.ogg diff --git a/tconstruct/client/TClientEvents.java b/tconstruct/client/TClientEvents.java index fbb03516..294d0861 100644 --- a/tconstruct/client/TClientEvents.java +++ b/tconstruct/client/TClientEvents.java @@ -40,7 +40,7 @@ public class TClientEvents boolean initSounds; - /*@ForgeSubscribe + @ForgeSubscribe public void onSound (SoundLoadEvent event) { if (!initSounds) @@ -59,7 +59,7 @@ public class TClientEvents System.err.println("[TConstruct] Failed to register one or more sounds"); } } - }*/ + } /* Liquids */ @ForgeSubscribe diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java index 076d1dbc..384f5cad 100644 --- a/tconstruct/client/TProxyClient.java +++ b/tconstruct/client/TProxyClient.java @@ -311,6 +311,28 @@ public class TProxyClient extends TProxyCommon { 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.battleaxe.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.battlesign.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.broadsword.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.chisel.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.cleaver.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.cutlass.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.excavator.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.frypan.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.hammer.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.hatchet.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.longsword.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.lumberaxe.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.mattock.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.pickaxe.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.rapier.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.scythe.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.shovel.itemID, renderer); addRenderMappings(); addToolButtons(); diff --git a/tconstruct/client/ToolCoreRenderer.java b/tconstruct/client/ToolCoreRenderer.java new file mode 100644 index 00000000..9bc12ee7 --- /dev/null +++ b/tconstruct/client/ToolCoreRenderer.java @@ -0,0 +1,251 @@ +package tconstruct.client; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import tconstruct.library.tools.ToolCore; + +public class ToolCoreRenderer implements IItemRenderer +{ + @Override + public boolean handleRenderType (ItemStack item, ItemRenderType type) + { + switch (type) + { + case ENTITY: + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + case INVENTORY: + return true; + default: + System.out.println("[TCon] Unhandled render case!"); + case FIRST_PERSON_MAP: + return false; + } + } + + @Override + public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) + { + return handleRenderType(item, type) & helper.ordinal() < ItemRendererHelper.EQUIPPED_BLOCK.ordinal(); + } + + private static final int toolIcons = 10; + + @Override + public void renderItem (ItemRenderType type, ItemStack item, Object... data) + { + ToolCore tool = (ToolCore) item.getItem(); + + boolean isInventory = type == ItemRenderType.INVENTORY; + Entity ent = null; + if (data.length > 1) + ent = (Entity) data[1]; + + int iconParts = toolIcons;//tool.getRenderPasses(item.getItemDamage()); + + Icon[] tempParts = new Icon[iconParts]; + label: + { + if (!isInventory && ent instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) ent; + ItemStack itemInUse = player.getItemInUse(); + if (itemInUse != null) + { + int useCount = player.getItemInUseCount(); + for (int i = iconParts; i-- > 0;) + tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount); + break label; + } + } + for (int i = iconParts; i-- > 0;) + tempParts[i] = tool.getIcon(item, i); + } + + int count = 0; + Icon[] parts = new Icon[iconParts]; + for (int i = 0; i < iconParts; ++i) + { + Icon part = tempParts[i]; + if (part == null || part == ToolCore.blankSprite | part == ToolCore.emptyIcon) + ++count; + else + parts[i - count] = part; + } + iconParts -= count; + + if (iconParts <= 0) + { + iconParts = 1; + // TODO: assign default sprite + // parts = new Icon[]{ defaultSprite }; + } + + Tessellator tess = Tessellator.instance; + float[] xMax = new float[iconParts]; + float[] yMin = new float[iconParts]; + float[] xMin = new float[iconParts]; + float[] yMax = new float[iconParts]; + int[] sheetWidth = new int[iconParts]; + int[] sheetHeight = new int[iconParts]; + float depth = 1f / 16f; + + float[] width = new float[iconParts]; + float[] height = new float[iconParts]; + float[] xDiff = new float[iconParts]; + float[] yDiff = new float[iconParts]; + for (int i = 0; i < iconParts; ++i) + { + Icon icon = parts[i]; + xMin[i] = icon.getMinU(); + xMax[i] = icon.getMaxU(); + yMin[i] = icon.getMinV(); + yMax[i] = icon.getMaxV(); + sheetWidth[i] = icon.getOriginX(); + sheetHeight[i] = icon.getOriginY(); + width[i] = sheetWidth[i] * (xMax[i] - xMin[i]); + height[i] = sheetHeight[i] * (yMax[i] - yMin[i]); + xDiff[i] = xMin[i] - xMax[i]; + yDiff[i] = yMin[i] - yMax[i]; + } + GL11.glPushMatrix(); + + if (type == ItemRenderType.INVENTORY) + { + GL11.glDisable(GL11.GL_LIGHTING); + tess.startDrawingQuads(); + for (int i = 0; i < iconParts; ++i) + { + tess.addVertexWithUV(0, 16, 0, xMin[i], yMax[i]); + tess.addVertexWithUV(16, 16, 0, xMax[i], yMax[i]); + tess.addVertexWithUV(16, 0, 0, xMax[i], yMin[i]); + tess.addVertexWithUV(0, 0, 0, xMin[i], yMin[i]); + } + tess.draw(); + GL11.glEnable(GL11.GL_LIGHTING); + } + else + { + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + switch (type) + { + case EQUIPPED_FIRST_PERSON: + break; + case EQUIPPED: + GL11.glTranslatef(0, -4 / 16f, 0); + break; + case ENTITY: + GL11.glTranslatef(0, 4 / 16f, 0); + break; + default: + } + + tess.startDrawingQuads(); + tess.setNormal(0, 0, 1); + for (int i = 0; i < iconParts; ++i) + { + tess.addVertexWithUV(0, 0, 0, xMax[i], yMax[i]); + tess.addVertexWithUV(1, 0, 0, xMin[i], yMax[i]); + tess.addVertexWithUV(1, 1, 0, xMin[i], yMin[i]); + tess.addVertexWithUV(0, 1, 0, xMax[i], yMin[i]); + } + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(0, 0, -1); + for (int i = 0; i < iconParts; ++i) + { + tess.addVertexWithUV(0, 1, -depth, xMax[i], yMin[i]); + tess.addVertexWithUV(1, 1, -depth, xMin[i], yMin[i]); + tess.addVertexWithUV(1, 0, -depth, xMin[i], yMax[i]); + tess.addVertexWithUV(0, 0, -depth, xMax[i], yMax[i]); + } + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(-1, 0, 0); + int k; + float pos; + float iconPos; + + for (int i = 0; i < iconParts; ++i) + { + for (k = 0; k < width[i]; ++k) + { + pos = k / width[i]; + iconPos = xMax[i] + xDiff[i] * pos - 0.5F / sheetWidth[i]; + tess.addVertexWithUV(pos, 0, -depth, iconPos, yMax[i]); + tess.addVertexWithUV(pos, 0, 0, iconPos, yMax[i]); + tess.addVertexWithUV(pos, 1, 0, iconPos, yMin[i]); + tess.addVertexWithUV(pos, 1, -depth, iconPos, yMin[i]); + } + } + + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(1, 0, 0); + float posEnd; + + for (int i = 0; i < iconParts; ++i) + { + for (k = 0; k < width[i]; ++k) + { + pos = k / width[i]; + iconPos = xMax[i] + xDiff[i] * pos - 0.5F / sheetWidth[i]; + posEnd = pos + 1 / width[i]; + tess.addVertexWithUV(posEnd, 1, -depth, iconPos, yMin[i]); + tess.addVertexWithUV(posEnd, 1, 0, iconPos, yMin[i]); + tess.addVertexWithUV(posEnd, 0, 0, iconPos, yMax[i]); + tess.addVertexWithUV(posEnd, 0, -depth, iconPos, yMax[i]); + } + } + + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(0, 1, 0); + + for (int i = 0; i < iconParts; ++i) + { + for (k = 0; k < height[i]; ++k) + { + pos = k / height[i]; + iconPos = yMax[i] + yDiff[i] * pos - 0.5F / sheetHeight[i]; + posEnd = pos + 1 / height[i]; + tess.addVertexWithUV(0, posEnd, 0, xMax[i], iconPos); + tess.addVertexWithUV(1, posEnd, 0, xMin[i], iconPos); + tess.addVertexWithUV(1, posEnd, -depth, xMin[i], iconPos); + tess.addVertexWithUV(0, posEnd, -depth, xMax[i], iconPos); + } + } + + tess.draw(); + tess.startDrawingQuads(); + tess.setNormal(0, -1, 0); + + for (int i = 0; i < iconParts; ++i) + { + for (k = 0; k < height[i]; ++k) + { + pos = k / height[i]; + iconPos = yMax[i] + yDiff[i] * pos - 0.5F / sheetHeight[i]; + tess.addVertexWithUV(1, pos, 0, xMin[i], iconPos); + tess.addVertexWithUV(0, pos, 0, xMax[i], iconPos); + tess.addVertexWithUV(0, pos, -depth, xMax[i], iconPos); + tess.addVertexWithUV(1, pos, -depth, xMin[i], iconPos); + } + } + + tess.draw(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + } + + GL11.glPopMatrix(); + } +} diff --git a/tconstruct/client/entity/projectile/ArrowRender.java b/tconstruct/client/entity/projectile/ArrowRender.java index d26f0e68..a36bbe09 100644 --- a/tconstruct/client/entity/projectile/ArrowRender.java +++ b/tconstruct/client/entity/projectile/ArrowRender.java @@ -2,19 +2,12 @@ package tconstruct.client.entity.projectile; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -23,612 +16,86 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import tconstruct.entity.projectile.ArrowEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ArrowRender extends Render { - private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png"); - private RenderBlocks itemRenderBlocks = new RenderBlocks(); + private static RenderItem renderer = new RenderItem(); + private Random random = new Random(); - /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ - private Random random = new Random(); - public boolean renderWithColor = true; + public ArrowRender() {} - /** Defines the zLevel of rendering of item on GUI. */ - public float zLevel; - public static boolean renderInFrame; + /** + * Renders the item + */ + public void doRenderItem(ArrowEntity arrow, double par2, double par4, double par6, float par8, float par9) + { + random.setSeed(187L); + ItemStack item = arrow.getEntityItem(); + GL11.glPushMatrix(); + GL11.glTranslatef((float)par2, (float)par4, (float)par6); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glRotatef(arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par9 - 45.0F, 0.0F, 0.0F, 1.0F); + float shake = arrow.arrowShake - par9; + if (shake > 0.0F) + GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); + GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); + float scale = 1.35f; + GL11.glScalef(scale, scale, scale); + ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, renderBlocks); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } - public ArrowRender() - { - this.shadowSize = 0.15F; - this.shadowOpaque = 0.75F; - } + /** + * Renders the item's icon or block into the UI at the specified position. + */ + public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + { + renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); + } - /** - * Renders the item - */ - public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) - { - this.func_110777_b(par1ArrowEntity); - this.random.setSeed(187L); - ItemStack itemstack = par1ArrowEntity.getEntityItem(); + /** + * Render the item's icon or block into the GUI, including the glint effect. + */ + public void renderItemAndEffectIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + { + renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); + } - if (itemstack.getItem() != null) - { - GL11.glPushMatrix(); - float f2 = shouldBob() ? MathHelper.sin(((float) 0 + par9) / 10.0F + 0) * 0.1F + 0.1F : 0F; - float f3 = (((float) 0 + par9) / 20.0F + 0) * (180F / (float) Math.PI); - byte b0 = getMiniBlockCount(itemstack); + /** + * Renders the item's overlay information. Examples being stack count or + * damage on top of the item's image at the specified position. + */ + public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + { + renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); + } - GL11.glTranslatef((float) par2, (float) par4 + f2, (float) par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - float f4; - float f5; - float f6; - int i; - - Block block = null; - if (itemstack.itemID < Block.blocksList.length) - { - block = Block.blocksList[itemstack.itemID]; - } - - if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) - { - GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); - - if (renderInFrame) - { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glTranslatef(0.0F, 0.05F, 0.0F); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - } - - float f7 = 0.25F; - int j = block.getRenderType(); - - if (j == 1 || j == 19 || j == 12 || j == 2) - { - f7 = 0.5F; - } - - GL11.glScalef(f7, f7, f7); - - for (i = 0; i < b0; ++i) - { - GL11.glPushMatrix(); - - if (i > 0) - { - f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - GL11.glTranslatef(f5, f4, f6); - } - - f5 = 1.0F; - this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); - GL11.glPopMatrix(); - } - } - else - { - float f8; - - if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) - { - if (renderInFrame) - { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) - { - this.random.setSeed(187L); - Icon icon = itemstack.getItem().getIcon(itemstack, k); - f8 = 1.0F; - - if (this.renderWithColor) - { - i = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, k); - f5 = (float) (i >> 16 & 255) / 255.0F; - f4 = (float) (i >> 8 & 255) / 255.0F; - f6 = (float) (i & 255) / 255.0F; - GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); - this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8, k); - } - else - { - this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); - } - } - } - else - { - if (renderInFrame) - { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - Icon icon1 = itemstack.getIconIndex(); - - if (this.renderWithColor) - { - int l = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, 0); - f8 = (float) (l >> 16 & 255) / 255.0F; - float f9 = (float) (l >> 8 & 255) / 255.0F; - f5 = (float) (l & 255) / 255.0F; - f4 = 1.0F; - this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); - } - else - { - this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, 1.0F, 1.0F, 1.0F); - } - } - } - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - } - - protected ResourceLocation func_110796_a (ArrowEntity par1ArrowEntity) - { - return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); - } - - /** - * Renders a dropped item - */ - private void renderDroppedItem (ArrowEntity par1ArrowEntity, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) - { - renderDroppedItem(par1ArrowEntity, par2Icon, par3, par4, par5, par6, par7, 0); - } - - private void renderDroppedItem (ArrowEntity arrow, Icon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) - { - Tessellator tessellator = Tessellator.instance; - - if (par2Icon == null) - { - TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K(); - ResourceLocation resourcelocation = texturemanager.func_130087_a(arrow.getEntityItem().getItemSpriteNumber()); - par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno"); - } - - float f4 = ((Icon) par2Icon).getMinU(); - float f5 = ((Icon) par2Icon).getMaxU(); - float f6 = ((Icon) par2Icon).getMinV(); - float f7 = ((Icon) par2Icon).getMaxV(); - float f8 = 1.0F; - float f9 = 0.5F; - float f10 = 0.25F; - float f11; - GL11.glRotatef(arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par4 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par4 - 45.0F, 0.0F, 0.0F, 1.0F); - - GL11.glPushMatrix(); - - if (renderInFrame) - { - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - } - else - { - GL11.glRotatef((((float) 0 + par4) / 20.0F + 0) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); - } - - float f12 = 0.0625F; - f11 = 0.021875F; - ItemStack itemstack = arrow.getEntityItem(); - int j = itemstack.stackSize; - byte b0 = getMiniItemCount(itemstack); - - GL11.glTranslatef(-f9, -f10, -((f12 + f11) * (float) b0 / 2.0F)); - - for (int k = 0; k < b0; ++k) - { - // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug... - if (k > 0 && shouldSpreadItems()) - { - float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - GL11.glTranslatef(x, y, f12 + f11); - } - else - { - GL11.glTranslatef(0f, 0f, f12 + f11); - } - - if (itemstack.getItemSpriteNumber() == 0) - { - this.func_110776_a(TextureMap.field_110575_b); - } - else - { - this.func_110776_a(TextureMap.field_110576_c); - } - - GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12); - - if (itemstack.hasEffect(pass)) - { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.func_110577_a(field_110798_h); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - float f13 = 0.76F; - GL11.glColor4f(0.5F * f13, 0.25F * f13, 0.8F * f13, 1.0F); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); - float f14 = 0.125F; - GL11.glScalef(f14, f14, f14); - float f15 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; - GL11.glTranslatef(f15, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(f14, f14, f14); - f15 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; - GL11.glTranslatef(-f15, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } - } - - GL11.glPopMatrix(); - } - - /** - * Renders the item's icon or block into the UI at the specified position. - */ - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, false); - } - - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, boolean renderEffect) - { - int k = par3ItemStack.itemID; - int l = par3ItemStack.getItemDamage(); - Object object = par3ItemStack.getIconIndex(); - float f; - int i1; - float f1; - float f2; - - Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) - { - par2TextureManager.func_110577_a(TextureMap.field_110575_b); - GL11.glPushMatrix(); - GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); - GL11.glScalef(10.0F, 10.0F, 10.0F); - GL11.glTranslatef(1.0F, 0.5F, 1.0F); - GL11.glScalef(1.0F, 1.0F, -1.0F); - GL11.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); - f = (float) (i1 >> 16 & 255) / 255.0F; - f1 = (float) (i1 >> 8 & 255) / 255.0F; - f2 = (float) (i1 & 255) / 255.0F; - - if (this.renderWithColor) - { - GL11.glColor4f(f, f1, f2, 1.0F); - } - - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - this.itemRenderBlocks.useInventoryTint = this.renderWithColor; - this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); - this.itemRenderBlocks.useInventoryTint = true; - GL11.glPopMatrix(); - } - else if (Item.itemsList[k].requiresMultipleRenderPasses()) - { - GL11.glDisable(GL11.GL_LIGHTING); - - for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) - { - par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); - Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); - int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); - f1 = (float) (k1 >> 16 & 255) / 255.0F; - f2 = (float) (k1 >> 8 & 255) / 255.0F; - float f3 = (float) (k1 & 255) / 255.0F; - - if (this.renderWithColor) - { - GL11.glColor4f(f1, f2, f3, 1.0F); - } - - this.renderIcon(par4, par5, icon, 16, 16); - - if (par3ItemStack.hasEffect(j1)) - { - renderEffect(par2TextureManager, par4, par5); - } - } - - GL11.glEnable(GL11.GL_LIGHTING); - } - else - { - GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber()); - par2TextureManager.func_110577_a(resourcelocation); - - if (object == null) - { - object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno"); - } - - i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); - f = (float) (i1 >> 16 & 255) / 255.0F; - f1 = (float) (i1 >> 8 & 255) / 255.0F; - f2 = (float) (i1 & 255) / 255.0F; - - if (this.renderWithColor) - { - GL11.glColor4f(f, f1, f2, 1.0F); - } - - this.renderIcon(par4, par5, (Icon) object, 16, 16); - GL11.glEnable(GL11.GL_LIGHTING); - - if (par3ItemStack.hasEffect(0)) - { - renderEffect(par2TextureManager, par4, par5); - } - } - - GL11.glEnable(GL11.GL_CULL_FACE); - } - - private void renderEffect (TextureManager manager, int x, int y) - { - GL11.glDepthFunc(GL11.GL_GREATER); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - manager.func_110577_a(field_110798_h); - this.zLevel -= 50.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); - GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); - this.renderGlint(x * 431278612 + y * 32178161, x - 2, y - 2, 20, 20); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - this.zLevel += 50.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } - - /** - * Render the item's icon or block into the GUI, including the glint effect. - */ - public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - if (par3ItemStack != null) - { - if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) par5)) - { - this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true); - } - - /* Modders must handle this themselves if they use custom renderers! - if (par3ItemStack.hasEffect()) - { - GL11.glDepthFunc(GL11.GL_GREATER); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - par2TextureManager.func_110577_a(field_110798_h); - this.zLevel -= 50.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); - GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); - this.renderGlint(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - this.zLevel += 50.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } - */ - } - } - - private void renderGlint (int par1, int par2, int par3, int par4, int par5) - { - for (int j1 = 0; j1 < 2; ++j1) - { - if (j1 == 0) - { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - } - - if (j1 == 1) - { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - } - - float f = 0.00390625F; - float f1 = 0.00390625F; - float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) / (3000.0F + (float) (j1 * 1873)) * 256.0F; - float f3 = 0.0F; - Tessellator tessellator = Tessellator.instance; - float f4 = 4.0F; - - if (j1 == 1) - { - f4 = -1.0F; - } - - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); - tessellator.draw(); - } - } - - /** - * Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the - * specified position. - */ - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, (String) null); - } - - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, String par6Str) - { - if (par3ItemStack != null) - { - if (par3ItemStack.stackSize > 1 || par6Str != null) - { - String s1 = par6Str == null ? String.valueOf(par3ItemStack.stackSize) : par6Str; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - par1FontRenderer.drawStringWithShadow(s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } - - if (par3ItemStack.isItemDamaged()) - { - int k = (int) Math.round(13.0D - (double) par3ItemStack.getItemDamageForDisplay() * 13.0D / (double) par3ItemStack.getMaxDamage()); - int l = (int) Math.round(255.0D - (double) par3ItemStack.getItemDamageForDisplay() * 255.0D / (double) par3ItemStack.getMaxDamage()); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_TEXTURE_2D); - Tessellator tessellator = Tessellator.instance; - int i1 = 255 - l << 16 | l << 8; - int j1 = (255 - l) / 4 << 16 | 16128; - this.renderQuad(tessellator, par4 + 2, par5 + 13, 13, 2, 0); - this.renderQuad(tessellator, par4 + 2, par5 + 13, 12, 1, j1); - this.renderQuad(tessellator, par4 + 2, par5 + 13, k, 1, i1); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - } - } - - /** - * Adds a quad to the tesselator at the specified position with the set width and height and color. Args: - * tessellator, x, y, width, height, color - */ - private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) - { - par1Tessellator.startDrawingQuads(); - par1Tessellator.setColorOpaque_I(par6); - par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + 0), 0.0D); - par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + par5), 0.0D); - par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + par5), 0.0D); - par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + 0), 0.0D); - par1Tessellator.draw(); - } - - public void renderIcon (int par1, int par2, Icon par3Icon, int par4, int par5) - { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMaxV()); - tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMaxV()); - tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMinV()); - tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMinV()); - tessellator.draw(); - } - - protected ResourceLocation func_110775_a (Entity par1Entity) + /** + * Actually renders the given argument. This is a synthetic bridge method, + * always casting down its argument and then handing it off to a worker + * function which does the actual work. In all probabilty, the class Render + * is generic (Render 1) - ret = 2; - if (stack.stackSize > 5) - ret = 3; - if (stack.stackSize > 20) - ret = 4; - if (stack.stackSize > 40) - ret = 5; - return ret; - } - - /** - * Allows for a subclass to override how many rendered items appear in a - * "mini item 3d stack" - * @param stack - * @return - */ - public byte getMiniItemCount (ItemStack stack) - { - byte ret = 1; - if (stack.stackSize > 1) - ret = 2; - if (stack.stackSize > 15) - ret = 3; - if (stack.stackSize > 31) - ret = 4; - return ret; + return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/tconstruct/client/entity/projectile/DaggerRender.java b/tconstruct/client/entity/projectile/DaggerRender.java index 6a12bd21..fd710ee7 100644 --- a/tconstruct/client/entity/projectile/DaggerRender.java +++ b/tconstruct/client/entity/projectile/DaggerRender.java @@ -2,19 +2,12 @@ package tconstruct.client.entity.projectile; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -23,23 +16,14 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import tconstruct.entity.projectile.DaggerEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class DaggerRender extends Render { - private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png"); - private RenderBlocks itemRenderBlocks = new RenderBlocks(); - - /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ + private static RenderItem renderer = new RenderItem(); private Random random = new Random(); - public boolean renderWithColor = true; - - /** Defines the zLevel of rendering of item on GUI. */ - public float zLevel; - public static boolean renderInFrame; public DaggerRender() { @@ -50,584 +34,77 @@ public class DaggerRender extends Render /** * Renders the item */ - public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) + public void doRenderItem(DaggerEntity dagger, double par2, double par4, double par6, float par8, float par9) { - this.func_110777_b(par1ArrowEntity); - this.random.setSeed(187L); - ItemStack itemstack = par1ArrowEntity.getEntityItem(); - - if (itemstack.getItem() != null) - { - GL11.glPushMatrix(); - float f2 = shouldBob() ? MathHelper.sin(((float) 0 + par9) / 10.0F + 0) * 0.1F + 0.1F : 0F; - float f3 = (((float) 0 + par9) / 20.0F + 0) * (180F / (float) Math.PI); - byte b0 = getMiniBlockCount(itemstack); - - GL11.glTranslatef((float) par2, (float) par4 + f2, (float) par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - float f4; - float f5; - float f6; - int i; - - Block block = null; - if (itemstack.itemID < Block.blocksList.length) - { - block = Block.blocksList[itemstack.itemID]; - } - - if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) - { - GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); - - if (renderInFrame) - { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glTranslatef(0.0F, 0.05F, 0.0F); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - } - - float f7 = 0.25F; - int j = block.getRenderType(); - - if (j == 1 || j == 19 || j == 12 || j == 2) - { - f7 = 0.5F; - } - - GL11.glScalef(f7, f7, f7); - - for (i = 0; i < b0; ++i) - { - GL11.glPushMatrix(); - - if (i > 0) - { - f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; - GL11.glTranslatef(f5, f4, f6); - } - - f5 = 1.0F; - this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); - GL11.glPopMatrix(); - } - } - else - { - float f8; - - if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) - { - if (renderInFrame) - { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) - { - this.random.setSeed(187L); - Icon icon = itemstack.getItem().getIcon(itemstack, k); - f8 = 1.0F; - - if (this.renderWithColor) - { - i = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, k); - f5 = (float) (i >> 16 & 255) / 255.0F; - f4 = (float) (i >> 8 & 255) / 255.0F; - f6 = (float) (i & 255) / 255.0F; - GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); - this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8, k); - } - else - { - this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); - } - } - } - else - { - if (renderInFrame) - { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - Icon icon1 = itemstack.getIconIndex(); - - if (this.renderWithColor) - { - int l = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, 0); - f8 = (float) (l >> 16 & 255) / 255.0F; - float f9 = (float) (l >> 8 & 255) / 255.0F; - f5 = (float) (l & 255) / 255.0F; - f4 = 1.0F; - this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); - } - else - { - this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, 1.0F, 1.0F, 1.0F); - } - } - } - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - } - - protected ResourceLocation func_110796_a (DaggerEntity par1ArrowEntity) - { - return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); - } - - /** - * Renders a dropped item - */ - private void renderDroppedItem (DaggerEntity par1ArrowEntity, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) - { - renderDroppedItem(par1ArrowEntity, par2Icon, par3, par4, par5, par6, par7, 0); - } - - private void renderDroppedItem (DaggerEntity dagger, Icon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) - { - Tessellator tessellator = Tessellator.instance; - - if (par2Icon == null) - { - TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K(); - ResourceLocation resourcelocation = texturemanager.func_130087_a(dagger.getEntityItem().getItemSpriteNumber()); - par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno"); - } - - float f4 = ((Icon) par2Icon).getMinU(); - float f5 = ((Icon) par2Icon).getMaxU(); - float f6 = ((Icon) par2Icon).getMinV(); - float f7 = ((Icon) par2Icon).getMaxV(); - float f8 = 1.0F; - float f9 = 0.5F; - float f10 = 0.25F; - float f11; - float rotation = dagger.prevRotationPitch + (dagger.rotationPitch - dagger.prevRotationPitch) * par7; - + random.setSeed(187L); + ItemStack item = dagger.getEntityItem(); GL11.glPushMatrix(); - - if (renderInFrame) - { - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - } - else - { - GL11.glRotatef((((float) 0 + par4) / 20.0F + 0) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); - } - - float f12 = 0.0625F; - f11 = 0.021875F; - ItemStack itemstack = dagger.getEntityItem(); - int j = itemstack.stackSize; - byte b0 = getMiniItemCount(itemstack); - - GL11.glTranslatef(-f9, -f10, -((f12 + f11) * (float) b0 / 2.0F)); - - for (int k = 0; k < b0; ++k) - { - // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug... - if (k > 0 && shouldSpreadItems()) - { - float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - GL11.glTranslatef(x, y, f12 + f11); - } - else - { - GL11.glTranslatef(0f, 0f, f12 + f11); - } - - if (itemstack.getItemSpriteNumber() == 0) - { - this.func_110776_a(TextureMap.field_110575_b); - } - else - { - this.func_110776_a(TextureMap.field_110576_c); - } - - GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12); - - if (itemstack.hasEffect(pass)) - { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.func_110577_a(field_110798_h); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - float f13 = 0.76F; - GL11.glColor4f(0.5F * f13, 0.25F * f13, 0.8F * f13, 1.0F); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); - float f14 = 0.125F; - GL11.glScalef(f14, f14, f14); - float f15 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; - GL11.glTranslatef(f15, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(f14, f14, f14); - f15 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; - GL11.glTranslatef(-f15, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } - } - + GL11.glTranslatef((float)par2, (float)par4, (float)par6); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glRotatef(dagger.prevRotationYaw + (dagger.rotationYaw - dagger.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(dagger.prevRotationPitch + (dagger.rotationPitch - dagger.prevRotationPitch) * par9 - 45.0F, 0.0F, 0.0F, 1.0F); + + float rotation = dagger.prevRotationPitch + (dagger.rotationPitch - dagger.prevRotationPitch) * par9; + GL11.glRotatef(dagger.rotationYaw + 90, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(rotation * 15, 0.0F, 0.0F, 1.0F); + + float shake = dagger.arrowShake - par9; + if (shake > 0.0F) + GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); + GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); + float scale = 1.35f; + GL11.glScalef(scale, scale, scale); + ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, renderBlocks); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); } /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + public void renderItemIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) { - renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, false); - } - - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, boolean renderEffect) - { - int k = par3ItemStack.itemID; - int l = par3ItemStack.getItemDamage(); - Object object = par3ItemStack.getIconIndex(); - float f; - int i1; - float f1; - float f2; - - Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) - { - par2TextureManager.func_110577_a(TextureMap.field_110575_b); - GL11.glPushMatrix(); - GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); - GL11.glScalef(10.0F, 10.0F, 10.0F); - GL11.glTranslatef(1.0F, 0.5F, 1.0F); - GL11.glScalef(1.0F, 1.0F, -1.0F); - GL11.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); - f = (float) (i1 >> 16 & 255) / 255.0F; - f1 = (float) (i1 >> 8 & 255) / 255.0F; - f2 = (float) (i1 & 255) / 255.0F; - - if (this.renderWithColor) - { - GL11.glColor4f(f, f1, f2, 1.0F); - } - - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - this.itemRenderBlocks.useInventoryTint = this.renderWithColor; - this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); - this.itemRenderBlocks.useInventoryTint = true; - GL11.glPopMatrix(); - } - else if (Item.itemsList[k].requiresMultipleRenderPasses()) - { - GL11.glDisable(GL11.GL_LIGHTING); - - for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) - { - par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c); - Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); - int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); - f1 = (float) (k1 >> 16 & 255) / 255.0F; - f2 = (float) (k1 >> 8 & 255) / 255.0F; - float f3 = (float) (k1 & 255) / 255.0F; - - if (this.renderWithColor) - { - GL11.glColor4f(f1, f2, f3, 1.0F); - } - - this.renderIcon(par4, par5, icon, 16, 16); - - if (par3ItemStack.hasEffect(j1)) - { - renderEffect(par2TextureManager, par4, par5); - } - } - - GL11.glEnable(GL11.GL_LIGHTING); - } - else - { - GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber()); - par2TextureManager.func_110577_a(resourcelocation); - - if (object == null) - { - object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno"); - } - - i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); - f = (float) (i1 >> 16 & 255) / 255.0F; - f1 = (float) (i1 >> 8 & 255) / 255.0F; - f2 = (float) (i1 & 255) / 255.0F; - - if (this.renderWithColor) - { - GL11.glColor4f(f, f1, f2, 1.0F); - } - - this.renderIcon(par4, par5, (Icon) object, 16, 16); - GL11.glEnable(GL11.GL_LIGHTING); - - if (par3ItemStack.hasEffect(0)) - { - renderEffect(par2TextureManager, par4, par5); - } - } - - GL11.glEnable(GL11.GL_CULL_FACE); - } - - private void renderEffect (TextureManager manager, int x, int y) - { - GL11.glDepthFunc(GL11.GL_GREATER); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - manager.func_110577_a(field_110798_h); - this.zLevel -= 50.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); - GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); - this.renderGlint(x * 431278612 + y * 32178161, x - 2, y - 2, 20, 20); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - this.zLevel += 50.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); + renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + public void renderItemAndEffectIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) { - if (par3ItemStack != null) - { - if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) par5)) - { - this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true); - } - - /* Modders must handle this themselves if they use custom renderers! - if (par3ItemStack.hasEffect()) - { - GL11.glDepthFunc(GL11.GL_GREATER); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - par2TextureManager.func_110577_a(field_110798_h); - this.zLevel -= 50.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); - GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); - this.renderGlint(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - this.zLevel += 50.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } - */ - } - } - - private void renderGlint (int par1, int par2, int par3, int par4, int par5) - { - for (int j1 = 0; j1 < 2; ++j1) - { - if (j1 == 0) - { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - } - - if (j1 == 1) - { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - } - - float f = 0.00390625F; - float f1 = 0.00390625F; - float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) / (3000.0F + (float) (j1 * 1873)) * 256.0F; - float f3 = 0.0F; - Tessellator tessellator = Tessellator.instance; - float f4 = 4.0F; - - if (j1 == 1) - { - f4 = -1.0F; - } - - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); - tessellator.draw(); - } + renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** - * Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the - * specified position. + * Renders the item's overlay information. Examples being stack count or + * damage on top of the item's image at the specified position. */ - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) + public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) { - this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, (String) null); - } - - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, String par6Str) - { - if (par3ItemStack != null) - { - if (par3ItemStack.stackSize > 1 || par6Str != null) - { - String s1 = par6Str == null ? String.valueOf(par3ItemStack.stackSize) : par6Str; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - par1FontRenderer.drawStringWithShadow(s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } - - if (par3ItemStack.isItemDamaged()) - { - int k = (int) Math.round(13.0D - (double) par3ItemStack.getItemDamageForDisplay() * 13.0D / (double) par3ItemStack.getMaxDamage()); - int l = (int) Math.round(255.0D - (double) par3ItemStack.getItemDamageForDisplay() * 255.0D / (double) par3ItemStack.getMaxDamage()); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_TEXTURE_2D); - Tessellator tessellator = Tessellator.instance; - int i1 = 255 - l << 16 | l << 8; - int j1 = (255 - l) / 4 << 16 | 16128; - this.renderQuad(tessellator, par4 + 2, par5 + 13, 13, 2, 0); - this.renderQuad(tessellator, par4 + 2, par5 + 13, 12, 1, j1); - this.renderQuad(tessellator, par4 + 2, par5 + 13, k, 1, i1); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - } + renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** - * Adds a quad to the tesselator at the specified position with the set width and height and color. Args: - * tessellator, x, y, width, height, color + * Actually renders the given argument. This is a synthetic bridge method, + * always casting down its argument and then handing it off to a worker + * function which does the actual work. In all probabilty, the class Render + * is generic (Render 1) - ret = 2; - if (stack.stackSize > 5) - ret = 3; - if (stack.stackSize > 20) - ret = 4; - if (stack.stackSize > 40) - ret = 5; - return ret; - } - - /** - * Allows for a subclass to override how many rendered items appear in a - * "mini item 3d stack" - * @param stack - * @return - */ - public byte getMiniItemCount (ItemStack stack) - { - byte ret = 1; - if (stack.stackSize > 1) - ret = 2; - if (stack.stackSize > 15) - ret = 3; - if (stack.stackSize > 31) - ret = 4; - return ret; + return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/tconstruct/dimension/TinkerChunkProvider.java b/tconstruct/dimension/TinkerChunkProvider.java index 09dfcfbd..f8eb36a7 100644 --- a/tconstruct/dimension/TinkerChunkProvider.java +++ b/tconstruct/dimension/TinkerChunkProvider.java @@ -6,7 +6,6 @@ import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.NETH import java.util.List; import java.util.Random; -import mods.natura.dimension.NetheriteChunk; import net.minecraft.block.Block; import net.minecraft.block.BlockSand; import net.minecraft.entity.EnumCreatureType; @@ -303,7 +302,8 @@ public class TinkerChunkProvider implements IChunkProvider this.replaceBlocksForBiome(chunkX, chunkZ, lowerArray); this.netherCaveGenerator.generate(this, this.worldObj, chunkX, chunkZ, lowerArray); this.genNetherBridge.generate(this, this.worldObj, chunkX, chunkZ, lowerArray); - Chunk chunk = new NetheriteChunk(this.worldObj, lowerArray, chunkX, chunkZ); + Chunk chunk = new Chunk(this.worldObj, lowerArray, chunkX, chunkZ); + //Chunk chunk = new NetheriteChunk(this.worldObj, lowerArray, chunkX, chunkZ); BiomeGenBase[] abiomegenbase = this.worldObj.getWorldChunkManager().loadBlockGeneratorData((BiomeGenBase[]) null, chunkX * 16, chunkZ * 16, 16, 16); byte[] abyte1 = chunk.getBiomeArray(); From 0be9e6753eade59b928abd65513877404d1d2041 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 12 Aug 2013 05:58:15 -0700 Subject: [PATCH 3/3] Essence Extractor and Slime Islands --- assets/tinker/lang/en_US.xml | 84 +++-- assets/tinker/textures/blocks/coal_block.png | Bin 0 -> 368 bytes .../textures/blocks/compressed_ender.png | Bin 0 -> 570 bytes .../textures/blocks/extractor_bottom.png | Bin 0 -> 665 bytes .../tinker/textures/blocks/extractor_side.png | Bin 0 -> 567 bytes .../tinker/textures/blocks/extractor_top.png | Bin 0 -> 427 bytes .../textures/blocks/liquid_alubrass.txt | 38 --- .../textures/blocks/liquid_alubrass_flow.txt | 16 - .../textures/blocks/liquid_aluminum.txt | 38 --- .../textures/blocks/liquid_aluminum_flow.txt | 16 - .../tinker/textures/blocks/liquid_alumite.txt | 38 --- .../textures/blocks/liquid_alumite_flow.txt | 16 - .../tinker/textures/blocks/liquid_ardite.txt | 38 --- .../textures/blocks/liquid_ardite_flow.txt | 16 - .../tinker/textures/blocks/liquid_bronze.txt | 38 --- .../textures/blocks/liquid_bronze_flow.txt | 16 - .../tinker/textures/blocks/liquid_cobalt.txt | 38 --- .../textures/blocks/liquid_cobalt_flow.txt | 16 - .../tinker/textures/blocks/liquid_copper.txt | 38 --- .../textures/blocks/liquid_copper_flow.txt | 16 - assets/tinker/textures/blocks/liquid_cow.txt | 32 -- .../textures/blocks/liquid_cow_flow.txt | 0 ...mcmeta => liquid_electrum_flow.png.mcmeta} | 0 .../tinker/textures/blocks/liquid_ender.png | Bin 0 -> 8594 bytes .../textures/blocks/liquid_ender.png.mcmeta | 3 + .../textures/blocks/liquid_ender_flow.png | Bin 0 -> 8468 bytes .../blocks/liquid_ender_flow.png.mcmeta | 5 + .../tinker/textures/blocks/liquid_glass.txt | 32 -- .../textures/blocks/liquid_glass_flow.txt | 0 assets/tinker/textures/blocks/liquid_gold.txt | 38 --- .../textures/blocks/liquid_gold_flow.txt | 16 - assets/tinker/textures/blocks/liquid_iron.txt | 38 --- .../textures/blocks/liquid_iron_flow.txt | 16 - .../textures/blocks/liquid_manyullyn.txt | 38 --- .../textures/blocks/liquid_manyullyn_flow.txt | 16 - .../textures/blocks/liquid_obsidian.txt | 38 --- .../textures/blocks/liquid_obsidian_flow.txt | 16 - .../tinker/textures/blocks/liquid_steel.txt | 38 --- .../textures/blocks/liquid_steel_flow.txt | 16 - .../tinker/textures/blocks/liquid_stone.txt | 32 -- .../textures/blocks/liquid_stone_flow.txt | 0 assets/tinker/textures/blocks/liquid_tin.txt | 38 --- .../textures/blocks/liquid_tin_flow.txt | 16 - .../textures/blocks/liquid_villager.txt | 32 -- .../textures/blocks/liquid_villager_flow.txt | 0 assets/tinker/textures/blocks/slime_blue.png | Bin 0 -> 13627 bytes .../textures/blocks/slime_blue.png.mcmeta | 3 + .../textures/blocks/slime_blue_flow.png | Bin 0 -> 9503 bytes .../blocks/slime_blue_flow.png.mcmeta | 5 + .../textures/blocks/slimeblock_blue.png | Bin 0 -> 513 bytes .../textures/blocks/slimeblock_green.png | Bin 0 -> 534 bytes .../textures/blocks/slimeblock_purple.png | Bin 0 -> 551 bytes .../tinker/textures/blocks/slimedirt_blue.png | Bin 0 -> 919 bytes .../textures/blocks/slimedirt_green.png | Bin 0 -> 908 bytes .../textures/blocks/slimegrass_blue_fern.png | Bin 0 -> 824 bytes .../textures/blocks/slimegrass_blue_side.png | Bin 0 -> 869 bytes .../textures/blocks/slimegrass_blue_tall.png | Bin 0 -> 871 bytes .../textures/blocks/slimegrass_blue_top.png | Bin 0 -> 884 bytes .../blocks/slimegrass_green_blue_side.png | Bin 0 -> 884 bytes .../blocks/slimegrass_green_dirt_side.png | Bin 0 -> 839 bytes .../blocks/slimegrass_green_green_side.png | Bin 0 -> 877 bytes .../textures/blocks/slimegrass_green_top.png | Bin 0 -> 956 bytes .../blocks/slimeleaves_blue_fancy.png | Bin 0 -> 575 bytes .../textures/blocks/slimeleaves_blue_fast.png | Bin 0 -> 531 bytes .../textures/blocks/slimesapling_blue.png | Bin 0 -> 752 bytes .../tinker/textures/blocks/slimesnow_blue.png | Bin 0 -> 637 bytes .../items/arrow/thaumium_arrow_head.png | Bin 0 -> 116 bytes .../items/arrow/thaumium_arrow_shaft.png | Bin 0 -> 104 bytes .../items/materials/bucket_electrum.png | Bin 0 -> 299 bytes .../textures/items/materials/bucket_ender.png | Bin 0 -> 539 bytes .../textures/items/materials/bucket_invar.png | Bin 0 -> 516 bytes .../textures/items/materials/bucket_lead.png | Bin 0 -> 481 bytes .../items/materials/bucket_nickel.png | Bin 0 -> 551 bytes .../textures/items/materials/bucket_shiny.png | Bin 0 -> 566 bytes .../items/materials/bucket_silver.png | Bin 0 -> 547 bytes .../items/materials/cast_bowstring.png | Bin 0 -> 414 bytes .../items/materials/cast_fletching.png | Bin 0 -> 414 bytes .../items/parts/thaumium_arrowhead.png | Bin 0 -> 141 bytes tconstruct/TConstruct.java | 4 +- tconstruct/blocks/EssenceExtractor.java | 182 +++++++++++ tconstruct/blocks/SoilBlock.java | 2 +- tconstruct/blocks/TMetalBlock.java | 2 +- .../blocks/logic/EssenceExtractorLogic.java | 245 +++++++++++++++ tconstruct/blocks/slime/SlimeFluid.java | 59 ++++ tconstruct/blocks/slime/SlimeGel.java | 76 +++++ tconstruct/blocks/slime/SlimeGrass.java | 127 ++++++++ tconstruct/blocks/slime/SlimeLeaves.java | 144 +++++++++ tconstruct/blocks/slime/SlimeSapling.java | 127 ++++++++ tconstruct/blocks/slime/SlimeTallGrass.java | 131 ++++++++ tconstruct/client/StepSoundSlime.java | 30 ++ tconstruct/common/TContent.java | 157 +++++++--- tconstruct/items/EssenceCrystal.java | 102 +++++++ tconstruct/items/FilledBucket.java | 4 +- .../items/blocks/CraftedSoilItemBlock.java | 10 +- .../items/blocks/SlimeGelItemBlock.java | 33 ++ .../items/blocks/SlimeGrassItemBlock.java | 33 ++ .../items/blocks/SlimeLeavesItemBlock.java | 33 ++ .../items/blocks/SlimeSaplingItemBlock.java | 33 ++ .../items/blocks/SlimeTallGrassItem.java | 39 +++ tconstruct/util/PHConstruct.java | 28 +- tconstruct/worldgen/PlantGen.java | 53 ++++ tconstruct/worldgen/SlimeIslandGen.java | 288 ++++++++++++++++++ tconstruct/worldgen/SlimeTreeGen.java | 166 ++++++++++ 103 files changed, 2123 insertions(+), 915 deletions(-) create mode 100644 assets/tinker/textures/blocks/coal_block.png create mode 100644 assets/tinker/textures/blocks/compressed_ender.png create mode 100644 assets/tinker/textures/blocks/extractor_bottom.png create mode 100644 assets/tinker/textures/blocks/extractor_side.png create mode 100644 assets/tinker/textures/blocks/extractor_top.png delete mode 100644 assets/tinker/textures/blocks/liquid_alubrass.txt delete mode 100644 assets/tinker/textures/blocks/liquid_alubrass_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_aluminum.txt delete mode 100644 assets/tinker/textures/blocks/liquid_aluminum_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_alumite.txt delete mode 100644 assets/tinker/textures/blocks/liquid_alumite_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_ardite.txt delete mode 100644 assets/tinker/textures/blocks/liquid_ardite_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_bronze.txt delete mode 100644 assets/tinker/textures/blocks/liquid_bronze_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_cobalt.txt delete mode 100644 assets/tinker/textures/blocks/liquid_cobalt_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_copper.txt delete mode 100644 assets/tinker/textures/blocks/liquid_copper_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_cow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_cow_flow.txt rename assets/tinker/textures/blocks/{liquid_electrum_flow.mcmeta => liquid_electrum_flow.png.mcmeta} (100%) create mode 100644 assets/tinker/textures/blocks/liquid_ender.png create mode 100644 assets/tinker/textures/blocks/liquid_ender.png.mcmeta create mode 100644 assets/tinker/textures/blocks/liquid_ender_flow.png create mode 100644 assets/tinker/textures/blocks/liquid_ender_flow.png.mcmeta delete mode 100644 assets/tinker/textures/blocks/liquid_glass.txt delete mode 100644 assets/tinker/textures/blocks/liquid_glass_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_gold.txt delete mode 100644 assets/tinker/textures/blocks/liquid_gold_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_iron.txt delete mode 100644 assets/tinker/textures/blocks/liquid_iron_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_manyullyn.txt delete mode 100644 assets/tinker/textures/blocks/liquid_manyullyn_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_obsidian.txt delete mode 100644 assets/tinker/textures/blocks/liquid_obsidian_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_steel.txt delete mode 100644 assets/tinker/textures/blocks/liquid_steel_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_stone.txt delete mode 100644 assets/tinker/textures/blocks/liquid_stone_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_tin.txt delete mode 100644 assets/tinker/textures/blocks/liquid_tin_flow.txt delete mode 100644 assets/tinker/textures/blocks/liquid_villager.txt delete mode 100644 assets/tinker/textures/blocks/liquid_villager_flow.txt create mode 100644 assets/tinker/textures/blocks/slime_blue.png create mode 100644 assets/tinker/textures/blocks/slime_blue.png.mcmeta create mode 100644 assets/tinker/textures/blocks/slime_blue_flow.png create mode 100644 assets/tinker/textures/blocks/slime_blue_flow.png.mcmeta create mode 100644 assets/tinker/textures/blocks/slimeblock_blue.png create mode 100644 assets/tinker/textures/blocks/slimeblock_green.png create mode 100644 assets/tinker/textures/blocks/slimeblock_purple.png create mode 100644 assets/tinker/textures/blocks/slimedirt_blue.png create mode 100644 assets/tinker/textures/blocks/slimedirt_green.png create mode 100644 assets/tinker/textures/blocks/slimegrass_blue_fern.png create mode 100644 assets/tinker/textures/blocks/slimegrass_blue_side.png create mode 100644 assets/tinker/textures/blocks/slimegrass_blue_tall.png create mode 100644 assets/tinker/textures/blocks/slimegrass_blue_top.png create mode 100644 assets/tinker/textures/blocks/slimegrass_green_blue_side.png create mode 100644 assets/tinker/textures/blocks/slimegrass_green_dirt_side.png create mode 100644 assets/tinker/textures/blocks/slimegrass_green_green_side.png create mode 100644 assets/tinker/textures/blocks/slimegrass_green_top.png create mode 100644 assets/tinker/textures/blocks/slimeleaves_blue_fancy.png create mode 100644 assets/tinker/textures/blocks/slimeleaves_blue_fast.png create mode 100644 assets/tinker/textures/blocks/slimesapling_blue.png create mode 100644 assets/tinker/textures/blocks/slimesnow_blue.png create mode 100644 assets/tinker/textures/items/arrow/thaumium_arrow_head.png create mode 100644 assets/tinker/textures/items/arrow/thaumium_arrow_shaft.png create mode 100644 assets/tinker/textures/items/materials/bucket_electrum.png create mode 100644 assets/tinker/textures/items/materials/bucket_ender.png create mode 100644 assets/tinker/textures/items/materials/bucket_invar.png create mode 100644 assets/tinker/textures/items/materials/bucket_lead.png create mode 100644 assets/tinker/textures/items/materials/bucket_nickel.png create mode 100644 assets/tinker/textures/items/materials/bucket_shiny.png create mode 100644 assets/tinker/textures/items/materials/bucket_silver.png create mode 100644 assets/tinker/textures/items/materials/cast_bowstring.png create mode 100644 assets/tinker/textures/items/materials/cast_fletching.png create mode 100644 assets/tinker/textures/items/parts/thaumium_arrowhead.png create mode 100644 tconstruct/blocks/EssenceExtractor.java create mode 100644 tconstruct/blocks/logic/EssenceExtractorLogic.java create mode 100644 tconstruct/blocks/slime/SlimeFluid.java create mode 100644 tconstruct/blocks/slime/SlimeGel.java create mode 100644 tconstruct/blocks/slime/SlimeGrass.java create mode 100644 tconstruct/blocks/slime/SlimeLeaves.java create mode 100644 tconstruct/blocks/slime/SlimeSapling.java create mode 100644 tconstruct/blocks/slime/SlimeTallGrass.java create mode 100644 tconstruct/client/StepSoundSlime.java create mode 100644 tconstruct/items/EssenceCrystal.java create mode 100644 tconstruct/items/blocks/SlimeGelItemBlock.java create mode 100644 tconstruct/items/blocks/SlimeGrassItemBlock.java create mode 100644 tconstruct/items/blocks/SlimeLeavesItemBlock.java create mode 100644 tconstruct/items/blocks/SlimeSaplingItemBlock.java create mode 100644 tconstruct/items/blocks/SlimeTallGrassItem.java create mode 100644 tconstruct/worldgen/PlantGen.java create mode 100644 tconstruct/worldgen/SlimeIslandGen.java create mode 100644 tconstruct/worldgen/SlimeTreeGen.java diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml index a339446f..c8d6bfd7 100644 --- a/assets/tinker/lang/en_US.xml +++ b/assets/tinker/lang/en_US.xml @@ -21,7 +21,6 @@ Casting Table Tool Forge - Crafting Station Drying Rack Slimy Mud Grout @@ -42,7 +41,7 @@ Copper Oreberry Bush Tin Oreberry Bush Aluminum Oreberry Bush - Essence Oreberry Bush + Essence Berry Bush Iron Gravel Ore Gold Gravel Ore @@ -132,8 +131,10 @@ Copper Nugget Tin Nugget Aluminum Nugget - Essence Crystal + Fake Essence Crystal Aluminum Brass Nugget + Silky Cloth + Silky Jewel Obsidian Nugget Cobalt Nugget Ardite Nugget @@ -142,6 +143,8 @@ Alumite Nugget Steel Nugget + Essence Crystal + Smeltery Controller Smeltery Drain Seared Bricks @@ -166,6 +169,7 @@ Spruce Barricade Birch Barricade Jungle Barricade + Essence Extractor Block of Cobalt Block of Ardite @@ -177,8 +181,10 @@ Block of Aluminum Brass Block of Alumite Block of Steel + Block of Solid Ender Torch + Crafting Station Clear Glass Soul Glass @@ -239,6 +245,15 @@ Graveyard Soil Slab Consecrated Soil Slab + Blue Slimedirt + Slimy Leaves + Slimy Sapling + Slimy Grass + Slimy Grass + Slimy Grass + Congealed Blue Slime + Congealed Green Slime + Knapsack Blank Pattern Blank Cast @@ -271,33 +286,41 @@ Seared Stone Bucket Liquified Emerald Bucket Bucket o' Blood + Molten Nickel Bucket + Molten Lead Bucket + Molten Silver Bucket + Molten Shiny Bucket + Molten Invar Bucket + Molten Electrum Bucket + Liquified Ender Bucket Bowstring - Enchanted Bowstring + Enchanted Bowstring - Molten Iron - Molten Gold - Molten Copper - Molten Tin - Molten Aluminum - Molten Cobalt - Molten Ardite - Molten Bronze - Molten Aluminum Brass - Molten Manyullyn - Molten Alumite - Molten Obsidian - Molten Steel - Molten Glass - Seared Stone - Liquified Emerald - Blood - Molten Nickel - Molten Lead - Molten Silver - Molten Shiny - Molten Invar - Molten Electrum + Molten Iron + Molten Gold + Molten Copper + Liquid Tin + Molten Aluminum + Molten Cobalt + Molten Ardite + Molten Bronze + Molten Aluminum Brass + Molten Manyullyn + Molten Alumite + Molten Obsidian + Molten Steel + Molten Glass + Seared Stone + Liquified Emerald + Blood + Molten Nickel + Molten Silver + Molten Lead + Molten Shiny + Molten Invar + Molten Electrum + Liquified Ender Jeweled Apple Gelatinous Slime @@ -312,7 +335,7 @@ Blue Slime King Slime - Gardeslime + Gardeslime Armor Gui @@ -321,10 +344,6 @@ %1$s will be a stepping stone for our revolution! %1$s thought swimming in hot liquids was a good idea - %1$s watched their legs get blown off - %1$s was doomed to fall by Landmine - %1$s took a ride on a firework - Wooden Stone Iron @@ -366,5 +385,6 @@ Molten Platinum Molten Invar Molten Shiny + Liquid Ender \ No newline at end of file diff --git a/assets/tinker/textures/blocks/coal_block.png b/assets/tinker/textures/blocks/coal_block.png new file mode 100644 index 0000000000000000000000000000000000000000..024404bc1460a980280f4c6a94598bcd952410c7 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sDMfiPqHot61OLG}_)Usv|KtZW>5Oes%&T!BI#JY5_^EKcVJ zZ(P@6z+=p@O7E@Pv48)!8!9ea!JS`uj`e=&%8aDz8&4O>9B=;r^xcWo*QB1W`PlRO z*s~z6s`mxuXDk;k*%~%O^4w>h0!>!$?6-^z#?_6XzVBrj44${_WyCC1t6hli9lOeZTi5`(>^u9-dTw^aoT*A7513OI` z-|P@-W9PbdW@U$5YSZ+lm<9Y^%ibs7{Qmc165D38V;#3YO8_mr_+!(goE)%A_P)p1*4;0j{VE~`kD@)TY7)%qq~b=e1rDw;Z!xP+esB@UQN z7Gn%4z0#4deb1RWGw1pZ-@b0yt?U`x8b>R=gKP!yyQ3oqfXNK94FoO>Z}lAgRfaJz zPGN8k#)4`^-&`BQW&x0GAm6}hEy&4(y0I*{U#cK`hAb7p@&N|#0kFifhQ}uu&!OLi z`vqM87V~lmfe+J#NPG{XuJ)ybm4WL-heK3Ut$@iTV>&D3;T~E3aT~uFaXb0Lca&`Ieh=Imlp)(_(&#&`1B6q9>fmJXAngY zHr2&sCXP<1o9KJsR^>%-df;B;1Rirp{=mgY=rrJGQncC=qhAL<(Eg%bdScOO>ksrC zxcmg+iP$|KT5YjKks?0Z8|>N#9k?|`@~07*qo IM6N<$f-kiElK=n! literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/extractor_bottom.png b/assets/tinker/textures/blocks/extractor_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a7755c878b87092c6e106be358728e33be41c821 GIT binary patch literal 665 zcmV;K0%rY*P)R({%!rEda8DuPG>yW7N<_fVK5AZ znz#r-f+js+lX7-XJG<|_eednA^y%Y=fF}$YKsSwWA)8NAJ=_iF0O|A!>GTS^Y4F^9 z34p380L%fLAD^LC6!51a8F@l><5dB&)-6_Cq^u!mg)X#MG@{t6P{(&5TsTV>~@EKAc#p4x@m-DX(7P9 z9#Y!ciX6l{>dNOH4))o9`7Z1Q^fzYa8o`|*Ui#rbK*jU3g(U0g?my(Bjaj2*$7 zckdB?o5t~3)IqVN5%?1TYKDpM+r%V^cqYYuy^g9Wj2%H`V-MlCIe#RF4o1P4>dq^G z8Gx!OxN$*wL#OZGgnQY18gJk+7`V|p_?P$f!2xPTp?lfG6C=9K9u}>c=Pt{zw7L)p z03?&k$V+oL{tekep33?j_Jc*j5sbwxcDqBikVma3OolG=%kd~eCYQju9!xDef{A;F zEq5puHR9PtUaJN3WV>U%oPlP00000NkvXXu0mjf6qqQ- literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/extractor_side.png b/assets/tinker/textures/blocks/extractor_side.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f52414d8756aa81d265a4cac39012b1a7af88b GIT binary patch literal 567 zcmV-70?7S|P)fihH0V1a=P0HNLqOK%`|!H5uCLMB=y zq)H4OC@k2D(k8JQ+r-%U!3jfDhpH74JKuJ6-skz=qXYjZvi17OG$E#ECppEVz4w0w zjy^qy?f`(%rB5s&rg>3)i4k;Y_Ada?r2MV0VfIk&lqi<(qD5DD_wg+PfDv>s0~>&Y zMjgZK-3lKx>HwI5jS+MJ5Rg+e`xgv6pF>??@A0!6k}G(tcArCCVc_|*wsMNdhemz+ z=O$T`P>UL$k4|{=^i|j@x0oTjR-mu9v28cZ$F87X!!faBoRQ;`D2Y_6+hJvZ>{@}L z<*>0+!S)s6`F^+ZP}n2BMJ&mFhOjLJqz8m7(QOF6~}}LxDdXQdxfha4jHf z5?;n(wY15Pi5=eMl^i2?gzI`U!P)UC(P$Kahx_};Wr^;0lab@oHB4GG*{tn^TLl49 zi;1}aAe&7iq+(bTn|wi`d~cUt&|<-I7&?7==WX%@1-UFS{^=178kHC-C1SJ zVeAd)32jtWBa=@eh%2<31^~&WC05l90J?^G^BezlegjRd#!lt5Z%_aL002ovPDHLk FV1lnk^Z5V( literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/extractor_top.png b/assets/tinker/textures/blocks/extractor_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1eaf2fa1531b834d8780544c034e6ff1d00635cc GIT binary patch literal 427 zcmV;c0aX5pP)}W*O$uISkLeO;bsoAtGsyPW^Jg?vxMF4tCmU{j*mxG;sJfp}1pl$n|e*j8~ VgHTT`olpP(002ovPDHLkV1jG(s*L~u literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/liquid_alubrass.txt b/assets/tinker/textures/blocks/liquid_alubrass.txt deleted file mode 100644 index b0a7c084..00000000 --- a/assets/tinker/textures/blocks/liquid_alubrass.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/assets/tinker/textures/blocks/liquid_alubrass_flow.txt b/assets/tinker/textures/blocks/liquid_alubrass_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/assets/tinker/textures/blocks/liquid_alubrass_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/assets/tinker/textures/blocks/liquid_aluminum.txt b/assets/tinker/textures/blocks/liquid_aluminum.txt deleted file mode 100644 index b0a7c084..00000000 --- a/assets/tinker/textures/blocks/liquid_aluminum.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/assets/tinker/textures/blocks/liquid_aluminum_flow.txt b/assets/tinker/textures/blocks/liquid_aluminum_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/assets/tinker/textures/blocks/liquid_aluminum_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/assets/tinker/textures/blocks/liquid_alumite.txt b/assets/tinker/textures/blocks/liquid_alumite.txt deleted file mode 100644 index b0a7c084..00000000 --- a/assets/tinker/textures/blocks/liquid_alumite.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/assets/tinker/textures/blocks/liquid_alumite_flow.txt b/assets/tinker/textures/blocks/liquid_alumite_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/assets/tinker/textures/blocks/liquid_alumite_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/assets/tinker/textures/blocks/liquid_ardite.txt b/assets/tinker/textures/blocks/liquid_ardite.txt deleted file mode 100644 index b0a7c084..00000000 --- a/assets/tinker/textures/blocks/liquid_ardite.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/assets/tinker/textures/blocks/liquid_ardite_flow.txt b/assets/tinker/textures/blocks/liquid_ardite_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/assets/tinker/textures/blocks/liquid_ardite_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/assets/tinker/textures/blocks/liquid_bronze.txt b/assets/tinker/textures/blocks/liquid_bronze.txt deleted file mode 100644 index b0a7c084..00000000 --- a/assets/tinker/textures/blocks/liquid_bronze.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/assets/tinker/textures/blocks/liquid_bronze_flow.txt b/assets/tinker/textures/blocks/liquid_bronze_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/assets/tinker/textures/blocks/liquid_bronze_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/assets/tinker/textures/blocks/liquid_cobalt.txt b/assets/tinker/textures/blocks/liquid_cobalt.txt deleted file mode 100644 index b0a7c084..00000000 --- a/assets/tinker/textures/blocks/liquid_cobalt.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/assets/tinker/textures/blocks/liquid_cobalt_flow.txt b/assets/tinker/textures/blocks/liquid_cobalt_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/assets/tinker/textures/blocks/liquid_cobalt_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/assets/tinker/textures/blocks/liquid_copper.txt b/assets/tinker/textures/blocks/liquid_copper.txt deleted file mode 100644 index b0a7c084..00000000 --- a/assets/tinker/textures/blocks/liquid_copper.txt +++ /dev/null @@ -1,38 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -18*2 -17*2 -16*2 -15*2 -14*2 -13*2 -12*2 -11*2 -10*2 -9*2 -8*2 -7*2 -6*2 -5*2 -4*2 -3*2 -2*2 -1*2 diff --git a/assets/tinker/textures/blocks/liquid_copper_flow.txt b/assets/tinker/textures/blocks/liquid_copper_flow.txt deleted file mode 100644 index 2e6ca4fc..00000000 --- a/assets/tinker/textures/blocks/liquid_copper_flow.txt +++ /dev/null @@ -1,16 +0,0 @@ -0*3 -1*3 -2*3 -3*3 -4*3 -5*3 -6*3 -7*3 -8*3 -9*3 -10*3 -11*3 -12*3 -13*3 -14*3 -15*3 diff --git a/assets/tinker/textures/blocks/liquid_cow.txt b/assets/tinker/textures/blocks/liquid_cow.txt deleted file mode 100644 index d8fe765a..00000000 --- a/assets/tinker/textures/blocks/liquid_cow.txt +++ /dev/null @@ -1,32 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -20*2 -21*2 -22*2 -23*2 -24*2 -25*2 -26*2 -27*2 -28*2 -29*2 -30*2 -31*2 diff --git a/assets/tinker/textures/blocks/liquid_cow_flow.txt b/assets/tinker/textures/blocks/liquid_cow_flow.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/assets/tinker/textures/blocks/liquid_electrum_flow.mcmeta b/assets/tinker/textures/blocks/liquid_electrum_flow.png.mcmeta similarity index 100% rename from assets/tinker/textures/blocks/liquid_electrum_flow.mcmeta rename to assets/tinker/textures/blocks/liquid_electrum_flow.png.mcmeta diff --git a/assets/tinker/textures/blocks/liquid_ender.png b/assets/tinker/textures/blocks/liquid_ender.png new file mode 100644 index 0000000000000000000000000000000000000000..bbc90b395ba1e19a4559508e67f3cd1fad9bc1d1 GIT binary patch literal 8594 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 literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/liquid_ender.png.mcmeta b/assets/tinker/textures/blocks/liquid_ender.png.mcmeta new file mode 100644 index 00000000..4f0718ac --- /dev/null +++ b/assets/tinker/textures/blocks/liquid_ender.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/assets/tinker/textures/blocks/liquid_ender_flow.png b/assets/tinker/textures/blocks/liquid_ender_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..2612655ccf82d3518d010d1c400bb11a293e3dab GIT binary patch literal 8468 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 L6YUBu$Eg1YQzJ2& literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slime_blue_flow.png.mcmeta b/assets/tinker/textures/blocks/slime_blue_flow.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/assets/tinker/textures/blocks/slime_blue_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/assets/tinker/textures/blocks/slimeblock_blue.png b/assets/tinker/textures/blocks/slimeblock_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..cc2a161b4a4857cc14f6f6794e2dd113d4c649b0 GIT binary patch literal 513 zcmV+c0{;DpP)DSmz1ahjs&uAAQfDn;)R zbW=A@Y*}9-yO8V%0zrTy4LL)RU%yce5!|JBi3ktegTS5E#8Z5GrZq}I)gpr4Qxn_) z?I|o=LpF&Xu&CmH{>E`d6*H652QLRd{R{2n?8_28L=%Zf!p%Jbcg_Wnl#I6vrNs9q z0M`K4H2}aJui?QaxXbCxk}dWNs$iJ$z?tEWD(=*Z8W3NfDa|lLmDXqtV7HsNFMELF z%G;I8g-ubFmsQ8C0IK9X^FyZfNpjp_#scnfz1sXw4b^+DycfIz*p5TSZ1UUa2e>(V zojfqn4az&kaA%v`CMiV(>m9utqi2BXyuQvM9aN=vn`qTpur!4N4huhj@P6Z5(1v@6 zsB9az``i!cXlyoNJmp8p#=?NX44;P7N{vq$M{$ZX?l|Q}V_H@#s?<8v6A_D)*x#Qu zXdN2vlo1Q9(WgZLCL)pZbYSj}Pt}JfKyNgalu-Q-fwbeCB<#G`00000NkvXXu0mjf D1kcn$ literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slimeblock_green.png b/assets/tinker/textures/blocks/slimeblock_green.png new file mode 100644 index 0000000000000000000000000000000000000000..e0d9f10d8e87638da315d87c325c29bd1745b7a5 GIT binary patch literal 534 zcmV+x0_pvUP)wij+4JTS`yqKjIe(OcaeWqbZjs?Iju;-ngjdju93!U#U zNC1!x{CIT&FK`CD@30O|m|##G)~wjQg6ETqX(Vd!>jPqRMtM6lgycuHA3nUj)^~F8 zeW{UF8@vb^xa}p9FLna`>oH+4=WESCl+J-TLA{VyO>9|XTsL;+ED>G4)7GQNOTh+g zd);s2+zm4$)C}SPAM^`p7* YAHJNR4C6yl1Xw@K@3EnhN|D)2Ey#wa~bZ+saUWu zfx+(nLrG#$jlESoWok(I{_SciKvrc`Mgdt=Rt954bG>|QW8`*AHMFwE$jYiHfy<(; zi3)Ba(A+?tpSEL9HO$1<>v6iY=U>~1YF$@1z?uMJQ~*^~+id{e#MhUxzU1=Q3><*g z6#z0gqOuC1lGi_5@9x%2l*L3%{&VGBGfGXeV&Ag61oiM~;YfEEF*){v0+zF?Nk%<< zHsJiIuTOEi4pTv~Q`5+r!fLdBH|b|PR zwxrsoX_~f4lXf$^h~3GKb{*|$m9AB^wF^}f(j+AWFc|P32Adu9^f`T`-~aq;i&8|+ zwp{j30BCi(q-z*Yu1KN~bEiU16tSEg02HC|?%x+!6$kn5<27=&rT6j~00qND7A1nn zB@5zDW|?GC$ST~R7I(Qk{|8l4iQEP9!QoRbdnY)}d#I9%U2h=C3EpH(&QNJ}x&*U1 zn=nQ-1b6*DCC#DWl*t)7A`Ai=ttW)x2-Pf+t|3i)Ow-1yILsGQRNbIh-bFPGX6`AE zkAEf%0(N#2#NEvqQLvhZt0($0$`dp6E56Sk|-qa-cr&WN~Xo_yK7wU0|2U|vQAeJLAqJfesqjDIQ*L7hYJ)< zC5b{>oi3g`VVwoks$Z~E1$9zHh?I4jFddEAs$f@JWYP-Z-VV`>B1%qh^y9CrS21R# zLaqhNs;1|=9fp1WE71U({Yeho!H+XtlB=8y%XHYfc%w#rsz2LAJ9KLWfO#m zfg_f+=Qq?k4MIOa({*xr1pr;Q84ackuHIl( z9I_-sRtrHC=ZE}sTx_=m!g)B)Z zLPex`B%x8;Z<5cK$pJ|iVO4D+FF;Wh3T2BlPEa%*`QF2Ckfa>maEM)R5XN)d>-Svs z&Ip$-dk?!j{^2LQ(H*5~6-_fSj1u-R)=Q$fa!RM5DJY)U39(7+t<(8 tW@`ZItv0?F;w^@Fiy;-~KJN8<{s+13TvL(KaKHcn002ovPDHLkV1gwkk=g(N literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slimedirt_green.png b/assets/tinker/textures/blocks/slimedirt_green.png new file mode 100644 index 0000000000000000000000000000000000000000..d499245241a696b992abaf1127ea88e93c7cc5a1 GIT binary patch literal 908 zcmV;719SX|P)NaxKz_BU-2u+*cniV8dCw=tD(lr2; znhtS9S`;W-2L1DY5sE=H&yb&=yrh46L8IG5C_5p$rvtw@J;mc@B6g6_!?qVwbT3~%l!t0l5HqkY)L zpZXMw5bNbLEI_T4D6cl;*^t#maWmug(+-Exg-(IRVNigT+w>KP|yd=DP z!2fcO(1bv5Sp< z+WULxj=|UqSdM30zW+cp@<@^dy{;jdI(b>*>fJ|FvqBmrWQ!azpC{b?^%C4U2e1rEa6uRPyDDBubEXe?DSUl9&yB8ZDP7@bIoj^gj1U9_Q@7c*+lN zUojiaFx@Iz&7@-1sJH7Rs}&;nI%H>mkJf>NH=H08h1QEUx?^$q{*-l50I<{9A&hgv i(TH#acDIdpJ>q{`;$+c))k{MF0000S*>JC)@o&MB9b`XxKyz- zF>Y%_s7axM67tx*_6HXFl0Ye??L#Osd`7wkm08 z@6%=OVa|8YjQDD2i;NH?#t@v20XXSJa6XThonbLw;3&}?ot~1I2|@@)S`!5UmoHqz zvVdV6xZkHzF0+|G2Y_9#e8BcN0Ki>e=US=EAIy|Rncg-nf7PHq4{F%LjXRWPx19+k`l~sZ1BT3 z-{MHglke{TCqbkXjim*~2Loy!T_sYA>W0LgzvL1g9;K?u1V>6DrFb`kX{fqC0$^va ziz6iu!`IkOHb;My4zMf}DaHR00LGD047Rr^R;%eNl(dF4pTJQc5Jlp>U)$ z0LRTX%Y`EL?%Rly7cUt1dc=c)Sh#V6;qET)*09$DVASb=5CUV!c^*fJ#_BwLO5w^C zjMgb)t3@0H{{#y#?smzRN@QIZfSl(M2Lb12^85v9f=<@knJJ?H0000nqs1SwUcCL(D76Q_=ywcYi4 zclJHY_rXt(4hR(Dj8B6A0H70c<+G|p+c|X=$5t4`S%x6=;@G`>wbAQh2%#N?JyjD0 zL?Ap~*%}d-QDlYlyR}9`Rz}PndtONtX{XHrz%?olE2fjg&#o@1fHXo>j8%*!gzP9R ziqe)=u)^@lvT#2CaiE|vWI2TY^<0C}c@Qw3hOceCTvjoWkbuZ%pEOl@IB763(tiD z4AS(YdaFt0kl^iNDd3zXiBMP7b9cRpqloi3P4nOUuvO4Sj5~_@e#Q7{GJZOpcn`mI zllaWBgGWzG z#>)qf0RTI9K4h*3MyEHncL4w|pZ|G1SxzpF&2EoJ9Dcd?i!*m51xtz&c!|9j*>kIE zws?|Odfm{8BA<;;4$MxUxhoKI?983f$w9%aMa;Xg^EPqhVx{W3uYJ#5EGG4hEdYS1 z=0ZOx*P3Rljq2M&xlj}!Bv`_!2r)HVO;OYl01@+xM%lMLB9WY4OoNC}S?COQAw;X$ ztX!+JV6_;ZU!4BM){Dkqcls-00000NkvXXu0mjf?evW| literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slimegrass_blue_tall.png b/assets/tinker/textures/blocks/slimegrass_blue_tall.png new file mode 100644 index 0000000000000000000000000000000000000000..bb10912e1db79b0f84430ebbfac0b8095c6c6dfe GIT binary patch literal 871 zcmV-t1DO1YP)^1QUw}Fm7q$Iw*~z z2$e)?k*X?PblXM$!)~jp>O<leQmPb7u#ieK2m=P=F`+~#r5FYQuH&#c{{fl?oclhdM3U>t z6qR(A2bBsr-C!{B**WX8l*&*q6zT6D%Px~F{-nGDV^4blF5{feIsEgp3`*uVZEStAC( zf%!(>xC0(r7A<#x+iLOp!ll1|EahU6_0*gIXdC4ZC5R#b3b$|bNxlexYnpt$usr31 z0RZN%C12fJRnEkx(Q1*a)zBVW7DvB5k}$6;2}2r3He<&D!1jiC@802UK9kwCHH>5u z-7-p$0^;vPjEaGfSrylxq6+g{s~$x7AF`E0jSoN6u_w4Md>>K{`Fjjmc^YL zi^_TOg#Pw60KH}tnM?rCibf1X_&+}X_8aAzCYoUY@Yb6OWLH)o3;~cJV6`xd_Vm=j zZMP|{uTzXC066i-)9A@0027%;i+mq>KY6{P{_Y*4J)B~FOMKwUcU zFAxBUBFUQyaJ!aR|IN#d?AoM)k-QBCBp=E(mxG!E1FO?XC0h+b7E9vEB0!TK)h4002ovPDHLkV1is~h!Ow* literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slimegrass_blue_top.png b/assets/tinker/textures/blocks/slimegrass_blue_top.png new file mode 100644 index 0000000000000000000000000000000000000000..5d9ad68e7f00cef2c16d991d65f4aa8080a78693 GIT binary patch literal 884 zcmV-)1B?8LP)PbXFR5;5$(o1V3RRBQYb8pqHcU4!Cwv$e`$zVbp zP*j9*1{rjxI~Oj*y?@Z9_*f_?0UyYqjv&J@nwVrJZFi@-p7-7=7Y?2ua8{rA_`&Jm z2!S027HtE-NO@c~6+6mj7DlYCVcoXap+^WoWemk)!F+FuD}hbdF;7x_A#kO`AH|x~ zaarq*g>Jb&-eW%q`KzwDtV%}8Bb-d=8F0rz$laX@mC<~)UgAkf>^Q{ABUa!_$xYXi zc|Ipe#=32|TrKhAm=C5eBJO_i>5%0)zL4zrKDD)^%Hy}2CA~2yrBFhWxr*HLD6OTn z2IV+h)D`lrg9A+8^XB%LKdX}4ShYbIWR z_~h3g20IKqyt?3>gIj#Rc*ZPF7>0q^aXG6tZ21ApwxQ{Js?CP&EF)A3PdbRVPrn>q z%eF|B;&Hjb1+LnL*l}5zjzBsnA$WH>r|LR>zgh88l5tU&l-45mgNP?(L7_FRH5j0_ zhT|+JkPfpj;?B;5uP@H{=II4JP*}sGvfwz$a9eBG4P%re$UGkx*m~|@9E426nCqs- z0I5=xy5q6Y=wic<&NVVs9#?fq=K5G`X@>zvNPHoBjxeaKhHSZ6a-RooMh1V+@DO@4I^r;dAMFt z>W-sy#H}bneE9RX!=4vV^*!fx$w`(!M`NkArnZ)m@;J#xthx?>z?EFp4a#wFJ7YPw z6`@j;*3cNkvTZnwQ>^kSbjKUx37?%k0U&V|;~?Z&+wl6PbXFR4C5{!AWl$RR93sH#6_eo5eF8du)&6CEl_) zPD4_Ow5WiB5S1c9qh5O8z#(UjNc;_s9INJlgt|$HOE_^sLMf28C~iue)^!}$OU53L zXWz{C5j)5Gkc2@Lbge!BAdQn9qnF|2Wxg~H^u9B4=ROVK)HlqxlXATZNkFLXWKCG6 zNrVaXkJc1$Y~)UcmbzE?yu>b?n-?vklg0^lg_+OiFwZKx*-xjw_2>8{OF;p}5=cxS z5mU74YBH9#q_sH;0Z|;Y&9Y9}LW^nXhNX zB=ObDZ~b}r_uChHjoXKVKk8yNiozHaUYV^TR(j6J3T#_7WhEsbk*8=%zsFT$g{_4~ zQ$J79(z($IK=?-QkOZ1V<~PMV2rRUfCuHYC0Im*_`D})r(f=^{F*e^DFhn$2;0^AY?KOBXXP|=L?n{!s+-T zw^$`hwehGAA!X zAcRUoG-;wVY*=8TfsGpzqcJ8*;-AnTpmA-Y(T(g#hzU_as1Z!;3{6`)ebCNOX4)y! z>9}a@#P)!QM}P?WU4s;=qBwcIos3W7_qp^jY>`})(y=B_^BoZ0E|VnPWLA$Fw$D@hmYVxd}!4J^3Ly_}Lx$f<6UHIGt;Vc`8{XVeuw)vDX& zxEaH(1kDmQmavhSsZ^I7Bok!($Mr%cdu*~(YeP$j`} z=XeK!VVHwtx=H()rqpzmz^IHQpwaQjc~iU5GyA*3PuVBOtlmzGWyK$RGPb4&NNIXWR1$-vGpiP>jasdwIGkNp z!e+rtSY^4xM-K#hCk`rHmxd3`mXX+CKt-?8}+HhuZ+)ak0sq z2>-Mi4FSNL&pY9O7h9Yj?W8FbL6+twxmVv>ST~GRURsTYg2R1#3BhWiM7hRXoc;|*^!^JejE zd>^&@dLPj!PUEgO005Y*e&(JR1Y<+2PGfrzjKeHq09r&Y>C9?d4MYQK63&|P218?( z!oSXsWmX!8vynI1t9)4Htu}eva?eaw<1cbqmZ36Vyu0$=BJzHk9`O*#SkkbfVTFav zB%B+pdPQya!cq6U$LQStg$I;za7!&{9AZmc!Hq)$ORq*J>2iq#3?VdF)ns)iB7PEJ z$aUv^`tH^T%QX6^aQlsYdPBdoDc5tN_(^l`(dItslTk3Ki`ARj&XD})MD~iJQy(9F z9%acdox{EDJI{wdZYhm4O(Z0rkk%?&JP*cR?E4d96!S7xM94tjSFG)0yPap$ zwtE(X|p3`M40s#K;dY8V->SDG1`1>qLuO6_B zfSf0X?>^-L0Pwm}&o`{eixxg~{2iV>BJ2?{FIcmee-TPJb!*h>NqGUS z-)d4kWzXj;C9CsQt8#5aGj&3|al2o?x()#7yl#!Ai_vl0T+2sk2H*c|mpGwrXq>{y zs|Bw&?wxcXgn}yNN=kyTXy#5|{+_e+(DmamL$>Yz`|}&Eq%PfM$%r1i{S2l`O3$8Vbq9#y)rdf;`nc`rvQb3wQWmMoVHAC^e1R+{b`6S9P zhvA(s9=Ox_qQ9tYt`Xa|do$v=Ak9kaC9_r-wEJqs04XKPqHIWhlAy)gfmL5CHK^%e zj2Nc0RpzzapFg}x;}`&7RV~MhoZ-+J0<~72wub)$d~RBLl4Imh00000NkvXXu0mjf DuPKu` literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slimegrass_green_top.png b/assets/tinker/textures/blocks/slimegrass_green_top.png new file mode 100644 index 0000000000000000000000000000000000000000..cf7ff8b49dc674f9624d9e62b7d8e7381dd29558 GIT binary patch literal 956 zcmV;t14I0YP)1R5;5$)5&X8cL2cg@4R*P<;@zMWXxzL$+WdW zMXlIIL_tUiy-J~wUVH4l|3|MqmO`OWs1)o;DPk>68!cvHOq{Ia>~EPjZ~665@E`ad zKJbmK{<$F(Nx=_&+V(L3McrWEJfsxQvyiCK^G6&{I=I3^Lt*HdSi61BE!9yZB6Qt8 z%c%u4NkxySJR3YGr6=jQeNOEz>($%TVl(VmZ)lnO6!jdjMie0g%Gp?%dzFtFdN#lJ zHi^j!DK$w>O_Nj8=(0xF9gx?vtYnuta8GF;9-tXfHqL)WB>&@ekuBwjDmrJPB~0HX zuO@kV`hsveMTx7(vP@pjQq&E`o`n-kP~|A?!4cBErCUrxk2|Fs{5yKZRpUJtQ}bjJ z3GOei^Y!8e){({Oq|1Dw#515OWm`~I=v`-L0NI}c; z)*mn$nz((3U)9G*hL&N+d4r)DO#La-&_j`AG)bjp?(_4}LjW$O8`R@fL=du^YEU^- z0YEBfIo8UnSb+&Z+difduQB#4=HgY>W^S`>?NN-C@PVkJ^XTLWgXx%?h08=rzuXib z&NSJ#k7y?A^!yQSFs0-6n1oX@Y7ziVQvdf69wG<!F9CK5t$t8|TLy)7G8;p2w^3yC>ma+JuGr=N@YScQ>q(K7eAYOHWPIbj^QjJ*-2Z&TEBT*@}- zxI+NaN{m-+~g9(JGO8yz120000J%=P)WFU8GbZ8()Nlj2>E@cM*00E;(L_t(I%Y~CMZXz)l zg})!AMD!q#rU}{$kRm-PpxS~HATEK6oo22;gE#@jRx?F29lby}|x`;^XU+?~mVXe?AFdxtQA~%>d}8PMb6{S9-PU4FLA% z6A#P9oMbQrpx12K{(OoDM&pS9 z7htaRvf1&VdjJ6?gJF#D`t)qB^wF^^y{x}p-L<=1%-N(_gn0b|Stqetuh}wRoo>aUzg{7U#~)KkqQ73Lzg}s&+iG?^Xm&hky4y+;)%~!p1z17N7dfv_ z&vsMo!oe4Lbo2nom7YrT5Fow0zeRZ6)G6!*F5T40BtXP)WFU8GbZ8()Nlj2>E@cM*00DPNL_t(I%Y~D%Pr^VH z#=ioE!R7`X8qFoLFgg+w2jk+RGYg{){t<)(oAj?Jp<@>YC)hP{Fpe%J9U$a_+=@6| zVjb{Zj!VHeUf$jB`@VP2>CUG)_ZY-_g}2WIvN%Dz-va=oVFW6d`%prn-S2^W3;-b3 zE0mY);9+@mh{gI#U*;YItJZLOagO(=X8=H%dH7j<(`fjm)y~C041buF0xbE7a)<+Fxu)d6+87H z$W33AaP#=2Fg$Yt08pVxlv%!iY(EYIdb}F4z2S(nqB6){{o*Q V9}o-UcLe|d002ovPDHLkV1oC5*DU}5 literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slimesapling_blue.png b/assets/tinker/textures/blocks/slimesapling_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..c48bc13d04a71bda8a0710f13e436df60571dc15 GIT binary patch literal 752 zcmVWFU8GbZ8()Nlj2>E@cM*00LA=L_t(I%XO1KXj4%X z#((!w5hY~ll$h3lzBG#+3MmpQ#i0<|K~jmULI~7B2SJf!@GYq#{y_^W4VgMVZK;qT z(M7aF33O4NIj&ldGg z8#|u^U~Vofi;hiqcb{PBwTk%s?jt*&Bauu|ZZ_OIL&L3DS&Z10w0>RU>Y0~RH(S)Y zj|3p#@e=TOF=AT+NW|wCr&ypg9z8^$Apz3QZ+>Bdr*|H5>g0@iUbrlY$<<^1iunA> z=;!k%KlAi;_2$zPR;t^7#Y*E*1u&q4J+5k{x-Gr4ascD}Sw6nKCL^O#ik;;R%+W!*A1)|B;$~R&BR0y-1{Ety z$jUHy;)}f4xgq6dgY>Ph>fQI-LJvhEnUWrV=}|cRz$q47`LqH~<)#31clR+z2N^c* zt9}nS#R4HK1Hb@4=D?xcJV)H@8EA49`|}m4ZnhYi9iucJC1hn(aC%0x`+ikrAp&br6ua_?xXGn| literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/blocks/slimesnow_blue.png b/assets/tinker/textures/blocks/slimesnow_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..9a81f24353aa0f87df9d679659d7e04af015e4ff GIT binary patch literal 637 zcmV-@0)qXCP)5)dDz=9@GLN{1)| z>d;mhlck-yWY3JZF8mewLpr5H$97GJs6$av8LSu~NH8|`*#;N54kxT@)kinH_uljV z?z!U#ApigX7C`pzg4O`wVGIBjSq1fFYKxqiqxbLj zl~U+?hi5MZN6O?27+ZmdO>?Z)UI0K`POXAvu2fN~^_Y6vmi99|#|cP8n>dFOO0^P? zXJY`NA7qNT!1e@DNM$pdWhf*hzH!vyxY%Mk&6QMtxiF34!{Ddyn&qSR$*Xhwahfg` z6N$ZKGMy_|{9uC?b3?7Q`1-;8X@ZcT9=9ba+rR%pw!Z00000NkvXXu0mjfZh02s literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/items/arrow/thaumium_arrow_head.png b/assets/tinker/textures/items/arrow/thaumium_arrow_head.png new file mode 100644 index 0000000000000000000000000000000000000000..b5effc7391aeea223d45bd494ca4562a1f465a22 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`)}AhoAr*6yH<)z%;XlOlgelYT z?Elcn*9Y2ItgcT;7dSIv>SzDS=^Q5*CZtVJOxekh#&L6&`#}wfUknWAGiB!f<)~W< PG={;`)z4*}Q$iB}uO=qV literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/items/arrow/thaumium_arrow_shaft.png b/assets/tinker/textures/items/arrow/thaumium_arrow_shaft.png new file mode 100644 index 0000000000000000000000000000000000000000..50070b32ec238b93435017af134566b555a2e2d9 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``kpS1Ar*6y6C~msqI^E@U+Vaz zzKbWq^8c3=iWzMoscWTG+E}cv^O!rIFl%_lz`$|Bisj(W2f;wC44$rjF6*2UngELR BAE^KU literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/items/materials/bucket_electrum.png b/assets/tinker/textures/items/materials/bucket_electrum.png new file mode 100644 index 0000000000000000000000000000000000000000..00d1819dfadefa91c09e00260f22f067a3fc4c4f GIT binary patch literal 299 zcmV+`0o4A9P)&WcVy+BX%DEu^e;5WThU2L4Xol+YItEWSFNUh}YJ>qG z6G4W+G+jKM{{P{lIxvQ@K{U)DklK|iS7I0dR&;1v$p3q%E&jiG?DPN6pJXrwu|Z-m zgFtGFii%LZ0W}${5LqL-AxPfCG~oI3=WqoeO)!^$FiafibTEw(!XN`~+_(WY1lb^T z1A$J*ZvY5`07&tvQ>Wk<<8)l#d006@CWqi7l7y1AI002ovPDHLkV1ikQb7cSk literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/items/materials/bucket_ender.png b/assets/tinker/textures/items/materials/bucket_ender.png new file mode 100644 index 0000000000000000000000000000000000000000..d957a2c2e5195885d238cbdc717b1c7719e810c4 GIT binary patch literal 539 zcmV+$0_6RPP)@4P843;*h!1 z!A(v<$ddCFJqVP(QBbeFB2rw=;e69XuT;=ydfw-GzTfxx33n82@L^dN#bOZv z+qQ26XZbbd$e%uB{A>dA(M!bRcA`KE05GPHYqL+Ev%9xLxm@Pc=a1x7P)Nw{$zO?} z&Hj@Ij25N=*zX-OTA1cf?}$Zal5amcocui2=3c)7NC~baQNYukHcXDdtO11=&<&t> z!1jDf^b8W$b+w@$RIAk_3`4|40F}3?u^Xf$O7BQ4-RSpE2tjVJNsi-S=?2!OObs2G z0=og0Jjc=vYPA{wLWmnB5XUi&;{Z^pR6sXCo~M8%6S@Je>kdsOe|=PO9Ala$;v!&s z!|B@>zO1nJW*Oi2vk7e5)_|m5uLJP?>lU8p{f+EM{3)MStA!Av-@9Dac1bBQO_Nfo z1V9u;tiAh?xrw>kuI&5u)&H-u8mB4)!1Fw!C<36-Xbh$Q&kUN)W?xs}TOHHD(Ii>+ d>%ZTNTmpZ>pkiAU+7JK$002ovPDHLkV1m8_?fd`$ literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/items/materials/bucket_invar.png b/assets/tinker/textures/items/materials/bucket_invar.png new file mode 100644 index 0000000000000000000000000000000000000000..c8e0f24bc2e91a83df8d6a95b785f628875f7bee GIT binary patch literal 516 zcmV+f0{i`mP)F{p$mRgw<6Z8G)w?cA*=XqF`1%Oft z%d${Pv0N^T&tE>Fz9z=&H?IJG68u8pc^-$ufh^0Y*X!7}O|#h~NfNRwV>le5lwvlU z6=4_}7d;pZ21OjlxUNg9)dC<%5^USnwo;14VxjvdrMyr;5Cru5eE@vlM=7OalgR{t z(P+ecK1WJfc>-yg5(EK&CMx0kKAX*kFbpsJwcDdg(-g;Xa9x*nyRH5E{hmC}E2Gr} zLI?vWrqd|^yu`BxRJRx54)PJU&X&X%UQ%YXa!|AHTcfT)+-UKaKM0000S(9jf3FO zr4E)r$xtY10}l1SC2gcqT#SneiKZeV_)K>X?>+b2aWDKggeX!`6xWLriGo3Ul!!09TJq=Hf}N9-9oLyDvgwuz0~$h&i)#ulwAZPmDcGvE;6CYd+Dv?z8xs zVYEFHawrC^wgjD#=LuG4*O`x{uzGa>=3^P$+~1MuLgsIB1#%KrWX92|6?Y*m&FJ;^vHMwK`nD6Om<^mHsB% zM;V_#+&Uqu^W~xu00000NkvXXu0mjfnYP7e literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/items/materials/bucket_nickel.png b/assets/tinker/textures/items/materials/bucket_nickel.png new file mode 100644 index 0000000000000000000000000000000000000000..ff248756b2db455c77f0ad71ab074895e8682af8 GIT binary patch literal 551 zcmV+?0@(eDP)fAxkPWT+w2*5Q&Sv;U#%K-wh58R=$fx3 zhcxP|B$7)2_=7%)VO0x);I!ST^i=y>^tORv|X z)oLN747rO;+pcc6i)orPS-J z#&pRo;?kvqG_T?jjY&yy@Gfbu9M`*sfq>09(7UvyMiP0Z=Y4*?&+~o05B#S{y^mBX zMJyHrKv9%S!NdHL?+71{5;++|9)F0K*!BD*KLOz8jfgb&V4l6NpGhPVtQXb@`#}Z< z?c0tg*d@7HU@AHdfZ3`u6`jUx)oH$Z>-{+RhSfTf7LtzvE(&zTOKui8c8}N}KW8#> z%H3P{VCD{cj*j*FoM#*Bn5{a-ixsa@sYrboq|<57FbqbvS9x^*2>=a8zbMkxt#*@6 zCKuo*gdo%llB%k7GCB62E&^b+n=~AqhNELHzNC}MkGVypE0Nb`%-Z>n~#L!hK`~La-zp3o6(;ovs z(==?`2B26h_O<`l4oam`p!>;JI;NhZ@rKz4f4>&_1DIs5V@QQ2;1RcEP&h$-AB8PN1hc;(^i3NS8_kEu4^E}_@7yP4Wf^-qF5~Q^!XD~Bany3_v?dL za)iCNi=i6;1S-JL4FVM)U%ie$d^(}m|EAr&cL(4+z=g#2-Y)(ADPPZq{P=klL(h;- z-{6b#QD;LoA3h*Z0p8;mvFp0pL=SA+jy=y~y|TmFt=vU+A4AV1Z#C%AdiFBupOkWf z0gmHfSr#o|>tG)>=q0u{l}7-S%Vp~II#SA+5(vW($8i9#ENfx{TL=4m{QMsGtvjJl zO^+%JLrl|Ty|TmhN-ohKDxbU`(VfC40fZ155Z7uo0Pg2DXt&!5P%TD8-7d{$6DeiV zyM=k%)#-FFO_M^QaPF)Wc|V%Fi3^uq*^|uD-vbCCv}(1Quo#!TAI;GJBZEex@w;}V lE`Lm8M-$J}PiOxx@(UVlsy>=Ms_*~+002ovPDHLkV1iMb><<6{ literal 0 HcmV?d00001 diff --git a/assets/tinker/textures/items/materials/cast_bowstring.png b/assets/tinker/textures/items/materials/cast_bowstring.png new file mode 100644 index 0000000000000000000000000000000000000000..3b0fc0a9c0e05228e844d584e9688d6a7da0c8a7 GIT binary patch literal 414 zcmV;P0b%}$P)Pu15Jq3Q?9L1z%@sHb7voMGhDBB^7^H}Z6{sg_+f|iC&-9Omtl~{ew)^S(UK!rG z1fc%-8XiuB6A^#`U_DS(l4i0hDG3ol@6OZtJDTYPu15Jq3Q?9L1z%@sHb7voMGhDBB^7^H}Z6{sg_+f|iC&-9Omtl~{ew)^S(UK!rG z1fc%-8XiuB6A^#`U_DS(l4i0hDG3ol@6OZtJDTYmdKI;Vst0Bs~K+yDRo literal 0 HcmV?d00001 diff --git a/tconstruct/TConstruct.java b/tconstruct/TConstruct.java index 2e6abe59..b204eeb3 100644 --- a/tconstruct/TConstruct.java +++ b/tconstruct/TConstruct.java @@ -13,6 +13,7 @@ import tconstruct.util.PHConstruct; import tconstruct.util.TCraftingHandler; import tconstruct.util.TEventHandler; import tconstruct.util.player.TPlayerHandler; +import tconstruct.worldgen.SlimeIslandGen; import tconstruct.worldgen.TBaseWorldGenerator; import tconstruct.worldgen.TerrainGenEventHandler; import tconstruct.worldgen.village.TVillageTrades; @@ -37,7 +38,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.26", dependencies = "required-after:Forge@[7.7.1.687,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.27", dependencies = "required-after:Forge@[7.7.1.687,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { @@ -116,6 +117,7 @@ public class TConstruct public void init (FMLInitializationEvent event) { content.intermodCommunication(); + GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); } @EventHandler diff --git a/tconstruct/blocks/EssenceExtractor.java b/tconstruct/blocks/EssenceExtractor.java new file mode 100644 index 00000000..a277bbf9 --- /dev/null +++ b/tconstruct/blocks/EssenceExtractor.java @@ -0,0 +1,182 @@ +package tconstruct.blocks; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.FakePlayer; +import tconstruct.blocks.logic.EssenceExtractorLogic; +import tconstruct.common.TContent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class EssenceExtractor extends BlockContainer +{ + @SideOnly(Side.CLIENT) + private Icon field_94461_a; + @SideOnly(Side.CLIENT) + private Icon field_94460_b; + + public EssenceExtractor(int par1) + { + super(par1, Material.rock); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.75F, 1.0F); + this.setLightOpacity(0); + this.setCreativeTab(CreativeTabs.tabDecorations); + } + + /** + * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc) + */ + public boolean renderAsNormalBlock() + { + return false; + } + + @SideOnly(Side.CLIENT) + + /** + * A randomly called display update to be able to add particles or other items for display + */ + public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + { + super.randomDisplayTick(par1World, par2, par3, par4, par5Random); + + for (int l = par2 - 2; l <= par2 + 2; ++l) + { + for (int i1 = par4 - 2; i1 <= par4 + 2; ++i1) + { + if (l > par2 - 2 && l < par2 + 2 && i1 == par4 - 1) + { + i1 = par4 + 2; + } + + if (par5Random.nextInt(16) == 0) + { + for (int j1 = par3; j1 <= par3 + 1; ++j1) + { + if (par1World.getBlockId(l, j1, i1) == Block.bookShelf.blockID) + { + if (!par1World.isAirBlock((l - par2) / 2 + par2, j1, (i1 - par4) / 2 + par4)) + { + break; + } + + par1World.spawnParticle("enchantmenttable", (double)par2 + 0.5D, (double)par3 + 2.0D, (double)par4 + 0.5D, (double)((float)(l - par2) + par5Random.nextFloat()) - 0.5D, (double)((float)(j1 - par3) - par5Random.nextFloat() - 1.0F), (double)((float)(i1 - par4) + par5Random.nextFloat()) - 0.5D); + } + } + } + } + } + } + + /** + * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two + * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. + */ + public boolean isOpaqueCube() + { + return false; + } + + @SideOnly(Side.CLIENT) + + /** + * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata + */ + public Icon getIcon(int par1, int par2) + { + return par1 == 0 ? this.field_94460_b : (par1 == 1 ? this.field_94461_a : this.blockIcon); + } + + /** + * Returns a new instance of a block's tile entity class. Called on placing the block. + */ + public TileEntity createNewTileEntity(World par1World) + { + return new EssenceExtractorLogic(); + } + + /* Right-click to form a crystal */ + + @Override + public void onBlockClicked (World world, int x, int y, int z, EntityPlayer player) + { + if (world.isRemote) + { + return; + } + else + { + EssenceExtractorLogic logic = (EssenceExtractorLogic)world.getBlockTileEntity(x, y, z); + int amount = logic.removeEssence(); + if (amount > 0) + { + ItemStack crystal = new ItemStack(TContent.essenceCrystal, 1); + NBTTagCompound tags = new NBTTagCompound(); + tags.setInteger("Essence", amount); + crystal.setTagCompound(tags); + + EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, crystal); + world.spawnEntityInWorld(entityitem); + if (!(player instanceof FakePlayer)) + entityitem.onCollideWithPlayer(player); + } + } + } + + /** + * Called upon block activation (right click on the block.) + */ + public boolean onBlockActivated(World par1World, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + { + if (par1World.isRemote) + { + return true; + } + else + { + EssenceExtractorLogic logic = (EssenceExtractorLogic)par1World.getBlockTileEntity(x, y, z); + logic.addEssence(player); + logic.getEssenceMessage(player); + return true; + } + } + + /** + * Called when the block is placed in the world. + */ + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLiving par5EntityLiving, ItemStack par6ItemStack) + { + super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLiving, par6ItemStack); + + if (par6ItemStack.hasDisplayName()) + { + ((EssenceExtractorLogic)par1World.getBlockTileEntity(par2, par3, par4)).func_94134_a(par6ItemStack.getDisplayName()); + } + } + + @SideOnly(Side.CLIENT) + + /** + * When this method is called, your block should register all the icons it needs with the given IconRegister. This + * is the only chance you get to register icons. + */ + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("tinker:extractor_side"); + this.field_94461_a = par1IconRegister.registerIcon("tinker:extractor_top"); + this.field_94460_b = par1IconRegister.registerIcon("tinker:extractor_bottom"); + } +} diff --git a/tconstruct/blocks/SoilBlock.java b/tconstruct/blocks/SoilBlock.java index 0504c999..2b38c8fa 100644 --- a/tconstruct/blocks/SoilBlock.java +++ b/tconstruct/blocks/SoilBlock.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; public class SoilBlock extends TConstructBlock { - static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil" }; + static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue" }; public SoilBlock(int id) { diff --git a/tconstruct/blocks/TMetalBlock.java b/tconstruct/blocks/TMetalBlock.java index 95d5c332..33c5443b 100644 --- a/tconstruct/blocks/TMetalBlock.java +++ b/tconstruct/blocks/TMetalBlock.java @@ -8,7 +8,7 @@ public class TMetalBlock extends TConstructBlock { static String[] metalTypes = new String[] { "compressed_cobalt", "compressed_ardite", "compressed_manyullyn", "compressed_copper", "compressed_bronze", "compressed_tin", "compressed_aluminum", - "compressed_alubrass", "compressed_alumite", "compressed_steel" }; + "compressed_alubrass", "compressed_alumite", "compressed_steel", "compressed_ender" }; public TMetalBlock(int id, Material material, float hardness) { diff --git a/tconstruct/blocks/logic/EssenceExtractorLogic.java b/tconstruct/blocks/logic/EssenceExtractorLogic.java new file mode 100644 index 00000000..7a95a406 --- /dev/null +++ b/tconstruct/blocks/logic/EssenceExtractorLogic.java @@ -0,0 +1,245 @@ +package tconstruct.blocks.logic; + +import java.text.DecimalFormat; +import java.util.Random; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityEnchantmentTable; + +public class EssenceExtractorLogic extends TileEntityEnchantmentTable +{ + /** Used by the render to make the book 'bounce' */ + public int tickCount; + + /** Value used for determining how the page flip should look. */ + public float pageFlip; + + /** The last tick's pageFlip value. */ + public float pageFlipPrev; + public float field_70373_d; + public float field_70374_e; + + /** The amount that the book is open. */ + public float bookSpread; + + /** The amount that the book is open. */ + public float bookSpreadPrev; + public float bookRotation2; + public float bookRotationPrev; + public float bookRotation; + private static Random rand = new Random(); + private String field_94136_s; + + private int essenceAmount; + static DecimalFormat df = new DecimalFormat("##.##"); + + /*public EssenceExtractorLogic() + { + df.setRoundingMode(RoundingMode.DOWN); + }*/ + + /** + * Writes a tile entity to NBT. + */ + public void writeToNBT (NBTTagCompound tags) + { + super.writeToNBT(tags); + + if (this.func_94135_b()) + { + tags.setString("CustomName", this.field_94136_s); + } + tags.setInteger("Essence", essenceAmount); + } + + /** + * Reads a tile entity from NBT. + */ + public void readFromNBT (NBTTagCompound tags) + { + super.readFromNBT(tags); + + if (tags.hasKey("CustomName")) + { + this.field_94136_s = tags.getString("CustomName"); + } + + essenceAmount = tags.getInteger("Essence"); + } + + /** + * Allows the entity to update its state. Overridden in most subclasses, e.g. the mob spawner uses this to count + * ticks and creates a new spawn inside its implementation. + */ + public void updateEntity () + { + super.updateEntity(); + this.bookSpreadPrev = this.bookSpread; + this.bookRotationPrev = this.bookRotation2; + EntityPlayer entityplayer = this.worldObj.getClosestPlayer((double) ((float) this.xCoord + 0.5F), (double) ((float) this.yCoord + 0.5F), (double) ((float) this.zCoord + 0.5F), 3.0D); + + if (entityplayer != null) + { + double d0 = entityplayer.posX - (double) ((float) this.xCoord + 0.5F); + double d1 = entityplayer.posZ - (double) ((float) this.zCoord + 0.5F); + this.bookRotation = (float) Math.atan2(d1, d0); + this.bookSpread += 0.1F; + + if (this.bookSpread < 0.5F || rand.nextInt(40) == 0) + { + float f = this.field_70373_d; + + do + { + this.field_70373_d += (float) (rand.nextInt(4) - rand.nextInt(4)); + } while (f == this.field_70373_d); + } + } + else + { + this.bookRotation += 0.02F; + this.bookSpread -= 0.1F; + } + + while (this.bookRotation2 >= (float) Math.PI) + { + this.bookRotation2 -= ((float) Math.PI * 2F); + } + + while (this.bookRotation2 < -(float) Math.PI) + { + this.bookRotation2 += ((float) Math.PI * 2F); + } + + while (this.bookRotation >= (float) Math.PI) + { + this.bookRotation -= ((float) Math.PI * 2F); + } + + while (this.bookRotation < -(float) Math.PI) + { + this.bookRotation += ((float) Math.PI * 2F); + } + + float f1; + + for (f1 = this.bookRotation - this.bookRotation2; f1 >= (float) Math.PI; f1 -= ((float) Math.PI * 2F)) + { + ; + } + + while (f1 < -(float) Math.PI) + { + f1 += ((float) Math.PI * 2F); + } + + this.bookRotation2 += f1 * 0.4F; + + if (this.bookSpread < 0.0F) + { + this.bookSpread = 0.0F; + } + + if (this.bookSpread > 1.0F) + { + this.bookSpread = 1.0F; + } + + ++this.tickCount; + this.pageFlipPrev = this.pageFlip; + float f2 = (this.field_70373_d - this.pageFlip) * 0.4F; + float f3 = 0.2F; + + if (f2 < -f3) + { + f2 = -f3; + } + + if (f2 > f3) + { + f2 = f3; + } + + this.field_70374_e += (f2 - this.field_70374_e) * 0.9F; + this.pageFlip += this.field_70374_e; + } + + public String func_94133_a () + { + return this.func_94135_b() ? this.field_94136_s : "container.enchant"; + } + + public boolean func_94135_b () + { + return this.field_94136_s != null && this.field_94136_s.length() > 0; + } + + public void func_94134_a (String par1Str) + { + this.field_94136_s = par1Str; + } + + public void addEssence (EntityPlayer player) + { + int amount = player.experienceTotal; + essenceAmount += amount; + player.addExperienceLevel(-player.experienceLevel - 1); + } + + public int removeEssence() + { + int amount = this.essenceAmount; + this.essenceAmount = 0; + return amount; + } + + public void getEssenceMessage (EntityPlayer player) + { + player.addChatMessage("Total Essence: " + this.essenceAmount); + player.addChatMessage("Stored Levels: " + getEssencelevels(this.essenceAmount)); + } + + public static String getEssencelevels (int essence) + { + if (essence < 255) //0-14 + { + float ret = essence / 17f; + return String.valueOf(df.format(ret)); + } + else if (essence < 825) + { + int amount = essence - 255; + int levels = 15; + int offset = 3; + + int sub = 17 + offset; + while (amount - sub >= 0) + { + amount -= sub; + sub += offset; + levels++; + } + + float ret = levels + amount / (float) sub; + return String.valueOf(df.format(ret)); + } + else + { + int amount = essence - 825; + int levels = 30; + int offset = 7; + + int sub = 62 + offset; + while (amount - sub >= 0) + { + amount -= sub; + sub += offset; + levels++; + } + + float ret = levels + amount / (float) sub; + return String.valueOf(df.format(ret)); + } + } +} diff --git a/tconstruct/blocks/slime/SlimeFluid.java b/tconstruct/blocks/slime/SlimeFluid.java new file mode 100644 index 00000000..831e75ab --- /dev/null +++ b/tconstruct/blocks/slime/SlimeFluid.java @@ -0,0 +1,59 @@ +package tconstruct.blocks.slime; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; +import tconstruct.entity.BlueSlime; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlimeFluid extends BlockFluidClassic +{ + Icon stillIcon; + Icon flowIcon; + public SlimeFluid(int id, Fluid fluid, Material material) + { + super(id, fluid, material); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister iconRegister) + { + stillIcon = iconRegister.registerIcon("tinker:slime_blue"); + flowIcon = iconRegister.registerIcon("tinker:slime_blue_flow"); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon (int side, int meta) + { + if (side == 0 || side == 1) + return stillIcon; + return flowIcon; + } + + public void updateTick(World world, int x, int y, int z, Random rand) + { + super.updateTick(world, x, y, z, rand); + if (rand.nextInt(100) == 0 && world.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2)) ) + { + BlueSlime entityslime = new BlueSlime(world); + entityslime.setPosition((double)x + 0.5D, (double)y + 1.5D, (double)z + 0.5D); + world.spawnEntityInWorld(entityslime); + } + } + + public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) + { + + } +} diff --git a/tconstruct/blocks/slime/SlimeGel.java b/tconstruct/blocks/slime/SlimeGel.java new file mode 100644 index 00000000..25fa7dd4 --- /dev/null +++ b/tconstruct/blocks/slime/SlimeGel.java @@ -0,0 +1,76 @@ +package tconstruct.blocks.slime; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; +import tconstruct.blocks.TConstructBlock; +import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlimeGel extends TConstructBlock +{ + public SlimeGel(int id) + { + super(id, Material.sponge, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); + setCreativeTab(TConstructRegistry.blockTab); + } + + public boolean getEnableStats () + { + return false; + } + + public int getMobilityFlag () + { + return 0; + } + + public int damageDropped (int meta) + { + return meta; + } + + @Override + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) + { + if (entity.motionY < 0) + { + if (entity.motionY < -0.08F) + { + Block var9 = Block.blocksList[this.blockID]; + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.getStepSound(), (var9.stepSound.getVolume()) / 2.0F, var9.stepSound.getPitch() * 0.65F); + } + entity.motionY *= -1.2F; + } + entity.fallDistance = 0; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + { + return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); + } + + @SideOnly(Side.CLIENT) + /** + * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) + */ + public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) + { + par3List.add(new ItemStack(par1, 1, 0)); + par3List.add(new ItemStack(par1, 1, 1)); + //par3List.add(new ItemStack(par1, 1, 2)); + } + + public boolean canSustainLeaves (World world, int x, int y, int z) + { + return true; + } +} diff --git a/tconstruct/blocks/slime/SlimeGrass.java b/tconstruct/blocks/slime/SlimeGrass.java new file mode 100644 index 00000000..f491b031 --- /dev/null +++ b/tconstruct/blocks/slime/SlimeGrass.java @@ -0,0 +1,127 @@ +package tconstruct.blocks.slime; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.IPlantable; +import tconstruct.common.TContent; +import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlimeGrass extends Block +{ + public String[] textureNames = { "slimegrass_green_top", "slimedirt_blue", "slimegrass_green_blue_side", "slimegrass_green_dirt_side" };//green, purple + public Icon[] icons; + + public SlimeGrass(int id) + { + super(id, Material.grass); + setHardness(0.6f); + this.setTickRandomly(true); + this.setCreativeTab(TConstructRegistry.blockTab); + } + + @Override + public int damageDropped (int meta) + { + return meta; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); + } + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon (int side, int meta) + { + if (side == 0) + { + return meta % 2 == 1 ? Block.dirt.getIcon(0, 0) : icons[1]; + } + else if (side == 1) + { + return icons[0]; + } + else + { + return icons[meta + 2]; + } + } + + @Override + public void getSubBlocks (int id, CreativeTabs tab, List list) + { + for (int iter = 0; iter < 1; iter++) + { + list.add(new ItemStack(id, 1, iter)); + } + } + + @Override + public boolean canSustainPlant (World world, int x, int y, int z, ForgeDirection direction, IPlantable plant) + { + EnumPlantType plantType = plant.getPlantType(world, x, y + 1, z); + return plantType == EnumPlantType.Plains && plant.getPlantID(world, x, y+1, z) != Block.tallGrass.blockID; + } + + 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); + } + + public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) + { + if (!par1World.isRemote) + { + 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); + } + else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) + { + for (int l = 0; l < 4; ++l) + { + int posX = par2 + par5Random.nextInt(3) - 1; + int posY = par3 + par5Random.nextInt(5) - 3; + int posZ = par4 + par5Random.nextInt(3) - 1; + int l1 = par1World.getBlockId(posX, posY + 1, posZ); + + if (par1World.getBlockLightValue(posX, posY + 1, posZ) >= 4 && par1World.getBlockLightOpacity(posX, posY + 1, posZ) <= 2) + { + int blockID = par1World.getBlockId(posX, posY, posZ); + if (blockID == Block.dirt.blockID) + { + par1World.setBlock(posX, posY, posZ, this.blockID, 1, 3); + return; + } + int blockMeta = par1World.getBlockMetadata(posX, posY, posZ); + if (blockID == TContent.craftedSoil.blockID) + { + if (blockMeta == 5) + par1World.setBlock(posX, posY, posZ, this.blockID, 0, 3); + } + } + } + } + } + } +} diff --git a/tconstruct/blocks/slime/SlimeLeaves.java b/tconstruct/blocks/slime/SlimeLeaves.java new file mode 100644 index 00000000..4ad70295 --- /dev/null +++ b/tconstruct/blocks/slime/SlimeLeaves.java @@ -0,0 +1,144 @@ +package tconstruct.blocks.slime; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.BlockLeaves; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import tconstruct.common.TContent; +import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlimeLeaves extends BlockLeaves +{ + private static final String[] fastLeaves = new String[] { "slimeleaves_blue_fast" }; + private static final String[] fancyLeaves = new String[] { "slimeleaves_blue_fancy" }; + @SideOnly(Side.CLIENT) + private Icon[] fastIcons; + @SideOnly(Side.CLIENT) + private Icon[] fancyIcons; + + public SlimeLeaves(int id) + { + super(id); + setCreativeTab(TConstructRegistry.blockTab); + setLightOpacity(1); + } + + @SideOnly(Side.CLIENT) + public int getBlockColor () + { + return 0xffffff; + } + + @SideOnly(Side.CLIENT) + public int getRenderColor (int par1) + { + return 0xffffff; + } + + @SideOnly(Side.CLIENT) + public int colorMultiplier (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + { + return 0xffffff; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons (IconRegister iconRegister) + { + this.fastIcons = new Icon[fastLeaves.length]; + this.fancyIcons = new Icon[fancyLeaves.length]; + + for (int i = 0; i < this.fastIcons.length; i++) + { + this.fastIcons[i] = iconRegister.registerIcon("tinker:" + fastLeaves[i] ); + this.fancyIcons[i] = iconRegister.registerIcon("tinker:" + fancyLeaves[i]); + } + } + + public Icon getIcon (int side, int meta) + { + int tex = meta % 4; + + if (this.graphicsLevel) + return fancyIcons[tex]; + else + return fastIcons[tex]; + } + + @Override + public void getSubBlocks (int id, CreativeTabs tab, List list) + { + for (int iter = 0; iter < fastIcons.length; iter++) + { + list.add(new ItemStack(id, 1, iter)); + } + } + + /* Drops */ + + + /** + * Returns the ID of the items to drop on destruction. + */ + public int idDropped(int par1, Random par2Random, int par3) + { + return TContent.slimeSapling.blockID; + } + + /** + * Drops the block items with a specified chance of dropping the specified items + */ + public void dropBlockAsItemWithChance(World world, int x, int y, int z, int meta, float chance, int fortune) + { + if (!world.isRemote) + { + int dropChance = 35; + + /*if ((meta & 3) == 3) + { + j1 = 40; + }*/ + + if (fortune > 0) + { + dropChance -= 2 << fortune; + + if (dropChance < 15) + { + dropChance = 15; + } + } + + if (world.rand.nextInt(dropChance) == 0) + { + int k1 = this.idDropped(meta, world.rand, fortune); + this.dropBlockAsItem_do(world, x, y, z, new ItemStack(k1, 1, this.damageDropped(meta))); + } + + dropChance = 80; + + if (fortune > 0) + { + dropChance -= 10 << fortune; + + if (dropChance < 20) + { + dropChance = 20; + } + } + + if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0) + { + this.dropBlockAsItem_do(world, x, y, z, new ItemStack(TContent.strangeFood, 1, 0)); + } + } + } +} diff --git a/tconstruct/blocks/slime/SlimeSapling.java b/tconstruct/blocks/slime/SlimeSapling.java new file mode 100644 index 00000000..8cb0b859 --- /dev/null +++ b/tconstruct/blocks/slime/SlimeSapling.java @@ -0,0 +1,127 @@ +package tconstruct.blocks.slime; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockSapling; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import tconstruct.common.TContent; +import tconstruct.library.TConstructRegistry; +import tconstruct.worldgen.SlimeTreeGen; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlimeSapling extends BlockSapling +{ + public Icon[] icons; + public String[] textureNames = new String[] { "blue" }; + + public SlimeSapling(int id) + { + super(id); + float f = 0.4F; + setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); + this.setHardness(0.0F); + this.setStepSound(Block.soundGrassFootstep); + this.setCreativeTab(TConstructRegistry.blockTab); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.registerIcon("tinker:slimesapling_" + textureNames[i]); + } + } + + public boolean canThisPlantGrowOnThisBlockID (int id) + { + return id == Block.grass.blockID || id == Block.dirt.blockID || id == TContent.slimeGrass.blockID || id == TContent.craftedSoil.blockID; + } + + public void updateTick (World world, int x, int y, int z, Random random) + { + if (world.isRemote) + { + return; + } + super.updateTick(world, x, y, z, random); + int md = world.getBlockMetadata(x, y, z); + if (random.nextInt(10) == 0 && world.getBlockLightValue(x, y + 1, z) >= 9) + { + if ((md & 8) == 0) + world.setBlockMetadataWithNotify(x, y, z, md | 8, 4); + + else + growTree(world, x, y, z, random); + } + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon (int side, int meta) + { + return icons[meta % 8]; + } + + @Override + public void markOrGrowMarked (World world, int x, int y, int z, Random random) + { + boneFertilize(world, x, y, z, random, null); + } + + public boolean boneFertilize (World world, int x, int y, int z, Random random, EntityPlayer player) + { + int meta = world.getBlockMetadata(x, y, z); + + if (meta % 8 == 0 && (player == null || !player.capabilities.isCreativeMode)) + return false; + + if ((meta & 8) == 0) + { + world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + } + else + { + this.growTree(world, x, y, z, random); + } + + return true; + } + + public void growTree (World world, int x, int y, int z, Random random) + { + int md = world.getBlockMetadata(x, y, z) % 8; + world.setBlock(x, y, z, 0); + WorldGenerator obj = null; + + obj = new SlimeTreeGen(true, 5, 4, 1, 0); + + if (!(obj.generate(world, random, x, y, z))) + world.setBlock(x, y, z, blockID, md + 8, 3); + } + + public int damageDropped (int i) + { + return i % 8; + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) + { + for (int i = 0; i < 1; i++) + par3List.add(new ItemStack(par1, 1, i)); + } +} diff --git a/tconstruct/blocks/slime/SlimeTallGrass.java b/tconstruct/blocks/slime/SlimeTallGrass.java new file mode 100644 index 00000000..f76a7bb2 --- /dev/null +++ b/tconstruct/blocks/slime/SlimeTallGrass.java @@ -0,0 +1,131 @@ +package tconstruct.blocks.slime; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.BlockFlower; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.IShearable; +import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlimeTallGrass extends BlockFlower implements IShearable +{ + private static final String[] grassTypes = new String[] {"slimegrass_blue_tall"}; + @SideOnly(Side.CLIENT) + private Icon[] iconArray; + + public SlimeTallGrass(int par1) + { + super(par1, Material.vine); + float f = 0.4F; + this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); + setCreativeTab(TConstructRegistry.blockTab); + } + + @SideOnly(Side.CLIENT) + + /** + * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata + */ + public Icon getIcon(int side, int meta) + { + /*if (meta >= this.iconArray.length) + { + meta = 0; + }*/ + + return this.iconArray[meta]; + } + + /** + * Returns the ID of the items to drop on destruction. + */ + public int idDropped(int par1, Random par2Random, int par3) + { + return -1; + } + + /** + * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). + */ + public int quantityDroppedWithBonus(int par1, Random par2Random) + { + return 1 + par2Random.nextInt(par1 * 2 + 1); + } + /** + * Get the block's damage value (for use with pick block). + */ + public int getDamageValue(World par1World, int par2, int par3, int par4) + { + return par1World.getBlockMetadata(par2, par3, par4); + } + + @SideOnly(Side.CLIENT) + + /** + * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) + */ + public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) + { + for (int j = 0; j < 1; ++j) + { + par3List.add(new ItemStack(par1, 1, j)); + } + } + + @SideOnly(Side.CLIENT) + + /** + * When this method is called, your block should register all the icons it needs with the given IconRegister. This + * is the only chance you get to register icons. + */ + public void registerIcons(IconRegister par1IconRegister) + { + this.iconArray = new Icon[grassTypes.length]; + + for (int i = 0; i < this.iconArray.length; ++i) + { + this.iconArray[i] = par1IconRegister.registerIcon("tinker:"+grassTypes[i]); + } + } + + @Override + public ArrayList getBlockDropped(World world, int x, int y, int z, int meta, int fortune) + { + ArrayList ret = new ArrayList(); + if (world.rand.nextInt(8) != 0) + { + return ret; + } + + ItemStack item = ForgeHooks.getGrassSeed(world); + if (item != null) + { + ret.add(item); + } + return ret; + } + + @Override + public boolean isShearable(ItemStack item, World world, int x, int y, int z) + { + return true; + } + + @Override + public ArrayList onSheared(ItemStack item, World world, int x, int y, int z, int fortune) + { + ArrayList ret = new ArrayList(); + ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z))); + return ret; + } +} diff --git a/tconstruct/client/StepSoundSlime.java b/tconstruct/client/StepSoundSlime.java new file mode 100644 index 00000000..54d83c45 --- /dev/null +++ b/tconstruct/client/StepSoundSlime.java @@ -0,0 +1,30 @@ +package tconstruct.client; + +import net.minecraft.block.StepSound; + +public class StepSoundSlime extends StepSound +{ + + public StepSoundSlime(String par1Str, float par2, float par3) + { + super(par1Str, par2, par3); + // TODO Auto-generated constructor stub + } + + /** + * Used when a block breaks, EXA: Player break, Shep eating grass, etc.. + */ + public String getBreakSound() + { + return this.stepSoundName + ".big"; + } + + /** + * Used when a entity walks over, or otherwise interacts with the block. + */ + public String getStepSound() + { + return this.stepSoundName + ".small"; + } + +} diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index 38b6f0ea..28579640 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -8,6 +8,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; +import net.minecraft.block.StepSound; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; @@ -15,10 +16,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EnumCreatureType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.RecipesTools; -import net.minecraft.item.crafting.RecipesWeapons; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; @@ -40,6 +38,7 @@ import tconstruct.blocks.Aggregator; import tconstruct.blocks.CraftingStationBlock; import tconstruct.blocks.DryingRack; import tconstruct.blocks.EquipBlock; +import tconstruct.blocks.EssenceExtractor; import tconstruct.blocks.GlassBlockConnected; import tconstruct.blocks.GlassBlockConnectedMeta; import tconstruct.blocks.GlassPane; @@ -69,6 +68,7 @@ import tconstruct.blocks.logic.CastingTableLogic; import tconstruct.blocks.logic.CraftingStationLogic; import tconstruct.blocks.logic.DrawbridgeLogic; import tconstruct.blocks.logic.DryingRackLogic; +import tconstruct.blocks.logic.EssenceExtractorLogic; import tconstruct.blocks.logic.FaucetLogic; import tconstruct.blocks.logic.FirestarterLogic; import tconstruct.blocks.logic.FrypanLogic; @@ -82,8 +82,15 @@ import tconstruct.blocks.logic.SmelteryLogic; import tconstruct.blocks.logic.StencilTableLogic; import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.blocks.logic.ToolStationLogic; +import tconstruct.blocks.slime.SlimeFluid; +import tconstruct.blocks.slime.SlimeGel; +import tconstruct.blocks.slime.SlimeGrass; +import tconstruct.blocks.slime.SlimeLeaves; +import tconstruct.blocks.slime.SlimeSapling; +import tconstruct.blocks.slime.SlimeTallGrass; import tconstruct.blocks.traps.BarricadeBlock; import tconstruct.blocks.traps.Punji; +import tconstruct.client.StepSoundSlime; import tconstruct.entity.Automaton; import tconstruct.entity.BlueSlime; import tconstruct.entity.Crystal; @@ -96,6 +103,7 @@ import tconstruct.entity.projectile.LaunchedPotion; import tconstruct.items.Bowstring; import tconstruct.items.CraftingItem; import tconstruct.items.DiamondApple; +import tconstruct.items.EssenceCrystal; import tconstruct.items.FilledBucket; import tconstruct.items.Fletching; import tconstruct.items.GoldenHead; @@ -129,6 +137,11 @@ import tconstruct.items.blocks.OreberryBushSecondItem; import tconstruct.items.blocks.RedstoneMachineItem; 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; @@ -319,6 +332,8 @@ public class TContent implements IFuelHandler //Crystalline public static Block aggregator; public static Block lightCrystalBase; + public static Block essenceExtractor; + public static Item essenceCrystal; //Liquids public static Material liquidMetal; @@ -346,6 +361,8 @@ public class TContent implements IFuelHandler public static Fluid moltenShinyFluid; public static Fluid moltenInvarFluid; public static Fluid moltenElectrumFluid; + public static Fluid moltenEnderFluid; + public static Fluid blueSlimeFluid; public static Block moltenIron; public static Block moltenGold; @@ -370,6 +387,16 @@ public class TContent implements IFuelHandler 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; //Ores public static Block oreSlag; @@ -448,7 +475,7 @@ public class TContent implements IFuelHandler BiomeGenBase[] nether = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.NETHER); - if (PHConstruct.blueSlime) + /*if (PHConstruct.blueSlime) { EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, plains); EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, mountain); @@ -470,11 +497,11 @@ public class TContent implements IFuelHandler catch (Exception e) { - } + }*/ } - public static Fluid[] fluids = new Fluid[23]; - public static Block[] fluidBlocks = new Block[23]; + public static Fluid[] fluids = new Fluid[25]; + public static Block[] fluidBlocks = new Block[25]; void registerBlocks () { @@ -537,6 +564,10 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(redstoneMachine, RedstoneMachineItem.class, "Redstone.Machine"); GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge"); GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter"); + + essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence"); + GameRegistry.registerBlock(essenceExtractor, "extractor.essence"); + GameRegistry.registerTileEntity(EssenceExtractorLogic.class, "extractor.essence"); //Traps landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) @@ -567,211 +598,247 @@ public class TContent implements IFuelHandler liquidMetal = new MaterialLiquid(MapColor.tntColor); moltenIronFluid = new Fluid("Molten Iron"); + FluidRegistry.registerFluid(moltenIronFluid); moltenIron = new LiquidMetalFinite(PHConstruct.moltenIron, moltenIronFluid, "liquid_iron").setUnlocalizedName("metal.molten.iron"); GameRegistry.registerBlock(moltenIron, "metal.molten.iron"); moltenIronFluid.setBlockID(moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[0] = moltenIronFluid; fluidBlocks[0] = moltenIron; - FluidRegistry.registerFluid(moltenIronFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenIronFluid, 1), new ItemStack(buckets, 1, 0), new ItemStack(Item.bucketEmpty))); moltenGoldFluid = new Fluid("Molten Gold"); + FluidRegistry.registerFluid(moltenGoldFluid); moltenGold = new LiquidMetalFinite(PHConstruct.moltenGold, moltenGoldFluid, "liquid_gold").setUnlocalizedName("metal.molten.gold"); GameRegistry.registerBlock(moltenGold, "metal.molten.gold"); moltenGoldFluid.setBlockID(moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[1] = moltenGoldFluid; fluidBlocks[1] = moltenGold; - FluidRegistry.registerFluid(moltenGoldFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGoldFluid, 1), new ItemStack(buckets, 1, 1), new ItemStack(Item.bucketEmpty))); moltenCopperFluid = new Fluid("Molten Copper"); + FluidRegistry.registerFluid(moltenCopperFluid); moltenCopper = new LiquidMetalFinite(PHConstruct.moltenCopper, moltenCopperFluid, "liquid_copper").setUnlocalizedName("metal.molten.copper"); GameRegistry.registerBlock(moltenCopper, "metal.molten.copper"); moltenCopperFluid.setBlockID(moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[2] = moltenCopperFluid; fluidBlocks[2] = moltenCopper; - FluidRegistry.registerFluid(moltenCopperFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCopperFluid, 1), new ItemStack(buckets, 1, 2), new ItemStack(Item.bucketEmpty))); moltenTinFluid = new Fluid("Molten Tin"); + FluidRegistry.registerFluid(moltenTinFluid); moltenTin = new LiquidMetalFinite(PHConstruct.moltenTin, moltenTinFluid, "liquid_tin").setUnlocalizedName("metal.molten.tin"); GameRegistry.registerBlock(moltenTin, "metal.molten.tin"); moltenTinFluid.setBlockID(moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[3] = moltenTinFluid; fluidBlocks[3] = moltenTin; - FluidRegistry.registerFluid(moltenTinFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenTinFluid, 1), new ItemStack(buckets, 1, 3), new ItemStack(Item.bucketEmpty))); moltenAluminumFluid = new Fluid("Molten Aluminum"); + FluidRegistry.registerFluid(moltenAluminumFluid); moltenAluminum = new LiquidMetalFinite(PHConstruct.moltenAluminum, moltenAluminumFluid, "liquid_aluminum").setUnlocalizedName("metal.molten.aluminum"); GameRegistry.registerBlock(moltenAluminum, "metal.molten.aluminum"); moltenAluminumFluid.setBlockID(moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[4] = moltenAluminumFluid; fluidBlocks[4] = moltenAluminum; - FluidRegistry.registerFluid(moltenAluminumFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAluminumFluid, 1), new ItemStack(buckets, 1, 4), new ItemStack(Item.bucketEmpty))); moltenCobaltFluid = new Fluid("Molten Cobalt"); + FluidRegistry.registerFluid(moltenCobaltFluid); moltenCobalt = new LiquidMetalFinite(PHConstruct.moltenCobalt, moltenCobaltFluid, "liquid_cobalt").setUnlocalizedName("metal.molten.cobalt"); GameRegistry.registerBlock(moltenCobalt, "metal.molten.cobalt"); moltenCobaltFluid.setBlockID(moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[5] = moltenCobaltFluid; fluidBlocks[5] = moltenCobalt; - FluidRegistry.registerFluid(moltenCobaltFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCobaltFluid, 1), new ItemStack(buckets, 1, 5), new ItemStack(Item.bucketEmpty))); moltenArditeFluid = new Fluid("Molten Ardite"); + FluidRegistry.registerFluid(moltenArditeFluid); moltenArdite = new LiquidMetalFinite(PHConstruct.moltenArdite, moltenArditeFluid, "liquid_ardite").setUnlocalizedName("metal.molten.ardite"); GameRegistry.registerBlock(moltenArdite, "metal.molten.ardite"); moltenArditeFluid.setBlockID(moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[6] = moltenArditeFluid; fluidBlocks[6] = moltenArdite; - FluidRegistry.registerFluid(moltenArditeFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenArditeFluid, 1), new ItemStack(buckets, 1, 6), new ItemStack(Item.bucketEmpty))); moltenBronzeFluid = new Fluid("Molten Bronze"); + FluidRegistry.registerFluid(moltenBronzeFluid); moltenBronze = new LiquidMetalFinite(PHConstruct.moltenBronze, moltenBronzeFluid, "liquid_bronze").setUnlocalizedName("metal.molten.bronze"); GameRegistry.registerBlock(moltenBronze, "metal.molten.bronze"); moltenBronzeFluid.setBlockID(moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[7] = moltenBronzeFluid; fluidBlocks[7] = moltenBronze; - FluidRegistry.registerFluid(moltenBronzeFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenBronzeFluid, 1), new ItemStack(buckets, 1, 7), new ItemStack(Item.bucketEmpty))); moltenAlubrassFluid = new Fluid("Molten Aluminum Brass"); + FluidRegistry.registerFluid(moltenAlubrassFluid); moltenAlubrass = new LiquidMetalFinite(PHConstruct.moltenAlubrass, moltenAlubrassFluid, "liquid_alubrass").setUnlocalizedName("metal.molten.alubrass"); GameRegistry.registerBlock(moltenAlubrass, "metal.molten.alubrass"); moltenAlubrassFluid.setBlockID(moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[8] = moltenAlubrassFluid; fluidBlocks[8] = moltenAlubrass; - FluidRegistry.registerFluid(moltenAlubrassFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlubrassFluid, 1), new ItemStack(buckets, 1, 8), new ItemStack(Item.bucketEmpty))); moltenManyullynFluid = new Fluid("Molten Manyullyn"); + FluidRegistry.registerFluid(moltenManyullynFluid); moltenManyullyn = new LiquidMetalFinite(PHConstruct.moltenManyullyn, moltenManyullynFluid, "liquid_manyullyn").setUnlocalizedName("metal.molten.manyullyn"); GameRegistry.registerBlock(moltenManyullyn, "metal.molten.manyullyn"); moltenManyullynFluid.setBlockID(moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[9] = moltenManyullynFluid; fluidBlocks[9] = moltenManyullyn; - FluidRegistry.registerFluid(moltenManyullynFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenManyullynFluid, 1), new ItemStack(buckets, 1, 9), new ItemStack(Item.bucketEmpty))); moltenAlumiteFluid = new Fluid("Molten Alumite"); + FluidRegistry.registerFluid(moltenAlumiteFluid); moltenAlumite = new LiquidMetalFinite(PHConstruct.moltenAlumite, moltenAlumiteFluid, "liquid_alumite").setUnlocalizedName("metal.molten.alumite"); GameRegistry.registerBlock(moltenAlumite, "metal.molten.alumite"); moltenAlumiteFluid.setBlockID(moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[10] = moltenAlumiteFluid; fluidBlocks[10] = moltenAlumite; - FluidRegistry.registerFluid(moltenAlumiteFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlumiteFluid, 1), new ItemStack(buckets, 1, 10), new ItemStack(Item.bucketEmpty))); moltenObsidianFluid = new Fluid("Molten Obsidian"); + FluidRegistry.registerFluid(moltenObsidianFluid); moltenObsidian = new LiquidMetalFinite(PHConstruct.moltenObsidian, moltenObsidianFluid, "liquid_obsidian").setUnlocalizedName("metal.molten.obsidian"); GameRegistry.registerBlock(moltenObsidian, "metal.molten.obsidian"); moltenObsidianFluid.setBlockID(moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[11] = moltenObsidianFluid; fluidBlocks[11] = moltenObsidian; - FluidRegistry.registerFluid(moltenObsidianFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenObsidianFluid, 1), new ItemStack(buckets, 1, 11), new ItemStack(Item.bucketEmpty))); moltenSteelFluid = new Fluid("Molten Steel"); + FluidRegistry.registerFluid(moltenSteelFluid); moltenSteel = new LiquidMetalFinite(PHConstruct.moltenSteel, moltenSteelFluid, "liquid_steel").setUnlocalizedName("metal.molten.steel"); GameRegistry.registerBlock(moltenSteel, "metal.molten.steel"); moltenSteelFluid.setBlockID(moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[12] = moltenSteelFluid; fluidBlocks[12] = moltenSteel; - FluidRegistry.registerFluid(moltenSteelFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSteelFluid, 1), new ItemStack(buckets, 1, 12), new ItemStack(Item.bucketEmpty))); moltenGlassFluid = new Fluid("Molten Glass"); + FluidRegistry.registerFluid(moltenGlassFluid); moltenGlass = new LiquidMetalFinite(PHConstruct.moltenGlass, moltenGlassFluid, "liquid_glass").setUnlocalizedName("metal.molten.glass"); GameRegistry.registerBlock(moltenGlass, "metal.molten.glass"); moltenGlassFluid.setBlockID(moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[13] = moltenGlassFluid; fluidBlocks[13] = moltenGlass; - FluidRegistry.registerFluid(moltenGlassFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGlassFluid, 1), new ItemStack(buckets, 1, 13), new ItemStack(Item.bucketEmpty))); moltenStoneFluid = new Fluid("Seared Stone"); + FluidRegistry.registerFluid(moltenStoneFluid); moltenStone = new LiquidMetalFinite(PHConstruct.moltenStone, moltenStoneFluid, "liquid_stone").setUnlocalizedName("molten.stone"); GameRegistry.registerBlock(moltenStone, "molten.stone"); moltenStoneFluid.setBlockID(moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000); fluids[14] = moltenStoneFluid; fluidBlocks[14] = moltenStone; - FluidRegistry.registerFluid(moltenStoneFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenStoneFluid, 1), new ItemStack(buckets, 1, 14), new ItemStack(Item.bucketEmpty))); moltenEmeraldFluid = new Fluid("Liquified Emerald"); + FluidRegistry.registerFluid(moltenEmeraldFluid); moltenEmerald = new LiquidMetalFinite(PHConstruct.moltenEmerald, moltenEmeraldFluid, "liquid_villager").setUnlocalizedName("molten.emerald"); GameRegistry.registerBlock(moltenEmerald, "molten.emerald"); moltenEmeraldFluid.setBlockID(moltenEmerald).setDensity(3000).setViscosity(6000); fluids[15] = moltenEmeraldFluid; fluidBlocks[15] = moltenEmerald; - FluidRegistry.registerFluid(moltenEmeraldFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEmeraldFluid, 1), new ItemStack(buckets, 1, 15), new ItemStack(Item.bucketEmpty))); bloodFluid = new Fluid("Blood"); + FluidRegistry.registerFluid(bloodFluid); blood = new LiquidMetalFinite(PHConstruct.blood, bloodFluid, "liquid_cow").setUnlocalizedName("liquid.blood"); GameRegistry.registerBlock(blood, "liquid.blood"); bloodFluid.setBlockID(blood).setDensity(3000).setViscosity(6000); fluids[16] = bloodFluid; fluidBlocks[16] = blood; - FluidRegistry.registerFluid(bloodFluid); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(bloodFluid, 1), new ItemStack(buckets, 1, 16), new ItemStack(Item.bucketEmpty))); - moltenNickelFluid = new Fluid("Molten Nickel"); + moltenNickelFluid = new Fluid("nickel.molten"); + FluidRegistry.registerFluid(moltenNickelFluid); moltenNickel = new LiquidMetalFinite(PHConstruct.moltenNickel, moltenNickelFluid, "liquid_ferrous").setUnlocalizedName("metal.molten.nickel"); GameRegistry.registerBlock(moltenNickel, "metal.molten.nickel"); moltenNickelFluid.setBlockID(moltenNickel).setDensity(3000).setViscosity(6000); fluids[17] = moltenNickelFluid; fluidBlocks[17] = moltenNickel; - FluidRegistry.registerFluid(moltenNickelFluid); - //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenNickelFluid, 1), new ItemStack(buckets, 1, 17), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenNickelFluid, 1), new ItemStack(buckets, 1, 17), new ItemStack(Item.bucketEmpty))); - moltenLeadFluid = new Fluid("Molten Lead"); + moltenLeadFluid = new Fluid("lead.molten"); + FluidRegistry.registerFluid(moltenLeadFluid); moltenLead = new LiquidMetalFinite(PHConstruct.moltenLead, moltenLeadFluid, "liquid_lead").setUnlocalizedName("metal.molten.lead"); GameRegistry.registerBlock(moltenLead, "metal.molten.lead"); moltenLeadFluid.setBlockID(moltenLead).setDensity(3000).setViscosity(6000); fluids[18] = moltenLeadFluid; fluidBlocks[18] = moltenLead; - FluidRegistry.registerFluid(moltenLeadFluid); - //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenLeadFluid, 1), new ItemStack(buckets, 1, 18), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenLeadFluid, 1), new ItemStack(buckets, 1, 18), new ItemStack(Item.bucketEmpty))); - moltenSilverFluid = new Fluid("Molten Silver"); + moltenSilverFluid = new Fluid("silver.molten"); + FluidRegistry.registerFluid(moltenSilverFluid); moltenSilver = new LiquidMetalFinite(PHConstruct.moltenSilver, moltenSilverFluid, "liquid_silver").setUnlocalizedName("metal.molten.silver"); GameRegistry.registerBlock(moltenSilver, "metal.molten.silver"); moltenSilverFluid.setBlockID(moltenSilver).setDensity(3000).setViscosity(6000); fluids[19] = moltenSilverFluid; fluidBlocks[19] = moltenSilver; - FluidRegistry.registerFluid(moltenSilverFluid); - //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSilverFluid, 1), new ItemStack(buckets, 1, 19), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSilverFluid, 1), new ItemStack(buckets, 1, 19), new ItemStack(Item.bucketEmpty))); - moltenShinyFluid = new Fluid("Molten Platinum"); + moltenShinyFluid = new Fluid("platinum.molten"); + FluidRegistry.registerFluid(moltenShinyFluid); moltenShiny = new LiquidMetalFinite(PHConstruct.moltenShiny, moltenShinyFluid, "liquid_shiny").setUnlocalizedName("metal.molten.shiny"); GameRegistry.registerBlock(moltenShiny, "metal.molten.shiny"); moltenShinyFluid.setBlockID(moltenShiny).setDensity(3000).setViscosity(6000); fluids[20] = moltenLeadFluid; fluidBlocks[20] = moltenShiny; - FluidRegistry.registerFluid(moltenShinyFluid); - //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenShinyFluid, 1), new ItemStack(buckets, 1, 20), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenShinyFluid, 1), new ItemStack(buckets, 1, 20), new ItemStack(Item.bucketEmpty))); - moltenInvarFluid = new Fluid("Molten Invar"); + moltenInvarFluid = new Fluid("invar.molten"); + FluidRegistry.registerFluid(moltenInvarFluid); moltenInvar = new LiquidMetalFinite(PHConstruct.moltenInvar, moltenInvarFluid, "liquid_invar").setUnlocalizedName("metal.molten.invar"); GameRegistry.registerBlock(moltenInvar, "metal.molten.invar"); moltenInvarFluid.setBlockID(moltenInvar).setDensity(3000).setViscosity(6000); fluids[21] = moltenInvarFluid; fluidBlocks[21] = moltenInvar; - FluidRegistry.registerFluid(moltenInvarFluid); - //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenInvarFluid, 1), new ItemStack(buckets, 1, 21), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenInvarFluid, 1), new ItemStack(buckets, 1, 21), new ItemStack(Item.bucketEmpty))); - moltenElectrumFluid = new Fluid("Molten Electrum"); + moltenElectrumFluid = new Fluid("electrum.molten"); + FluidRegistry.registerFluid(moltenElectrumFluid); moltenElectrum = new LiquidMetalFinite(PHConstruct.moltenElectrum, moltenElectrumFluid, "liquid_electrum").setUnlocalizedName("metal.molten.electrum"); GameRegistry.registerBlock(moltenElectrum, "metal.molten.electrum"); moltenElectrumFluid.setBlockID(moltenElectrum).setDensity(3000).setViscosity(6000); fluids[22] = moltenElectrumFluid; fluidBlocks[22] = moltenElectrum; - FluidRegistry.registerFluid(moltenElectrumFluid); - //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenElectrumFluid, 1), new ItemStack(buckets, 1, 22), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenElectrumFluid, 1), new ItemStack(buckets, 1, 22), new ItemStack(Item.bucketEmpty))); + + moltenEnderFluid = new Fluid("ender"); + FluidRegistry.registerFluid(moltenEnderFluid); + moltenEnder = new LiquidMetalFinite(PHConstruct.moltenEnder, moltenEnderFluid, "liquid_ender").setUnlocalizedName("liquid.ender"); + GameRegistry.registerBlock(moltenEnder, "liquid.ender"); + moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); + fluids[23] = moltenEnderFluid; + fluidBlocks[23] = moltenEnder; + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); + + //Slime + slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); + + blueSlimeFluid = new Fluid("slime.blue"); + FluidRegistry.registerFluid(blueSlimeFluid); + slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.slime"); + GameRegistry.registerBlock(slimePool, "liquid.slime"); + blueSlimeFluid.setBlockID(slimePool); + fluids[24] = blueSlimeFluid; + fluidBlocks[24] = slimePool; + //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(blueSlimeFluid, 1), new ItemStack(buckets, 1, 24), new ItemStack(Item.bucketEmpty))); + + slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setUnlocalizedName("slime.gel"); + GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel"); + + slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).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).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"); //Decoration stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); @@ -955,6 +1022,8 @@ public class TContent implements IFuelHandler 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"); + + 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", @@ -1332,6 +1401,8 @@ public class TContent implements IFuelHandler basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue / 9), new ItemStack(Block.gravel), true, 100); //brownstone + basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, 25), new ItemStack(Block.obsidian), true, 100); //endstone + basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender //Ore Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); @@ -1348,6 +1419,8 @@ public class TContent implements IFuelHandler Smeltery.addMelting(new ItemStack(blankPattern, 4, 1), metalBlock.blockID, 7, 150, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue)); Smeltery.addMelting(new ItemStack(blankPattern, 4, 2), metalBlock.blockID, 7, 150, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + + Smeltery.addMelting(new ItemStack(Item.enderPearl, 4), metalBlock.blockID, 10, 500, new FluidStack(moltenEnderFluid, 250)); //Blocks Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 9)); diff --git a/tconstruct/items/EssenceCrystal.java b/tconstruct/items/EssenceCrystal.java new file mode 100644 index 00000000..c34ae4fd --- /dev/null +++ b/tconstruct/items/EssenceCrystal.java @@ -0,0 +1,102 @@ +package tconstruct.items; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import tconstruct.blocks.logic.EssenceExtractorLogic; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class EssenceCrystal extends Item +{ + public EssenceCrystal(int id) + { + super(id); + this.setCreativeTab(CreativeTabs.tabMisc); + } + + @Override + public int getMaxItemUseDuration (ItemStack par1ItemStack) + { + return 32; + } + + @Override + public EnumAction getItemUseAction (ItemStack par1ItemStack) + { + return EnumAction.eat; + } + + @Override + public ItemStack onItemRightClick (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); + return par1ItemStack; + } + + @Override + public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) + { + if (stack.hasTagCompound()) + { + EntityXPOrb entity = new EntityXPOrb(world, player.posX, player.posY + 1, player.posZ, stack.getTagCompound().getInteger("Essence")); + spawnEntity(player.posX, player.posY + 1, player.posZ, entity, world, player); + if (!player.capabilities.isCreativeMode) + stack.stackSize--; + } + return stack; + } + + public static void spawnEntity (double x, double y, double z, Entity entity, World world, EntityPlayer player) + { + if (!world.isRemote) + { + world.spawnEntityInWorld(entity); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister iconRegister) + { + this.itemIcon = iconRegister.registerIcon("tinker:materials/material_essencecrystal"); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + if (stack.hasTagCompound()) + { + int amount = stack.getTagCompound().getInteger("Essence"); + list.add("Stored Levels: " + EssenceExtractorLogic.getEssencelevels(amount)); + } + else + { + list.add("Stored Levels: 0"); + } + } + + @Override + public void getSubItems (int id, CreativeTabs tab, List list) + { + int[] amount = new int[] { 17, 85, 170, 255, 385, 590, 825 }; + for (int i = 0; i < amount.length; i++) + { + ItemStack crystal = new ItemStack(id, 1, 0); + NBTTagCompound tags = new NBTTagCompound(); + tags.setInteger("Essence", amount[i]); + crystal.setTagCompound(tags); + list.add(crystal); + } + } +} diff --git a/tconstruct/items/FilledBucket.java b/tconstruct/items/FilledBucket.java index 66f971db..5454790b 100644 --- a/tconstruct/items/FilledBucket.java +++ b/tconstruct/items/FilledBucket.java @@ -177,8 +177,8 @@ public class FilledBucket extends ItemBucket } public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", - "Glass", "Stone", "Villager", "Cow" }; + "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender" }; public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", - "glass", "stone", "emerald", "blood" }; + "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender" }; } diff --git a/tconstruct/items/blocks/CraftedSoilItemBlock.java b/tconstruct/items/blocks/CraftedSoilItemBlock.java index eec72a9d..72bc83b0 100644 --- a/tconstruct/items/blocks/CraftedSoilItemBlock.java +++ b/tconstruct/items/blocks/CraftedSoilItemBlock.java @@ -2,16 +2,16 @@ package tconstruct.items.blocks; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class CraftedSoilItemBlock extends ItemBlock { - public static final String blockType[] = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil" }; + public static final String blockType[] = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt" }; public CraftedSoilItemBlock(int id) { @@ -28,7 +28,9 @@ public class CraftedSoilItemBlock extends ItemBlock public String getUnlocalizedName (ItemStack itemstack) { int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); - return (new StringBuilder()).append("CraftedSoil.").append(blockType[pos]).toString(); + if (pos <= 4) + return (new StringBuilder()).append("CraftedSoil.").append(blockType[pos]).toString(); + return (new StringBuilder()).append("block.slime.soil.").append(blockType[pos]).toString(); } @Override diff --git a/tconstruct/items/blocks/SlimeGelItemBlock.java b/tconstruct/items/blocks/SlimeGelItemBlock.java new file mode 100644 index 00000000..9434b93f --- /dev/null +++ b/tconstruct/items/blocks/SlimeGelItemBlock.java @@ -0,0 +1,33 @@ +package tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class SlimeGelItemBlock extends ItemBlock +{ + public static final String blockType[] = { "blue", "green", "purple", "magma", "yellow", "red", "metal" }; + + public SlimeGelItemBlock(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata (int meta) + { + return meta; + } + + public String getUnlocalizedName (ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); + return (new StringBuilder()).append("block.slime.congealed.").append(blockType[pos]).toString(); + } +} diff --git a/tconstruct/items/blocks/SlimeGrassItemBlock.java b/tconstruct/items/blocks/SlimeGrassItemBlock.java new file mode 100644 index 00000000..79285889 --- /dev/null +++ b/tconstruct/items/blocks/SlimeGrassItemBlock.java @@ -0,0 +1,33 @@ +package tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class SlimeGrassItemBlock extends ItemBlock +{ + public static final String blockType[] = { "blue", "dirt" }; + + public SlimeGrassItemBlock(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata (int meta) + { + return meta; + } + + public String getUnlocalizedName (ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); + return (new StringBuilder()).append("block.slime.grass.").append(blockType[pos]).toString(); + } +} diff --git a/tconstruct/items/blocks/SlimeLeavesItemBlock.java b/tconstruct/items/blocks/SlimeLeavesItemBlock.java new file mode 100644 index 00000000..296124c0 --- /dev/null +++ b/tconstruct/items/blocks/SlimeLeavesItemBlock.java @@ -0,0 +1,33 @@ +package tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class SlimeLeavesItemBlock extends ItemBlock +{ + public static final String blockType[] = { "blue" }; + + public SlimeLeavesItemBlock(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata (int meta) + { + return meta; + } + + public String getUnlocalizedName (ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); + return (new StringBuilder()).append("block.slime.leaves.").append(blockType[pos]).toString(); + } +} diff --git a/tconstruct/items/blocks/SlimeSaplingItemBlock.java b/tconstruct/items/blocks/SlimeSaplingItemBlock.java new file mode 100644 index 00000000..484b0c09 --- /dev/null +++ b/tconstruct/items/blocks/SlimeSaplingItemBlock.java @@ -0,0 +1,33 @@ +package tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class SlimeSaplingItemBlock extends ItemBlock +{ + public static final String blockType[] = { "bluegreen" }; + + public SlimeSaplingItemBlock(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata (int meta) + { + return meta; + } + + public String getUnlocalizedName (ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); + return (new StringBuilder()).append("block.slime.sapling.").append(blockType[pos]).toString(); + } +} diff --git a/tconstruct/items/blocks/SlimeTallGrassItem.java b/tconstruct/items/blocks/SlimeTallGrassItem.java new file mode 100644 index 00000000..f0c36293 --- /dev/null +++ b/tconstruct/items/blocks/SlimeTallGrassItem.java @@ -0,0 +1,39 @@ +package tconstruct.items.blocks; + +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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlimeTallGrassItem extends ItemBlock +{ + public static final String blockType[] = { "tallgrass", "tallgrass.fern" }; + + public SlimeTallGrassItem(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata (int meta) + { + return meta; + } + + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage (int meta) + { + int arr = MathHelper.clamp_int(meta, 0, blockType.length); + return TContent.slimeTallGrass.getIcon(0, arr); + } + + public String getUnlocalizedName (ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); + return (new StringBuilder()).append("block.slime.").append(blockType[pos]).toString(); + } +} diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java index a5aaa2e1..50033006 100644 --- a/tconstruct/util/PHConstruct.java +++ b/tconstruct/util/PHConstruct.java @@ -68,7 +68,6 @@ public class PHConstruct vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true).getBoolean(true); lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true).getBoolean(true); removeVanillaToolRecipes = config.get("Difficulty Changes", "Remove Vanilla Tool Recipes", false).getBoolean(false); - deGreg = config.get("Difficulty Changes", "Remove Vanilla GregTech Nerfs", true).getBoolean(true); harderBronze = config.get("Difficulty Changes", "Lower bronze output to 2 ingots", false).getBoolean(false); stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); @@ -130,6 +129,7 @@ public class PHConstruct moltenStone = config.getBlock("Molten Stone", 3215).getInt(3215); moltenEmerald = config.getBlock("Molten Emerald", 3216).getInt(3216); blood = config.getBlock("Liquid Cow", 3217).getInt(3217); + moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218); aggregator = config.getBlock("Aggregator", 3221).getInt(3221); lightCrystalBase = config.getBlock("Light Crystal", 3222).getInt(3222); @@ -147,6 +147,14 @@ public class PHConstruct punji = config.getBlock("Punji", 3232).getInt(3232); woodCrafter = config.getBlock("Crafting Station", 3233).getInt(3233); + essenceExtractor = config.getBlock("Essence Extractor", 3234).getInt(3234); + + slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); + slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237); + slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238); + slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239); + slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240); + slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241); /*golemCore = config.getBlock("Golem Core", 1481).getInt(1481); golemHead = config.getBlock("Golem Head", 1482).getInt(1482);*/ @@ -233,6 +241,7 @@ public class PHConstruct glove = config.getItem("Equipables", "Gloves", 14111).getInt(14111); knapsack = config.getItem("Equipables", "Knapsack", 14112).getInt(14112); goldHead = config.getItem("Patterns and Misc", "Golden Head", 14113).getInt(14113); + essenceCrystal = config.getItem("Patterns and Misc", "Essence Crystal", 14114).getInt(14114); boolean ic2 = true; boolean xycraft = true; @@ -321,6 +330,9 @@ public class PHConstruct worldBorder = config.get("Ultra Hardcore Changes", "Add World Border", false).getBoolean(false); worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000).getInt(1000); freePatterns = config.get("Ultra Hardcore Changes", "Add Patterns to Pattern Chests", false).getBoolean(false); //Check + + //Slime pools + islandRarity = config.get("Worldgen", "Slime Island Rarity", 450).getInt(450); /* Save the configuration file */ config.save(); @@ -381,6 +393,8 @@ public class PHConstruct //Crystalline public static int aggregator; public static int lightCrystalBase; + public static int essenceExtractor; + public static int essenceCrystal; //Liquids public static int metalFlowing; @@ -403,12 +417,21 @@ public class PHConstruct public static int moltenStone; public static int moltenEmerald; public static int blood; + public static int moltenEnder; public static int moltenSilver; //Thermal Expansion public static int moltenLead; public static int moltenNickel; public static int moltenShiny; public static int moltenInvar; public static int moltenElectrum; + + //Slime + public static int slimePoolBlue; + public static int slimeGel; + public static int slimeGrass; + public static int slimeTallGrass; + public static int slimeLeaves; + public static int slimeSapling; //Decoration public static int stoneTorch; @@ -620,5 +643,6 @@ public class PHConstruct public static boolean gregtech; public static boolean lavaFortuneInteraction; - public static boolean deGreg; + + public static int islandRarity; } diff --git a/tconstruct/worldgen/PlantGen.java b/tconstruct/worldgen/PlantGen.java new file mode 100644 index 00000000..b4d4359d --- /dev/null +++ b/tconstruct/worldgen/PlantGen.java @@ -0,0 +1,53 @@ +package tconstruct.worldgen; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class PlantGen extends WorldGenerator +{ + /** The ID of the plant block used in this plant generator. */ + public final int plantID; + public final int metadata; + public int chances = 64; + int xSize = 8; + int ySize = 4; + int zSize = 8; + boolean clumped = true; + + public PlantGen(int id, int meta) + { + this.plantID = id; + this.metadata = meta; + } + + public PlantGen(int id, int meta, int count, int range, int height, int width, boolean clumped) + { + this.plantID = id; + this.metadata = meta; + this.chances = count; + this.xSize = range; + this.ySize = height; + this.zSize = width; + this.clumped = clumped; + } + + public boolean generate (World world, Random random, int x, int y, int z) + { + for (int iter = 0; iter < chances; ++iter) + { + int posX = clumped ? x + random.nextInt(xSize) - random.nextInt(xSize) : x + random.nextInt(xSize); + int posY = clumped ? y + random.nextInt(ySize) - random.nextInt(ySize) : y + random.nextInt(ySize); + int posZ = clumped ? z + random.nextInt(zSize) - random.nextInt(zSize) : z + random.nextInt(zSize); + + if (world.isAirBlock(posX, posY, posZ) && (!world.provider.hasNoSky || posY < 127) && Block.blocksList[this.plantID].canBlockStay(world, posX, posY, posZ)) + { + world.setBlock(posX, posY, posZ, this.plantID, this.metadata, 2); + } + } + + return true; + } +} \ No newline at end of file diff --git a/tconstruct/worldgen/SlimeIslandGen.java b/tconstruct/worldgen/SlimeIslandGen.java new file mode 100644 index 00000000..36c65183 --- /dev/null +++ b/tconstruct/worldgen/SlimeIslandGen.java @@ -0,0 +1,288 @@ +package tconstruct.worldgen; + +import java.awt.geom.Ellipse2D; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.feature.WorldGenerator; +import tconstruct.common.TContent; +import tconstruct.util.PHConstruct; +import cpw.mods.fml.common.IWorldGenerator; + +public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator +{ + private int liquidBlock; + private int gelMeta; + int randomness = 2; + Random random = new Random(); + int baseID = TContent.craftedSoil.blockID;//Block.dirt.blockID; + int topID = TContent.slimeGrass.blockID; + SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0); + + public SlimeIslandGen(int id, int meta) + { + this.liquidBlock = id; + this.gelMeta = meta; + } + + @Override + public void generate (Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) //IWorldGenerator version + { + if (world.provider.dimensionId == 0 || world.provider.dimensionId >= 2) + { + if (random.nextInt(PHConstruct.islandRarity) == 0) + generateIsland(world, random, chunkX * 16, chunkZ * 16); + } + } + + //Island is biased towards one direction. Quadrants would be more useful + public void generateIsland (World world, Random rand, int xChunk, int zChunk) + { + int xRange = random.nextInt(13) + 20; + int yCenter = 100 + random.nextInt(41); + int zRange = random.nextInt(13) + 20; + int height = 12; + int initialHeight = height; + Ellipse2D.Double ellipse = new Ellipse2D.Double(0, 0, xRange, zRange); + + //Basic shape + for (int x = 0; x <= xRange; x++) + { + for (int z = 0; z <= zRange; z++) + { + for (int y = 0; y <= height; y++) + { + if (ellipse.contains(x, z)) + world.setBlock(x + xChunk, y + yCenter, z + zChunk, baseID, 5, 0); + } + } + } + + //Erode bottom + height = 8; + for (int x = 0; x <= xRange; x++) + { + for (int z = 0; z <= zRange; z++) + { + for (int y = 0; y >= -height; y--) + { + int xPos = x + xChunk; + int yPos = y + yCenter + height; + int zPos = z + zChunk; + if (world.getBlockId(xPos - 1, yPos + 1, zPos) == baseID && world.getBlockId(xPos + 1, yPos + 1, zPos) == baseID && world.getBlockId(xPos, yPos + 1, zPos - 1) == baseID + && world.getBlockId(xPos - 1, yPos + 1, zPos + 1) == baseID && random.nextInt(100) > randomness) + { + ; + } + else + { + world.setBlock(xPos, yPos, zPos, 0, 0, 0); + + } + } + } + } + + //Erode top + height = 3; + for (int x = 0; x <= xRange; x++) + { + for (int z = 0; z <= zRange; z++) + { + for (int y = 1; y <= height; y++) + { + int xPos = x + xChunk; + int yPos = y + yCenter + initialHeight - height + 1; + int zPos = z + zChunk; + if (world.getBlockId(xPos - 1, yPos - 1, zPos) == baseID && world.getBlockId(xPos + 1, yPos - 1, zPos) == baseID && world.getBlockId(xPos, yPos - 1, zPos - 1) == baseID + && world.getBlockId(xPos - 1, yPos - 1, zPos + 1) == baseID) + { + ; + } + else + { + world.setBlock(xPos, yPos, zPos, 0, 0, 0); + } + } + } + } + + //Replace blocks + for (int x = 0; x <= xRange; x++) + { + for (int z = 0; z <= zRange; z++) + { + for (int y = 0; y <= height; y++) + { + int xPos = x + xChunk; + int yPos = y + yCenter + initialHeight - height; + int zPos = z + zChunk; + if (world.getBlockId(xPos, yPos, zPos) == baseID) + { + Block block = Block.blocksList[world.getBlockId(xPos, yPos + 1, zPos)]; + if (block == null || block.isAirBlock(world, xPos, yPos + 1, zPos)) + world.setBlock(xPos, yPos, zPos, topID, 0, 0); + } + } + } + } + + //Decorate + generateSlimePool(world, rand, xChunk + xRange / 2, yCenter + initialHeight, zChunk + zRange / 2); + + PlantGen tallGrass = new PlantGen(TContent.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false); + tallGrass.generate(world, rand, xChunk, yCenter + initialHeight + 1, zChunk); + for (int i = 0; i < 3; i++) + { + trees.generate(world, random, xChunk + random.nextInt(xRange), yCenter + initialHeight + 3, zChunk + random.nextInt(zRange)); + } + } + + public void generateSlimePool (World world, Random rand, int x, int y, int z) + { + this.generate(world, rand, x, y, z); + } + + public boolean generate (World world, Random rand, int x, int y, int z) //WorldGenerator version + { + x -= 8; + z -= 8; + /*for (z -= 8; y > 5 && world.isAirBlock(x, y, z); --y) + { + ; + } + + if (y <= 4) + { + return false; + } + else + {*/ + y -= 4; + boolean[] validLocations = new boolean[2048]; + int var7 = rand.nextInt(4) + 4; + int xPos; + + for (xPos = 0; xPos < var7; ++xPos) + { + double noise1 = rand.nextDouble() * 6.0D + 3.0D; + double noise2 = rand.nextDouble() * 4.0D + 2.0D; + double noise3 = rand.nextDouble() * 6.0D + 3.0D; + double noise4 = rand.nextDouble() * (16.0D - noise1 - 2.0D) + 1.0D + noise1 / 2.0D; + double noise5 = rand.nextDouble() * (8.0D - noise2 - 4.0D) + 2.0D + noise2 / 2.0D; + double noise6 = rand.nextDouble() * (16.0D - noise3 - 2.0D) + 1.0D + noise3 / 2.0D; + + for (int xIter = 1; xIter < 15; ++xIter) + { + for (int zIter = 1; zIter < 15; ++zIter) + { + for (int yIter = 1; yIter < 7; ++yIter) + { + double var24 = ((double) xIter - noise4) / (noise1 / 2.0D); + double var26 = ((double) yIter - noise5) / (noise2 / 2.0D); + double var28 = ((double) zIter - noise6) / (noise3 / 2.0D); + double validSpot = var24 * var24 + var26 * var26 + var28 * var28; + + if (validSpot < 1.0D) + { + validLocations[(xIter * 16 + zIter) * 8 + yIter] = true; + } + } + } + } + } + + int yPos; + int zPos; + boolean var33; + + for (xPos = 0; xPos < 16; ++xPos) + { + for (zPos = 0; zPos < 16; ++zPos) + { + for (yPos = 0; yPos < 8; ++yPos) + { + var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] + && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 + && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 + && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); + + if (var33) + { + Material var12 = world.getBlockMaterial(x + xPos, y + yPos, z + zPos); + + if (yPos >= 4 && var12.isLiquid()) + { + return false; + } + + if (yPos < 4 && !var12.isSolid() && world.getBlockId(x + xPos, y + yPos, z + zPos) != this.liquidBlock) + { + return false; + } + } + } + } + } + + for (xPos = 0; xPos < 16; ++xPos) + { + for (zPos = 0; zPos < 16; ++zPos) + { + for (yPos = 0; yPos < 8; ++yPos) + { + if (validLocations[(xPos * 16 + zPos) * 8 + yPos]) + { + world.setBlock(x + xPos, y + yPos, z + zPos, yPos >= 4 ? 0 : this.liquidBlock); + } + } + } + } + + for (xPos = 0; xPos < 16; ++xPos) + { + for (zPos = 0; zPos < 16; ++zPos) + { + for (yPos = 4; yPos < 8; ++yPos) + { + if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.getBlockId(x + xPos, y + yPos - 1, z + zPos) == baseID + && world.getSavedLightValue(EnumSkyBlock.Sky, x + xPos, y + yPos, z + zPos) > 0) + { + world.setBlock(x + xPos, y + yPos - 1, z + zPos, topID, 2, 0); + } + } + } + } + + //Generate blocks around + if (Block.blocksList[this.liquidBlock].blockMaterial == Material.water) + { + for (xPos = 0; xPos < 16; ++xPos) + { + for (zPos = 0; zPos < 16; ++zPos) + { + for (yPos = 0; yPos < 8; ++yPos) + { + var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] + && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 + && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 + && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); + + 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); + } + } + } + } + } + + return true; + //} + } +} diff --git a/tconstruct/worldgen/SlimeTreeGen.java b/tconstruct/worldgen/SlimeTreeGen.java new file mode 100644 index 00000000..ac2b1923 --- /dev/null +++ b/tconstruct/worldgen/SlimeTreeGen.java @@ -0,0 +1,166 @@ +package tconstruct.worldgen; + +import java.util.Random; + +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; + +public class SlimeTreeGen extends WorldGenerator +{ + public final int minTreeHeight; + public final int treeHeightRange; + public final int metaWood; + public final int metaLeaves; + public final boolean seekHeight; + + public SlimeTreeGen(boolean notify, int treeHeight, int treeRange, int woodMeta, int leavesMeta) + { + super(notify); + this.minTreeHeight = treeHeight; + this.treeHeightRange = treeRange; + this.metaWood = woodMeta; + this.metaLeaves = leavesMeta; + this.seekHeight = !notify; + } + + public boolean generate (World world, Random random, int xPos, int yPos, int zPos) + { + int height = random.nextInt(this.treeHeightRange) + this.minTreeHeight; + boolean flag = true; + if (seekHeight) + { + yPos = findGround(world, xPos, yPos, zPos); + if (yPos == -1) + return false; + } + + 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)); + + if (isSoil) + { + if (!checkClear(world, xPos, yPos, zPos, height)) + return false; + + soil.onPlantGrow(world, xPos, yPos - 1, zPos, xPos, yPos, zPos); + placeCanopy(world, random, xPos, yPos, zPos, height); + placeTrunk(world, xPos, yPos, zPos, height); + return true; + } + } + return false; + } + + boolean checkClear (World world, int x, int y, int z, int treeHeight) + { + for (int yPos = 0; yPos < treeHeight + 1; yPos++) + { + int range = 1; + + if (yPos == 0) + range = 0; + else if (yPos >= treeHeight - 1) + range = 2; + + for (int xPos = range; xPos <= range; xPos++) + { + for (int zPos = range; zPos <= range; zPos++) + { + 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)) + return false; + } + } + } + return true; + } + + int findGround (World world, int x, int y, int z) + { + int ret = -1; + int height = y; + 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)]) + { + ret = height + 1; + break; + } + height--; + } while (height > 0); + return ret; + } + + void placeCanopy (World world, Random random, int xPos, int yPos, int zPos, int height) + { + for (int i = 0; i < 4; i++) + { + placeDiamondLayer(world, xPos, yPos + height - i, zPos, i + 1); + } + + this.setBlockAndMetadata(world, xPos+4, yPos + height - 3, zPos, 0, 0); + this.setBlockAndMetadata(world, xPos-4, yPos + height - 3, zPos, 0, 0); + this.setBlockAndMetadata(world, xPos, yPos + height - 3, zPos+4, 0, 0); + this.setBlockAndMetadata(world, xPos, yPos + height - 3, zPos-4, 0, 0); + this.setBlockAndMetadata(world, xPos+1, yPos + height - 3, zPos+1, 0, 0); + this.setBlockAndMetadata(world, xPos+1, yPos + height - 3, zPos-1, 0, 0); + this.setBlockAndMetadata(world, xPos-1, yPos + height - 3, zPos+1, 0, 0); + 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 - 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); + } + + void placeDiamondLayer(World world, int xPos, int yPos, int zPos, int range ) + { + for (int x = -range; x <= range; x++) + { + for (int z = -range; z <= range; z++) + { + if (Math.abs(x) + Math.abs(z) <= range) + { + this.setBlockAndMetadata(world, x+xPos, yPos, z+zPos, TContent.slimeLeaves.blockID, this.metaLeaves); + } + } + } + } + + void placeTrunk (World world, int xPos, int yPos, int zPos, int height) + { + for (int localHeight = 0; localHeight < height; ++localHeight) + { + int blockID = world.getBlockId(xPos, yPos + localHeight, zPos); + + Block block = Block.blocksList[blockID]; + + if (blockID == 0 || block == null || block.isLeaves(world, xPos, yPos + localHeight, zPos)) + { + this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TContent.slimeGel.blockID, this.metaWood); + } + } + } + +}