From 074fd910cf783548a0d86976bec8a252ce2e15cd Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 20 Oct 2021 23:05:27 -0300 Subject: [PATCH] 21w42a --- gradle.properties | 4 ++-- .../carpet/mixins/MinecraftServer_tickspeedMixin.java | 4 ++-- src/main/java/carpet/mixins/VillagerEntity_aiMixin.java | 8 +++++--- src/main/java/carpet/script/utils/WorldTools.java | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index e4d58a33..8b528be0 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=21w41a - yarn_mappings=21w41a+build.21 + minecraft_version=21w42a + yarn_mappings=21w42a+build.1 loader_version=0.12.2 fabric_version=0.41.1+1.18 diff --git a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java index 6a94c2eb..c1bbe957 100644 --- a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java +++ b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java @@ -193,7 +193,7 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantThreadExec @Inject(method = "tick", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/PlayerManager;saveAllPlayerData()V", + target = "Lnet/minecraft/server/MinecraftServer;method_39218(ZZZ)Z", // save shift = At.Shift.BEFORE )) private void startAutosave(BooleanSupplier booleanSupplier_1, CallbackInfo ci) @@ -203,7 +203,7 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantThreadExec @Inject(method = "tick", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/MinecraftServer;save(ZZZ)Z", + target = "Lnet/minecraft/server/MinecraftServer;method_39218(ZZZ)Z", shift = At.Shift.AFTER )) private void finishAutosave(BooleanSupplier booleanSupplier_1, CallbackInfo ci) diff --git a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java index 37a403a7..a41e9170 100644 --- a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java +++ b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java @@ -5,6 +5,7 @@ import carpet.fakes.MemoryInterface; import carpet.helpers.ParticleDisplay; import carpet.utils.Messenger; import carpet.utils.MobAI; +import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.brain.Activity; import net.minecraft.entity.ai.brain.Memory; @@ -16,6 +17,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BedItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.particle.BlockStateParticleEffect; import net.minecraft.particle.ParticleTypes; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; @@ -125,7 +127,7 @@ public abstract class VillagerEntity_aiMixin extends MerchantEntity if (bedPos == null || bedPos.getDimension() != world.getRegistryKey()) // get Dimension { sayNo(); - ((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, getX(), getY() + getStandingEyeHeight() + 1, getZ(), 1, 0.1, 0.1, 0.1, 0.0); + ((ServerWorld) getEntityWorld()).spawnParticles(new BlockStateParticleEffect(ParticleTypes.BLOCK_MARKER, Blocks.BARRIER.getDefaultState()), getX(), getY() + getStandingEyeHeight() + 1, getZ(), 1, 0.1, 0.1, 0.1, 0.0); } else { @@ -158,7 +160,7 @@ public abstract class VillagerEntity_aiMixin extends MerchantEntity pv.x, pv.y+1, pv.z, 50, 0.1, 0.3, 0.1, 0.0); else - ((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, + ((ServerWorld) getEntityWorld()).spawnParticles(new BlockStateParticleEffect(ParticleTypes.BLOCK_MARKER, Blocks.BARRIER.getDefaultState()), pv.x, pv.y+1, pv.z, 1, 0.1, 0.1, 0.1, 0.0); } @@ -184,7 +186,7 @@ public abstract class VillagerEntity_aiMixin extends MerchantEntity { if (MobAI.isTracking(this, MobAI.TrackingType.IRON_GOLEM_SPAWNING)) { - ((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, getX(), getY()+3, getZ(), 1, 0.1, 0.1, 0.1, 0.0); + ((ServerWorld) getEntityWorld()).spawnParticles(new BlockStateParticleEffect(ParticleTypes.BLOCK_MARKER, Blocks.BARRIER.getDefaultState()), getX(), getY()+3, getZ(), 1, 0.1, 0.1, 0.1, 0.0); } } diff --git a/src/main/java/carpet/script/utils/WorldTools.java b/src/main/java/carpet/script/utils/WorldTools.java index c08268a5..529c459f 100644 --- a/src/main/java/carpet/script/utils/WorldTools.java +++ b/src/main/java/carpet/script/utils/WorldTools.java @@ -99,7 +99,7 @@ public class WorldTools DimensionType dimensionType2; if (dimensionOptions == null) { dimensionType2 = server.getRegistryManager().getMutable(Registry.DIMENSION_TYPE_KEY).getOrThrow(DimensionType.OVERWORLD_REGISTRY_KEY); - chunkGenerator2 = GeneratorOptions.createOverworldGenerator(server.getRegistryManager().get(Registry.BIOME_KEY), server.getRegistryManager().get(Registry.CHUNK_GENERATOR_SETTINGS_KEY), (new Random()).nextLong()); + chunkGenerator2 = GeneratorOptions.createOverworldGenerator(server.getRegistryManager(), (new Random()).nextLong()); } else { dimensionType2 = dimensionOptions.getDimensionType(); chunkGenerator2 = dimensionOptions.getChunkGenerator(); @@ -114,7 +114,7 @@ public class WorldTools // return server.getRegistryManager().get(Registry.CHUNK_GENERATOR_SETTINGS_KEY).getOrThrow(ChunkGeneratorSettings.OVERWORLD); //}); - chunkGenerator2 = new NoiseChunkGenerator(MultiNoiseBiomeSource.Preset.OVERWORLD.getBiomeSource(server.getRegistryManager().get(Registry.BIOME_KEY)), seed, () -> { + chunkGenerator2 = new NoiseChunkGenerator(server.getRegistryManager().get(Registry.NOISE_WORLDGEN), MultiNoiseBiomeSource.Preset.OVERWORLD.getBiomeSource(server.getRegistryManager().get(Registry.BIOME_KEY)), seed, () -> { return server.getRegistryManager().get(Registry.CHUNK_GENERATOR_SETTINGS_KEY).getOrThrow(ChunkGeneratorSettings.OVERWORLD); });