Skip to content

feat: update to mc26.2 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Craemon merged 1 commit into from
Jun 17, 2026
Merged

feat: update to mc26.2 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ 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
maven_group=io.nihlen.scriptschunkloaders
archives_base_name=scripts-chunk-loaders

# Dependencies
fabric_api_version=0.145.4+26.1.2
fabric_api_version=0.152.1+26.2
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
64 changes: 32 additions & 32 deletions src/gametest/java/io/nihlen/scriptschunkloaders/ScriptsChunkLoadersGameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
);
Expand All @@ -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
);
Expand All @@ -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
);
Expand All @@ -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
);
Expand All @@ -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
);
Expand All @@ -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
);
Expand Down Expand Up @@ -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
);
Expand All @@ -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
);
Expand All @@ -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
);
Expand All @@ -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
);
Expand All @@ -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
);
Expand All @@ -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();
});
});
Expand All @@ -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();
});
});
Expand All @@ -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
);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/nihlen/scriptschunkloaders/mixin/DispenserBlockMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
}
Expand Down
Loading