FACN, Upstream, Update, Edit, Fix

RuinedTechnologyUnify · Feb 19, 2023 · 313e776 · 313e776
1 parent fd30ffc
commit 313e776
Show file tree

Hide file tree

Showing 97 changed files with 7,590 additions and 367 deletions.
diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt
@@ -22,4 +22,21 @@ minecraft net.minecraft.nbt.ListTag.java
 minecraft net.minecraft.Util.java
 minecraft net.minecraft.world.level.LocalMobCapCalculator.java
 minecraft net.minecraft.server.commands.SeedCommand.java
-minecraft net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement.java
+minecraft net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement.java
+minecraft net.minecraft.world.level.levelgen.structure.structures.WoodlandMansionPieces.java
+minecraft net.minecraft.world.level.levelgen.structure.structures.StrongholdPieces.java
+datafixerupper com.mojang.datafixers.types.Type.java
+minecraft com.mojang.math.Transformation.java
+minecraft com.mojang.math.OctahedralGroup.java
+minecraft net.minecraft.world.level.levelgen.structure.structures.DesertPyramidPiece.java
+minecraft net.minecraft.world.level.levelgen.structure.structures.JungleTemplePiece.java
+minecraft net.minecraft.world.level.levelgen.structure.structures.MineshaftPieces.java
+minecraft net.minecraft.world.level.levelgen.structure.structures.NetherFortressPieces.java
+minecraft net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator.java
+minecraft net.minecraft.world.entity.ai.behavior.GateBehavior.java
+minecraft net.minecraft.world.level.levelgen.feature.stateproviders.RandomizedIntStateProvider.java
+minecraft net.minecraft.world.level.levelgen.structure.structures.StrongholdPieces.java
+minecraft net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.java
+minecraft net.minecraft.world.level.levelgen.structure.StructureCheck.java
+minecraft net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings.java
+minecraft net.minecraft.world.level.levelgen.structure.StructureStart.java
diff --git a/gradle.properties b/gradle.properties
@@ -8,4 +8,4 @@ group = com.github.ipecter.fusion
 version = 1.19.3-R0.1-SNAPSHOT
 mcVersion = 1.19.3
 
