fix: some oxygen sync related crashes, cleanup accesswidener

marcus8448 · marcus8448 · commit 5a1babeb3c3c · 2021-08-16T14:20:15.000-07:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ val fabric = "0.37.1+1.17"
 val lba = "0.9.0"
 
 group = "dev.galacticraft"
-version ="0.4.0-prealpha.17+$mc"
+version ="0.4.0-prealpha.18+$mc"
 
 base.archivesName.set("GalacticraftAPI")
 
diff --git a/src/main/java/dev/galacticraft/impl/internal/accessor/ChunkOxygenSyncer.java b/src/main/java/dev/galacticraft/impl/internal/accessor/ChunkOxygenSyncer.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 public interface ChunkOxygenSyncer {
-    @NotNull List<@NotNull CustomPayloadS2CPacket> syncToClient();
+    @NotNull List<@NotNull CustomPayloadS2CPacket> syncToClient_gc();
 
     void readOxygenUpdate(byte b, @NotNull PacketByteBuf buf);
 }
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/ChunkHolderMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/ChunkHolderMixin.java
@@ -44,7 +44,7 @@ public abstract class ChunkHolderMixin {
 
     @Inject(method = "flushUpdates", at = @At("HEAD"))
     private void flushOxygen_gc(WorldChunk chunk, CallbackInfo ci) {
-        List<CustomPayloadS2CPacket> packets = ((ChunkOxygenSyncer) chunk).syncToClient();
+        List<CustomPayloadS2CPacket> packets = ((ChunkOxygenSyncer) chunk).syncToClient_gc();
         for (CustomPayloadS2CPacket packet : packets) {
             this.sendPacketToPlayersWatching(packet, false);
         }
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/ChunkSectionMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/ChunkSectionMixin.java
@@ -126,33 +126,43 @@ public boolean getDefaultBreathable_gc() {
     @Override
     public void writeData_gc(PacketByteBuf buf) {
         boolean[] inverted = this.getChangedArray_gc();
-        for (int p = 0; p < (16 * 16 * 16) / 8; p++) {
-            byte b = -128;
-            b += inverted[(p * 8)] ? 1 : 0;
-            b += inverted[(p * 8) + 1] ? 2 : 0;
-            b += inverted[(p * 8) + 2] ? 4 : 0;
-            b += inverted[(p * 8) + 3] ? 8 : 0;
-            b += inverted[(p * 8) + 4] ? 16 : 0;
-            b += inverted[(p * 8) + 5] ? 32 : 0;
-            b += inverted[(p * 8) + 6] ? 64 : 0;
-            b += inverted[(p * 8) + 7] ? 128 : 0;
-            buf.writeByte(b);
+        if (this.inverted == null) {
+            buf.writeBoolean(false);
+        } else {
+            buf.writeBoolean(true);
+            for (int p = 0; p < (16 * 16 * 16) / 8; p++) {
+                byte b = -128;
+                b += inverted[(p * 8)] ? 1 : 0;
+                b += inverted[(p * 8) + 1] ? 2 : 0;
+                b += inverted[(p * 8) + 2] ? 4 : 0;
+                b += inverted[(p * 8) + 3] ? 8 : 0;
+                b += inverted[(p * 8) + 4] ? 16 : 0;
+                b += inverted[(p * 8) + 5] ? 32 : 0;
+                b += inverted[(p * 8) + 6] ? 64 : 0;
+                b += inverted[(p * 8) + 7] ? 128 : 0;
+                buf.writeByte(b);
+            }
         }
     }
 
     @Override
     public void readData_gc(PacketByteBuf buf) {
         boolean[] inverted = this.getChangedArray_gc();
-        for (int i = 0; i < 512; i++) {
-            short b = (short) (buf.readByte() + 128);
-            inverted[(i * 8)] = (b & 1) != 0;
-            inverted[(i * 8) + 1] = (b & 2) != 0;
-            inverted[(i * 8) + 2] = (b & 4) != 0;
-            inverted[(i * 8) + 3] = (b & 8) != 0;
-            inverted[(i * 8) + 4] = (b & 16) != 0;
-            inverted[(i * 8) + 5] = (b & 32) != 0;
-            inverted[(i * 8) + 6] = (b & 64) != 0;
-            inverted[(i * 8) + 7] = (b & 128) != 0;
+        boolean notEmpty = buf.readBoolean();
+        if (notEmpty) {
+            for (int i = 0; i < 512; i++) {
+                short b = (short) (buf.readByte() + 128);
+                inverted[(i * 8)] = (b & 1) != 0;
+                inverted[(i * 8) + 1] = (b & 2) != 0;
+                inverted[(i * 8) + 2] = (b & 4) != 0;
+                inverted[(i * 8) + 3] = (b & 8) != 0;
+                inverted[(i * 8) + 4] = (b & 16) != 0;
+                inverted[(i * 8) + 5] = (b & 32) != 0;
+                inverted[(i * 8) + 6] = (b & 64) != 0;
+                inverted[(i * 8) + 7] = (b & 128) != 0;
+            }
+        } else {
+            this.setChangedArray_gc(null);
         }
     }
 }
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/EmptyChunkMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/EmptyChunkMixin.java
@@ -49,7 +49,7 @@ public void setBreathable(int x, int y, int z, boolean value) {
     }
 
     @Override
-    public @NotNull List<CustomPayloadS2CPacket> syncToClient() {
+    public @NotNull List<CustomPayloadS2CPacket> syncToClient_gc() {
         return Collections.emptyList();
     }
 
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/MinecraftServerAccessor.java b/src/main/java/dev/galacticraft/impl/internal/mixin/MinecraftServerAccessor.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2019-2021 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.impl.internal.mixin;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.World;
+import net.minecraft.world.level.storage.LevelStorage;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+import java.util.concurrent.Executor;
+
+@Mixin(MinecraftServer.class)
+public interface MinecraftServerAccessor {
+    @Accessor("workerExecutor")
+    Executor getWorkerExecutor();
+
+    @Accessor("session")
+    LevelStorage.Session getSession();
+
+    @Accessor("worlds")
+    Map<RegistryKey<World>, ServerWorld> getWorlds();
+}
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/ProtoChunkMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/ProtoChunkMixin.java
@@ -66,7 +66,7 @@ public void setBreathable(int x, int y, int z, boolean value) {
     }
 
     @Override
-    public @NotNull List<CustomPayloadS2CPacket> syncToClient() {
+    public @NotNull List<CustomPayloadS2CPacket> syncToClient_gc() {
         throw new UnsupportedOperationException("ProtoChunks shouldn't be synced");
     }
 
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/WorldChunkMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/WorldChunkMixin.java
@@ -105,14 +105,14 @@ public void setBreathable(int x, int y, int z, boolean value) {
     }
 
     @Override
-    public @NotNull List<CustomPayloadS2CPacket> syncToClient() {
+    public @NotNull List<CustomPayloadS2CPacket> syncToClient_gc() {
         if (update && !world.isClient) {
             update = false;
             List<CustomPayloadS2CPacket> list = new LinkedList<>();
             for (int i = 0; i < 16; i++) {
                 if (updatable[i]) {
                     updatable[i] = false;
-                    PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer(1 + ((16 * 16 * 16) / 8) + (4 * 2), 50 + 1 + ((16 * 16 * 16) / 8) + (4 * 2)).writeByte(i).writeInt(this.pos.x).writeInt(this.pos.z));
+                    PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer(1 + 1 + ((16 * 16 * 16) / 8) + (4 * 2), 50 + 1 + ((16 * 16 * 16) / 8) + (4 * 2)).writeByte(i).writeInt(this.pos.x).writeInt(this.pos.z));
                     ((ChunkSectionOxygenAccessorInternal) sections[i]).writeData_gc(buf);
                     list.add(new CustomPayloadS2CPacket(new Identifier(Constant.MOD_ID, "oxygen_update"), buf));
                 }
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/client/AbstractClientPlayerEntityMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/client/AbstractClientPlayerEntityMixin.java
@@ -57,19 +57,19 @@ private FullFixedItemInv createInv() {
         FullFixedItemInv inv = new FullFixedItemInv(12);
         inv.setOwnerListener((invView, slot, prev, current) -> {
             if (current.getItem() instanceof Accessory accessory && accessory.enablesHearing()) {
-                ((SoundSystemAccessor) MinecraftClient.getInstance().getSoundManager().soundSystem).gc_updateAtmosphericMultiplier(1.0f);
+                ((SoundSystemAccessor) ((SoundManagerAccessor)MinecraftClient.getInstance().getSoundManager()).getSoundSystem()).gc_updateAtmosphericMultiplier(1.0f);
             } else if (prev.getItem() instanceof Accessory accessory && accessory.enablesHearing()) {
                 boolean hasFreqModule = false;
                 for (int i = 0; i < invView.getSlotCount(); i++) {
                     if (i == slot) continue;
                     if (invView.getInvStack(i).getItem() instanceof Accessory accessory2 && accessory2.enablesHearing()) {
-                        ((SoundSystemAccessor) MinecraftClient.getInstance().getSoundManager().soundSystem).gc_updateAtmosphericMultiplier(1.0f);
+                        ((SoundSystemAccessor) ((SoundManagerAccessor)MinecraftClient.getInstance().getSoundManager()).getSoundSystem()).gc_updateAtmosphericMultiplier(1.0f);
                         hasFreqModule = true;
                         break;
                     }
                 }
                 if (!hasFreqModule) {
-                    ((SoundSystemAccessor) MinecraftClient.getInstance().getSoundManager().soundSystem)
+                    ((SoundSystemAccessor) ((SoundManagerAccessor)MinecraftClient.getInstance().getSoundManager()).getSoundSystem())
                             .gc_updateAtmosphericMultiplier(CelestialBody.getByDimension(this.clientWorld)
                                     .map(body -> body.atmosphere().pressure()).orElse(1.0f));
                 }
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/client/MinecraftClientMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/client/MinecraftClientMixin.java
@@ -46,9 +46,9 @@ public abstract class MinecraftClientMixin {
     @Inject(method = "setWorld", at = @At("RETURN"))
     private void gc_updateSoundMultiplier(ClientWorld world, CallbackInfo ci) {
         if (world != null) {
-            ((SoundSystemAccessor) this.getSoundManager().soundSystem).gc_updateAtmosphericMultiplier(CelestialBody.getByDimension(world).map(body -> body.atmosphere().pressure()).orElse(1.0f));
+            ((SoundSystemAccessor) ((SoundManagerAccessor)this.getSoundManager()).getSoundSystem()).gc_updateAtmosphericMultiplier(CelestialBody.getByDimension(world).map(body -> body.atmosphere().pressure()).orElse(1.0f));
         } else {
-            ((SoundSystemAccessor) this.getSoundManager().soundSystem).gc_updateAtmosphericMultiplier(1.0f);
+            ((SoundSystemAccessor) ((SoundManagerAccessor)this.getSoundManager()).getSoundSystem()).gc_updateAtmosphericMultiplier(1.0f);
         }
     }
 }
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/client/ParticleAccessor.java b/src/main/java/dev/galacticraft/impl/internal/mixin/client/ParticleAccessor.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019-2021 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.impl.internal.mixin.client;
+
+import net.minecraft.client.particle.Particle;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Particle.class)
+public interface ParticleAccessor {
+    @Accessor("gravityStrength")
+    float getGravityStrength();
+
+    @Accessor("gravityStrength")
+    void setGravityStrength(float gravityStrength);
+}
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/client/ParticleManagerMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/client/ParticleManagerMixin.java
@@ -41,6 +41,6 @@ public abstract class ParticleManagerMixin {
 
     @Inject(method = "addParticle(Lnet/minecraft/client/particle/Particle;)V", at = @At("RETURN"))
     protected void overrideGravity_gc(Particle particle, CallbackInfo ci) {
-        CelestialBody.getByDimension(this.world).ifPresent(celestialBodyType -> particle.gravityStrength *= celestialBodyType.gravity());
+        CelestialBody.getByDimension(this.world).ifPresent(celestialBodyType -> ((ParticleAccessor) particle).setGravityStrength(((ParticleAccessor) particle).getGravityStrength() * celestialBodyType.gravity()));
     }
 }
diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/client/SoundManagerAccessor.java b/src/main/java/dev/galacticraft/impl/internal/mixin/client/SoundManagerAccessor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019-2021 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.impl.internal.mixin.client;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.sound.SoundManager;
+import net.minecraft.client.sound.SoundSystem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(SoundManager.class)
+@Environment(EnvType.CLIENT)
+public interface SoundManagerAccessor {
+    @Accessor("soundSystem")
+    SoundSystem getSoundSystem();
+}
diff --git a/src/main/java/dev/galacticraft/impl/universe/celestialbody/type/SatelliteType.java b/src/main/java/dev/galacticraft/impl/universe/celestialbody/type/SatelliteType.java
@@ -36,6 +36,7 @@
 import dev.galacticraft.api.universe.galaxy.Galaxy;
 import dev.galacticraft.api.universe.position.CelestialPosition;
 import dev.galacticraft.impl.Constant;
+import dev.galacticraft.impl.internal.mixin.MinecraftServerAccessor;
 import dev.galacticraft.impl.internal.world.gen.SatelliteChunkGenerator;
 import dev.galacticraft.impl.internal.world.gen.biome.GcApiBiomes;
 import dev.galacticraft.impl.universe.display.config.IconCelestialDisplayConfig;
@@ -130,9 +131,9 @@ public static CelestialBody<SatelliteConfig, SatelliteType> create(Identifier id
         DimensionType dimensionType3 = options.getDimensionType();
         ChunkGenerator chunkGenerator3 = options.getChunkGenerator();
         UnmodifiableLevelProperties unmodifiableLevelProperties = new UnmodifiableLevelProperties(server.getSaveProperties(), server.getSaveProperties().getMainWorldProperties());
-        ServerWorld serverWorld2 = new ServerWorld(server, server.workerExecutor, server.session, unmodifiableLevelProperties, RegistryKey.of(Registry.WORLD_KEY, id), dimensionType3, EMPTY_PROGRESS_LISTENER, chunkGenerator3, server.getSaveProperties().getGeneratorOptions().isDebugWorld(), BiomeAccess.hashSeed(server.getSaveProperties().getGeneratorOptions().getSeed()), ImmutableList.of(), false);
+        ServerWorld serverWorld2 = new ServerWorld(server, ((MinecraftServerAccessor) server).getWorkerExecutor(), ((MinecraftServerAccessor) server).getSession(), unmodifiableLevelProperties, RegistryKey.of(Registry.WORLD_KEY, id), dimensionType3, EMPTY_PROGRESS_LISTENER, chunkGenerator3, server.getSaveProperties().getGeneratorOptions().isDebugWorld(), BiomeAccess.hashSeed(server.getSaveProperties().getGeneratorOptions().getSeed()), ImmutableList.of(), false);
         server.getWorld(World.OVERWORLD).getWorldBorder().addListener(new WorldBorderListener.WorldBorderSyncer(serverWorld2.getWorldBorder()));
-        server.worlds.put(RegistryKey.of(Registry.WORLD_KEY, id), serverWorld2);
+        ((MinecraftServerAccessor) server).getWorlds().put(RegistryKey.of(Registry.WORLD_KEY, id), serverWorld2);
 
         for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList()) {
             NbtCompound compound = (NbtCompound) SatelliteConfig.CODEC.encode(satellite.config(), NbtOps.INSTANCE, new NbtCompound()).get().orThrow();
diff --git a/src/main/resources/galacticraft-api.accesswidener b/src/main/resources/galacticraft-api.accesswidener
@@ -1,12 +1,2 @@
 accessWidener v1 named
 accessible class net/minecraft/util/registry/DynamicRegistryManager$Info
-accessible method net/minecraft/util/dynamic/RegistryOps decodeOrId (Ljava/lang/Object;Lnet/minecraft/util/registry/RegistryKey;Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/DataResult;
-accessible method net/minecraft/util/dynamic/RegistryReadingOps encodeOrId (Ljava/lang/Object;Ljava/lang/Object;Lnet/minecraft/util/registry/RegistryKey;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult;
-accessible method net/minecraft/world/dimension/DimensionType <init> (Ljava/util/OptionalLong;ZZZZDZZZZZILnet/minecraft/world/biome/source/BiomeAccessType;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;F)V
-accessible field net/minecraft/server/MinecraftServer workerExecutor Ljava/util/concurrent/Executor;
-accessible field net/minecraft/server/MinecraftServer session Lnet/minecraft/world/level/storage/LevelStorage$Session;
-accessible field net/minecraft/server/MinecraftServer worlds Ljava/util/Map;
-accessible field net/minecraft/client/particle/Particle gravityStrength F
-accessible method net/minecraft/world/biome/BuiltinBiomes register (ILnet/minecraft/util/registry/RegistryKey;Lnet/minecraft/world/biome/Biome;)Lnet/minecraft/world/biome/Biome;
-accessible method net/minecraft/util/dynamic/RegistryOps <init> (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/util/dynamic/RegistryOps$EntryLoader;Lnet/minecraft/util/registry/DynamicRegistryManager$Impl;Ljava/util/IdentityHashMap;)V
-accessible field net/minecraft/client/sound/SoundManager soundSystem Lnet/minecraft/client/sound/SoundSystem;
diff --git a/src/main/resources/gc-api.mixins.json b/src/main/resources/gc-api.mixins.json
@@ -12,13 +12,16 @@
     "EmptyChunkMixin",
     "EntityGravityMixin",
     "LivingEntityMixin",
+    "MinecraftServerAccessor",
     "MinecraftServerMixin",
     "PlayerManagerMixin",
     "ProtoChunkMixin",
     "ReadOnlyChunkMixin",
     "ServerPlayerEntityMixin",
     "WorldChunkMixin",
-    "WorldMixin"
+    "WorldMixin",
+    "client.ParticleAccessor",
+    "client.SoundManagerAccessor"
   ],
   "client": [
     "client.AbstractClientPlayerEntityMixin",

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`import java.util.List;`
`30`	`30`
`31`	`31`	`public interface ChunkOxygenSyncer {`
`32`		`- @NotNull List<@NotNull CustomPayloadS2CPacket> syncToClient();`
	`32`	`+ @NotNull List<@NotNull CustomPayloadS2CPacket> syncToClient_gc();`
`33`	`33`
`34`	`34`	`void readOxygenUpdate(byte b, @NotNull PacketByteBuf buf);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public abstract class ChunkHolderMixin {`
`44`	`44`
`45`	`45`	`@Inject(method = "flushUpdates", at = @At("HEAD"))`
`46`	`46`	`private void flushOxygen_gc(WorldChunk chunk, CallbackInfo ci) {`
`47`		`- List<CustomPayloadS2CPacket> packets = ((ChunkOxygenSyncer) chunk).syncToClient();`
	`47`	`+ List<CustomPayloadS2CPacket> packets = ((ChunkOxygenSyncer) chunk).syncToClient_gc();`
`48`	`48`	`for (CustomPayloadS2CPacket packet : packets) {`
`49`	`49`	`this.sendPacketToPlayersWatching(packet, false);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void setBreathable(int x, int y, int z, boolean value) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
`52`		`- public @NotNull List<CustomPayloadS2CPacket> syncToClient() {`
	`52`	`+ public @NotNull List<CustomPayloadS2CPacket> syncToClient_gc() {`
`53`	`53`	`return Collections.emptyList();`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void setBreathable(int x, int y, int z, boolean value) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`
`69`		`- public @NotNull List<CustomPayloadS2CPacket> syncToClient() {`
	`69`	`+ public @NotNull List<CustomPayloadS2CPacket> syncToClient_gc() {`
`70`	`70`	`throw new UnsupportedOperationException("ProtoChunks shouldn't be synced");`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ public abstract class MinecraftClientMixin {`
`46`	`46`	`@Inject(method = "setWorld", at = @At("RETURN"))`
`47`	`47`	`private void gc_updateSoundMultiplier(ClientWorld world, CallbackInfo ci) {`
`48`	`48`	`if (world != null) {`
`49`		`- ((SoundSystemAccessor) this.getSoundManager().soundSystem).gc_updateAtmosphericMultiplier(CelestialBody.getByDimension(world).map(body -> body.atmosphere().pressure()).orElse(1.0f));`
	`49`	`+ ((SoundSystemAccessor) ((SoundManagerAccessor)this.getSoundManager()).getSoundSystem()).gc_updateAtmosphericMultiplier(CelestialBody.getByDimension(world).map(body -> body.atmosphere().pressure()).orElse(1.0f));`
`50`	`50`	`} else {`
`51`		`- ((SoundSystemAccessor) this.getSoundManager().soundSystem).gc_updateAtmosphericMultiplier(1.0f);`
	`51`	`+ ((SoundSystemAccessor) ((SoundManagerAccessor)this.getSoundManager()).getSoundSystem()).gc_updateAtmosphericMultiplier(1.0f);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`