Skip to content

Commit 6613478

Browse files
committed
Thresheld
- Fix threshold switches not correctly counting empty slots #9420
1 parent 9e3262d commit 6613478

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/main/java/com/simibubi/create/AllKeys.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
import net.neoforged.api.distmarker.Dist;
1414
import net.neoforged.bus.api.SubscribeEvent;
1515
import net.neoforged.fml.common.EventBusSubscriber;
16-
import net.neoforged.fml.common.EventBusSubscriber.Bus;
1716
import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
1817
import net.neoforged.neoforge.client.settings.KeyModifier;
1918

20-
@EventBusSubscriber(value = Dist.CLIENT, bus = Bus.MOD)
19+
@EventBusSubscriber(Dist.CLIENT)
2120
public enum AllKeys {
2221

2322
TOOL_MENU("toolmenu", GLFW.GLFW_KEY_LEFT_ALT, "Focus Schematic Overlay"),

src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import net.createmod.catnip.math.BlockFace;
2424
import net.minecraft.core.BlockPos;
2525
import net.minecraft.core.HolderLookup;
26+
import net.minecraft.core.component.DataComponents;
2627
import net.minecraft.nbt.CompoundTag;
2728
import net.minecraft.network.chat.MutableComponent;
2829
import net.minecraft.util.Mth;
@@ -170,7 +171,7 @@ public void updateCurrentLevel() {
170171
.filter(compat -> compat.isFromThisMod(targetBlockEntity))
171172
.map(compat -> compat.getSpaceInSlot(inv, finalSlot))
172173
.findFirst()
173-
.orElseGet(() -> (long) Math.min(stackInSlot.getMaxStackSize(), inv.getSlotLimit(finalSlot)));
174+
.orElseGet(() -> (long) Math.min(stackInSlot.getOrDefault(DataComponents.MAX_STACK_SIZE, 64), inv.getSlotLimit(finalSlot)));
174175

175176
int count = stackInSlot.getCount();
176177
if (space == 0)

src/main/java/com/simibubi/create/foundation/events/ClientEvents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ public static void leftClickEmpty(PlayerInteractEvent.LeftClickEmpty event) {
356356
}
357357
}
358358

359-
@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
359+
@EventBusSubscriber(Dist.CLIENT)
360360
public static class ModBusEvents {
361361

362362
@SubscribeEvent

src/main/java/com/simibubi/create/foundation/render/RenderTypes.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import net.minecraft.client.renderer.ShaderInstance;
1515
import net.minecraft.resources.ResourceLocation;
1616
import net.minecraft.server.packs.resources.ResourceProvider;
17+
1718
import net.neoforged.api.distmarker.Dist;
1819
import net.neoforged.bus.api.SubscribeEvent;
1920
import net.neoforged.fml.common.EventBusSubscriber;
@@ -141,7 +142,7 @@ private RenderTypes() {
141142
super(null, null, null);
142143
}
143144

144-
@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
145+
@EventBusSubscriber(Dist.CLIENT)
145146
private static class Shaders {
146147
private static ShaderInstance glowingShader;
147148

0 commit comments

Comments
 (0)