diff --git a/gradle.properties b/gradle.properties index d4a20396..f1a7d909 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.16-pre1 - yarn_mappings=1.16-pre1+build.1 + minecraft_version=1.16-pre2 + yarn_mappings=1.16-pre2+build.1 loader_version=0.8.7+build.201 # Mod Properties diff --git a/src/main/java/carpet/mixins/CommandManagerMixin.java b/src/main/java/carpet/mixins/CommandManagerMixin.java index 94842611..c2677cbf 100644 --- a/src/main/java/carpet/mixins/CommandManagerMixin.java +++ b/src/main/java/carpet/mixins/CommandManagerMixin.java @@ -25,7 +25,7 @@ public abstract class CommandManagerMixin private CommandDispatcher dispatcher; @Inject(method = "", at = @At("RETURN")) - private void onRegister(CommandManager.class_5364 arg, CallbackInfo ci) { + private void onRegister(CommandManager.RegistrationEnvironment arg, CallbackInfo ci) { CarpetServer.registerCarpetCommands(this.dispatcher); } diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 25f435ef..38a63113 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -1332,21 +1332,21 @@ public class CarpetExpression if (radius < 1 || radius > 32) throw new InternalExpressionException("Ticket radius should be between 1 and 32 chunks"); // due to types we will wing it: ChunkPos target = new ChunkPos(pos); - if (ticket == ChunkTicketType.PORTAL) - cc.s.getWorld().getChunkManager().addTicket(ChunkTicketType.PORTAL, target, radius, pos); - else if (ticket == ChunkTicketType.POST_TELEPORT) - cc.s.getWorld().getChunkManager().addTicket(ChunkTicketType.POST_TELEPORT, target, radius, 1); + if (ticket == ChunkTicketType.field_19280) // portal + cc.s.getWorld().getChunkManager().addTicket(ChunkTicketType.field_19280, target, radius, pos); + else if (ticket == ChunkTicketType.field_19347) // post teleport + cc.s.getWorld().getChunkManager().addTicket(ChunkTicketType.field_19347, target, radius, 1); else - cc.s.getWorld().getChunkManager().addTicket(ChunkTicketType.UNKNOWN, target, radius, target); + cc.s.getWorld().getChunkManager().addTicket(ChunkTicketType.field_14032, target, radius, target); Value ret = new NumericValue(ticket.getExpiryTicks()); return (_c, _t) -> ret; }); } private Map> ticketTypes = new HashMap>(){{ - put("portal", ChunkTicketType.PORTAL); - put("teleport", ChunkTicketType.POST_TELEPORT); - put("unknown", ChunkTicketType.UNKNOWN); + put("portal", ChunkTicketType.field_19280); + put("teleport", ChunkTicketType.field_19347); + put("unknown", ChunkTicketType.field_14032); // unknown }}; private static String getScoreboardKeyFromValue(Value keyValue)