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

@@ -3,7 +3,6 @@ package tconstruct.client;
import java.io.InputStream;
import java.text.DecimalFormat;
import javax.xml.parsers.*;
import mantle.client.SmallFontRenderer;
import mantle.lib.client.MantleClientRegistry;
import net.minecraft.client.Minecraft;
@@ -35,7 +34,8 @@ public class TProxyClient extends TProxyCommon {
/* Registers any rendering code. */
public void registerRenderer() {
Minecraft mc = Minecraft.getMinecraft();
smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false);
smallFontRenderer = new SmallFontRenderer(
mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false);
}
public static Document diary;
@@ -47,7 +47,10 @@ public class TProxyClient extends TProxyCommon {
public void readManuals() {
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
String CurrentLanguage = Minecraft.getMinecraft()
.getLanguageManager()
.getCurrentLanguage()
.getLanguageCode();
Document diary_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/diary.xml", dbFactory);
Document volume1_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory);
@@ -59,7 +62,8 @@ public class TProxyClient extends TProxyCommon {
volume1 = volume1_cl != null ? volume1_cl : readManual("/assets/tinker/manuals/en_US/firstday.xml", dbFactory);
volume2 = volume2_cl != null ? volume2_cl : readManual("/assets/tinker/manuals/en_US/materials.xml", dbFactory);
smelter = smelter_cl != null ? smelter_cl : readManual("/assets/tinker/manuals/en_US/smeltery.xml", dbFactory);
weaponry = weaponry_cl != null ? weaponry_cl : readManual("/assets/tinker/manuals/en_US/weaponry.xml", dbFactory);
weaponry =
weaponry_cl != null ? weaponry_cl : readManual("/assets/tinker/manuals/en_US/weaponry.xml", dbFactory);
initManualIcons();
initManualRecipes();
@@ -96,12 +100,9 @@ public class TProxyClient extends TProxyCommon {
MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Blocks.netherrack));
}
public void initManualRecipes() {
}
public void initManualRecipes() {}
void initManualPages() {
}
void initManualPages() {}
public static Document getManualFromStack(ItemStack stack) {
switch (stack.getItemDamage()) {
@@ -121,5 +122,4 @@ public class TProxyClient extends TProxyCommon {
public void recalculateHealth() {
ArmorProxyClient.armorExtended.recalculateHealth(mc.thePlayer, TPlayerStats.get(mc.thePlayer));
}
}