diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 8a6bac65..10c95c3e 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -204,6 +204,7 @@ item.tconstruct.MetalPattern.bowstring.name=Bowstring Cast item.tconstruct.MetalPattern.fletching.name=Fletching Cast item.tconstruct.MetalPattern.arrowhead.name=Arrowhead Cast item.tconstruct.MetalPattern.ingot.name=Ingot Cast +item.tconstruct.MetalPattern.gem.name=Gem Cast item.tconstruct.Materials.PaperStack.name=Paper Stack item.tconstruct.Materials.SlimeCrystal.name=Slime Crystal diff --git a/resources/assets/tinker/textures/blocks/compressed_alubrass.png b/resources/assets/tinker/textures/blocks/compressed_alubrass.png index 9f76af18..90f0329e 100644 Binary files a/resources/assets/tinker/textures/blocks/compressed_alubrass.png and b/resources/assets/tinker/textures/blocks/compressed_alubrass.png differ diff --git a/resources/assets/tinker/textures/blocks/compressed_alumite.png b/resources/assets/tinker/textures/blocks/compressed_alumite.png index 475b8b7d..d01bb421 100644 Binary files a/resources/assets/tinker/textures/blocks/compressed_alumite.png and b/resources/assets/tinker/textures/blocks/compressed_alumite.png differ diff --git a/resources/assets/tinker/textures/blocks/compressed_ardite.png b/resources/assets/tinker/textures/blocks/compressed_ardite.png index dea37435..4804615e 100644 Binary files a/resources/assets/tinker/textures/blocks/compressed_ardite.png and b/resources/assets/tinker/textures/blocks/compressed_ardite.png differ diff --git a/resources/assets/tinker/textures/blocks/compressed_cobalt.png b/resources/assets/tinker/textures/blocks/compressed_cobalt.png index 65c4eeee..1aa1e195 100644 Binary files a/resources/assets/tinker/textures/blocks/compressed_cobalt.png and b/resources/assets/tinker/textures/blocks/compressed_cobalt.png differ diff --git a/resources/assets/tinker/textures/blocks/compressed_ender.png b/resources/assets/tinker/textures/blocks/compressed_ender.png index b7e9bbbc..ac36a3f0 100644 Binary files a/resources/assets/tinker/textures/blocks/compressed_ender.png and b/resources/assets/tinker/textures/blocks/compressed_ender.png differ diff --git a/resources/assets/tinker/textures/blocks/compressed_manyullyn.png b/resources/assets/tinker/textures/blocks/compressed_manyullyn.png index 7722c8d9..5f54d305 100644 Binary files a/resources/assets/tinker/textures/blocks/compressed_manyullyn.png and b/resources/assets/tinker/textures/blocks/compressed_manyullyn.png differ diff --git a/resources/assets/tinker/textures/items/materials/cast_gem.png b/resources/assets/tinker/textures/items/materials/cast_gem.png new file mode 100644 index 00000000..5ba859fe Binary files /dev/null and b/resources/assets/tinker/textures/items/materials/cast_gem.png differ diff --git a/src/tconstruct/blocks/BloodBlock.java b/src/tconstruct/blocks/BloodBlock.java new file mode 100644 index 00000000..ef5511c0 --- /dev/null +++ b/src/tconstruct/blocks/BloodBlock.java @@ -0,0 +1,27 @@ +package tconstruct.blocks; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; + +public class BloodBlock extends TConstructFluid +{ + + public BloodBlock(int id, Fluid fluid, Material material, String texture) + { + super(id, fluid, material, texture); + } + + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) + { + if (entity instanceof EntityLivingBase) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 200, 0)); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20*10, 4)); + } + } +} diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java index 057695ea..72284e2a 100644 --- a/src/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryLogic.java @@ -9,6 +9,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -313,11 +314,11 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (o instanceof EntityVillager) { EntityVillager villager = (EntityVillager) o; - if (villager.attackEntityFrom(new SmelteryDamageSource(), 1)) + if (villager.attackEntityFrom(new SmelteryDamageSource(), 5)) { - if (currentLiquid + 8 < maxLiquid) + if (currentLiquid + 40 < maxLiquid) { - int amount = villager.isChild() ? 1 : 8; + int amount = villager.isChild() ? 5 : 40; this.fill(new FluidStack(TContent.moltenEmeraldFluid, amount), true); } } @@ -325,22 +326,33 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci else if (o instanceof EntityEnderman) { EntityEnderman villager = (EntityEnderman) o; - if (villager.attackEntityFrom(new SmelteryDamageSource(), 1)) + if (villager.attackEntityFrom(new SmelteryDamageSource(), 5)) { - if (currentLiquid + 25 < maxLiquid) + if (currentLiquid + 125 < maxLiquid) { - this.fill(new FluidStack(TContent.moltenEnderFluid, 25), true); + this.fill(new FluidStack(TContent.moltenEnderFluid, 125), true); + } + } + } + else if (o instanceof EntityIronGolem) + { + EntityIronGolem golem = (EntityIronGolem) o; + if (golem.attackEntityFrom(new SmelteryDamageSource(), 5)) + { + if (currentLiquid + 40 < maxLiquid) + { + this.fill(new FluidStack(TContent.moltenIronFluid, 40), true); } } } else if (o instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) o; - if (living.attackEntityFrom(new SmelteryDamageSource(), 1)) + if (living.attackEntityFrom(new SmelteryDamageSource(), 5)) { - if (currentLiquid + 8 < maxLiquid) + if (currentLiquid + 40 < maxLiquid) { - int amount = (living.isChild() || living instanceof EntityPlayer) ? 1 : 8; + int amount = (living.isChild() || living instanceof EntityPlayer) ? 5 : 40; this.fill(new FluidStack(TContent.bloodFluid, amount), true); } } @@ -952,7 +964,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } else { - if (doDrain) + if (doDrain && maxDrain > 0) { liquid.amount -= maxDrain; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); @@ -977,7 +989,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci resource.amount = maxLiquid - currentLiquid; int amount = resource.amount; - if (doFill) + if (amount > 0 && doFill) { if (addMoltenMetal(resource, false)) { diff --git a/src/tconstruct/blocks/slime/SlimeGel.java b/src/tconstruct/blocks/slime/SlimeGel.java index 0e9f4bdc..65c660b5 100644 --- a/src/tconstruct/blocks/slime/SlimeGel.java +++ b/src/tconstruct/blocks/slime/SlimeGel.java @@ -53,7 +53,7 @@ public class SlimeGel extends TConstructBlock entity.motionY *= -1.2F; if (entity instanceof EntityLivingBase) { - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 4)); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 2)); } } entity.fallDistance = 0; diff --git a/src/tconstruct/client/TClientEvents.java b/src/tconstruct/client/TClientEvents.java index 168ebed0..22437194 100644 --- a/src/tconstruct/client/TClientEvents.java +++ b/src/tconstruct/client/TClientEvents.java @@ -69,7 +69,6 @@ public class TClientEvents { stillIcons[0] = register.registerIcon("tinker:liquid_pigiron"); flowIcons[0] = register.registerIcon("tinker:liquid_pigiron"); - System.out.println("Icons: "+stillIcons[0]+" "+flowIcons[0]); } } @@ -97,125 +96,129 @@ public class TClientEvents @ForgeSubscribe public void renderHealthbar (RenderGameOverlayEvent.Pre event) { - if (event.type == ElementType.HEALTH && !Loader.isModLoaded("tukmc_Vz")) // Loader check to avoid conflicting with a GUI mod (thanks Vazkii!) + if (!Loader.isModLoaded("tukmc_Vz"))// Loader check to avoid conflicting with a GUI mod (thanks Vazkii!) { - event.setCanceled(true); - updateCounter++; - - ScaledResolution scaledresolution = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); - int scaledWidth = scaledresolution.getScaledWidth(); - int scaledHeight = scaledresolution.getScaledHeight(); - int xBasePos = scaledWidth / 2 - 91; - int yBasePos = scaledHeight - 39; - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(mc.thePlayer.username); - - boolean highlight = mc.thePlayer.hurtResistantTime / 3 % 2 == 1; - - if (mc.thePlayer.hurtResistantTime < 10) + if (event.type == ElementType.HEALTH) { - highlight = false; - } + updateCounter++; - AttributeInstance attrMaxHealth = this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth); - int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth()); - int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth); - float healthMax = (float) attrMaxHealth.getAttributeValue(); - if (healthMax > 20) - healthMax = 20; - float absorb = this.mc.thePlayer.getAbsorptionAmount(); + ScaledResolution scaledresolution = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); + int scaledWidth = scaledresolution.getScaledWidth(); + int scaledHeight = scaledresolution.getScaledHeight(); + int xBasePos = scaledWidth / 2 - 91; + int yBasePos = scaledHeight - 39; + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(mc.thePlayer.username); - int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); - int rowHeight = Math.max(10 - (healthRows - 2), 3); + boolean highlight = mc.thePlayer.hurtResistantTime / 3 % 2 == 1; - this.rand.setSeed((long) (updateCounter * 312871)); - - int left = scaledWidth / 2 - 91; - int top = scaledHeight - left_height; - - int regen = -1; - if (mc.thePlayer.isPotionActive(Potion.regeneration)) - { - regen = updateCounter % 25; - } - - final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); - final int BACKGROUND = (highlight ? 25 : 16); - int MARGIN = 16; - if (mc.thePlayer.isPotionActive(Potion.poison)) - MARGIN += 36; - else if (mc.thePlayer.isPotionActive(Potion.wither)) - MARGIN += 72; - float absorbRemaining = absorb; - - for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) - { - int b0 = (highlight ? 1 : 0); - int row = MathHelper.ceiling_float_int((float) (i + 1) / 10.0F) - 1; - int x = left + i % 10 * 8; - int y = top - row * rowHeight; - - if (health <= 4) - y += rand.nextInt(2); - if (i == regen) - y -= 2; - - drawTexturedModalRect(x, y, BACKGROUND, TOP, 9, 9); - - if (highlight) + if (mc.thePlayer.hurtResistantTime < 10) { - if (i * 2 + 1 < healthLast) - drawTexturedModalRect(x, y, MARGIN + 54, TOP, 9, 9); //6 - else if (i * 2 + 1 == healthLast) - drawTexturedModalRect(x, y, MARGIN + 63, TOP, 9, 9); //7 + highlight = false; } - if (absorbRemaining > 0.0F) + AttributeInstance attrMaxHealth = this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth); + int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth()); + int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth); + float healthMax = (float) attrMaxHealth.getAttributeValue(); + if (healthMax > 20) + healthMax = 20; + float absorb = this.mc.thePlayer.getAbsorptionAmount(); + + int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); + int rowHeight = Math.max(10 - (healthRows - 2), 3); + + this.rand.setSeed((long) (updateCounter * 312871)); + + int left = scaledWidth / 2 - 91; + int top = scaledHeight - left_height; + + int regen = -1; + if (mc.thePlayer.isPotionActive(Potion.regeneration)) { - if (absorbRemaining == absorb && absorb % 2.0F == 1.0F) - drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); //17 + regen = updateCounter % 25; + } + + final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int BACKGROUND = (highlight ? 25 : 16); + int MARGIN = 16; + if (mc.thePlayer.isPotionActive(Potion.poison)) + MARGIN += 36; + else if (mc.thePlayer.isPotionActive(Potion.wither)) + MARGIN += 72; + float absorbRemaining = absorb; + + for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) + { + int b0 = (highlight ? 1 : 0); + int row = MathHelper.ceiling_float_int((float) (i + 1) / 10.0F) - 1; + int x = left + i % 10 * 8; + int y = top - row * rowHeight; + + if (health <= 4) + y += rand.nextInt(2); + if (i == regen) + y -= 2; + + drawTexturedModalRect(x, y, BACKGROUND, TOP, 9, 9); + + if (highlight) + { + if (i * 2 + 1 < healthLast) + drawTexturedModalRect(x, y, MARGIN + 54, TOP, 9, 9); //6 + else if (i * 2 + 1 == healthLast) + drawTexturedModalRect(x, y, MARGIN + 63, TOP, 9, 9); //7 + } + + if (absorbRemaining > 0.0F) + { + if (absorbRemaining == absorb && absorb % 2.0F == 1.0F) + drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); //17 + else + drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); //16 + absorbRemaining -= 2.0F; + } else - drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); //16 - absorbRemaining -= 2.0F; + { + if (i * 2 + 1 < health) + drawTexturedModalRect(x, y, MARGIN + 36, TOP, 9, 9); //4 + else if (i * 2 + 1 == health) + drawTexturedModalRect(x, y, MARGIN + 45, TOP, 9, 9); //5 + } } - else + + PotionEffect potion = mc.thePlayer.getActivePotionEffect(Potion.wither); + if (potion != null) + return; + potion = mc.thePlayer.getActivePotionEffect(Potion.poison); + if (potion != null) + return; + + //Extra hearts + this.mc.getTextureManager().bindTexture(hearts); + + int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth()); + for (int iter = 0; iter < hp / 20; iter++) { - if (i * 2 + 1 < health) - drawTexturedModalRect(x, y, MARGIN + 36, TOP, 9, 9); //4 - else if (i * 2 + 1 == health) - drawTexturedModalRect(x, y, MARGIN + 45, TOP, 9, 9); //5 + int renderHearts = (hp - 20 * (iter + 1)) / 2; + if (renderHearts > 10) + renderHearts = 10; + for (int i = 0; i < renderHearts; i++) + { + this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos, 0 + 18 * iter, 0, 8, 8); + } + if (hp % 2 == 1 && renderHearts < 10) + { + this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * iter, 0, 8, 8); + } } - } - PotionEffect potion = mc.thePlayer.getActivePotionEffect(Potion.wither); - if (potion != null) - return; - potion = mc.thePlayer.getActivePotionEffect(Potion.poison); - if (potion != null) - return; - - //Extra hearts - this.mc.getTextureManager().bindTexture(hearts); - - int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth()); - for (int iter = 0; iter < hp / 20; iter++) - { - int renderHearts = (hp - 20 * (iter + 1)) / 2; - if (renderHearts > 10) - renderHearts = 10; - for (int i = 0; i < renderHearts; i++) - { - this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos, 0 + 18 * iter, 0, 8, 8); - } - if (hp % 2 == 1 && renderHearts < 10) - { - this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * iter, 0, 8, 8); - } - } - - this.mc.getTextureManager().bindTexture(icons); - GuiIngameForge.left_height += 10; - if (absorb > 0) + this.mc.getTextureManager().bindTexture(icons); GuiIngameForge.left_height += 10; + if (absorb > 0) + GuiIngameForge.left_height += 10; + + event.setCanceled(true); + } } } diff --git a/src/tconstruct/client/gui/SmelteryGui.java b/src/tconstruct/client/gui/SmelteryGui.java index 34ad2896..9b491384 100644 --- a/src/tconstruct/client/gui/SmelteryGui.java +++ b/src/tconstruct/client/gui/SmelteryGui.java @@ -281,7 +281,7 @@ public class SmelteryGui extends NewContainerGui list.add("\u00A7f" + name); if (name.equals("Liquified Emerald")) { - list.add("Emeralds: " + liquid.amount / 320f); + list.add("Emeralds: " + liquid.amount / 640f); } else if (name.equals("Molten Glass")) { diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 7181df6d..ced9da48 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -613,7 +613,7 @@ public class TContent implements IFuelHandler bloodFluid = new Fluid("blood"); if (!FluidRegistry.registerFluid(bloodFluid)) bloodFluid = FluidRegistry.getFluid("blood"); - blood = new TConstructFluid(PHConstruct.blood, bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); + blood = new BloodBlock(PHConstruct.blood, bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); GameRegistry.registerBlock(blood, "liquid.blood"); fluids[16] = bloodFluid; fluidBlocks[16] = blood; @@ -815,9 +815,9 @@ public class TContent implements IFuelHandler materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); toolRod = new ToolPart(PHConstruct.toolRod, "_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard"); - woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern", "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); - metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); - armorPattern = new ArmorPattern(PHConstruct.armorPattern, "ArmorPattern", "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); + woodPattern = new Pattern(PHConstruct.woodPattern, "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); + metalPattern = new MetalPattern(PHConstruct.metalPattern, "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); GameRegistry.registerItem(materials, "materials"); GameRegistry.registerItem(woodPattern, "woodPattern"); GameRegistry.registerItem(metalPattern, "metalPattern"); @@ -1021,7 +1021,7 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); - TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 150, 600, 2, 1.1F, 1, 0f, "\u00A7c", "Tasty"); + TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", "Tasty"); TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); //Wood TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); //Stone @@ -1368,7 +1368,6 @@ public class TContent implements IFuelHandler GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(woolSlab1, 1, sc), new ItemStack(woolSlab1, 1, sc)); GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(woolSlab2, 1, sc), new ItemStack(woolSlab2, 1, sc)); } - GameRegistry.addRecipe(new ItemStack(woolSlab1, 6, 0), "www", 'w', new ItemStack(Block.cloth, 1, Short.MAX_VALUE)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth")); //Trap Recipes GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); @@ -1440,7 +1439,7 @@ public class TContent implements IFuelHandler { /* Tools */ patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod, - toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead }; + toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead, null }; int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; @@ -1568,13 +1567,19 @@ public class TContent implements IFuelHandler { /* Smeltery */ ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); + ItemStack gemcast = new ItemStack(metalPattern, 1, 26); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); //Blank tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Item.emerald), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80); //Ingots tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), ingotcast, 80); //stone + + //Gems + tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(moltenEmeraldFluid, 640), gemcast, 80); //Buckets ItemStack bucket = new ItemStack(Item.bucketEmpty); @@ -1663,7 +1668,7 @@ public class TContent implements IFuelHandler basinCasting.addCastingRecipe(new ItemStack(clearGlass, 1, 0), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); - + basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640*9), null, true, 100); //emerald basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender @@ -1694,7 +1699,7 @@ public class TContent implements IFuelHandler Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn Smeltery.addAlloyMixing(new FluidStack(pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue), - new FluidStack(bloodFluid, 400)); //Pigiron + new FluidStack(moltenEmeraldFluid, 640), new FluidStack(bloodFluid, 80)); //Pigiron // Stone parts for (int sc = 0; sc < patternOutputs.length; sc++) @@ -1735,6 +1740,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.doorIron), 0, TConstruct.ingotLiquidValue * 6); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.cauldron), 0, TConstruct.ingotLiquidValue * 7); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.Emerald, new ItemStack(Item.emerald), -50, 800); //Blocks melt as themselves! //Ore @@ -1755,6 +1761,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640*9)); Smeltery.addMelting(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); @@ -2001,6 +2008,8 @@ public class TContent implements IFuelHandler ensureOreIsRegistered("crafterWood", new ItemStack(Block.workbench, 1)); + OreDictionary.registerOre("torchStone", new ItemStack(stoneTorch)); + String[] matNames = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" }; for (int i = 0; i < matNames.length; i++) diff --git a/src/tconstruct/items/ArmorPattern.java b/src/tconstruct/items/ArmorPattern.java index a20ee08f..fd1d8866 100644 --- a/src/tconstruct/items/ArmorPattern.java +++ b/src/tconstruct/items/ArmorPattern.java @@ -16,7 +16,7 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike private Icon baseIcon; - public ArmorPattern(int id, String partType, String patternType, String folder) + public ArmorPattern(int id, String patternType, String folder) { super(id, patternName, getPatternNames(patternType), folder); this.setHasSubtypes(true); diff --git a/src/tconstruct/items/MetalPattern.java b/src/tconstruct/items/MetalPattern.java index c65fcfff..6d6a6a49 100644 --- a/src/tconstruct/items/MetalPattern.java +++ b/src/tconstruct/items/MetalPattern.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; public class MetalPattern extends Pattern { - public MetalPattern(int id, String partType, String patternType, String folder) + public MetalPattern(int id, String patternType, String folder) { - super(id, partType, patternType, folder); + super(id, patternName, getPatternNames(patternType), folder); } protected static String[] getPatternNames (String partType) @@ -19,11 +19,13 @@ public class MetalPattern extends Pattern for (int i = 0; i < patternName.length; i++) if (!(patternName[i].equals(""))) names[i] = partType + patternName[i]; + else + names[i] = ""; return names; } private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", - "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead" }; + "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" }; public void getSubItems (int id, CreativeTabs tab, List list) { diff --git a/src/tconstruct/items/Pattern.java b/src/tconstruct/items/Pattern.java index 21bf795d..62bb2fc6 100644 --- a/src/tconstruct/items/Pattern.java +++ b/src/tconstruct/items/Pattern.java @@ -11,9 +11,14 @@ import tconstruct.library.util.IPattern; public class Pattern extends CraftingItem implements IPattern { - public Pattern(int id, String partType, String patternType, String folder) + public Pattern(int id, String patternType, String folder) { - super(id, patternName, getPatternNames(patternType), folder); + this(id, patternName, getPatternNames(patternType), folder); + } + + public Pattern(int id, String[] names, String[] patternTypes, String folder) + { + super(id, names, patternTypes, folder); this.setHasSubtypes(true); this.setMaxDamage(0); this.setContainerItem(this); diff --git a/src/tconstruct/library/client/FluidRenderProperties.java b/src/tconstruct/library/client/FluidRenderProperties.java index 58df82e0..5794e70e 100644 --- a/src/tconstruct/library/client/FluidRenderProperties.java +++ b/src/tconstruct/library/client/FluidRenderProperties.java @@ -46,7 +46,7 @@ public class FluidRenderProperties public static enum Applications { - TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.0625F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); + TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.062F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); public float minHeight, maxHeight, minX, maxX, minZ, maxZ; diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index 0dff1537..c401dcc0 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -19,6 +19,7 @@ public class EnvironmentChecks /** * Checks for conflicting stuff in environment; adds callable to any crash logs if so. + * Note: This code adds additional data to crashlogs. It does not trigger any crashes. */ public static void verifyEnvironmentSanity () { @@ -31,6 +32,8 @@ public class EnvironmentChecks TConstruct.logger.severe("[Environment Checks] For this reason, the TCon dev team urge you to seek your tedium fix from someone else, as Greg disobeys"); TConstruct.logger.severe("[Environment Checks] the basic tenets of good modders conduct. We log this message rather than sabotage. We'd hope he'd do the same."); TConstruct.logger.severe("[Environment Checks] In the meantime, we recommend not playing anything but IC2 alongside Gregtech. ~ Sunstrike"); + TConstruct.logger.severe("[Environment Checks] GT Appendum I: And now he's going after Forge Mod Loader too..."); + TConstruct.logger.severe("[Environment Checks] http://forum.industrial-craft.net/index.php?page=Thread&postID=138551#post138551 ~ SlimeKnights"); modIds.add("gregtech_addon"); } @@ -40,12 +43,6 @@ public class EnvironmentChecks modIds.add("optifine"); } - if (Loader.isModLoaded("DragonAPI")) - { - TConstruct.logger.severe("[Environment Checks] DragonAPI detected. Currently this just logs a warning, however if Reika continues his plan to implement DRM-like"); - TConstruct.logger.severe("[Environment Checks] code in his mod then it may become marked as fully unsupported. This is just a warning at this stage."); - } - try { Class cl = Class.forName("org.bukkit.Bukkit");