From a09ab80b4eb1be8b5c122b4f760dec131cae2585 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 11 Mar 2020 15:39:28 -0300 Subject: [PATCH] 20w11a --- gradle.properties | 4 ++-- src/main/java/carpet/helpers/FeatureGenerator.java | 2 +- .../mixins/ExplosiveProjectileEntity_extremeMixin.java | 10 +--------- src/main/java/carpet/mixins/IntegratedServerMixin.java | 3 ++- .../carpet/mixins/MinecraftDedicatedServerMixin.java | 2 +- .../java/carpet/mixins/MinecraftServer_coreMixin.java | 3 ++- .../mixins/ServerWorld_onePlayerSleepingMixin.java | 2 +- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2bc77b63..8e232746 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=20w10a - yarn_mappings=20w10a+build.20 + minecraft_version=20w11a + yarn_mappings=20w11a+build.1 loader_version=0.7.8+build.187 # Mod Properties diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index e3091b8a..bbf75e1a 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -89,7 +89,7 @@ public class FeatureGenerator @Override public BiomeSource getBiomeSource() { - return new VanillaLayeredBiomeSource(new VanillaLayeredBiomeSourceConfig(w.getLevelProperties())) + return new VanillaLayeredBiomeSource(new VanillaLayeredBiomeSourceConfig(w.getLevelProperties().getSeed())) { @Override public Biome getBiomeForNoiseGen(int i, int j, int k) diff --git a/src/main/java/carpet/mixins/ExplosiveProjectileEntity_extremeMixin.java b/src/main/java/carpet/mixins/ExplosiveProjectileEntity_extremeMixin.java index 6a03d9f1..326f1582 100644 --- a/src/main/java/carpet/mixins/ExplosiveProjectileEntity_extremeMixin.java +++ b/src/main/java/carpet/mixins/ExplosiveProjectileEntity_extremeMixin.java @@ -11,13 +11,5 @@ import java.util.Random; @Mixin(ExplosiveProjectileEntity.class) public class ExplosiveProjectileEntity_extremeMixin { - @Redirect(method = "(Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/LivingEntity;DDDLnet/minecraft/world/World;)V", - expect = 3, at = @At( - value = "INVOKE", - target = "Ljava/util/Random;nextGaussian()D" - )) - private double nextGauBian(Random random) - { - return RandomTools.nextGauBian(random); - } + //intentonally left blank until becomes master } diff --git a/src/main/java/carpet/mixins/IntegratedServerMixin.java b/src/main/java/carpet/mixins/IntegratedServerMixin.java index c81dbf84..761663a6 100644 --- a/src/main/java/carpet/mixins/IntegratedServerMixin.java +++ b/src/main/java/carpet/mixins/IntegratedServerMixin.java @@ -2,6 +2,7 @@ package carpet.mixins; import carpet.CarpetServer; import com.google.gson.JsonElement; +import net.minecraft.class_4952; import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.world.level.LevelGeneratorType; import org.spongepowered.asm.mixin.Mixin; @@ -13,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class IntegratedServerMixin { @Inject(method = "loadWorld", at = @At("HEAD")) - private void onSetupServerIntegrated(String string_1, String string_2, long long_1, LevelGeneratorType levelGeneratorType_1, JsonElement jsonElement_1, CallbackInfo ci) { + private void onSetupServerIntegrated(String name, String serverName, long seed, class_4952 arg, CallbackInfo ci) { CarpetServer.onServerLoaded((IntegratedServer) (Object) this); } } diff --git a/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java b/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java index a9cf010a..3944610a 100644 --- a/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java +++ b/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java @@ -14,7 +14,7 @@ public class MinecraftDedicatedServerMixin // this.tickWorlds(booleanSupplier_1); @Inject(method = "setupServer", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld(Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/world/level/LevelGeneratorType;Lcom/google/gson/JsonElement;)V", + target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld(Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/class_4952;)V", shift = At.Shift.BEFORE )) private void onSetupServer(CallbackInfoReturnable cir) { diff --git a/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java b/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java index 5d5e330e..e02d9b77 100644 --- a/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java +++ b/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java @@ -2,6 +2,7 @@ package carpet.mixins; import carpet.CarpetServer; import com.google.gson.JsonElement; +import net.minecraft.class_4952; import net.minecraft.server.MinecraftServer; import net.minecraft.world.level.LevelGeneratorType; import org.spongepowered.asm.mixin.Mixin; @@ -31,7 +32,7 @@ public abstract class MinecraftServer_coreMixin // Dedicated server only @Inject(method = "loadWorld", at = @At("HEAD")) - private void serverLoaded(String string_1, String string_2, long long_1, LevelGeneratorType levelGeneratorType_1, JsonElement jsonElement_1, CallbackInfo ci) + private void serverLoaded(String name, String serverName, long seed, class_4952 arg, CallbackInfo ci) { CarpetServer.onServerLoaded((MinecraftServer) (Object) this); } diff --git a/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java b/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java index f74ded3a..32f8a630 100644 --- a/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java +++ b/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java @@ -22,7 +22,7 @@ public class ServerWorld_onePlayerSleepingMixin @Shadow private boolean allPlayersSleeping; - @Inject(method = "updatePlayersSleeping", cancellable = true, at = @At("HEAD")) + @Inject(method = "updateSleepingPlayers", cancellable = true, at = @At("HEAD")) private void updateOnePlayerSleeping(CallbackInfo ci) { if(CarpetSettings.onePlayerSleeping)