From da023a7669b8cc3fa51d84a025389fd4c041c03e Mon Sep 17 00:00:00 2001 From: Agaricus Date: Sat, 9 Mar 2013 14:11:57 -0800 Subject: [PATCH 1/2] Update for final MCP 7.26a mappings --- tinker/common/InventoryBlock.java | 2 +- tinker/common/fancyitem/FancyEntityItem.java | 2 +- tinker/common/fancyitem/FancyItemRender.java | 4 ++-- tinker/tconstruct/AbilityHelper.java | 2 +- .../client/CastingTableSpecialRenderer.java | 2 +- .../tconstruct/client/SuperCustomToolRenderer.java | 4 ++-- tinker/tconstruct/entity/CartEntity.java | 14 +++++++------- tinker/tconstruct/logic/FrypanLogic.java | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tinker/common/InventoryBlock.java b/tinker/common/InventoryBlock.java index b2fad8b0..1c18e0da 100644 --- a/tinker/common/InventoryBlock.java +++ b/tinker/common/InventoryBlock.java @@ -79,7 +79,7 @@ public abstract class InventoryBlock extends BlockContainer if (stack.hasTagCompound()) { - entityitem.func_92014_d().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); } float offset = 0.05F; diff --git a/tinker/common/fancyitem/FancyEntityItem.java b/tinker/common/fancyitem/FancyEntityItem.java index 887909e4..8c0c8ac7 100644 --- a/tinker/common/fancyitem/FancyEntityItem.java +++ b/tinker/common/fancyitem/FancyEntityItem.java @@ -30,7 +30,7 @@ public class FancyEntityItem extends EntityItem public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) { this(par1World, par2, par4, par6); - this.func_92013_a(par8ItemStack); + this.func_92058_a(par8ItemStack); this.lifespan = (par8ItemStack.getItem() == null ? 6000 : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World)); } diff --git a/tinker/common/fancyitem/FancyItemRender.java b/tinker/common/fancyitem/FancyItemRender.java index ed51150a..12170351 100644 --- a/tinker/common/fancyitem/FancyItemRender.java +++ b/tinker/common/fancyitem/FancyItemRender.java @@ -49,7 +49,7 @@ public class FancyItemRender extends Render public void doRenderItem(EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) { this.random.setSeed(187L); - ItemStack var10 = par1EntityItem.func_92014_d(); + ItemStack var10 = par1EntityItem.getEntityItem(); if (var10.getItem() != null) { @@ -212,7 +212,7 @@ public class FancyItemRender extends Render float var16 = 0.0625F; var17 = 0.021875F; - ItemStack var18 = par1EntityItem.func_92014_d(); + ItemStack var18 = par1EntityItem.getEntityItem(); int var19 = var18.stackSize; byte var24 = getMiniItemCountForItemStack(var18); diff --git a/tinker/tconstruct/AbilityHelper.java b/tinker/tconstruct/AbilityHelper.java index e1b0a1d5..006b6c51 100644 --- a/tinker/tconstruct/AbilityHelper.java +++ b/tinker/tconstruct/AbilityHelper.java @@ -168,7 +168,7 @@ public class AbilityHelper if (entity instanceof EntityLiving) { - EnchantmentThorns.func_92044_a(player, (EntityLiving)entity, random); + EnchantmentThorns.func_92096_a(player, (EntityLiving)entity, random); } } diff --git a/tinker/tconstruct/client/CastingTableSpecialRenderer.java b/tinker/tconstruct/client/CastingTableSpecialRenderer.java index 828d586a..cbfbc8d6 100644 --- a/tinker/tconstruct/client/CastingTableSpecialRenderer.java +++ b/tinker/tconstruct/client/CastingTableSpecialRenderer.java @@ -53,7 +53,7 @@ public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer void renderItem(CastingTableLogic logic, ItemStack stack) { FancyEntityItem entityitem = new FancyEntityItem(logic.worldObj, 0.0D, 0.0D, 0.0D, stack); - entityitem.func_92014_d().stackSize = 1; + entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glPushMatrix(); GL11.glTranslatef(1F, 1.478F, 0.55F); diff --git a/tinker/tconstruct/client/SuperCustomToolRenderer.java b/tinker/tconstruct/client/SuperCustomToolRenderer.java index 7613c76f..5a9860b0 100644 --- a/tinker/tconstruct/client/SuperCustomToolRenderer.java +++ b/tinker/tconstruct/client/SuperCustomToolRenderer.java @@ -291,7 +291,7 @@ public class SuperCustomToolRenderer implements IItemRenderer void renderEntityItem (ItemStack stack, RenderBlocks renderer, EntityItem entity) { this.random.setSeed(187L); - ItemStack var10 = entity.func_92014_d(); + ItemStack var10 = entity.getEntityItem(); ToolCore tool = (ToolCore) var10.getItem(); if (var10.getItem() != null) @@ -398,7 +398,7 @@ public class SuperCustomToolRenderer implements IItemRenderer float var16 = 0.0625F; var17 = 0.021875F; - ItemStack stack = par1EntityItem.func_92014_d(); + ItemStack stack = par1EntityItem.getEntityItem(); ToolCore tool = (ToolCore) stack.getItem(); int var19 = stack.stackSize; byte var24 = getMiniBlockCountForItemStack(stack); diff --git a/tinker/tconstruct/entity/CartEntity.java b/tinker/tconstruct/entity/CartEntity.java index dd3ebd92..dbc344fa 100644 --- a/tinker/tconstruct/entity/CartEntity.java +++ b/tinker/tconstruct/entity/CartEntity.java @@ -264,7 +264,7 @@ public class CartEntity extends Entity if (var2.hasTagCompound()) { - var7.func_92014_d().setTagCompound((NBTTagCompound)var2.getTagCompound().copy()); + var7.getEntityItem().setTagCompound((NBTTagCompound)var2.getTagCompound().copy()); } float var8 = 0.05F; @@ -326,9 +326,9 @@ public class CartEntity extends Entity { if (var1.getAllowNether()) { - if (this.ridingEntity == null && this.field_82153_h++ >= var2) + if (this.ridingEntity == null && this.timeInPortal++ >= var2) { - this.field_82153_h = var2; + this.timeInPortal = var2; this.timeUntilPortal = this.getPortalCooldown(); byte var3; @@ -349,14 +349,14 @@ public class CartEntity extends Entity } else { - if (this.field_82153_h > 0) + if (this.timeInPortal > 0) { - this.field_82153_h -= 4; + this.timeInPortal -= 4; } - if (this.field_82153_h < 0) + if (this.timeInPortal < 0) { - this.field_82153_h = 0; + this.timeInPortal = 0; } } diff --git a/tinker/tconstruct/logic/FrypanLogic.java b/tinker/tconstruct/logic/FrypanLogic.java index c69e536d..30f05db2 100644 --- a/tinker/tconstruct/logic/FrypanLogic.java +++ b/tinker/tconstruct/logic/FrypanLogic.java @@ -253,7 +253,7 @@ public class FrypanLogic extends EquipLogic } if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemSword && ((ItemSword) item).func_77825_f().equals("WOOD")) + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; if (item instanceof ItemHoe && ((ItemHoe) item).func_77842_f().equals("WOOD")) return 200; From 03b466a133cbb5a4be73ee87c3b60e488da55f40 Mon Sep 17 00:00:00 2001 From: Agaricus Date: Sat, 9 Mar 2013 14:20:23 -0800 Subject: [PATCH 2/2] Add Maven POM --- pom.xml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..c80255e9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,73 @@ + + 4.0.0 + tinker + TinkersConstruct + 1.4.7 + TinkersConstruct + https://github.com/mDiyo/TinkersConstruct + + + net.md-5 + ForgeMod + 1.4.7-6.6.2.534-R2 + + + + 222 + 1.115.${ic2.build}-lf + https://raw.github.com/MinecraftForge/FML/1bd6847bc80f51b06544068011f7df3218f13999/conf/ + + + + + + true + + built + + + + net.industrial-craft + ic2 + ${ic2.version} + jar + compile + + + + + + + ${basedir}/tinker + + + ${basedir}/resources + + + + + net.md-5 + specialsource-maven-plugin + 1.0 + + + install-remapped-ic2 + initialize + + install-remapped-file + + + net.industrial-craft + ic2 + ${ic2.version} + + http://ic2api.player.to:8080/job/IC2_lf/${ic2.build}/artifact/packages/industrialcraft-2_${ic2.version}.jar + + ${ic2.mcp.mappings} + + + + + + +