mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 21:20:06 +00:00
fix lots of rendering mappings. rename toolmaterial to ttoolmaterial to avoid conflicts w/ a SRG name for something in vanilla
This commit is contained in:
1 parent
f7a86a7377
commit
ab73bafc15
28 files changed
+140
-139
No files matched your search
+3
-3
@@ -3,7 +3,7 @@ package tconstruct.library.tools;
|
||||
/*
|
||||
* Dynamic substitute for an enum. It carries a lot of information
|
||||
*/
|
||||
public class ToolMaterial
|
||||
public class TToolMaterial
|
||||
{
|
||||
//mining level, durability, mining speed, baseDamage, handle modifier, Reinforced level, shoddy/spiny level, color/style on name
|
||||
|
||||
@@ -19,12 +19,12 @@ public class ToolMaterial
|
||||
public final String tipStyle;
|
||||
public final String ability;
|
||||
|
||||
public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
public TToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
{
|
||||
this(name, name + " ", level, durability, speed, damage, handle, reinforced, stonebound, style, ability);
|
||||
}
|
||||
|
||||
public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
public TToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
{
|
||||
this.materialName = name;
|
||||
this.displayName = displayName;
|
||||
@@ -68,7 +68,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
public static IIcon blankSprite;
|
||||
public static IIcon emptyIcon;
|
||||
|
||||
public ToolCore( int baseDamage)
|
||||
public ToolCore(int baseDamage)
|
||||
{
|
||||
super();
|
||||
this.maxStackSize = 1;
|
||||
@@ -425,10 +425,10 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
|
||||
public String getReinforcedName (int head, int handle, int accessory, int extra, int unbreaking)
|
||||
{
|
||||
ToolMaterial headMat = TConstructRegistry.getMaterial(head);
|
||||
ToolMaterial handleMat = TConstructRegistry.getMaterial(handle);
|
||||
ToolMaterial accessoryMat = TConstructRegistry.getMaterial(accessory);
|
||||
ToolMaterial extraMat = TConstructRegistry.getMaterial(extra);
|
||||
TToolMaterial headMat = TConstructRegistry.getMaterial(TToolMaterial)head);
|
||||
TToolMaterial handleMat = TConstructRegistry.getMaterial(handle);
|
||||
TToolMaterial accessoryMat = TConstructRegistry.getMaterial(accessory);
|
||||
TToolMaterial extraMat = TConstructRegistry.getMaterial(extra);
|
||||
|
||||
int reinforced = 0;
|
||||
String style = "";
|
||||
@@ -455,7 +455,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
}
|
||||
if (getPartAmount() >= 4)
|
||||
{
|
||||
current = extraMat.reinforced();
|
||||
current = extraMat.reinforced();
|
||||
if (current > 0 && current > reinforced)
|
||||
{
|
||||
style = extraMat.style();
|
||||
@@ -527,7 +527,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
while (iter.hasNext())
|
||||
{
|
||||
Map.Entry pairs = (Map.Entry) iter.next();
|
||||
ToolMaterial material = (ToolMaterial) pairs.getValue();
|
||||
TToolMaterial material = (TToolMaterial) pairs.getValue();
|
||||
buildTool((Integer) pairs.getKey(), material.displayName, list);
|
||||
}
|
||||
}
|
||||
@@ -844,8 +844,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
return tags.getCompoundTag("InfiTool").getInteger("Damage");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Battlegear support, IBattlegearWeapon */
|
||||
|
||||
@Override
|
||||
@@ -961,6 +959,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
}
|
||||
return tags.getInteger("Energy");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxEnergyStored (ItemStack container)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user