mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +00:00
Fix JABBA-related issues with crafting station slots (#54)
* Fix shift-merging tools voiding items fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392> * Change 0-sized ItemStacks into null stacks in crafting station attached slots Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425> * Update buildscript * spotlessApply
This commit is contained in:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -2,9 +2,7 @@ package tconstruct.library.crafting;
|
||||
|
||||
/** Once upon a time, too many tools to count. Let's put them together automatically */
|
||||
import cpw.mods.fml.common.eventhandler.Event.Result;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.StatCollector;
|
||||
@@ -15,8 +13,7 @@ import tconstruct.library.modifier.ItemModifier;
|
||||
import tconstruct.library.tools.*;
|
||||
import tconstruct.library.util.IToolPart;
|
||||
|
||||
public class ToolBuilder
|
||||
{
|
||||
public class ToolBuilder {
|
||||
public static ToolBuilder instance = new ToolBuilder();
|
||||
|
||||
public HashMap<String, ToolRecipe> recipeList = new HashMap<String, ToolRecipe>();
|
||||
@@ -24,110 +21,89 @@ public class ToolBuilder
|
||||
public HashMap<String, String> modifiers = new HashMap<String, String>();
|
||||
|
||||
/* Build tools */
|
||||
public static void addNormalToolRecipe (ToolCore output, Item head, Item handle)
|
||||
{
|
||||
public static void addNormalToolRecipe(ToolCore output, Item head, Item handle) {
|
||||
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
|
||||
if (recipe != null)
|
||||
{
|
||||
if (recipe != null) {
|
||||
recipe.addHeadItem(head);
|
||||
recipe.addHandleItem(handle);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
recipe = new ToolRecipe(head, handle, output);
|
||||
instance.combos.add(recipe);
|
||||
instance.recipeList.put(output.getToolName(), recipe);
|
||||
}
|
||||
}
|
||||
|
||||
public static void addNormalToolRecipe (ToolCore output, Item head, Item handle, Item accessory)
|
||||
{
|
||||
//instance.combos.add(new ToolRecipe(head, accessory, output));
|
||||
public static void addNormalToolRecipe(ToolCore output, Item head, Item handle, Item accessory) {
|
||||
// instance.combos.add(new ToolRecipe(head, accessory, output));
|
||||
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
|
||||
if (recipe != null)
|
||||
{
|
||||
if (recipe != null) {
|
||||
recipe.addHeadItem(head);
|
||||
recipe.addHandleItem(handle);
|
||||
recipe.addAccessoryItem(accessory);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
recipe = new ToolRecipe(head, handle, accessory, output);
|
||||
instance.combos.add(recipe);
|
||||
instance.recipeList.put(output.getToolName(), recipe);
|
||||
}
|
||||
}
|
||||
|
||||
public static void addNormalToolRecipe (ToolCore output, Item head, Item handle, Item accessory, Item extra)
|
||||
{
|
||||
public static void addNormalToolRecipe(ToolCore output, Item head, Item handle, Item accessory, Item extra) {
|
||||
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
|
||||
if (recipe != null)
|
||||
{
|
||||
if (recipe != null) {
|
||||
recipe.addHeadItem(head);
|
||||
recipe.addHandleItem(handle);
|
||||
recipe.addAccessoryItem(accessory);
|
||||
recipe.addExtraItem(extra);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
recipe = new ToolRecipe(head, handle, accessory, extra, output);
|
||||
instance.combos.add(recipe);
|
||||
instance.recipeList.put(output.getToolName(), recipe);
|
||||
}
|
||||
}
|
||||
|
||||
public static void addCustomToolRecipe (ToolRecipe recipe)
|
||||
{
|
||||
public static void addCustomToolRecipe(ToolRecipe recipe) {
|
||||
instance.combos.add(recipe);
|
||||
}
|
||||
|
||||
public static void addToolRecipe (ToolCore output, Item... items)
|
||||
{
|
||||
if (items.length == 2)
|
||||
addNormalToolRecipe(output, items[0], items[1]);
|
||||
if (items.length == 3)
|
||||
addNormalToolRecipe(output, items[0], items[1], items[2]);
|
||||
if (items.length == 4)
|
||||
addNormalToolRecipe(output, items[0], items[1], items[2], items[3]);
|
||||
public static void addToolRecipe(ToolCore output, Item... items) {
|
||||
if (items.length == 2) addNormalToolRecipe(output, items[0], items[1]);
|
||||
if (items.length == 3) addNormalToolRecipe(output, items[0], items[1], items[2]);
|
||||
if (items.length == 4) addNormalToolRecipe(output, items[0], items[1], items[2], items[3]);
|
||||
}
|
||||
|
||||
public ToolCore getMatchingRecipe (Item head, Item handle, Item accessory, Item extra)
|
||||
{
|
||||
for (ToolRecipe recipe : combos)
|
||||
{
|
||||
if (recipe.validHead(head) && recipe.validHandle(handle) && recipe.validAccessory(accessory) && recipe.validExtra(extra))
|
||||
return recipe.getType();
|
||||
public ToolCore getMatchingRecipe(Item head, Item handle, Item accessory, Item extra) {
|
||||
for (ToolRecipe recipe : combos) {
|
||||
if (recipe.validHead(head)
|
||||
&& recipe.validHandle(handle)
|
||||
&& recipe.validAccessory(accessory)
|
||||
&& recipe.validExtra(extra)) return recipe.getType();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
//Builds a tool from the parts given
|
||||
public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, String name)
|
||||
{
|
||||
// Builds a tool from the parts given
|
||||
public ItemStack buildTool(ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, String name) {
|
||||
return buildTool(headStack, handleStack, accessoryStack, null, name);
|
||||
}
|
||||
|
||||
public int getMaterialID (ItemStack stack)
|
||||
{
|
||||
if (stack == null)
|
||||
return -1;
|
||||
public int getMaterialID(ItemStack stack) {
|
||||
if (stack == null) return -1;
|
||||
Item item = stack.getItem();
|
||||
|
||||
if (item instanceof IToolPart)
|
||||
return ((IToolPart) item).getMaterialID(stack);
|
||||
if (item instanceof IToolPart) return ((IToolPart) item).getMaterialID(stack);
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name)
|
||||
{
|
||||
public ItemStack buildTool(
|
||||
ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) {
|
||||
/*if (headStack != null && headStack.getItem() instanceof ToolCore)
|
||||
return modifyTool(headStack, new ItemStack[] { handleStack, accessoryStack, extraStack }, name);*/
|
||||
return modifyTool(headStack, new ItemStack[] { handleStack, accessoryStack, extraStack }, name);*/
|
||||
|
||||
if (headStack == null || handleStack == null) //Nothing to build without these. All tools need at least two parts!
|
||||
return null;
|
||||
if (name == null)
|
||||
name = "";
|
||||
if (headStack == null
|
||||
|| handleStack == null) // Nothing to build without these. All tools need at least two parts!
|
||||
return null;
|
||||
if (name == null) name = "";
|
||||
|
||||
// fire the ToolBuild event to get the correct items
|
||||
ToolBuildEvent buildEvent = new ToolBuildEvent(headStack, handleStack, accessoryStack, extraStack, name);
|
||||
@@ -144,54 +120,41 @@ public class ToolBuilder
|
||||
boolean validMaterials = true;
|
||||
int head = -1, handle = -1, accessory = -1, extra = -1;
|
||||
head = getMaterialID(headStack);
|
||||
if (head == -1)
|
||||
validMaterials = false;
|
||||
if (head == -1) validMaterials = false;
|
||||
|
||||
handle = getMaterialID(handleStack);
|
||||
if (handle == -1)
|
||||
validMaterials = false;
|
||||
if (handle == -1) validMaterials = false;
|
||||
|
||||
if (!validMaterials)
|
||||
return null;
|
||||
if (!validMaterials) return null;
|
||||
|
||||
if (accessoryStack == null)
|
||||
{
|
||||
if (accessoryStack == null) {
|
||||
item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), null, null);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
|
||||
accessory = getMaterialID(accessoryStack);
|
||||
if (accessory == -1)
|
||||
return null;
|
||||
if (accessory == -1) return null;
|
||||
|
||||
if (extraStack != null)
|
||||
{
|
||||
if (extraStack != null) {
|
||||
|
||||
extra = getMaterialID(extraStack);
|
||||
if (extra == -1)
|
||||
return null;
|
||||
if (extra == -1) return null;
|
||||
|
||||
item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), extraStack.getItem());
|
||||
}
|
||||
else
|
||||
{
|
||||
item = getMatchingRecipe(
|
||||
headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), extraStack.getItem());
|
||||
} else {
|
||||
item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), null);
|
||||
}
|
||||
}
|
||||
|
||||
if (item == null)
|
||||
return null;
|
||||
if (item == null) return null;
|
||||
|
||||
ToolMaterial headMat = null, handleMat = null, accessoryMat = null, extraMat = null;
|
||||
headMat = TConstructRegistry.getMaterial(head);
|
||||
handleMat = TConstructRegistry.getMaterial(handle);
|
||||
|
||||
if (accessory != -1)
|
||||
accessoryMat = TConstructRegistry.getMaterial(accessory);
|
||||
if (accessory != -1) accessoryMat = TConstructRegistry.getMaterial(accessory);
|
||||
|
||||
if (extra != -1)
|
||||
extraMat = TConstructRegistry.getMaterial(extra);
|
||||
if (extra != -1) extraMat = TConstructRegistry.getMaterial(extra);
|
||||
|
||||
int durability = headMat.durability();
|
||||
int heads = 1;
|
||||
@@ -199,58 +162,45 @@ public class ToolBuilder
|
||||
float modifier = 1f;
|
||||
int attack = headMat.attack();
|
||||
|
||||
if (item.durabilityTypeHandle() == 2)
|
||||
{
|
||||
if (item.durabilityTypeHandle() == 2) {
|
||||
heads++;
|
||||
durability += handleMat.durability();
|
||||
attack += handleMat.attack();
|
||||
}
|
||||
else if (item.durabilityTypeHandle() == 1)
|
||||
{
|
||||
} else if (item.durabilityTypeHandle() == 1) {
|
||||
handles++;
|
||||
modifier = handleMat.handleDurability();
|
||||
}
|
||||
|
||||
if (accessory != -1)
|
||||
{
|
||||
if (item.durabilityTypeAccessory() == 2)
|
||||
{
|
||||
if (accessory != -1) {
|
||||
if (item.durabilityTypeAccessory() == 2) {
|
||||
heads++;
|
||||
durability += accessoryMat.durability();
|
||||
attack += accessoryMat.attack();
|
||||
}
|
||||
else if (item.durabilityTypeAccessory() == 1)
|
||||
{
|
||||
} else if (item.durabilityTypeAccessory() == 1) {
|
||||
handles++;
|
||||
modifier += accessoryMat.handleDurability();
|
||||
}
|
||||
}
|
||||
|
||||
if (extra != -1)
|
||||
{
|
||||
if (item.durabilityTypeExtra() == 2)
|
||||
{
|
||||
if (extra != -1) {
|
||||
if (item.durabilityTypeExtra() == 2) {
|
||||
heads++;
|
||||
durability += extraMat.durability();
|
||||
attack += extraMat.attack();
|
||||
}
|
||||
else if (item.durabilityTypeExtra() == 1)
|
||||
{
|
||||
} else if (item.durabilityTypeExtra() == 1) {
|
||||
handles++;
|
||||
modifier += extraMat.handleDurability();
|
||||
}
|
||||
}
|
||||
|
||||
if (handles > 0)
|
||||
{
|
||||
if (handles > 0) {
|
||||
modifier *= (0.5 + handles * 0.5);
|
||||
modifier /= handles;
|
||||
}
|
||||
|
||||
durability = (int) (durability / heads * (0.5 + heads * 0.5) * modifier * item.getDurabilityModifier());
|
||||
attack = attack / heads + item.getDamageVsEntity(null);
|
||||
if (attack % heads != 0)
|
||||
attack++;
|
||||
if (attack % heads != 0) attack++;
|
||||
|
||||
ItemStack tool = new ItemStack(item);
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
@@ -262,75 +212,65 @@ public class ToolBuilder
|
||||
compound.getCompoundTag("InfiTool").setInteger("Handle", handle);
|
||||
compound.getCompoundTag("InfiTool").setInteger("RenderHandle", handle);
|
||||
|
||||
if (accessory != -1)
|
||||
{
|
||||
if (accessory != -1) {
|
||||
compound.getCompoundTag("InfiTool").setInteger("Accessory", accessory);
|
||||
compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", accessory);
|
||||
}
|
||||
if (extra != -1)
|
||||
{
|
||||
if (extra != -1) {
|
||||
compound.getCompoundTag("InfiTool").setInteger("Extra", extra);
|
||||
compound.getCompoundTag("InfiTool").setInteger("RenderExtra", extra);
|
||||
}
|
||||
|
||||
compound.getCompoundTag("InfiTool").setInteger("Damage", 0); //Damage is damage to the tool
|
||||
compound.getCompoundTag("InfiTool").setInteger("Damage", 0); // Damage is damage to the tool
|
||||
compound.getCompoundTag("InfiTool").setInteger("TotalDurability", durability);
|
||||
compound.getCompoundTag("InfiTool").setInteger("BaseDurability", durability);
|
||||
compound.getCompoundTag("InfiTool").setInteger("BonusDurability", 0); //Modifier
|
||||
compound.getCompoundTag("InfiTool").setFloat("ModDurability", 0f); //Modifier
|
||||
compound.getCompoundTag("InfiTool").setInteger("BonusDurability", 0); // Modifier
|
||||
compound.getCompoundTag("InfiTool").setFloat("ModDurability", 0f); // Modifier
|
||||
compound.getCompoundTag("InfiTool").setBoolean("Broken", false);
|
||||
compound.getCompoundTag("InfiTool").setInteger("Attack", attack);
|
||||
compound.getCompoundTag("InfiTool").setInteger("BaseAttack", attack);
|
||||
|
||||
compound.getCompoundTag("InfiTool").setInteger("MiningSpeed", headMat.toolSpeed());
|
||||
compound.getCompoundTag("InfiTool").setInteger("HarvestLevel", headMat.harvestLevel());
|
||||
if (item.durabilityTypeHandle() == 2)
|
||||
{
|
||||
if (item.durabilityTypeHandle() == 2) {
|
||||
compound.getCompoundTag("InfiTool").setInteger("MiningSpeedHandle", handleMat.toolSpeed());
|
||||
compound.getCompoundTag("InfiTool").setInteger("HarvestLevelHandle", handleMat.harvestLevel());
|
||||
}
|
||||
if (accessory != -1 && item.durabilityTypeAccessory() == 2)
|
||||
{
|
||||
if (accessory != -1 && item.durabilityTypeAccessory() == 2) {
|
||||
compound.getCompoundTag("InfiTool").setInteger("MiningSpeed2", accessoryMat.toolSpeed());
|
||||
compound.getCompoundTag("InfiTool").setInteger("HarvestLevel2", accessoryMat.harvestLevel());
|
||||
}
|
||||
|
||||
if (extra != -1 && item.durabilityTypeExtra() == 2)
|
||||
{
|
||||
if (extra != -1 && item.durabilityTypeExtra() == 2) {
|
||||
compound.getCompoundTag("InfiTool").setInteger("MiningSpeedExtra", extraMat.toolSpeed());
|
||||
compound.getCompoundTag("InfiTool").setInteger("HarvestLevelExtra", extraMat.harvestLevel());
|
||||
}
|
||||
|
||||
compound.getCompoundTag("InfiTool").setInteger("Unbreaking", buildReinforced(headMat, handleMat, accessoryMat, extraMat));
|
||||
compound.getCompoundTag("InfiTool")
|
||||
.setInteger("Unbreaking", buildReinforced(headMat, handleMat, accessoryMat, extraMat));
|
||||
compound.getCompoundTag("InfiTool").setFloat("Shoddy", buildShoddy(headMat, handleMat, accessoryMat, extraMat));
|
||||
|
||||
compound.getCompoundTag("InfiTool").setInteger("Modifiers", item.getModifierAmount());
|
||||
|
||||
if (name != null && !name.equals(""))
|
||||
{
|
||||
if (name != null && !name.equals("")) {
|
||||
compound.setTag("display", new NBTTagCompound());
|
||||
compound.getCompoundTag("display").setString("Name", "\u00A7f" + name);
|
||||
}
|
||||
// set a nice default name
|
||||
else
|
||||
{
|
||||
else {
|
||||
compound.setTag("display", new NBTTagCompound());
|
||||
compound.getCompoundTag("display").setString("Name", "\u00A7f" + defaultToolName(headMat, item));
|
||||
}
|
||||
|
||||
ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool(item, compound, new ToolMaterial[] { headMat, handleMat, accessoryMat, extraMat });
|
||||
ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool(
|
||||
item, compound, new ToolMaterial[] {headMat, handleMat, accessoryMat, extraMat});
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
|
||||
if (event.getResult() == Result.DEFAULT)
|
||||
{
|
||||
if (event.getResult() == Result.DEFAULT) {
|
||||
tool.setTagCompound(compound);
|
||||
}
|
||||
else if (event.getResult() == Result.ALLOW)
|
||||
{
|
||||
} else if (event.getResult() == Result.ALLOW) {
|
||||
tool = event.getResultStack();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
tool = null;
|
||||
}
|
||||
|
||||
@@ -375,78 +315,63 @@ public class ToolBuilder
|
||||
return null;
|
||||
}*/
|
||||
|
||||
int buildReinforced (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat)
|
||||
{
|
||||
int buildReinforced(
|
||||
ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) {
|
||||
int reinforced = 0;
|
||||
|
||||
int dHead = headMat.reinforced();
|
||||
int dHandle = handleMat.reinforced();
|
||||
int dAccessory = 0;
|
||||
if (accessoryMat != null)
|
||||
dAccessory = accessoryMat.reinforced();
|
||||
if (accessoryMat != null) dAccessory = accessoryMat.reinforced();
|
||||
int dExtra = 0;
|
||||
if (extraMat != null)
|
||||
dExtra = extraMat.reinforced();
|
||||
if (extraMat != null) dExtra = extraMat.reinforced();
|
||||
|
||||
if (dHead > reinforced)
|
||||
reinforced = dHead;
|
||||
if (dHandle > reinforced)
|
||||
reinforced = dHandle;
|
||||
if (dAccessory > reinforced)
|
||||
reinforced = dAccessory;
|
||||
if (dExtra > reinforced)
|
||||
reinforced = dExtra;
|
||||
if (dHead > reinforced) reinforced = dHead;
|
||||
if (dHandle > reinforced) reinforced = dHandle;
|
||||
if (dAccessory > reinforced) reinforced = dAccessory;
|
||||
if (dExtra > reinforced) reinforced = dExtra;
|
||||
|
||||
return reinforced;
|
||||
}
|
||||
|
||||
float buildShoddy (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat)
|
||||
{
|
||||
float buildShoddy(ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) {
|
||||
float sHead = headMat.shoddy();
|
||||
float sHandle = handleMat.shoddy();
|
||||
if (extraMat != null)
|
||||
{
|
||||
if (extraMat != null) {
|
||||
float sAccessory = accessoryMat.shoddy();
|
||||
float sExtra = extraMat.shoddy();
|
||||
return (sHead + sHandle + sAccessory + sExtra) / 4f;
|
||||
}
|
||||
|
||||
if (accessoryMat != null)
|
||||
{
|
||||
if (accessoryMat != null) {
|
||||
float sAccessory = accessoryMat.shoddy();
|
||||
return (sHead + sHandle + sAccessory) / 3f;
|
||||
}
|
||||
return (sHead + sHandle) / 2f;
|
||||
}
|
||||
|
||||
public static String defaultToolName (ItemStack stack)
|
||||
{
|
||||
if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool"))
|
||||
return null;
|
||||
if (!(stack.getItem() instanceof ToolCore))
|
||||
return null;
|
||||
public static String defaultToolName(ItemStack stack) {
|
||||
if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool")) return null;
|
||||
if (!(stack.getItem() instanceof ToolCore)) return null;
|
||||
|
||||
int mat = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Head");
|
||||
return defaultToolName(TConstructRegistry.getMaterial(mat), (ToolCore) stack.getItem());
|
||||
}
|
||||
|
||||
public static String defaultToolName (ToolMaterial headMat, ToolCore tool)
|
||||
{
|
||||
public static String defaultToolName(ToolMaterial headMat, ToolCore tool) {
|
||||
String toolName = tool.getToolName().toLowerCase();
|
||||
String matName = headMat.materialName.toLowerCase().replaceAll(" ", "").replaceAll("_","");
|
||||
|
||||
if (StatCollector.canTranslate("tool." + toolName + "." + matName))
|
||||
{
|
||||
String matName = headMat.materialName.toLowerCase().replaceAll(" ", "").replaceAll("_", "");
|
||||
|
||||
if (StatCollector.canTranslate("tool." + toolName + "." + matName)) {
|
||||
return StatCollector.translateToLocal("tool." + toolName + "." + matName);
|
||||
}
|
||||
|
||||
|
||||
return String.format("%s %s", headMat.prefixName(), tool.getLocalizedToolName());
|
||||
}
|
||||
|
||||
//Passthrough for now
|
||||
// Passthrough for now
|
||||
@Deprecated
|
||||
public static void registerToolMod (ItemModifier mod)
|
||||
{
|
||||
public static void registerToolMod(ItemModifier mod) {
|
||||
ModifyBuilder.registerModifier(mod);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user