From 706bf42bfdd79cd596a56a0194014b73bf4089d6 Mon Sep 17 00:00:00 2001 From: Tian mi <35869948+MCTian-mi@users.noreply.github.com> Date: Wed, 25 Jun 2025 13:51:05 +0800 Subject: [PATCH] Revert "Brute-force Fix of RAM Usage Problem When Using Alfheim (#2475)" This reverts commit ec756bbd72028945780601ffc04266c9135acb36. --- src/main/java/gregtech/api/util/Mods.java | 2 -- .../gregtech/api/util/world/DummyWorld.java | 26 ------------------- 2 files changed, 28 deletions(-) diff --git a/src/main/java/gregtech/api/util/Mods.java b/src/main/java/gregtech/api/util/Mods.java index 9b56b74688d..3f1c0222c05 100644 --- a/src/main/java/gregtech/api/util/Mods.java +++ b/src/main/java/gregtech/api/util/Mods.java @@ -74,7 +74,6 @@ public enum Mods { VoxelMap(Names.VOXEL_MAP), XaerosMinimap(Names.XAEROS_MINIMAP), Vintagium(Names.VINTAGIUM), - Alfheim(Names.ALFHEIM), // Special Optifine handler, but consolidated here for simplicity Optifine(null) { @@ -145,7 +144,6 @@ public static class Names { public static final String VOXEL_MAP = "voxelmap"; public static final String XAEROS_MINIMAP = "xaerominimap"; public static final String VINTAGIUM = "vintagium"; - public static final String ALFHEIM = "alfheim"; } private final String ID; diff --git a/src/main/java/gregtech/api/util/world/DummyWorld.java b/src/main/java/gregtech/api/util/world/DummyWorld.java index 451940347b9..858a27138bb 100644 --- a/src/main/java/gregtech/api/util/world/DummyWorld.java +++ b/src/main/java/gregtech/api/util/world/DummyWorld.java @@ -1,7 +1,5 @@ package gregtech.api.util.world; -import gregtech.api.util.Mods; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.profiler.Profiler; @@ -12,7 +10,6 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.storage.WorldInfo; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.fml.relauncher.FMLLaunchHandler; import org.jetbrains.annotations.NotNull; @@ -40,12 +37,6 @@ public DummyWorld() { // De-allocate lightUpdateBlockList, checkLightFor uses this ObfuscationReflectionHelper.setPrivateValue(World.class, this, null, FMLLaunchHandler.isDeobfuscatedEnvironment() ? "lightUpdateBlockList" : "field_72994_J"); - - // De-allocate alfheim lighting engine - if (Mods.Alfheim.isModLoaded()) { - ObfuscationReflectionHelper.setPrivateValue(World.class, this, null, - "alfheim$lightingEngine"); - } } @Override @@ -99,21 +90,4 @@ protected boolean isChunkLoaded(int x, int z, boolean allowEmpty) { public boolean checkLightFor(@NotNull EnumSkyBlock lightType, @NotNull BlockPos pos) { return true; } - - @Override - @Method(modid = Mods.Names.ALFHEIM) - public World init() { - return this; - } - - @Override - @Method(modid = Mods.Names.ALFHEIM) - public int getLightFromNeighborsFor(EnumSkyBlock type, BlockPos pos) { - return 15; - } - - @Method(modid = Mods.Names.ALFHEIM) - public int alfheim$getLight(BlockPos pos, boolean checkNeighbors) { - return 15; - } }