From e366e8cc835b6568b8246b7d8998026a9b7dce0f Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Wed, 17 Jun 2026 22:01:34 +0200 Subject: [PATCH] feat: update to mc26.2 --- gradle.properties | 8 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ScriptsChunkLoadersGameTest.java | 64 +++++++++---------- .../mixin/AbstractMinecartMixin.java | 3 +- .../mixin/DispenserBlockMixin.java | 4 +- src/main/resources/fabric.mod.json | 4 +- 6 files changed, 43 insertions(+), 42 deletions(-) diff --git a/gradle.properties b/gradle.properties index bf883b1..0df2a1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.1.2 -loader_version=0.18.6 -loom_version=1.16-SNAPSHOT +minecraft_version=26.2 +loader_version=0.19.3 +loom_version=1.17-SNAPSHOT # Mod Properties mod_version=0.0.0 @@ -14,4 +14,4 @@ maven_group=io.nihlen.scriptschunkloaders archives_base_name=scripts-chunk-loaders # Dependencies -fabric_api_version=0.145.4+26.1.2 \ No newline at end of file +fabric_api_version=0.152.1+26.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118..1a70468 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/gametest/java/io/nihlen/scriptschunkloaders/ScriptsChunkLoadersGameTest.java b/src/gametest/java/io/nihlen/scriptschunkloaders/ScriptsChunkLoadersGameTest.java index 465f9af..72f67cc 100644 --- a/src/gametest/java/io/nihlen/scriptschunkloaders/ScriptsChunkLoadersGameTest.java +++ b/src/gametest/java/io/nihlen/scriptschunkloaders/ScriptsChunkLoadersGameTest.java @@ -4,7 +4,7 @@ import net.minecraft.core.component.DataComponents; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EntityTypes; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.gametest.framework.GameTestHelper; @@ -70,12 +70,12 @@ private void clearTest(GameTestHelper context) { public void registersWithDefaultName_minecart(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.MINECART, 2, 1, 2); + context.spawn(EntityTypes.MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.MINECART, + EntityTypes.MINECART, getCustomName, defaultName ); @@ -87,12 +87,12 @@ public void registersWithDefaultName_minecart(GameTestHelper context) { public void registersWithDefaultName_hopperMinecart(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.HOPPER_MINECART, 2, 1, 2); + context.spawn(EntityTypes.HOPPER_MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.HOPPER_MINECART, + EntityTypes.HOPPER_MINECART, getCustomName, defaultName ); @@ -104,12 +104,12 @@ public void registersWithDefaultName_hopperMinecart(GameTestHelper context) { public void registersWithDefaultName_chestMinecart(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.CHEST_MINECART, 2, 1, 2); + context.spawn(EntityTypes.CHEST_MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.CHEST_MINECART, + EntityTypes.CHEST_MINECART, getCustomName, defaultName ); @@ -121,12 +121,12 @@ public void registersWithDefaultName_chestMinecart(GameTestHelper context) { public void registersWithDefaultName_furnaceMinecart(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.FURNACE_MINECART, 2, 1, 2); + context.spawn(EntityTypes.FURNACE_MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.FURNACE_MINECART, + EntityTypes.FURNACE_MINECART, getCustomName, defaultName ); @@ -138,12 +138,12 @@ public void registersWithDefaultName_furnaceMinecart(GameTestHelper context) { public void registersWithDefaultName_tntMinecart(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.TNT_MINECART, 2, 1, 2); + context.spawn(EntityTypes.TNT_MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.TNT_MINECART, + EntityTypes.TNT_MINECART, getCustomName, defaultName ); @@ -155,12 +155,12 @@ public void registersWithDefaultName_tntMinecart(GameTestHelper context) { public void registersWithDefaultName_commandBlockMinecart(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.COMMAND_BLOCK_MINECART, 2, 1, 2); + context.spawn(EntityTypes.COMMAND_BLOCK_MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.COMMAND_BLOCK_MINECART, + EntityTypes.COMMAND_BLOCK_MINECART, getCustomName, defaultName ); @@ -194,14 +194,14 @@ public void registersWithFirstItemName_chestMinecart(GameTestHelper context) { clearTest(context); context.killAllEntities(); - var entity = context.spawn(EntityType.CHEST_MINECART, 2, 1, 2); + var entity = context.spawn(EntityTypes.CHEST_MINECART, 2, 1, 2); entity.setChestVehicleItem(0, createNamedItem()); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.CHEST_MINECART, + EntityTypes.CHEST_MINECART, getCustomName, customItemName ); @@ -214,14 +214,14 @@ public void registersWithDefaultNameOtherSlot_hopperMinecart(GameTestHelper cont clearTest(context); context.killAllEntities(); - var entity = context.spawn(EntityType.HOPPER_MINECART, 2, 1, 2); + var entity = context.spawn(EntityTypes.HOPPER_MINECART, 2, 1, 2); entity.setChestVehicleItem(1, createNamedItem()); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.HOPPER_MINECART, + EntityTypes.HOPPER_MINECART, getCustomName, defaultName ); @@ -234,14 +234,14 @@ public void registersWithDefaultNameOtherSlot_chestMinecart(GameTestHelper conte clearTest(context); context.killAllEntities(); - var entity = context.spawn(EntityType.CHEST_MINECART, 2, 1, 2); + var entity = context.spawn(EntityTypes.CHEST_MINECART, 2, 1, 2); entity.setChestVehicleItem(1, createNamedItem()); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.CHEST_MINECART, + EntityTypes.CHEST_MINECART, getCustomName, defaultName ); @@ -254,14 +254,14 @@ public void registersWithDefaultNameUnnamedItem_hopperMinecart(GameTestHelper co clearTest(context); context.killAllEntities(); - var entity = context.spawn(EntityType.HOPPER_MINECART, 2, 1, 2); + var entity = context.spawn(EntityTypes.HOPPER_MINECART, 2, 1, 2); entity.setChestVehicleItem(0, createUnnamedItem()); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.HOPPER_MINECART, + EntityTypes.HOPPER_MINECART, getCustomName, defaultName ); @@ -274,14 +274,14 @@ public void registersWithDefaultNameUnnamedItem_chestMinecart(GameTestHelper con clearTest(context); context.killAllEntities(); - var entity = context.spawn(EntityType.CHEST_MINECART, 2, 1, 2); + var entity = context.spawn(EntityTypes.CHEST_MINECART, 2, 1, 2); entity.setChestVehicleItem(0, createUnnamedItem()); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.CHEST_MINECART, + EntityTypes.CHEST_MINECART, getCustomName, defaultName ); @@ -293,17 +293,17 @@ public void registersWithDefaultNameUnnamedItem_chestMinecart(GameTestHelper con public void registers_and_unregisters(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.MINECART, 2, 1, 2); + context.spawn(EntityTypes.MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { - context.assertEntityData(new BlockPos(2, 1, 2), EntityType.MINECART, getCustomName, defaultName); + context.assertEntityData(new BlockPos(2, 1, 2), EntityTypes.MINECART, getCustomName, defaultName); context.runAfterDelay(4, () -> { context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { - context.assertEntityData(new BlockPos(2, 1, 2), EntityType.MINECART, getCustomName, null); + context.assertEntityData(new BlockPos(2, 1, 2), EntityTypes.MINECART, getCustomName, null); context.succeed(); }); }); @@ -317,18 +317,18 @@ public void registers_and_unregisters(GameTestHelper context) { public void registers_unregisters_and_registers(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.MINECART, 2, 1, 2); + context.spawn(EntityTypes.MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { - context.assertEntityData(new BlockPos(2, 1, 2), EntityType.MINECART, getCustomName, defaultName); + context.assertEntityData(new BlockPos(2, 1, 2), EntityTypes.MINECART, getCustomName, defaultName); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { - context.assertEntityData(new BlockPos(2, 1, 2), EntityType.MINECART, getCustomName, null); + context.assertEntityData(new BlockPos(2, 1, 2), EntityTypes.MINECART, getCustomName, null); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { - context.assertEntityData(new BlockPos(2, 1, 2), EntityType.MINECART, getCustomName, defaultName); + context.assertEntityData(new BlockPos(2, 1, 2), EntityTypes.MINECART, getCustomName, defaultName); context.succeed(); }); }); @@ -339,12 +339,12 @@ public void registers_unregisters_and_registers(GameTestHelper context) { public void doesNotRegisterWithEmptyDispenser(GameTestHelper context) { clearTest(context); - context.spawn(EntityType.MINECART, 2, 1, 2); + context.spawn(EntityTypes.MINECART, 2, 1, 2); context.pulseRedstone(new BlockPos(1, 1, 1), 1); context.runAfterDelay(4, () -> { context.assertEntityData( new BlockPos(2, 1, 2), - EntityType.MINECART, + EntityTypes.MINECART, getCustomName, null ); diff --git a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartMixin.java b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartMixin.java index 670b81a..5389be3 100644 --- a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartMixin.java +++ b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartMixin.java @@ -2,6 +2,7 @@ import net.minecraft.core.component.DataComponents; //import net.minecraft.entity.vehicle.*; +import net.minecraft.world.entity.EntityTypes; import net.minecraft.world.entity.vehicle.minecart.AbstractMinecart; import net.minecraft.world.entity.vehicle.minecart.MinecartChest; import net.minecraft.world.level.storage.ValueInput; @@ -63,7 +64,7 @@ private void injectConstructor(CallbackInfo callbackInfo) { public void scripts_chunk_loaders$setChunkLoaderNameFromInventory() { EntityType minecartType = this.getType(); - if (minecartType == EntityType.CHEST_MINECART) { + if (minecartType == EntityTypes.CHEST_MINECART) { //noinspection DataFlowIssue - We're sure this is a chest because of the if statement. var entity = (MinecartChest)(Object)this; var firstSlot = entity.getItemStacks().get(0); diff --git a/src/main/java/io/nihlen/scriptschunkloaders/mixin/DispenserBlockMixin.java b/src/main/java/io/nihlen/scriptschunkloaders/mixin/DispenserBlockMixin.java index 9e4f678..d204bb7 100644 --- a/src/main/java/io/nihlen/scriptschunkloaders/mixin/DispenserBlockMixin.java +++ b/src/main/java/io/nihlen/scriptschunkloaders/mixin/DispenserBlockMixin.java @@ -3,7 +3,7 @@ import io.nihlen.scriptschunkloaders.MinecartEntityExt; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.DispenserBlock; -import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.BlockEntityTypes; import net.minecraft.world.level.block.entity.DispenserBlockEntity; import net.minecraft.world.entity.vehicle.minecart.AbstractMinecart; import net.minecraft.world.item.Item; @@ -37,7 +37,7 @@ public class DispenserBlockMixin { private void dispense(ServerLevel world, BlockState state, BlockPos pos, CallbackInfo info) { if (world.isClientSide()) return; - DispenserBlockEntity dispenserBlockEntity = world.getBlockEntity(pos, BlockEntityType.DISPENSER).orElse(null); + DispenserBlockEntity dispenserBlockEntity = world.getBlockEntity(pos, BlockEntityTypes.DISPENSER).orElse(null); if (dispenserBlockEntity == null) return; String action = this.getAction(dispenserBlockEntity); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2a8b0b8..a9f04f3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,8 @@ "scripts-chunk-loaders.mixins.json" ], "depends": { - "fabricloader": ">=0.18.6", - "minecraft": "26.1.2", + "fabricloader": ">=0.19.3", + "minecraft": "26.2", "java": ">=25", "fabric-api": "*" }