We now have dynamic toolparts with default textures, just like the tools themselves!

This commit is contained in:
Bernhard Bonigl committed 2014-09-22 14:29:21 +02:00
1 parent ec525923d4
commit 74c92e5939
13 files changed
+213 -76

No files matched your search

@@ -432,7 +432,7 @@ public class ToolBuilder
public static String defaultToolName (ToolMaterial headMat, ToolCore tool)
{
String toolName = tool.getToolName().toLowerCase();
String matName = headMat.materialName.toLowerCase().replaceAll(" ", "");
String matName = headMat.materialName.toLowerCase().replaceAll(" ", "").replaceAll("_","");
if (StatCollector.canTranslate("tool." + toolName + "." + matName))
{
@@ -0,0 +1,137 @@
package tconstruct.library.tools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mantle.items.abstracts.CraftingItem;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
import tconstruct.TConstruct;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.util.IToolPart;
import tconstruct.library.util.TextureHelper;
import tconstruct.tools.TinkerTools;
import java.util.List;
import java.util.Map;
public class DynamicToolPart extends CraftingItem implements IToolPart
{
public String partName;
public String texture;
public IIcon defaultIcon;
public DynamicToolPart(String texture, String name)
{
this(texture, name, "tinker");
}
public DynamicToolPart(String texture, String name, String domain)
{
super(null, null, "parts/", domain, TConstructRegistry.partTab);
this.setUnlocalizedName("tconstruct." + name);
this.partName = name;
this.texture = texture;
}
// item meta = material id
@Override
public int getMaterialID (ItemStack stack)
{
if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage()))
return stack.getItemDamage();
return -1;
}
@Override
public String getItemStackDisplayName (ItemStack stack)
{
tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack));
if(toolmat == null)
return super.getItemStackDisplayName(stack);
String material = toolmat.localizationString.substring(9); // :(
// custom name
if (StatCollector.canTranslate("toolpart." + partName + "." + material))
{
return StatCollector.translateToLocal("toolpart." + partName + "." + material);
}
// general name
else
{
material = StatCollector.translateToLocal("material." + material);
return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", material);
}
}
@Override
public String getUnlocalizedName(ItemStack stack) {
int id = getMaterialID(stack);
if(id == -1)
return getUnlocalizedName();
return "toolpart." + partName + "." + TConstructRegistry.getMaterial(id).materialName;
}
@Override
public void getSubItems (Item item, CreativeTabs tab, List list)
{
// material id == metadata
for(Integer matID : TConstructRegistry.toolMaterials.keySet())
list.add(new ItemStack(item, 1, matID));
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons (IIconRegister iconRegister)
{
// get the biggest material index
int max = -1;
for(Integer id : TConstructRegistry.toolMaterials.keySet())
if(id > max)
max = id;
this.icons = new IIcon[max+1];
// register icon for each material that has one
for(Map.Entry<Integer, tconstruct.library.tools.ToolMaterial> entry : TConstructRegistry.toolMaterials.entrySet())
{
String tex = modTexPrefix + ":" + folder + entry.getValue().materialName.toLowerCase() + texture;
if(TextureHelper.itemTextureExists(tex))
this.icons[entry.getKey()] = iconRegister.registerIcon(tex);
}
// default texture
this.defaultIcon = iconRegister.registerIcon(modTexPrefix + ":" + folder + texture);
}
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage (int meta)
{
if(meta > icons.length)
return defaultIcon;
if(icons[meta] == null)
return defaultIcon;
return icons[meta];
}
@Override
public int getColorFromItemStack(ItemStack stack, int renderpass) {
int matId = getMaterialID(stack);
if(matId > icons.length)
return super.getColorFromItemStack(stack, renderpass);
if(icons[matId] == null)
return TConstructRegistry.getMaterial(matId).primaryColor();
return super.getColorFromItemStack(stack, renderpass);
}
}
@@ -18,7 +18,7 @@ public class ToolMaterial
public final String tipStyle;
public final int primaryColor;
private final String localizationString;
public final String localizationString;
@Deprecated
public String displayName;
+22 -21
View File
@@ -224,30 +224,31 @@ public class TinkerTools
TinkerTools.potionLauncher = new PotionLauncher().setUnlocalizedName("tconstruct.PotionLauncher");
GameRegistry.registerItem(TinkerTools.potionLauncher, "potionLauncher");
TinkerTools.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead");
TinkerTools.shovelHead = new ToolPart("_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead");
TinkerTools.hatchetHead = new ToolPart("_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead");
TinkerTools.binding = new ToolPart("_binding", "Binding").setUnlocalizedName("tconstruct.Binding");
TinkerTools.toughBinding = new ToolPart("_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding");
TinkerTools.toughRod = new ToolPart("_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod");
TinkerTools.largePlate = new ToolPart("_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate");
//TinkerTools.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead");
TinkerTools.pickaxeHead = new DynamicToolPart("_pickaxe_head", "PickaxeHead");
TinkerTools.shovelHead = new DynamicToolPart("_shovel_head", "ShovelHead");
TinkerTools.hatchetHead = new DynamicToolPart("_axe_head", "AxeHead");
TinkerTools.binding = new DynamicToolPart("_binding", "Binding");
TinkerTools.toughBinding = new DynamicToolPart("_toughbind", "ToughBinding");
TinkerTools.toughRod = new DynamicToolPart("_toughrod", "ToughRod");
TinkerTools.largePlate = new DynamicToolPart("_largeplate", "LargePlate");
TinkerTools.swordBlade = new ToolPart("_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade");
TinkerTools.wideGuard = new ToolPart("_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard");
TinkerTools.handGuard = new ToolPart("_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard");
TinkerTools.crossbar = new ToolPart("_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar");
TinkerTools.knifeBlade = new ToolPart("_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade");
TinkerTools.fullGuard = new ToolPartHidden("_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard");
TinkerTools.swordBlade = new DynamicToolPart("_sword_blade", "SwordBlade");
TinkerTools.wideGuard = new DynamicToolPart("_large_guard", "LargeGuard");
TinkerTools.handGuard = new DynamicToolPart("_medium_guard", "MediumGuard");
TinkerTools.crossbar = new DynamicToolPart("_crossbar", "Crossbar");
TinkerTools.knifeBlade = new DynamicToolPart("_knife_blade", "KnifeBlade");
TinkerTools.fullGuard = new ToolPartHidden("_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); // todo
TinkerTools.frypanHead = new ToolPart("_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead");
TinkerTools.signHead = new ToolPart("_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead");
TinkerTools.chiselHead = new ToolPart("_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead");
TinkerTools.frypanHead = new DynamicToolPart("_frypan_head", "FrypanHead");
TinkerTools.signHead = new DynamicToolPart("_battlesign_head", "SignHead");
TinkerTools.chiselHead = new DynamicToolPart("_chisel_head", "ChiselHead");
TinkerTools.scytheBlade = new ToolPart("_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade");
TinkerTools.broadAxeHead = new ToolPart("_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead");
TinkerTools.excavatorHead = new ToolPart("_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead");
TinkerTools.largeSwordBlade = new ToolPart("_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade");
TinkerTools.hammerHead = new ToolPart("_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead");
TinkerTools.scytheBlade = new DynamicToolPart("_scythe_head", "ScytheHead");
TinkerTools.broadAxeHead = new DynamicToolPart("_lumberaxe_head", "LumberAxeHead");
TinkerTools.excavatorHead = new DynamicToolPart("_excavator_head", "ExcavatorHead");
TinkerTools.largeSwordBlade = new DynamicToolPart("_large_sword_blade", "LargeSwordBlade");
TinkerTools.hammerHead = new DynamicToolPart("_hammer_head", "HammerHead");
TinkerTools.bowstring = new Bowstring().setUnlocalizedName("tconstruct.Bowstring");
TinkerTools.arrowhead = new ToolPart("_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead");
@@ -15,8 +15,7 @@ public class ToolPart extends CraftingItem implements IToolPart
public ToolPart(String textureType, String name)
{
super(toolMaterialNames, buildTextureNames(textureType), "parts/", "tinker", TConstructRegistry.materialTab);
this.setCreativeTab(TConstructRegistry.partTab);
super(toolMaterialNames, buildTextureNames(textureType), "parts/", "tinker", TConstructRegistry.partTab);
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.partName = name;
@@ -34,7 +33,7 @@ public class ToolPart extends CraftingItem implements IToolPart
}
else
{
material = StatCollector.translateToLocal("parttype." + material);
material = StatCollector.translateToLocal("material." + material);
name = StatCollector.translateToLocal("toolpart." + partName);
name = name.replaceAll("%%material", material);
}