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:
Raven Szewczyk authored and GitHub committed 2022-09-22 20:51:23 +02:00
1 parent 18bfeaff32
commit 39be06c23b
571 files changed
+25959 -28223

No files matched your search

@@ -2,28 +2,22 @@ package tconstruct.library.tools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import java.util.Locale;
import java.util.Map;
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.library.tools.CustomMaterial;
import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
import java.util.List;
import java.util.Locale;
import java.util.Map;
public class DynamicToolPart extends CraftingItem implements IToolPart
{
public class DynamicToolPart extends CraftingItem implements IToolPart {
public String partName;
public String texture;
public IIcon defaultIcon;
@@ -31,23 +25,20 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
private boolean hidden = false;
public DynamicToolPart(String texture, String name)
{
public DynamicToolPart(String texture, String name) {
this(texture, name, (Class<? extends CustomMaterial>) null);
}
public DynamicToolPart(String texture, String name, Class<? extends CustomMaterial> customMaterialClass)
{
public DynamicToolPart(String texture, String name, Class<? extends CustomMaterial> customMaterialClass) {
this(texture, name, "tinker", customMaterialClass);
}
public DynamicToolPart(String texture, String name, String domain)
{
public DynamicToolPart(String texture, String name, String domain) {
this(texture, name, domain, (Class<? extends CustomMaterial>) null);
}
public DynamicToolPart(String texture, String name, String domain, Class<? extends CustomMaterial> customMaterialClass)
{
public DynamicToolPart(
String texture, String name, String domain, Class<? extends CustomMaterial> customMaterialClass) {
super(null, null, "parts/", domain, TConstructRegistry.partTab);
this.setUnlocalizedName("tconstruct." + name);
this.partName = name;
@@ -58,8 +49,7 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
/**
* Doesn't add the item to creative tabs
*/
public DynamicToolPart hide()
{
public DynamicToolPart hide() {
hidden = true;
return this;
@@ -67,60 +57,49 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
// item meta = material id
@Override
public int getMaterialID (ItemStack stack)
{
if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage()))
return stack.getItemDamage();
public int getMaterialID(ItemStack stack) {
if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage())) return stack.getItemDamage();
return -1;
}
@Override
public String getItemStackDisplayName (ItemStack stack)
{
public String getItemStackDisplayName(ItemStack stack) {
String material = "";
String matName = "";
if (customMaterialClass == null)
{
if (customMaterialClass == null) {
tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack));
if(toolmat == null)
return super.getItemStackDisplayName(stack);
if (toolmat == null) return super.getItemStackDisplayName(stack);
material = toolmat.localizationString.toLowerCase(Locale.ENGLISH).startsWith("material.") ? toolmat.localizationString.substring(9) : toolmat.localizationString; // :(
material = toolmat.localizationString.toLowerCase(Locale.ENGLISH).startsWith("material.")
? toolmat.localizationString.substring(9)
: toolmat.localizationString; // :(
matName = toolmat.prefixName();
}
else
{
CustomMaterial customMaterial = TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass);
if (customMaterial == null)
return super.getItemStackDisplayName(stack);
} else {
CustomMaterial customMaterial =
TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass);
if (customMaterial == null) return super.getItemStackDisplayName(stack);
material = "";
if (customMaterial.input != null)
{
if (customMaterial.input != null) {
material = customMaterial.input.getUnlocalizedName();
int firstPeriodIndex = material.indexOf('.');
if (firstPeriodIndex >= 0)
material = material.substring(firstPeriodIndex+1);
if (firstPeriodIndex >= 0) material = material.substring(firstPeriodIndex + 1);
matName = customMaterial.input.getDisplayName();
}
else
{
} else {
material = customMaterial.oredict;
matName = customMaterial.oredict;
}
}
// custom name
if (StatCollector.canTranslate("toolpart." + partName + "." + material))
{
if (StatCollector.canTranslate("toolpart." + partName + "." + material)) {
return StatCollector.translateToLocal("toolpart." + partName + "." + material);
}
// general name
else
{
else {
// specific material name for materials?
if(StatCollector.canTranslate("toolpart.material." + material))
if (StatCollector.canTranslate("toolpart.material." + material))
matName = StatCollector.translateToLocal("toolpart.material." + material);
return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", matName);
@@ -130,57 +109,49 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
@Override
public String getUnlocalizedName(ItemStack stack) {
int id = getMaterialID(stack);
if(id == -1)
return getUnlocalizedName();
if (id == -1) return getUnlocalizedName();
String material = "unknown";
if (customMaterialClass == null)
{
if (customMaterialClass == null) {
tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack));
material = toolmat.materialName;
}
else
{
CustomMaterial customMaterial = TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass);
material = customMaterial.input != null ? customMaterial.input.getUnlocalizedName() : customMaterial.oredict;
} else {
CustomMaterial customMaterial =
TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass);
material =
customMaterial.input != null ? customMaterial.input.getUnlocalizedName() : customMaterial.oredict;
}
return "toolpart." + partName + "." + material;
}
@Override
public void getSubItems (Item item, CreativeTabs tab, List list)
{
if(hidden)
return;
public void getSubItems(Item item, CreativeTabs tab, List list) {
if (hidden) return;
// material id == metadata
for(Integer matID : TConstructRegistry.defaultToolPartMaterials) {
for (Integer matID : TConstructRegistry.defaultToolPartMaterials) {
ItemStack stack = new ItemStack(item, 1, matID);
if (this.getMaterialID(stack) != -1)
list.add(stack);
if (this.getMaterialID(stack) != -1) list.add(stack);
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons (IIconRegister iconRegister)
{
public void registerIcons(IIconRegister iconRegister) {
// get the biggest material index
int max = -1;
for(Integer id : TConstructRegistry.toolMaterials.keySet())
if(id > max)
max = id;
for (Integer id : TConstructRegistry.toolMaterials.keySet()) if (id > max) max = id;
this.icons = new IIcon[max+1];
this.icons = new IIcon[max + 1];
// register icon for each material that has one
if(!PHConstruct.minimalTextures)
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);
if (!PHConstruct.minimalTextures)
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
@@ -188,13 +159,10 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
}
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage (int meta)
{
if(meta > icons.length)
return defaultIcon;
public IIcon getIconFromDamage(int meta) {
if (meta > icons.length) return defaultIcon;
if(icons[meta] == null)
return defaultIcon;
if (icons[meta] == null) return defaultIcon;
return icons[meta];
}
@@ -202,15 +170,12 @@ public class DynamicToolPart extends CraftingItem implements IToolPart
@Override
public int getColorFromItemStack(ItemStack stack, int renderpass) {
int matId = getMaterialID(stack);
if(matId > icons.length)
return super.getColorFromItemStack(stack, renderpass);
if (matId > icons.length) return super.getColorFromItemStack(stack, renderpass);
if(matId >= 0 && icons[matId] == null)
{
if (matId >= 0 && icons[matId] == null) {
if (customMaterialClass == null)
return TConstructRegistry.getMaterial(getMaterialID(stack)).primaryColor();
else
return TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass).color;
else return TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass).color;
}
return super.getColorFromItemStack(stack, renderpass);