mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Merge pull request #1 from agaricusb/maven
Update MCP mappings and add Maven POM for faster decompile-free building
This commit is contained in:
commit
f42aceb54c
9 files changed
+89
-16
No files matched your search
@@ -0,0 +1,73 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>tinker</groupId>
|
||||
<artifactId>TinkersConstruct</artifactId>
|
||||
<version>1.4.7</version>
|
||||
<name>TinkersConstruct</name>
|
||||
<url>https://github.com/mDiyo/TinkersConstruct</url>
|
||||
|
||||
<parent>
|
||||
<groupId>net.md-5</groupId>
|
||||
<artifactId>ForgeMod</artifactId>
|
||||
<version>1.4.7-6.6.2.534-R2</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<ic2.build>222</ic2.build>
|
||||
<ic2.version>1.115.${ic2.build}-lf</ic2.version>
|
||||
<ic2.mcp.mappings>https://raw.github.com/MinecraftForge/FML/1bd6847bc80f51b06544068011f7df3218f13999/conf/</ic2.mcp.mappings> <!-- 1.4.7 until IC2 updates -->
|
||||
</properties>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<id>built</id>
|
||||
<dependencies>
|
||||
<!-- after the remapped artifact is built, add it a dependency -->
|
||||
<dependency>
|
||||
<groupId>net.industrial-craft</groupId>
|
||||
<artifactId>ic2</artifactId>
|
||||
<version>${ic2.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<build>
|
||||
<sourceDirectory>${basedir}/tinker</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${basedir}/resources</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>net.md-5</groupId>
|
||||
<artifactId>specialsource-maven-plugin</artifactId>
|
||||
<version>1.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>install-remapped-ic2</id>
|
||||
<phase>initialize</phase>
|
||||
<goals>
|
||||
<goal>install-remapped-file</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<groupId>net.industrial-craft</groupId>
|
||||
<artifactId>ic2</artifactId>
|
||||
<version>${ic2.version}</version>
|
||||
<inJars>
|
||||
<param>http://ic2api.player.to:8080/job/IC2_lf/${ic2.build}/artifact/packages/industrialcraft-2_${ic2.version}.jar</param>
|
||||
</inJars>
|
||||
<srgIn>${ic2.mcp.mappings}</srgIn>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -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;
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user