From 1642976d0daf9b02ed73203a3a8d0fad823ef511 Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 4 Nov 2021 00:34:40 +0100 Subject: [PATCH] 21w44a --- gradle.properties | 8 ++++---- .../carpet/fakes/ClientSettingsC2SPacketInterface.java | 2 +- .../mixins/BarrierBlock_updateSuppressionBlockMixin.java | 2 +- .../mixins/ClientSettingsC2SPacket_scarpetMixin.java | 6 ++++-- .../mixins/ServerPlayerEntity_scarpetEventMixin.java | 2 +- src/main/java/carpet/mixins/StructureFeatureMixin.java | 2 +- .../java/carpet/mixins/WorldChunk_movableTEMixin.java | 6 +++--- .../java/carpet/mixins/World_getOtherEntitiesLimited.java | 2 +- src/main/java/carpet/script/utils/ShapesRenderer.java | 2 +- src/main/resources/carpet.mixins.json | 1 - 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7a8ac218..da90465b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=21w43a - yarn_mappings=21w43a+build.2 - loader_version=0.12.3 - fabric_version=0.41.2+1.18 + minecraft_version=21w44a + yarn_mappings=21w44a+build.1 + loader_version=0.12.4 + fabric_version=0.41.4+1.18 # Mod Properties mod_version = 1.4.51 diff --git a/src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java b/src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java index c881ee95..d2c6c887 100644 --- a/src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java +++ b/src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java @@ -1,5 +1,5 @@ package carpet.fakes; public interface ClientSettingsC2SPacketInterface { - public String getLanguage(); + //public String getLanguage(); } diff --git a/src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java b/src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java index ffa5bfc9..44b5665c 100644 --- a/src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java +++ b/src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java @@ -33,7 +33,7 @@ public class BarrierBlock_updateSuppressionBlockMixin extends Block { BlockState stateAbove = world.getBlockState(fromPos); if (stateAbove.isOf(Blocks.ACTIVATOR_RAIL) && !stateAbove.get(PoweredRailBlock.POWERED)) { if (CarpetSettings.updateSuppressionBlockSetting > 0) { - world.method_39279(pos, this, CarpetSettings.updateSuppressionBlockSetting);// schedule tick + world.createAndScheduleBlockTick(pos, this, CarpetSettings.updateSuppressionBlockSetting); } throw new StackOverflowError("updateSuppressionBlock"); } diff --git a/src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java b/src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java index 66a722c8..c4e93cd8 100644 --- a/src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java +++ b/src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java @@ -2,17 +2,19 @@ package carpet.mixins; import carpet.fakes.ClientSettingsC2SPacketInterface; import net.minecraft.network.packet.c2s.play.ClientSettingsC2SPacket; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Mixin(ClientSettingsC2SPacket.class) +//@Mixin(ClientSettingsC2SPacket.class) public class ClientSettingsC2SPacket_scarpetMixin implements ClientSettingsC2SPacketInterface { + /* @Final @Shadow private String language; @Override public String getLanguage(){ return this.language; - } + }*/ } diff --git a/src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java b/src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java index 6ef2e4e0..08445276 100644 --- a/src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java @@ -138,6 +138,6 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity @Inject(method = "setClientSettings", at = @At("HEAD")) public void setClientSettings(ClientSettingsC2SPacket packet, CallbackInfo ci){ - this.language = ((ClientSettingsC2SPacketInterface) packet).getLanguage(); + this.language = packet.language(); } } diff --git a/src/main/java/carpet/mixins/StructureFeatureMixin.java b/src/main/java/carpet/mixins/StructureFeatureMixin.java index f1400b12..5a96bc7c 100644 --- a/src/main/java/carpet/mixins/StructureFeatureMixin.java +++ b/src/main/java/carpet/mixins/StructureFeatureMixin.java @@ -73,7 +73,7 @@ public abstract class StructureFeatureMixin implements if (!wireOnly) { Registry> registry3 = world.getRegistryManager().get(Registry.STRUCTURE_FEATURE_KEY); - world.method_36972(() -> { + world.setCurrentlyGeneratingStructureName(() -> { Objects.requireNonNull(thiss); return registry3.getKey(thiss).map(Object::toString).orElseGet(thiss::toString); }); diff --git a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java index 43c39f3d..b9bc2f35 100644 --- a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java +++ b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java @@ -7,7 +7,6 @@ import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.PistonExtensionBlock; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.class_6752; //import net.minecraft.fluid.Fluid; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; @@ -17,6 +16,7 @@ import net.minecraft.world.Heightmap; //import net.minecraft.world.TickScheduler; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.BlendingData; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.chunk.UpgradeData; @@ -35,9 +35,9 @@ public abstract class WorldChunk_movableTEMixin extends Chunk implements WorldCh @Final World world; - public WorldChunk_movableTEMixin(ChunkPos chunkPos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry registry, long l, @Nullable ChunkSection[] chunkSections, @Nullable class_6752 arg) + public WorldChunk_movableTEMixin(ChunkPos chunkPos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry registry, long l, @Nullable ChunkSection[] chunkSections, @Nullable BlendingData blendingData) { - super(chunkPos, upgradeData, heightLimitView, registry, l, chunkSections, arg); + super(chunkPos, upgradeData, heightLimitView, registry, l, chunkSections, blendingData); } @Shadow diff --git a/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java b/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java index 14b864f7..ee2d73b9 100644 --- a/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java +++ b/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java @@ -24,7 +24,7 @@ public abstract class World_getOtherEntitiesLimited implements WorldInterface { @Override public List getOtherEntitiesLimited(@Nullable Entity except, Box box, Predicate predicate, int limit) { - this.getProfiler().method_39278("getEntities"); // visit + this.getProfiler().visit("getEntities"); // visit AtomicInteger checkedEntities = new AtomicInteger(); List list = Lists.newArrayList(); try { diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java index 889ca9eb..7a86f26b 100644 --- a/src/main/java/carpet/script/utils/ShapesRenderer.java +++ b/src/main/java/carpet/script/utils/ShapesRenderer.java @@ -90,7 +90,7 @@ public class ShapesRenderer ); MatrixStack matrixStack = RenderSystem.getModelViewStack(); matrixStack.push(); - matrixStack.method_34425(matrices.peek().getPositionMatrix()); + matrixStack.multiplyPositionMatrix(matrices.peek().getPositionMatrix()); RenderSystem.applyModelViewMatrix(); // lines diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index f2dea9dd..85774352 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -82,7 +82,6 @@ "ExperienceOrbEntityMixin", "PlayerActionC2SPacketMixin", "ServerPlayerEntityMixin", - "ClientSettingsC2SPacket_scarpetMixin", "PlayerManager_coreMixin", "PlayerManager_fakePlayersMixin", "RedstoneWireBlockMixin",