diff --git a/gradle.properties b/gradle.properties index 2c07c30..f7a0484 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 loader_version=0.18.3 # Mod Properties -mod_version=26.3.3 +mod_version=26.3.4 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/src/main/java/dev/tggamesyt/szar/SlotMachineBlockEntity.java b/src/main/java/dev/tggamesyt/szar/SlotMachineBlockEntity.java index e5225fa..c5ff422 100644 --- a/src/main/java/dev/tggamesyt/szar/SlotMachineBlockEntity.java +++ b/src/main/java/dev/tggamesyt/szar/SlotMachineBlockEntity.java @@ -32,6 +32,7 @@ public class SlotMachineBlockEntity extends BlockEntity { private final Random random = new Random(); + final SimpleInventory betInventory = new SimpleInventory(1); public final int[] currentSymbol = new int[3]; public final int[] finalSymbol = new int[3]; public static final int TOTAL_SYMBOLS = 7; @@ -209,7 +210,7 @@ public class SlotMachineBlockEntity extends BlockEntity { } } - public boolean onButtonClicked(PlayerEntity player, SlotMachineBlockEntity blockEntity, SimpleInventory betInventory) { + public boolean onButtonClicked(PlayerEntity player, SlotMachineBlockEntity blockEntity) { blockEntity.setHandleClicked(true, player); ItemStack bet = betInventory.getStack(0); if (bet.isEmpty()) return false; diff --git a/src/main/java/dev/tggamesyt/szar/SlotMachineScreenHandler.java b/src/main/java/dev/tggamesyt/szar/SlotMachineScreenHandler.java index 354bd2b..2c0eb2e 100644 --- a/src/main/java/dev/tggamesyt/szar/SlotMachineScreenHandler.java +++ b/src/main/java/dev/tggamesyt/szar/SlotMachineScreenHandler.java @@ -19,9 +19,6 @@ public class SlotMachineScreenHandler extends ScreenHandler { public final SlotMachineBlockEntity blockEntity; - private final SimpleInventory betInventory = new SimpleInventory(1); - - private final Random random = new Random(); public SlotMachineScreenHandler(int syncId, PlayerInventory playerInv, SlotMachineBlockEntity blockEntity) { super(Szar.SLOT_MACHINE_SCREEN_HANDLER_TYPE, syncId); @@ -31,7 +28,7 @@ public class SlotMachineScreenHandler extends ScreenHandler { this.addProperties(blockEntity.propertyDelegate); // Bet slot - this.addSlot(new Slot(betInventory, 0, 44, 35)); + this.addSlot(new Slot(blockEntity.betInventory, 0, 44, 35)); // Player inventory slots for (int y = 0; y < 3; y++) @@ -44,7 +41,7 @@ public class SlotMachineScreenHandler extends ScreenHandler { @Override public boolean onButtonClick(PlayerEntity player, int id) { if (id != 0 || blockEntity.getSpinning()) return false; - return blockEntity.onButtonClicked(player, blockEntity, betInventory); + return blockEntity.onButtonClicked(player, blockEntity); } /* @Override