Anti-Xray rewrite for 1.18 (#14)

* Anti-Xray rewrite for 1.18

- Both EngineMode's are now stable - most notably, EngineMode 2.
- Resolves lagspikes when used together with C2ME no-tick.

* Re-add polymer mod compatibility

* Clean up code

* Enable mixins on server environment only

* Fixed: anti-xray failing to obfuscate blocks next to chunkborders.

* Cache preset blockstate arrays.

* Bump version and adjust default nether config

Co-authored-by: DrexHD <nicknamedrex@gmail.com>

Author: Wesley1808

gradle.properties

@@ -2,12 +2,12 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.18-pre6
-loader_version=0.12.5
+minecraft_version=1.18
+loader_version=0.12.8
 # Mod Properties
-mod_version=1.1.1
+mod_version=1.1.2
 maven_group=me.drex
 archives_base_name=anti-xray
 # Dependencies
-fabric_version=0.42.9+1.18
+fabric_version=0.43.1+1.18
 toml_version=0.7.2

src/main/java/me/drex/antixray/AntiXray.java

@@ -22,5 +22,4 @@ public void onInitializeServer() {
         ServerLifecycleEvents.SERVER_STARTING.register(server -> minecraftServer = server);
         Config.loadConfig(FabricLoader.getInstance().getConfigDir().resolve("antixray.toml").toFile());
     }
-
-}
+}

src/main/java/me/drex/antixray/config/Config.java

@@ -9,7 +9,6 @@
 import java.util.Objects;
 
 public class Config {
-
     public static Toml toml;
 
     public static void loadConfig(File file) {
@@ -23,5 +22,4 @@ public static void loadConfig(File file) {
         }
         toml = new Toml().read(file);
     }
-
-}
+}

src/main/java/me/drex/antixray/config/WorldConfig.java

@@ -1,7 +1,6 @@
 package me.drex.antixray.config;
 
 import com.moandjiezana.toml.Toml;
-import me.drex.antixray.AntiXray;
 import me.drex.antixray.util.ChunkPacketBlockControllerAntiXray;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
