From 9cdc29731451beea0fa4013397e27c056002c1de Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 14 Jul 2021 01:07:19 -0300 Subject: [PATCH] 1.18 exp1 --- src/main/java/carpet/commands/PlayerCommand.java | 2 +- src/main/java/carpet/patches/EntityPlayerMPFake.java | 2 +- src/main/java/carpet/script/utils/BiomeInfo.java | 4 ++-- src/main/resources/fabric.mod.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/carpet/commands/PlayerCommand.java b/src/main/java/carpet/commands/PlayerCommand.java index b849276b..a9e07756 100644 --- a/src/main/java/carpet/commands/PlayerCommand.java +++ b/src/main/java/carpet/commands/PlayerCommand.java @@ -189,7 +189,7 @@ public class PlayerCommand Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is already logged on"); return true; } - GameProfile profile = server.getUserCache().findByName(playerName).orElse(null); + GameProfile profile = server.getUserCache().method_14515(playerName); // findByName .orElse(null) if (profile == null) { if (!CarpetSettings.allowSpawningOfflinePlayers) diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 19dafed4..4041232b 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -40,7 +40,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity UserCache.setUseRemote(false); GameProfile gameprofile; try { - gameprofile = server.getUserCache().findByName(username).orElse(null); + gameprofile = server.getUserCache().method_14515(username); //findByName .orElse(null) } finally { UserCache.setUseRemote(server.isDedicated() && server.isOnlineMode()); diff --git a/src/main/java/carpet/script/utils/BiomeInfo.java b/src/main/java/carpet/script/utils/BiomeInfo.java index 13603ca2..19477dd1 100644 --- a/src/main/java/carpet/script/utils/BiomeInfo.java +++ b/src/main/java/carpet/script/utils/BiomeInfo.java @@ -33,8 +33,8 @@ public class BiomeInfo put("water_fog_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMWaterFogColor())); put("humidity", (w, b) -> NumericValue.of(b.getDownfall())); put("precipitation", (w, b) -> StringValue.of(b.getPrecipitation().getName())); - put("depth", (w, b) -> NumericValue.of(b.getDepth())); - put("scale", (w, b) -> NumericValue.of(b.getScale())); + //put("depth", (w, b) -> NumericValue.of(b.getDepth())); + //put("scale", (w, b) -> NumericValue.of(b.getScale())); put("features", (w, b) -> { Registry> registry = w.getRegistryManager().get(Registry.CONFIGURED_FEATURE_KEY); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e5329f06..4528f125 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,8 +32,8 @@ "accessWidener" : "carpet.accesswidener", "depends": { - "minecraft": "1.17.x", - "fabricloader": ">=0.11.3", + "minecraft": "1.18.x", + "fabricloader": ">=0.11.6", "java": ">=16" } }