icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.16-pre2

Browse Source
This commit is contained in:
gnembon committed 2020-06-05 13:48:15 -03:00
1 parent d4c0c7307b
commit a15da8c007
3 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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