@@ -10,7 +9,6 @@
 import java.util.List;
 
 public class WorldConfig {
-
     public boolean enabled = false;
     public ChunkPacketBlockControllerAntiXray.EngineMode engineMode = ChunkPacketBlockControllerAntiXray.EngineMode.HIDE;
     public int maxBlockHeight = 64;
@@ -19,10 +17,8 @@ public class WorldConfig {
     public boolean usePermission = false;
     public List<String> hiddenBlocks = new ArrayList<>();
     public List<String> replacementBlocks = new ArrayList<>();
-    private ResourceLocation location;
 
     public WorldConfig(ResourceLocation location) {
-        this.location = location;
         Toml defaultToml = Config.toml;
         // Load default values
         this.loadValues(defaultToml);
@@ -38,16 +34,7 @@ private void loadValues(@NotNull Toml toml) {
         if (toml.contains("engineMode")) {
             ChunkPacketBlockControllerAntiXray.EngineMode mode = ChunkPacketBlockControllerAntiXray.EngineMode.getById(Math.toIntExact(toml.getLong("engineMode")));
             if (mode != null) {
-                if (mode == ChunkPacketBlockControllerAntiXray.EngineMode.OBFUSCATE) {
-                    this.engineMode = ChunkPacketBlockControllerAntiXray.EngineMode.HIDE;
-                    AntiXray.LOGGER.info("######################## ANTI XRAY ########################");
-                    AntiXray.LOGGER.info("DETECTED ENGINE MODE 2 FOR " + location.toString() + ".");
-                    AntiXray.LOGGER.info("FALLING BACK TO ENGINE MODE 1, ");
-                    AntiXray.LOGGER.info("BECAUSE ENGINE MODE 2 IS VERY UNSTABLE!!!");
-                    AntiXray.LOGGER.info("###########################################################");
-                } else {
-                    this.engineMode = mode;
-                }
+                this.engineMode = mode;
             }
         }
         if (toml.contains("maxBlockHeight")) {

src/main/java/me/drex/antixray/interfaces/IChunkPacket.java

@@ -0,0 +1,8 @@
+package me.drex.antixray.interfaces;
+
+public interface IChunkPacket {
+
+    boolean isReady();
+
+    void setReady(boolean ready);
+}

src/main/java/me/drex/antixray/interfaces/IChunkPacketData.java

@@ -0,0 +1,8 @@
+package me.drex.antixray.interfaces;
+
+import me.drex.antixray.util.ChunkPacketInfo;
+import net.minecraft.world.level.block.state.BlockState;
+
+public interface IChunkPacketData {
+    void customExtractChunkData(ChunkPacketInfo<BlockState> packetInfo);
+}

…ray/util/LevelChunkSectionInterface.java …x/antixray/interfaces/IChunkSection.javasrc/main/java/me/drex/antixray/util/LevelChunkSectionInterface.java renamed to src/main/java/me/drex/antixray/interfaces/IChunkSection.java src/main/java/me/drex/antixray/util/LevelChunkSectionInterface.java renamed to src/main/java/me/drex/antixray/interfaces/IChunkSection.java

@@ -1,16 +1,13 @@
-package me.drex.antixray.util;
+package me.drex.antixray.interfaces;
 
+import me.drex.antixray.util.ChunkPacketInfo;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.block.state.BlockState;
 
-public interface LevelChunkSectionInterface {
+public interface IChunkSection {
 
     void addBlockPresets(Level level);
 
-    void initValues(LevelHeightAccessor chunkAccess);
-
     void write(FriendlyByteBuf friendlyByteBuf, ChunkPacketInfo<BlockState> chunkPacketInfo);
-
 }

…e/drex/antixray/util/LevelInterface.java …/me/drex/antixray/interfaces/ILevel.javasrc/main/java/me/drex/antixray/util/LevelInterface.java renamed to src/main/java/me/drex/antixray/interfaces/ILevel.java src/main/java/me/drex/antixray/util/LevelInterface.java renamed to src/main/java/me/drex/antixray/interfaces/ILevel.java

@@ -1,15 +1,15 @@
-package me.drex.antixray.util;
+package me.drex.antixray.interfaces;
 
 import me.drex.antixray.config.WorldConfig;
+import me.drex.antixray.util.ChunkPacketBlockController;
 
 import java.util.concurrent.Executor;
 
-public interface LevelInterface {
+public interface ILevel {
 
     void initValues(Executor executor);
 
     ChunkPacketBlockController getChunkPacketBlockController();
 
     WorldConfig getWorldConfig();
-
 }

src/main/java/me/drex/antixray/interfaces/IPalettedContainer.java

@@ -0,0 +1,13 @@
+package me.drex.antixray.interfaces;
+
+import me.drex.antixray.util.ChunkPacketInfo;
+import net.minecraft.network.FriendlyByteBuf;
+
+public interface IPalettedContainer<T> {
+
+    void addPresetValuesWithEntries(T[] presetValues);
+
+    void addPresetValues(T[] presetValues);
+
+    void write(FriendlyByteBuf friendlyByteBuf, ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY);
+}

src/main/java/me/drex/antixray/mixin/ChunkAccessMixin.java

@@ -1,27 +1,30 @@
 package me.drex.antixray.mixin;
 
-import me.drex.antixray.util.LevelChunkSectionInterface;
+import me.drex.antixray.interfaces.IChunkSection;
+import me.drex.antixray.util.Util;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ChunkAccess.class)
 public abstract class ChunkAccessMixin {
 
-    @Inject(
+    @Redirect(
             method = "replaceMissingSections",
-            at = @At("RETURN")
+            at = @At(
+                    value = "NEW",
+                    target = "net/minecraft/world/level/chunk/LevelChunkSection"
+            )
+
     )
-    private static void initializeChunkSections(LevelHeightAccessor levelHeightAccessor, Registry<Biome> registry, LevelChunkSection[] levelChunkSections, CallbackInfo ci) {
-        for (LevelChunkSection levelChunkSection : levelChunkSections) {
-            ((LevelChunkSectionInterface) levelChunkSection).initValues(levelHeightAccessor);
-        }
+    private static LevelChunkSection addPresetValues(int y, Registry<Biome> registry, LevelHeightAccessor accessor, Registry<Biome> registry2, LevelChunkSection[] sections) {
+        final LevelChunkSection section = new LevelChunkSection(y, registry);
+        ((IChunkSection) section).addBlockPresets(Util.getLevel(accessor));
+        return section;
     }
-
 }