-purpurRef = 62c25ffbe8ae7ad1660a543c1dada02d78b50533
+purpurRef = 41593baf70c5402c2ad39e867b0f89561af95c30
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -241,4 +241,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega
diff --git a/patches/server/0001-Fusion-Rebrand.patch b/patches/server/0001-Fusion-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fusion-Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d5b7458f6b79addf1a12eb82443ba5bdbe2ea5d3..c3ba837f8d8f3a1507fd43b2622c3657201f8adf 100644
+index f25c0557cf984b97e0ab361f579eccbf46f82170..a1e1ec132df33741e0aa67bf1f66387d1597f8fa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,7 +7,7 @@ plugins {
@@ -17,7 +17,7 @@ index d5b7458f6b79addf1a12eb82443ba5bdbe2ea5d3..c3ba837f8d8f3a1507fd43b2622c3657
      // Pufferfish start
      implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
-@@ -83,7 +83,7 @@ tasks.jar {
+@@ -84,7 +84,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -141,10 +141,10 @@ index cea4447aad2d64db56a76e4ba180dc7326d2e13b..d09184b8be320048c66aeab5ad94f3ee
                  this.getRunningThread().stop();
                  try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b69634a5cf57e4086e644819f68638d6a2ab897c..e7e6e2ecc80b5b488657624ec35a1ca6935e3289 100644
+index 076d6733c87d040b9da33c6845c63194f3b93ef4..51a28c0c3485a8d4435dbbc7f7b8f0f80a9ada69 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
+@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
@@ -154,10 +154,10 @@ index b69634a5cf57e4086e644819f68638d6a2ab897c..e7e6e2ecc80b5b488657624ec35a1ca6
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ddec0b7470e5a925ad6247970269f3654792ab25..4427db9a2563ccd094de61b91d8e3b0e6f2e8ef5 100644
+index 78ac748859e21a61140e9bff67e4527a8d35b4b6..60cd5c1815385856864b9237d306faa15398633f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -877,7 +877,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -883,7 +883,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              return EntityCategory.WATER;
          }
 

diff --git a/patches/server/0002-Fusion-Configuration.patch b/patches/server/0002-Fusion-Configuration.patch
@@ -448,7 +448,7 @@ index 0000000000000000000000000000000000000000..38066d67105cd02df2939cb46d4c579e
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 46858fb57f122033a68aeb4ad3943132a677fb46..c036dfc118da454f6ae543d393674d38c7478530 100644
+index fd1b0564d2d2b45128e6f2556fb93ee56bd683b5..04457e58f6c6106f556e22a2d8a2167db637ec6e 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -227,6 +227,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -488,26 +488,26 @@ index a9289072b048095330ea32d7c965e8dda61a36fc..76ad4079f4a6b1222b7f424ea37856ef
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ad6813736d2d269fac54dc3193bfe1286dbf5391..c456da92ac826145472b77d2ad244c10ade481fc 100644
+index 51a28c0c3485a8d4435dbbc7f7b8f0f80a9ada69..ffd7191c689cf9bd077af91e40979318e7df0e18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1032,6 +1032,7 @@ public final class CraftServer implements Server {
+@@ -1033,6 +1033,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
 +        com.github.ipecter.fusion.FusionConfig.init((File) console.options.valueOf("fusion-settings")); // Fusion
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1048,6 +1049,7 @@ public final class CraftServer implements Server {
+@@ -1049,6 +1050,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.purpurConfig.init(); // Purpur
 +            world.fusionConfig.init(); // Fusion
          }
 
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -2885,6 +2887,13 @@ public final class CraftServer implements Server {
+@@ -2886,6 +2888,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
 

diff --git a/patches/server/0005-Fusion-OptimizeDefaultConfiguration.patch b/patches/server/0005-Fusion-OptimizeDefaultConfiguration.patch
@@ -153,10 +153,10 @@ index edaa6ef28c1f9a2239439698708897008fea2f7e..41d93390e16e7eb1edc3cf416dab8a22
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c036dfc118da454f6ae543d393674d38c7478530..4675524988ea2ef346726677f9767382f1e154ab 100644
+index 04457e58f6c6106f556e22a2d8a2167db637ec6e..b0ed34d6bcdeb3c6fd724a78547b4869aeafcd1b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -434,7 +434,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -440,7 +440,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          BufferedWriter bufferedwriter = Files.newBufferedWriter(file);
 
          try {
@@ -218,7 +218,7 @@ index 1e5fb707b034da7afa74ba64e53de81e7e7bdf79..98ff8cdace73d4fb8c575adf06b43a5e
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4cd080a0db99a5c36394bcf54526b96fe22a206a..330fd9021b907728a726645857a913181d02ca73 100644
+index c0c4742027217d5ae27843989ad18be93608496a..d33f2b09cb509e02a54e0fbce34ef7be45a52412 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -422,7 +422,7 @@ public class PurpurWorldConfig {
@@ -230,7 +230,7 @@ index 4cd080a0db99a5c36394bcf54526b96fe22a206a..330fd9021b907728a726645857a91318
      public boolean teleportOnNetherCeilingDamage = false;
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
-@@ -2770,7 +2770,7 @@ public class PurpurWorldConfig {
+@@ -2782,7 +2782,7 @@ public class PurpurWorldConfig {
      public boolean villagerLobotomizeEnabled = false;
      public int villagerLobotomizeCheckInterval = 100;
      public boolean villagerDisplayTradeItem = true;

diff --git a/patches/server/0007-NoChatReports-Implementation.patch b/patches/server/0007-NoChatReports-Implementation.patch
@@ -103,10 +103,10 @@ index 6e0a3086da142f1c42007a16bbec7edbab17da04..46409ef273bc8d2c2b20ed76b4cd91b6
          }
      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 4675524988ea2ef346726677f9767382f1e154ab..1a706fbd5b58049d31d7350a2eb500f92a31c743 100644
+index b0ed34d6bcdeb3c6fd724a78547b4869aeafcd1b..cff911e146d84237f338cfebc0874c5082345fde 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -679,9 +679,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -685,9 +685,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          return this.getProperties().networkCompressionThreshold;
      }
 
@@ -124,7 +124,7 @@ index 4675524988ea2ef346726677f9767382f1e154ab..1a706fbd5b58049d31d7350a2eb500f9
 
      protected boolean convertOldUsers() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a8e205af936efe0909c94575e3b7f8ca50cead2f..118a1acdd79e21a4337376da3bba6d0b255177ee 100644
+index 04652735fad2d2ef5bd4d08d85ac2df10be7e75d..e3774cffbc938014a81517784426e65234c8abf8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2229,12 +2229,35 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/patches/server/0008-Fusion-LithiumConfiguration.patch b/patches/server/0008-Fusion-LithiumConfiguration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fusion-LithiumConfiguration
 
 
 diff --git a/src/main/java/com/github/ipecter/fusion/FusionConfig.java b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
-index 4b83507afdccf4850bc282290b7927ba232a690b..9ad27576afacba774f07991ac2c31f1f53da70f7 100644
+index 4b83507afdccf4850bc282290b7927ba232a690b..2dc2fdf474a5b02c893a961f2644db6fb542ea2d 100644
 --- a/src/main/java/com/github/ipecter/fusion/FusionConfig.java
 +++ b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
 @@ -217,4 +217,14 @@ public class FusionConfig {
@@ -16,16 +16,16 @@ index 4b83507afdccf4850bc282290b7927ba232a690b..9ad27576afacba774f07991ac2c31f1f
 +    public static boolean lithiumEnable = true;
 +
 +    private static void lithiumConfig() {
-+        setComment("lithium", "[ Lithium ] General-Purpose Optimization Mod");
-+        lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
 +    }
 +
 +    private static void lithiumConfigSetup() {
++        setComment("lithium", "[ Lithium ] General-Purpose Optimization Mod");
++        lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
 +    }
  }
 \ No newline at end of file
 diff --git a/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java b/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java
-index fde38b20fae3050f18f11a5098ad482aff0587c1..5d7f7008c42b3976ce57f704861788f39bd329ad 100644
+index fde38b20fae3050f18f11a5098ad482aff0587c1..1b81cc69f295eabad2449d2f397e25b5fd19ed71 100644
 --- a/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java
 +++ b/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java
 @@ -129,4 +129,13 @@ public class FusionWorldConfig {
@@ -36,10 +36,10 @@ index fde38b20fae3050f18f11a5098ad482aff0587c1..5d7f7008c42b3976ce57f704861788f3
 +    public boolean lithiumEnable = true;
 +
 +    private void lithiumConfig() {
-+        lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
 +    }
 +
 +    private void lithiumConfigSetup() {
++        lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
 +    }
  }
 \ No newline at end of file
diff --git a/patches/server/0009-Lithium-Math-FastUtil.patch b/patches/server/0009-Lithium-Math-FastUtil.patch
@@ -8,18 +8,16 @@ JettPack - Titaniumtown - GPL 3.0
 Mirai - etil2jz - GPL 3.0
 
 diff --git a/src/main/java/com/github/ipecter/fusion/FusionConfig.java b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
-index 9ad27576afacba774f07991ac2c31f1f53da70f7..b6e759df57b6ab9392765546e0443dde9e12d4bc 100644
+index 2dc2fdf474a5b02c893a961f2644db6fb542ea2d..8479318557bea483313cb42e8c487600bf8d67a6 100644
 --- a/src/main/java/com/github/ipecter/fusion/FusionConfig.java
 +++ b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
-@@ -219,10 +219,12 @@ public class FusionConfig {
+@@ -219,8 +219,10 @@ public class FusionConfig {
      }
 
      public static boolean lithiumEnable = true;
 +    public static boolean lithiumMathFastUtil = true;
 
      private static void lithiumConfig() {
-         setComment("lithium", "[ Lithium ] General-Purpose Optimization Mod");
-         lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
 +        lithiumMathFastUtil = getBoolean("lithium.math.fast-util", lithiumMathFastUtil) && lithiumEnable;
      }
 

diff --git a/patches/server/0011-Lithium-Collections-BlockEntityTickers.patch b/patches/server/0011-Lithium-Collections-BlockEntityTickers.patch
@@ -8,17 +8,16 @@ JettPack - Titaniumtown - GPL 3.0
 Mirai - etil2jz - GPL 3.0
 
 diff --git a/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java b/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java
-index 5d7f7008c42b3976ce57f704861788f39bd329ad..7c14500f529c9d9869a74f2dbe0a01c0594ecb3e 100644
+index 1b81cc69f295eabad2449d2f397e25b5fd19ed71..dc602bdc299633eea03383b31eb802b2b2280433 100644
 --- a/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java
 +++ b/src/main/java/com/github/ipecter/fusion/FusionWorldConfig.java
-@@ -131,9 +131,11 @@ public class FusionWorldConfig {
+@@ -131,8 +131,10 @@ public class FusionWorldConfig {
      }
 
      public boolean lithiumEnable = true;
 +    public boolean lithiumCollectionsBlockEntityTickers = true;
 
      private void lithiumConfig() {
-         lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
 +        lithiumCollectionsBlockEntityTickers = getBoolean("lithium.collections.block-entity-tickers", lithiumCollectionsBlockEntityTickers) && lithiumEnable;
      }
 

diff --git a/patches/server/0013-Lithium-Math-SineLUT.patch b/patches/server/0013-Lithium-Math-SineLUT.patch
@@ -8,18 +8,16 @@ JettPack - Titaniumtown - GPL 3.0
 Mirai - etil2jz - GPL 3.0
 
 diff --git a/src/main/java/com/github/ipecter/fusion/FusionConfig.java b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
-index b6e759df57b6ab9392765546e0443dde9e12d4bc..70d9cae563e58549a8561bbb0d7a9dc0c3da3806 100644
+index 8479318557bea483313cb42e8c487600bf8d67a6..f92aed18e64f7d2d8a1a9d7cb0b2d1dd79714964 100644
 --- a/src/main/java/com/github/ipecter/fusion/FusionConfig.java
 +++ b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
-@@ -220,11 +220,13 @@ public class FusionConfig {
+@@ -220,9 +220,11 @@ public class FusionConfig {
 
      public static boolean lithiumEnable = true;
      public static boolean lithiumMathFastUtil = true;
 +    public static boolean lithiumMathSineLUT = true;
 
      private static void lithiumConfig() {
-         setComment("lithium", "[ Lithium ] General-Purpose Optimization Mod");
-         lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
          lithiumMathFastUtil = getBoolean("lithium.math.fast-util", lithiumMathFastUtil) && lithiumEnable;
 +        lithiumMathSineLUT = getBoolean("lithium.math.sine-lut", lithiumMathSineLUT) && lithiumEnable;
      }

diff --git a/patches/server/0014-Lithium-Entity-FastRetrieval.patch b/patches/server/0014-Lithium-Entity-FastRetrieval.patch
@@ -8,18 +8,16 @@ JettPack - Titaniumtown - GPL 3.0
 Mirai - etil2jz - GPL 3.0
 
 diff --git a/src/main/java/com/github/ipecter/fusion/FusionConfig.java b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
-index 70d9cae563e58549a8561bbb0d7a9dc0c3da3806..8fdd30002696e968af8529bcb30e81364572332d 100644
+index f92aed18e64f7d2d8a1a9d7cb0b2d1dd79714964..40b2c2fa1250825d560b6dc1522d08f89694473f 100644
 --- a/src/main/java/com/github/ipecter/fusion/FusionConfig.java
 +++ b/src/main/java/com/github/ipecter/fusion/FusionConfig.java
-@@ -221,12 +221,14 @@ public class FusionConfig {
+@@ -221,10 +221,12 @@ public class FusionConfig {
      public static boolean lithiumEnable = true;
      public static boolean lithiumMathFastUtil = true;
      public static boolean lithiumMathSineLUT = true;
 +    public static boolean lithiumEntityFastRetrieval = true;
 
      private static void lithiumConfig() {
-         setComment("lithium", "[ Lithium ] General-Purpose Optimization Mod");
-         lithiumEnable = getBoolean("lithium.enable", lithiumEnable);
          lithiumMathFastUtil = getBoolean("lithium.math.fast-util", lithiumMathFastUtil) && lithiumEnable;
          lithiumMathSineLUT = getBoolean("lithium.math.sine-lut", lithiumMathSineLUT) && lithiumEnable;
 +        lithiumEntityFastRetrieval = getBoolean("lithium.entity.fast-retrieval", lithiumEntityFastRetrieval) && lithiumEnable;