Skip to content

Commit 59bf3f8

Browse files
committed
- 移除 Ancient Spellcraft 的 ASFakePlayerFixes 补丁(Ancient Spellcraft 1.8.1+ 已原生修复),避免冲突与日志刷屏。
- 修复升级 Ancient Spellcraft 后的崩溃:删除对 ASFakePlayer.FAKE_PLAYER 的硬依赖(#56 #58)。 - 更新开发依赖:ancient-spellcraft CurseMaven 文件版本。
1 parent 51afb7b commit 59bf3f8

6 files changed

Lines changed: 1 addition & 80 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ dependencies {
280280
compileOnly(rfg.deobf("curse.maven:lazy-ae2-322347:3254160"))
281281
compileOnly(rfg.deobf("curse.maven:electroblobs-wizardry-265642:5354477"))
282282
compileOnly(rfg.deobf("curse.maven:ender-utilities-224320:2977010"))
283-
compileOnly(rfg.deobf("curse.maven:ancient-spellcraft-358124:5413256"))
283+
compileOnly(rfg.deobf("curse.maven:ancient-spellcraft-358124:7134366"))
284284
compileOnly(rfg.deobf("curse.maven:psi-241665:3085917"))
285285
compileOnly(rfg.deobf("curse.maven:random-psideas-302313:3215550"))
286286
compileOnly(rfg.deobf("curse.maven:journeymap-32274:5172461"))

src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.cleanroommc.neverenoughanimations.animations.HotbarAnimation;
66
import com.kamefrede.rpsideas.items.components.ItemBioticSensor;
77
import com.llamalad7.betterchat.gui.GuiBetterChat;
8-
import com.windanesz.ancientspellcraft.client.entity.ASFakePlayer;
98
import github.kasuminova.stellarcore.client.hudcaching.HUDCaching;
109
import github.kasuminova.stellarcore.client.pool.StellarUnpackedDataPool;
1110
import github.kasuminova.stellarcore.client.util.TitleUtils;
@@ -139,9 +138,6 @@ public void onDebugText(RenderGameOverlayEvent.Text event) {
139138
* 修复各种奇怪的模组导致 WorldClient 无法被 GC 导致内存泄露的问题。
140139
*/
141140
public void onClientWorldLoad(@Nullable final World world) {
142-
if (Loader.isModLoaded("ancientspellcraft")) {
143-
callAncientSpellCraftFakePlayerWorldChanged(world);
144-
}
145141
if (Loader.isModLoaded("libvulpes")) {
146142
callLibVulpesWorldChanged();
147143
}
@@ -208,14 +204,6 @@ private static void callMekanismClientTickHandlerWorldChanged() {
208204
ClientTickHandler.portableTeleports.remove(Minecraft.getMinecraft().player);
209205
}
210206

211-
@Optional.Method(modid = "ancientspellcraft")
212-
private static void callAncientSpellCraftFakePlayerWorldChanged(final World world) {
213-
if (!StellarCoreConfig.BUG_FIXES.ancientSpellCraft.asFakePlayer) {
214-
return;
215-
}
216-
ASFakePlayer.FAKE_PLAYER.setWorld(world);
217-
}
218-
219207
@Optional.Method(modid = "libvulpes")
220208
private static void callLibVulpesWorldChanged() {
221209
if (!StellarCoreConfig.BUG_FIXES.libVulpes.inputSyncHandler) {

src/main/java/github/kasuminova/stellarcore/common/config/category/BugFixes.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ public class BugFixes {
1616
@Config.Name("AdvancedRocketry")
1717
public final AdvancedRocketry advancedRocketry = new AdvancedRocketry();
1818

19-
@Config.Name("AncientSpellCraft")
20-
public final AncientSpellCraft ancientSpellCraft = new AncientSpellCraft();
21-
2219
@Config.Name("ArmourersWorkshop")
2320
public final ArmourersWorkshop armourersWorkshop = new ArmourersWorkshop();
2421

@@ -181,18 +178,6 @@ public static class AdvancedRocketry {
181178

182179
}
183180

184-
public static class AncientSpellCraft {
185-
186-
@Config.Comment({
187-
"(Client Only) Fix a memory leak caused by AncientSpellCraft's FakePlayer,",
188-
"mainly in that it would cause the first world loaded not to be cleaned up by Java GC.",
189-
"Experimental, if a crash occurs with anything related to ASFakePlayer, please report this issue immediately."
190-
})
191-
@Config.Name("ASFakePlayerFixes")
192-
public boolean asFakePlayer = false;
193-
194-
}
195-
196181
public static class ArmourersWorkshop {
197182

198183
@Config.Comment("Cleanroom only, used to fix an issue that caused the game to crash when unloading skin texture files.")

src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class StellarCoreLateMixinLoader implements ILateMixinLoader {
1717
static {
1818
addModdedMixinCFG("mixins.stellar_core_advancedrocketry.json", "advancedrocketry");
1919
addModdedMixinCFG("mixins.stellar_core_ae.json", "appliedenergistics2");
20-
addModdedMixinCFG("mixins.stellar_core_ancientspellcraft.json", "ancientspellcraft");
2120
addModdedMixinCFG("mixins.stellar_core_armourers_workshop.json", "armourers_workshop");
2221
addModdedMixinCFG("mixins.stellar_core_astralsorcery.json", "astralsorcery");
2322
addModdedMixinCFG("mixins.stellar_core_avaritia.json", "avaritia");

src/main/java/github/kasuminova/stellarcore/mixin/ancientspellcraft/MixinASFakePlayer.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/resources/mixins.stellar_core_ancientspellcraft.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)