From 32d0ba96944e00495e68a67750c8f0a49e694f9b Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 16 Dec 2020 19:06:09 -0400 Subject: [PATCH] 20w51a --- gradle.properties | 4 ++-- src/main/java/carpet/CarpetSettings.java | 4 ++-- .../carpet/mixins/ServerWorld_onePlayerSleepingMixin.java | 4 ++-- src/main/java/carpet/script/api/Inventories.java | 8 ++++---- src/main/java/carpet/script/api/WorldAccess.java | 8 ++++---- src/main/java/carpet/script/utils/WorldTools.java | 2 +- src/main/java/carpet/script/value/EntityValue.java | 6 +++--- src/main/java/carpet/script/value/ValueConversions.java | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index 27470602..ed329661 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=20w49a - yarn_mappings=20w49a+build.8 + minecraft_version=20w51a + yarn_mappings=20w51a+build.1 loader_version=0.10.8 # Mod Properties diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index fc374572..2e608ef1 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -538,8 +538,8 @@ public class CarpetSettings public static boolean waterFlow = true; */ - @Rule(desc = "One player is required on the server to cause night to pass", category = SURVIVAL) - public static boolean onePlayerSleeping = false; + //@Rule(desc = "One player is required on the server to cause night to pass", category = SURVIVAL) + //public static boolean onePlayerSleeping = false; @Rule( desc = "Sets a different motd message on client trying to connect to the server", diff --git a/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java b/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java index 32f8a630..6d2d6fab 100644 --- a/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java +++ b/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; @Mixin(ServerWorld.class) public class ServerWorld_onePlayerSleepingMixin -{ +{/* removed due to 1.17 changes @Shadow @Final private List players; @Shadow private boolean allPlayersSleeping; @@ -49,5 +49,5 @@ public class ServerWorld_onePlayerSleepingMixin return stream.anyMatch((p) -> !p.isSpectator() && p.isSleepingLongEnough()); return stream.noneMatch(predicate); } - +*/ } diff --git a/src/main/java/carpet/script/api/Inventories.java b/src/main/java/carpet/script/api/Inventories.java index 40dfa2e3..0548101f 100644 --- a/src/main/java/carpet/script/api/Inventories.java +++ b/src/main/java/carpet/script/api/Inventories.java @@ -73,7 +73,7 @@ public class Inventories { CarpetContext cc = (CarpetContext)c; TagManager tagManager = cc.s.getMinecraftServer().getTagManager(); String tag = lv.get(0).evalValue(c).getString(); - net.minecraft.tag.Tag itemTag = tagManager.getItems().getTag(new Identifier(tag)); + net.minecraft.tag.Tag itemTag = tagManager.method_33164(Registry.ITEM_KEY).getTag(new Identifier(tag)); if (itemTag == null) return LazyValue.NULL; Value ret = ListValue.wrap(itemTag.values().stream().map(b -> ValueConversions.of(Registry.ITEM.getId(b))).collect(Collectors.toList())); return (_c, _t) -> ret; @@ -85,17 +85,17 @@ public class Inventories { TagManager tagManager = cc.s.getMinecraftServer().getTagManager(); if (lv.size() == 0) { - Value ret = ListValue.wrap(tagManager.getItems().getTagIds().stream().map(ValueConversions::of).collect(Collectors.toList())); + Value ret = ListValue.wrap(tagManager.method_33164(Registry.ITEM_KEY).getTagIds().stream().map(ValueConversions::of).collect(Collectors.toList())); return (_c, _t) -> ret; } Item item = NBTSerializableValue.parseItem(lv.get(0).evalValue(c).getString()).getItem(); if (lv.size() == 1) { - Value ret = ListValue.wrap(tagManager.getItems().getTagsFor(item).stream().map(ValueConversions::of).collect(Collectors.toList())); + Value ret = ListValue.wrap(tagManager.method_33164(Registry.ITEM_KEY).getTagsFor(item).stream().map(ValueConversions::of).collect(Collectors.toList())); return (_c, _t) -> ret; } String tag = lv.get(1).evalValue(c).getString(); - net.minecraft.tag.Tag itemTag = tagManager.getItems().getTag(new Identifier(tag)); + net.minecraft.tag.Tag itemTag = tagManager.method_33164(Registry.ITEM_KEY).getTag(new Identifier(tag)); if (itemTag == null) return LazyValue.NULL; return itemTag.contains(item)?LazyValue.TRUE:LazyValue.FALSE; }); diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index ac558afb..c72b47b0 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -1109,7 +1109,7 @@ public class WorldAccess { CarpetContext cc = (CarpetContext)c; TagManager tagManager = cc.s.getMinecraftServer().getTagManager(); String tag = lv.get(0).evalValue(c).getString(); - net.minecraft.tag.Tag blockTag = tagManager.getBlocks().getTag(new Identifier(tag)); + net.minecraft.tag.Tag blockTag = tagManager.method_33164(Registry.BLOCK_KEY).getTag(new Identifier(tag)); if (blockTag == null) return LazyValue.NULL; Value ret = ListValue.wrap(blockTag.values().stream().map(b -> ValueConversions.of(Registry.BLOCK.getId(b))).collect(Collectors.toList())); return (_c, _t) -> ret; @@ -1121,17 +1121,17 @@ public class WorldAccess { TagManager tagManager = cc.s.getMinecraftServer().getTagManager(); if (lv.size() == 0) { - Value ret = ListValue.wrap(tagManager.getBlocks().getTagIds().stream().map(ValueConversions::of).collect(Collectors.toList())); + Value ret = ListValue.wrap(tagManager.method_33164(Registry.BLOCK_KEY).getTagIds().stream().map(ValueConversions::of).collect(Collectors.toList())); return (_c, _t) -> ret; } BlockArgument blockLocator = BlockArgument.findIn(cc, lv, 0, true); if (blockLocator.offset == lv.size()) { - Value ret = ListValue.wrap(tagManager.getBlocks().getTagsFor(blockLocator.block.getBlockState().getBlock()).stream().map(ValueConversions::of).collect(Collectors.toList())); + Value ret = ListValue.wrap(tagManager.method_33164(Registry.BLOCK_KEY).getTagsFor(blockLocator.block.getBlockState().getBlock()).stream().map(ValueConversions::of).collect(Collectors.toList())); return (_c, _t) -> ret; } String tag = lv.get(blockLocator.offset).evalValue(c).getString(); - net.minecraft.tag.Tag blockTag = tagManager.getBlocks().getTag(new Identifier(tag)); + net.minecraft.tag.Tag blockTag = tagManager.method_33164(Registry.BLOCK_KEY).getTag(new Identifier(tag)); if (blockTag == null) return LazyValue.NULL; return blockLocator.block.getBlockState().isIn(blockTag)?LazyValue.TRUE:LazyValue.FALSE; }); diff --git a/src/main/java/carpet/script/utils/WorldTools.java b/src/main/java/carpet/script/utils/WorldTools.java index 9fd952b4..1993c9a4 100644 --- a/src/main/java/carpet/script/utils/WorldTools.java +++ b/src/main/java/carpet/script/utils/WorldTools.java @@ -97,7 +97,7 @@ public class WorldTools ChunkGenerator chunkGenerator2; DimensionType dimensionType2; if (dimensionOptions == null) { - dimensionType2 = (DimensionType)server.getRegistryManager().getDimensionTypes().getOrThrow(DimensionType.OVERWORLD_REGISTRY_KEY); + dimensionType2 = (DimensionType)server.getRegistryManager().method_33309(Registry.DIMENSION_TYPE_KEY).getOrThrow(DimensionType.OVERWORLD_REGISTRY_KEY); chunkGenerator2 = GeneratorOptions.createOverworldGenerator(server.getRegistryManager().get(Registry.BIOME_KEY), server.getRegistryManager().get(Registry.NOISE_SETTINGS_WORLDGEN), (new Random()).nextLong()); } else { dimensionType2 = dimensionOptions.getDimensionType(); diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 7796ba70..d8961fc3 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -235,7 +235,7 @@ public class EntityValue extends Value positive = false; who = who.substring(1); } - net.minecraft.tag.Tag> eTag = server.getTagManager().getEntityTypes().getTag(new Identifier(who)); + net.minecraft.tag.Tag> eTag = server.getTagManager().method_33164(Registry.ENTITY_TYPE_KEY).getTag(new Identifier(who)); if (eTag == null) throw new InternalExpressionException(who+" is not a valid entity descriptor"); if (positive) { @@ -438,13 +438,13 @@ public class EntityValue extends Value put("tags", (e, a) -> ListValue.wrap(e.getScoreboardTags().stream().map(StringValue::new).collect(Collectors.toList()))); put("scoreboard_tags", (e, a) -> ListValue.wrap(e.getScoreboardTags().stream().map(StringValue::new).collect(Collectors.toList()))); - put("entity_tags", (e, a) -> ListValue.wrap(e.getServer().getTagManager().getEntityTypes().getTagsFor(e.getType()).stream().map(ValueConversions::of).collect(Collectors.toList()))); + put("entity_tags", (e, a) -> ListValue.wrap(e.getServer().getTagManager().method_33164(Registry.ENTITY_TYPE_KEY).getTagsFor(e.getType()).stream().map(ValueConversions::of).collect(Collectors.toList()))); // deprecated put("has_tag", (e, a) -> new NumericValue(e.getScoreboardTags().contains(a.getString()))); put("has_scoreboard_tag", (e, a) -> new NumericValue(e.getScoreboardTags().contains(a.getString()))); put("has_entity_tag", (e, a) -> { - net.minecraft.tag.Tag> tag = e.getServer().getTagManager().getEntityTypes().getTag(new Identifier(a.getString())); + net.minecraft.tag.Tag> tag = e.getServer().getTagManager().method_33164(Registry.ENTITY_TYPE_KEY).getTag(new Identifier(a.getString())); if (tag == null) return Value.NULL; return new NumericValue(e.getType().isIn(tag)); }); diff --git a/src/main/java/carpet/script/value/ValueConversions.java b/src/main/java/carpet/script/value/ValueConversions.java index adb26099..8699dc54 100644 --- a/src/main/java/carpet/script/value/ValueConversions.java +++ b/src/main/java/carpet/script/value/ValueConversions.java @@ -389,7 +389,7 @@ public class ValueConversions BlockPredicateInterface predicateData = (BlockPredicateInterface) blockPredicate; return ListValue.of( predicateData.getCMBlockState()==null?Value.NULL:of(Registry.BLOCK.getId(predicateData.getCMBlockState().getBlock())), - predicateData.getCMBlockTag()==null?Value.NULL:of(tagManager.getBlocks().getTagId(predicateData.getCMBlockTag())), + predicateData.getCMBlockTag()==null?Value.NULL:of(tagManager.method_33164(Registry.BLOCK_KEY).getUncheckedTagId(predicateData.getCMBlockTag())), MapValue.wrap(predicateData.getCMProperties()), predicateData.getCMDataTag() == null?Value.NULL:new NBTSerializableValue(predicateData.getCMDataTag()) );