upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-14 01:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash when opening stencil table with cast (#87)

Browse Source 
added guards before setActiveButton
This commit is contained in:
Dennis authored and GitHub committed 2023-05-22 06:59:36 +02:00
1 parent 8c4d534f6f
commit f019c7d845
2 files changed
+11 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/tools/gui/StencilTableGui.java
+9 -5
View File
@@ -116,15 +116,19 @@ public class StencilTableGui extends GuiContainer implements INEIGuiHandler {
// get the correct setting :I
ItemStack stack;
if (logic.getStackInSlot(1) != null) {
activeButton = StencilBuilder.getId(logic.getStackInSlot(1));
setActiveButton(activeButton);
ItemStack setting = logic.getStackInSlot(1);
int currentSetting = setting != null ? StencilBuilder.getId(setting) : -1;
if (currentSetting >= 0) {
setActiveButton(currentSetting);
stack = StencilBuilder
.getStencil(((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex);
} else stack = null;
logic.setSelectedPattern(stack);
updateServer(stack);
// only set valid patterns
if (stack != null) {
logic.setSelectedPattern(stack);
updateServer(stack);
}
}
@Override
src/main/java/tconstruct/weaponry/WeaponryClientProxy.java
+2 -2
View File
@@ -113,12 +113,12 @@ public class WeaponryClientProxy extends WeaponryCommonProxy {
TConstructClientRegistry.addStencilButton2(0, 0, -1, null, null);
TConstructClientRegistry.addStencilButton2(0, 0, -1, null, null);
TConstructClientRegistry.addStencilButton2(3, 4, 27, Reference.RESOURCE, tex); // bow limb
TConstructClientRegistry.addStencilButton2(10, 3, 23, Reference.RESOURCE, tex); // bowstring
TConstructClientRegistry.addStencilButton2(0, 4, 24, Reference.RESOURCE, tex); // shuriken
TConstructClientRegistry.addStencilButton2(1, 4, 25, Reference.RESOURCE, tex); // crossbow limb
TConstructClientRegistry.addStencilButton2(2, 4, 26, Reference.RESOURCE, tex); // crossbow body
TConstructClientRegistry.addStencilButton2(0, 4, 24, Reference.RESOURCE, tex); // shuriken
TConstructClientRegistry.addStencilButton2(3, 4, 27, Reference.RESOURCE, tex); // bow limb
// TConstructClientRegistry.addStencilButton2(4, 4, index, Reference.RESOURCE, "textures/gui/icons.png"); //
// bolt