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

@@ -23,48 +23,35 @@ import thaumcraft.api.nodes.IRevealer;
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer"),
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles")
})
public class TravelGear extends ArmorCore implements IRevealer, IGoggles
{
public class TravelGear extends ArmorCore implements IRevealer, IGoggles {
public TravelGear(ArmorPart part)
{
public TravelGear(ArmorPart part) {
super(0, part, "Clothing", "travelgear", "travel");
this.setMaxDamage(1035);
}
@Override
public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack)
{
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
super.onArmorTick(world, player, itemStack);
if (armorPart == ArmorPart.Chest)
{
if (player.isInWater())
{
if (armorPart == ArmorPart.Chest) {
if (player.isInWater()) {
player.motionX *= 1.2D;
if (player.motionY > 0.0D)
{
if (player.motionY > 0.0D) {
player.motionY *= 1.2D;
}
player.motionZ *= 1.2D;
double maxSpeed = 0.2D;
if (player.motionX > maxSpeed)
{
if (player.motionX > maxSpeed) {
player.motionX = maxSpeed;
}
else if (player.motionX < -maxSpeed)
{
} else if (player.motionX < -maxSpeed) {
player.motionX = -maxSpeed;
}
if (player.motionY > maxSpeed)
{
if (player.motionY > maxSpeed) {
player.motionY = maxSpeed;
}
if (player.motionZ > maxSpeed)
{
if (player.motionZ > maxSpeed) {
player.motionZ = maxSpeed;
}
else if (player.motionZ < -maxSpeed)
{
} else if (player.motionZ < -maxSpeed) {
player.motionZ = -maxSpeed;
}
}
@@ -72,129 +59,129 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles
}
@Override
protected double getBaseDefense ()
{
switch (armorPart)
{
case Head:
return 0;
case Chest:
return 4;
case Legs:
return 2;
case Feet:
return 2;
protected double getBaseDefense() {
switch (armorPart) {
case Head:
return 0;
case Chest:
return 4;
case Legs:
return 2;
case Feet:
return 2;
}
return 0;
}
@Override
protected double getMaxDefense ()
{
switch (armorPart)
{
case Head:
return 4;
case Chest:
return 10;
case Legs:
return 8;
case Feet:
return 6;
protected double getMaxDefense() {
switch (armorPart) {
case Head:
return 4;
case Chest:
return 10;
case Legs:
return 8;
case Feet:
return 6;
}
return 0;
}
@Override
protected int getDurability ()
{
protected int getDurability() {
return 1035;
}
//Temporary?
public ItemStack getRepairMaterial (ItemStack input)
{
// Temporary?
public ItemStack getRepairMaterial(ItemStack input) {
return new ItemStack(Items.leather);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons (IIconRegister iconRegister)
{
this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_" + (this.armorType == 0 ? "goggles" : this.armorType == 1 ? "vest" : this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet"));
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_"
+ (this.armorType == 0
? "goggles"
: this.armorType == 1
? "vest"
: this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet"));
registerModifiers(iconRegister);
}
@Override
@SideOnly(Side.CLIENT)
public ModelBiped getArmorModel (EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
{
if (armorSlot == 1)
return ArmorProxyClient.vest;
if (armorSlot == 2)
return ArmorProxyClient.wings;
if (armorSlot == 3)
return ArmorProxyClient.bootbump;
public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
if (armorSlot == 1) return ArmorProxyClient.vest;
if (armorSlot == 2) return ArmorProxyClient.wings;
if (armorSlot == 3) return ArmorProxyClient.bootbump;
return null;
}
@Override
@SideOnly(Side.CLIENT)
protected void registerModifiers (IIconRegister iconRegister) //temporary
{
switch (armorType)
{
case 0:
modifiers = new IIcon[5];
modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "nightvision");
modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic1");
modifiers[2] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic2");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "moss");
break;
case 1:
modifiers = new IIcon[5];
modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "dodge");
modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "stealth");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "moss");
break;
case 2:
modifiers = new IIcon[5];
modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump");
modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss");
break;
case 3:
modifiers = new IIcon[5];
modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "doublejump");
modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "waterwalk");
modifiers[2] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "leadweight");
modifiers[3] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "slimysole");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "moss");
break;
protected void registerModifiers(IIconRegister iconRegister) // temporary
{
switch (armorType) {
case 0:
modifiers = new IIcon[5];
modifiers[0] =
iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "nightvision");
modifiers[1] =
iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic1");
modifiers[2] =
iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic2");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "moss");
break;
case 1:
modifiers = new IIcon[5];
modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "dodge");
modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "stealth");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "moss");
break;
case 2:
modifiers = new IIcon[5];
modifiers[0] =
iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump");
modifiers[1] =
iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss");
break;
case 3:
modifiers = new IIcon[5];
modifiers[0] =
iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "doublejump");
modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "waterwalk");
modifiers[2] =
iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "leadweight");
modifiers[3] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "slimysole");
modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "moss");
break;
}
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
switch (armorPart)
{
case Head:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.ability") + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode()));
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.toggleabilities") + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.toggleGoggles.getKeyCode()));
break;
case Chest:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelvest.ability"));
break;
case Legs:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelwings.ability"));
break;
case Feet:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelboots.ability"));
break;
default:
switch (armorPart) {
case Head:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.ability")
+ GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode()));
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.toggleabilities")
+ GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.toggleGoggles.getKeyCode()));
break;
case Chest:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelvest.ability"));
break;
case Legs:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelwings.ability"));
break;
case Feet:
list.add("\u00a76" + StatCollector.translateToLocal("armor.travelboots.ability"));
break;
default:
}
super.addInformation(stack, player, list, par4);
@@ -203,7 +190,7 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles
@Optional.Method(modid = "Thaumcraft")
@Override
public boolean showNodes(ItemStack itemstack, EntityLivingBase player) {
if(itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles)
if (itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles)
return false;
return itemstack.getTagCompound().getCompoundTag(this.getBaseTagName()).getBoolean("Thaumic Senses");
@@ -212,7 +199,7 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles
@Optional.Method(modid = "Thaumcraft")
@Override
public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) {
if(itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles)
if (itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles)
return false;
return itemstack.getTagCompound().getCompoundTag(this.getBaseTagName()).getBoolean("Thaumic Vision");