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

@@ -9,41 +9,34 @@ import tconstruct.armor.inventory.*;
import tconstruct.armor.player.TPlayerStats;
import tconstruct.common.TProxyCommon;
public class ArmorProxyCommon implements IGuiHandler
{
public class ArmorProxyCommon implements IGuiHandler {
public static final int inventoryGui = 100;
public static final int armorGuiID = 101;
public static final int knapsackGuiID = 102;
public void preInit() {}
public void initialize ()
{
public void initialize() {
registerGuiHandler();
}
protected void registerGuiHandler ()
{
protected void registerGuiHandler() {
TProxyCommon.registerServerGuiHandler(inventoryGui, this);
TProxyCommon.registerServerGuiHandler(armorGuiID, this);
TProxyCommon.registerServerGuiHandler(knapsackGuiID, this);
}
@Override
public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
{
if (ID == ArmorProxyCommon.inventoryGui)
{
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
if (ID == ArmorProxyCommon.inventoryGui) {
// GuiInventory inv = new GuiInventory(player);
return player.inventoryContainer;
}
if (ID == ArmorProxyCommon.armorGuiID)
{
if (ID == ArmorProxyCommon.armorGuiID) {
TPlayerStats stats = TPlayerStats.get(player);
return new ArmorExtendedContainer(player.inventory, stats.armor);
}
if (ID == ArmorProxyCommon.knapsackGuiID)
{
if (ID == ArmorProxyCommon.knapsackGuiID) {
TPlayerStats stats = TPlayerStats.get(player);
return new KnapsackContainer(player.inventory, stats.knapsack);
}
@@ -52,29 +45,18 @@ public class ArmorProxyCommon implements IGuiHandler
}
@Override
public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
{
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
// TODO Auto-generated method stub
return null;
}
public void registerTickHandler ()
{
public void registerTickHandler() {}
}
public void registerKeys() {}
public void registerKeys ()
{
public void updatePlayerStats(TPlayerStats stats) {}
}
public void updatePlayerStats(TPlayerStats stats)
{
}
public void dumpTPlayerStats(TPlayerStats stats)
{
public void dumpTPlayerStats(TPlayerStats stats) {
TConstruct.logger.debug("~~~~~~~~~~~~~~~~~ STATS ~~~~~~~~~~~~~~~~~");
TConstruct.logger.debug("Player: " + stats.player.get().getCommandSenderName());
TConstruct.logger.debug("Level: " + stats.level);
@@ -91,19 +73,15 @@ public class ArmorProxyCommon implements IGuiHandler
TConstruct.logger.debug("BattleSign Bonus: " + stats.battlesignBonus);
TConstruct.logger.debug("Derp Level: " + stats.derpLevel);
int i = 0;
for (ItemStack stack : stats.armor.inventory)
{
if (stack != null)
{
TConstruct.logger.debug("Armor Slot: " + i + " Contains: " + stack.getDisplayName());
for (ItemStack stack : stats.armor.inventory) {
if (stack != null) {
TConstruct.logger.debug("Armor Slot: " + i + " Contains: " + stack.getDisplayName());
}
i++;
}
i = 0;
for (ItemStack stack : stats.knapsack.inventory)
{
if (stack != null)
{
for (ItemStack stack : stats.knapsack.inventory) {
if (stack != null) {
TConstruct.logger.debug("Knapsack Slot: " + i + " Contains: " + stack.getDisplayName());
}
i++;