mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +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
@@ -4,14 +4,14 @@ import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.client.TConstructClientRegistry;
|
||||
@@ -25,26 +25,17 @@ import tconstruct.library.util.IPattern;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public final class IMCHandler {
|
||||
private IMCHandler() {}
|
||||
|
||||
public static void processIMC(List<FMLInterModComms.IMCMessage> messages)
|
||||
{
|
||||
for(FMLInterModComms.IMCMessage message : messages)
|
||||
{
|
||||
public static void processIMC(List<FMLInterModComms.IMCMessage> messages) {
|
||||
for (FMLInterModComms.IMCMessage message : messages) {
|
||||
String type = message.key;
|
||||
if(type == null || type.isEmpty())
|
||||
continue;
|
||||
if (type == null || type.isEmpty()) continue;
|
||||
|
||||
// process materials added from mods
|
||||
if(type.equals("addMaterial"))
|
||||
{
|
||||
if(!message.isNBTMessage())
|
||||
{
|
||||
if (type.equals("addMaterial")) {
|
||||
if (!message.isNBTMessage()) {
|
||||
logInvalidMessage(message);
|
||||
continue;
|
||||
}
|
||||
@@ -52,14 +43,13 @@ public final class IMCHandler {
|
||||
NBTTagCompound tag = message.getNBTValue();
|
||||
int id = tag.getInteger("Id");
|
||||
ToolMaterial mat = scanMaterial(tag);
|
||||
if(mat != null) {
|
||||
if (mat != null) {
|
||||
TConstructRegistry.addtoolMaterial(id, mat);
|
||||
TConstructRegistry.addDefaultToolPartMaterial(id);
|
||||
TConstruct.logger.debug("IMC: Added material " + mat.materialName);
|
||||
|
||||
// bow stats
|
||||
if(tag.hasKey("Bow_DrawSpeed") && tag.hasKey("Bow_ProjectileSpeed"))
|
||||
{
|
||||
if (tag.hasKey("Bow_DrawSpeed") && tag.hasKey("Bow_ProjectileSpeed")) {
|
||||
int drawspeed = tag.getInteger("Bow_DrawSpeed");
|
||||
float flightspeed = tag.getFloat("Bow_ProjectileSpeed");
|
||||
|
||||
@@ -67,8 +57,7 @@ public final class IMCHandler {
|
||||
TConstruct.logger.debug("IMC: Added Bow stats for material " + mat.materialName);
|
||||
}
|
||||
// arrow stats
|
||||
if(tag.hasKey("Projectile_Mass") && tag.hasKey("Projectile_Fragility"))
|
||||
{
|
||||
if (tag.hasKey("Projectile_Mass") && tag.hasKey("Projectile_Fragility")) {
|
||||
float mass = tag.getFloat("Projectile_Mass");
|
||||
float breakchance = tag.getFloat("Projectile_Fragility");
|
||||
|
||||
@@ -76,28 +65,25 @@ public final class IMCHandler {
|
||||
TConstruct.logger.debug("IMC: Added Projectile stats for material " + mat.materialName);
|
||||
}
|
||||
|
||||
// add additional render mapping so resource packs or the mods themselves can have custom textures for the tools
|
||||
if(FMLCommonHandler.instance().getSide().isClient())
|
||||
TConstructClientRegistry.addMaterialRenderMapping(id, "tinker", mat.name().toLowerCase(), true);
|
||||
// add additional render mapping so resource packs or the mods themselves can have custom textures
|
||||
// for the tools
|
||||
if (FMLCommonHandler.instance().getSide().isClient())
|
||||
TConstructClientRegistry.addMaterialRenderMapping(
|
||||
id, "tinker", mat.name().toLowerCase(), true);
|
||||
}
|
||||
}
|
||||
else if(type.equals("addPartBuilderMaterial"))
|
||||
{
|
||||
if(!message.isNBTMessage())
|
||||
{
|
||||
} else if (type.equals("addPartBuilderMaterial")) {
|
||||
if (!message.isNBTMessage()) {
|
||||
logInvalidMessage(message);
|
||||
continue;
|
||||
}
|
||||
NBTTagCompound tag = message.getNBTValue();
|
||||
|
||||
if(!checkRequiredTags("PartBuilder", tag, "MaterialId", "Item", "Value"))
|
||||
continue;
|
||||
if (!checkRequiredTags("PartBuilder", tag, "MaterialId", "Item", "Value")) continue;
|
||||
|
||||
int matID = tag.getInteger("MaterialId");
|
||||
int value = tag.getInteger("Value");
|
||||
|
||||
if(TConstructRegistry.getMaterial(matID) == null)
|
||||
{
|
||||
if (TConstructRegistry.getMaterial(matID) == null) {
|
||||
FMLLog.bigWarning("PartBuilder IMC: Unknown Material ID " + matID);
|
||||
continue;
|
||||
}
|
||||
@@ -107,30 +93,27 @@ public final class IMCHandler {
|
||||
ItemStack rod = new ItemStack(TinkerTools.toolRod, 1, matID);
|
||||
|
||||
// default shard if none present. Has to exist because old code.
|
||||
if(shard == null)
|
||||
{
|
||||
if (shard == null) {
|
||||
TConstructRegistry.addDefaultShardMaterial(matID);
|
||||
shard = new ItemStack(TinkerTools.toolShard, 1, matID);
|
||||
}
|
||||
|
||||
// register the material
|
||||
PatternBuilder.instance.registerFullMaterial(item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID);
|
||||
PatternBuilder.instance.registerFullMaterial(
|
||||
item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID);
|
||||
|
||||
List<Item> addItems = new LinkedList<Item>();
|
||||
List<Integer> addMetas = new LinkedList<Integer>();
|
||||
List<ItemStack> addOUtputs = new LinkedList<ItemStack>();
|
||||
|
||||
// add mappings for everything that has stone tool mappings
|
||||
for(Map.Entry<List, ItemStack> mappingEntry : TConstructRegistry.patternPartMapping.entrySet())
|
||||
{
|
||||
for (Map.Entry<List, ItemStack> mappingEntry : TConstructRegistry.patternPartMapping.entrySet()) {
|
||||
List mapping = mappingEntry.getKey();
|
||||
// only stone mappings
|
||||
if((Integer)mapping.get(2) != TinkerTools.MaterialID.Stone)
|
||||
continue;
|
||||
if ((Integer) mapping.get(2) != TinkerTools.MaterialID.Stone) continue;
|
||||
|
||||
// only if the output is a dynamic part
|
||||
if(!(mappingEntry.getValue().getItem() instanceof DynamicToolPart))
|
||||
continue;
|
||||
if (!(mappingEntry.getValue().getItem() instanceof DynamicToolPart)) continue;
|
||||
|
||||
Item woodPattern = (Item) mapping.get(0);
|
||||
Integer meta = (Integer) mapping.get(1);
|
||||
@@ -145,138 +128,124 @@ public final class IMCHandler {
|
||||
}
|
||||
|
||||
// add a part mapping for it
|
||||
for(int i = 0; i < addItems.size(); i++)
|
||||
for (int i = 0; i < addItems.size(); i++)
|
||||
TConstructRegistry.addPartMapping(addItems.get(i), addMetas.get(i), matID, addOUtputs.get(i));
|
||||
|
||||
|
||||
TConstruct.logger.debug("PartBuilder IMC: Added Part builder mapping for " + TConstructRegistry.getMaterial(matID).materialName);
|
||||
}
|
||||
else if(type.equals("addPartCastingMaterial"))
|
||||
{
|
||||
if(!message.isNBTMessage())
|
||||
{
|
||||
TConstruct.logger.debug("PartBuilder IMC: Added Part builder mapping for "
|
||||
+ TConstructRegistry.getMaterial(matID).materialName);
|
||||
} else if (type.equals("addPartCastingMaterial")) {
|
||||
if (!message.isNBTMessage()) {
|
||||
logInvalidMessage(message);
|
||||
continue;
|
||||
}
|
||||
|
||||
NBTTagCompound tag = message.getNBTValue();
|
||||
|
||||
if(!checkRequiredTags("Casting", tag, "MaterialId", "FluidName"))
|
||||
continue;
|
||||
if (!checkRequiredTags("Casting", tag, "MaterialId", "FluidName")) continue;
|
||||
|
||||
if(!tag.hasKey("MaterialId"))
|
||||
{
|
||||
if (!tag.hasKey("MaterialId")) {
|
||||
FMLLog.bigWarning("Casting IMC: Not material ID for the result present");
|
||||
continue;
|
||||
}
|
||||
|
||||
int matID = tag.getInteger("MaterialId");
|
||||
FluidStack liquid = FluidStack.loadFluidStackFromNBT(tag);
|
||||
if(liquid == null) {
|
||||
if (liquid == null) {
|
||||
FMLLog.bigWarning("Casting IMC: No fluid found");
|
||||
continue;
|
||||
}
|
||||
|
||||
if(TConstructRegistry.getMaterial(matID) == null)
|
||||
{
|
||||
if (TConstructRegistry.getMaterial(matID) == null) {
|
||||
FMLLog.bigWarning("Casting IMC: Unknown Material ID " + matID);
|
||||
continue;
|
||||
}
|
||||
|
||||
// we add the toolpart to all smeltery recipies that use iron and create a toolpart
|
||||
List<CastingRecipe> newRecipies = new LinkedList<CastingRecipe>();
|
||||
for(CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes())
|
||||
{
|
||||
if(recipe.castingMetal.getFluid() != TinkerSmeltery.moltenIronFluid)
|
||||
continue;
|
||||
if(recipe.cast == null || !(recipe.cast.getItem() instanceof IPattern))
|
||||
continue;
|
||||
if(!(recipe.getResult().getItem() instanceof DynamicToolPart)) // has to be dynamic toolpart to support automatic addition
|
||||
continue;
|
||||
for (CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) {
|
||||
if (recipe.castingMetal.getFluid() != TinkerSmeltery.moltenIronFluid) continue;
|
||||
if (recipe.cast == null || !(recipe.cast.getItem() instanceof IPattern)) continue;
|
||||
if (!(recipe.getResult().getItem()
|
||||
instanceof DynamicToolPart)) // has to be dynamic toolpart to support automatic addition
|
||||
continue;
|
||||
|
||||
newRecipies.add(recipe);
|
||||
}
|
||||
|
||||
FluidType ft = FluidType.getFluidType(liquid.getFluid());
|
||||
if(ft == null) {
|
||||
if (ft == null) {
|
||||
ft = new FluidType(TinkerSmeltery.glueBlock, 0, 500, liquid.getFluid(), true);
|
||||
FluidType.registerFluidType(liquid.getFluid().getName(), ft);
|
||||
}
|
||||
|
||||
// has to be done separately so we have all checks and no concurrent modification exception
|
||||
for(CastingRecipe recipe : newRecipies)
|
||||
{
|
||||
for (CastingRecipe recipe : newRecipies) {
|
||||
ItemStack output = recipe.getResult().copy();
|
||||
output.setItemDamage(matID);
|
||||
|
||||
FluidStack liquid2 = new FluidStack(liquid, recipe.castingMetal.amount);
|
||||
|
||||
// ok, this recipe creates a toolpart and uses iron for it. add a new one for the IMC stuff!
|
||||
TConstructRegistry.getTableCasting().addCastingRecipe(output, liquid2, recipe.cast, recipe.consumeCast, recipe.coolTime);
|
||||
TConstructRegistry.getTableCasting()
|
||||
.addCastingRecipe(output, liquid2, recipe.cast, recipe.consumeCast, recipe.coolTime);
|
||||
// and make it melt!
|
||||
Smeltery.addMelting(ft, output, 0, liquid2.amount);
|
||||
}
|
||||
|
||||
TConstruct.logger.debug("Casting IMC: Added fluid " + tag.getString("FluidName") + " to part casting");
|
||||
}
|
||||
else if(type.equals("addMaterialItem")) {
|
||||
if(!message.isNBTMessage()) {
|
||||
} else if (type.equals("addMaterialItem")) {
|
||||
if (!message.isNBTMessage()) {
|
||||
logInvalidMessage(message);
|
||||
continue;
|
||||
}
|
||||
|
||||
NBTTagCompound tag = message.getNBTValue();
|
||||
|
||||
if (!checkRequiredTags("Material Item", tag, "MaterialId", "Value", "Item"))
|
||||
continue;
|
||||
if (!checkRequiredTags("Material Item", tag, "MaterialId", "Value", "Item")) continue;
|
||||
|
||||
int id = tag.getInteger("MaterialId");
|
||||
int value = tag.getInteger("Value");
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Item"));
|
||||
|
||||
if(stack == null) {
|
||||
if (stack == null) {
|
||||
FMLLog.bigWarning("Material Item IMC: Item for Material %d is null", id);
|
||||
continue;
|
||||
}
|
||||
|
||||
if(TConstructRegistry.getMaterial(id) == null) {
|
||||
if (TConstructRegistry.getMaterial(id) == null) {
|
||||
FMLLog.bigWarning("Material Item IMC: Material with ID %d does not exist", id);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
ToolMaterial mat = TConstructRegistry.getMaterial(id);
|
||||
|
||||
// we already have the material registered in there
|
||||
if(PatternBuilder.instance.materialSets.containsKey(mat.materialName))
|
||||
{
|
||||
if (PatternBuilder.instance.materialSets.containsKey(mat.materialName)) {
|
||||
PatternBuilder.instance.registerMaterial(stack, value, mat.materialName);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
TConstructRegistry.addDefaultShardMaterial(id);
|
||||
ItemStack shard = new ItemStack(TinkerTools.toolShard, 1, id);
|
||||
ItemStack rod = new ItemStack(TinkerTools.toolRod, 1, id);
|
||||
|
||||
// register the material
|
||||
PatternBuilder.instance.registerFullMaterial(stack, value, TConstructRegistry.getMaterial(id).materialName, shard, rod, id);
|
||||
PatternBuilder.instance.registerFullMaterial(
|
||||
stack, value, TConstructRegistry.getMaterial(id).materialName, shard, rod, id);
|
||||
}
|
||||
}
|
||||
else if(type.equals("addSmelteryMelting")) {
|
||||
} else if (type.equals("addSmelteryMelting")) {
|
||||
if (!message.isNBTMessage()) {
|
||||
logInvalidMessage(message);
|
||||
continue;
|
||||
}
|
||||
NBTTagCompound tag = message.getNBTValue();
|
||||
|
||||
if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Item", "Block"))
|
||||
continue;
|
||||
if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Item", "Block")) continue;
|
||||
|
||||
FluidStack liquid = FluidStack.loadFluidStackFromNBT(tag);
|
||||
if(liquid == null) {
|
||||
if (liquid == null) {
|
||||
FMLLog.bigWarning("Smeltery IMC: No fluid found");
|
||||
continue;
|
||||
}
|
||||
if(liquid.amount <= 0) {
|
||||
if (liquid.amount <= 0) {
|
||||
FMLLog.bigWarning("Smeltery IMC: Liquid has to have an amount greater than zero");
|
||||
continue;
|
||||
}
|
||||
@@ -284,25 +253,31 @@ public final class IMCHandler {
|
||||
ItemStack item = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Item"));
|
||||
ItemStack block = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Block"));
|
||||
int temperature = tag.getInteger("Temperature");
|
||||
|
||||
if(FluidType.getFluidType(liquid.getFluid()) == null)
|
||||
FluidType.registerFluidType(liquid.getFluid().getName(), Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid.getFluid(), false);
|
||||
|
||||
Smeltery.addMelting(item, Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid);
|
||||
TConstruct.logger.debug("Smeltery IMC: Added melting: " + item.getDisplayName() + " to " + liquid.amount + "mb " + liquid.getLocalizedName());
|
||||
}
|
||||
else if(type.equals("addSmelteryFuel")) {
|
||||
if (FluidType.getFluidType(liquid.getFluid()) == null)
|
||||
FluidType.registerFluidType(
|
||||
liquid.getFluid().getName(),
|
||||
Block.getBlockFromItem(block.getItem()),
|
||||
block.getItemDamage(),
|
||||
temperature,
|
||||
liquid.getFluid(),
|
||||
false);
|
||||
|
||||
Smeltery.addMelting(
|
||||
item, Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid);
|
||||
TConstruct.logger.debug("Smeltery IMC: Added melting: " + item.getDisplayName() + " to " + liquid.amount
|
||||
+ "mb " + liquid.getLocalizedName());
|
||||
} else if (type.equals("addSmelteryFuel")) {
|
||||
if (!message.isNBTMessage()) {
|
||||
logInvalidMessage(message);
|
||||
continue;
|
||||
}
|
||||
NBTTagCompound tag = message.getNBTValue();
|
||||
|
||||
if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Duration"))
|
||||
continue;
|
||||
if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Duration")) continue;
|
||||
|
||||
FluidStack liquid = FluidStack.loadFluidStackFromNBT(tag);
|
||||
if(liquid == null) {
|
||||
if (liquid == null) {
|
||||
FMLLog.bigWarning("Smeltery IMC: No fluid found");
|
||||
continue;
|
||||
}
|
||||
@@ -312,7 +287,8 @@ public final class IMCHandler {
|
||||
|
||||
Smeltery.addSmelteryFuel(liquid.getFluid(), temperature, duration);
|
||||
|
||||
TConstruct.logger.debug("Smeltery IMC: Added fuel: " + liquid.getLocalizedName() + " (" + temperature + ", " + duration + ")");
|
||||
TConstruct.logger.debug("Smeltery IMC: Added fuel: " + liquid.getLocalizedName() + " (" + temperature
|
||||
+ ", " + duration + ")");
|
||||
} else if (type.equals("addFluxBattery")) {
|
||||
if (!message.isItemStackMessage()) {
|
||||
logInvalidMessage(message, "ItemStack");
|
||||
@@ -321,7 +297,7 @@ public final class IMCHandler {
|
||||
ItemStack battery = message.getItemStackValue();
|
||||
battery.stackSize = 1; // avoid getting a stack size of 0 or larger than 1
|
||||
|
||||
if(!(battery.getItem() instanceof IEnergyContainerItem)) {
|
||||
if (!(battery.getItem() instanceof IEnergyContainerItem)) {
|
||||
FMLLog.bigWarning("Flux Battery IMC: ItemStack is no instance of IEnergyContainerItem");
|
||||
}
|
||||
|
||||
@@ -332,12 +308,10 @@ public final class IMCHandler {
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean checkRequiredTags(String prefix, NBTTagCompound tag, String... tags)
|
||||
{
|
||||
private static boolean checkRequiredTags(String prefix, NBTTagCompound tag, String... tags) {
|
||||
boolean ok = true;
|
||||
for(String t : tags)
|
||||
if(!tag.hasKey(t))
|
||||
{
|
||||
for (String t : tags)
|
||||
if (!tag.hasKey(t)) {
|
||||
FMLLog.bigWarning(String.format("%s IMC: Missing required NBT Tag %s", prefix, t));
|
||||
ok = false; // don't abort, report all missing tags
|
||||
}
|
||||
@@ -345,37 +319,32 @@ public final class IMCHandler {
|
||||
return ok;
|
||||
}
|
||||
|
||||
private static void logInvalidMessage(FMLInterModComms.IMCMessage message)
|
||||
{
|
||||
private static void logInvalidMessage(FMLInterModComms.IMCMessage message) {
|
||||
logInvalidMessage(message, "NBT");
|
||||
}
|
||||
|
||||
private static void logInvalidMessage(FMLInterModComms.IMCMessage message, String type)
|
||||
{
|
||||
FMLLog.bigWarning(String.format("Received invalid IMC '%s' from %s. Not a %s Message.", message.key, message.getSender(), type));
|
||||
private static void logInvalidMessage(FMLInterModComms.IMCMessage message, String type) {
|
||||
FMLLog.bigWarning(String.format(
|
||||
"Received invalid IMC '%s' from %s. Not a %s Message.", message.key, message.getSender(), type));
|
||||
}
|
||||
|
||||
private static ToolMaterial scanMaterial(NBTTagCompound tag)
|
||||
{
|
||||
if(!tag.hasKey("Name")) {
|
||||
private static ToolMaterial scanMaterial(NBTTagCompound tag) {
|
||||
if (!tag.hasKey("Name")) {
|
||||
FMLLog.bigWarning("Material IMC: Material has no name");
|
||||
return null;
|
||||
}
|
||||
String name = tag.getString("Name");
|
||||
|
||||
if(!tag.hasKey("Id")) {
|
||||
if (!tag.hasKey("Id")) {
|
||||
FMLLog.bigWarning("Material IMC: Materials need a unique id. " + name);
|
||||
return null;
|
||||
}
|
||||
else if(!tag.hasKey("Durability")) {
|
||||
} else if (!tag.hasKey("Durability")) {
|
||||
FMLLog.bigWarning("Material IMC: Materials need a durability. " + name);
|
||||
return null;
|
||||
}
|
||||
else if(!tag.hasKey("MiningSpeed")) {
|
||||
} else if (!tag.hasKey("MiningSpeed")) {
|
||||
FMLLog.bigWarning("Material IMC: Materials need a mining speed. " + name);
|
||||
return null;
|
||||
}
|
||||
else if(tag.hasKey("Stonebound") && tag.hasKey("Jagged")) {
|
||||
} else if (tag.hasKey("Stonebound") && tag.hasKey("Jagged")) {
|
||||
FMLLog.bigWarning("Material IMC: Materials can only be Stonebound or Jagged. " + name);
|
||||
return null;
|
||||
}
|
||||
@@ -390,23 +359,30 @@ public final class IMCHandler {
|
||||
String style = tag.getString("Style");
|
||||
int color = tag.getInteger("Color");
|
||||
|
||||
if(tag.hasKey("Jagged"))
|
||||
shoddy = -tag.getFloat("Jagged");
|
||||
if (tag.hasKey("Jagged")) shoddy = -tag.getFloat("Jagged");
|
||||
|
||||
if(tag.hasKey("localizationString"))
|
||||
return new ToolMaterial(name, tag.getString("localizationString"), hlvl, durability, speed, attack, handle, reinforced, shoddy, style, color);
|
||||
else
|
||||
return new ToolMaterial(name, hlvl, durability, speed, attack, handle, reinforced, shoddy, style, color);
|
||||
if (tag.hasKey("localizationString"))
|
||||
return new ToolMaterial(
|
||||
name,
|
||||
tag.getString("localizationString"),
|
||||
hlvl,
|
||||
durability,
|
||||
speed,
|
||||
attack,
|
||||
handle,
|
||||
reinforced,
|
||||
shoddy,
|
||||
style,
|
||||
color);
|
||||
else return new ToolMaterial(name, hlvl, durability, speed, attack, handle, reinforced, shoddy, style, color);
|
||||
}
|
||||
|
||||
// basically FMLLog.bigWarning
|
||||
public static void bigWarning(String format, Object... data)
|
||||
{
|
||||
public static void bigWarning(String format, Object... data) {
|
||||
StackTraceElement[] trace = Thread.currentThread().getStackTrace();
|
||||
TConstruct.logger.error("**********************************************************************");
|
||||
TConstruct.logger.error(String.format("* " + format, data));
|
||||
for (int i = 2; i < 8 && i < trace.length; i++)
|
||||
{
|
||||
for (int i = 2; i < 8 && i < trace.length; i++) {
|
||||
TConstruct.logger.error(String.format("* at %s%s", trace[i].toString(), i == 7 ? "..." : ""));
|
||||
}
|
||||
TConstruct.logger.error("**********************************************************************");
|
||||
|
||||
Reference in new issue
Block a user