Skip to content

Commit bb40624

Browse files
committed
huh
ok archaicfix *was* compatible but i never actually checked the archaicfix source for potential incompats... suffice to say, its not compatible. all changes here are just spotless changes.
1 parent 97f66df commit bb40624

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

src/main/java/com/gamma/spool/core/SpoolCompat.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ public enum SpecialModVersions {
176176
outputFile = new File(Launch.minecraftHome, "spool/spool-compat.log");
177177
outputFile.getParentFile()
178178
.mkdirs();
179-
if(outputFile.exists())
180-
outputFile.delete();
179+
if (outputFile.exists()) outputFile.delete();
181180
try {
182181
outputFileWriter = new FileWriter(outputFile);
183182
} catch (IOException e) {

src/main/java/com/gamma/spool/core/SpoolMixinCore.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.gamma.spool.core;
22

3+
import static com.gamma.spool.core.SpoolCompat.logChange;
4+
35
import java.util.ArrayList;
46
import java.util.List;
57
import java.util.Set;
@@ -14,8 +16,6 @@
1416

1517
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
1618

17-
import static com.gamma.spool.core.SpoolCompat.logChange;
18-
1919
@LateMixin
2020
public class SpoolMixinCore implements IMixinConfigPlugin, ILateMixinLoader {
2121

@@ -53,8 +53,12 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
5353
if (isLate) {
5454
// TODO: Make this not manual...
5555
if (mixinName.startsWith("hbm_space")) {
56-
if(!SpoolCompat.isModLoaded("hbm", SpoolCompat.SpecialModVersions.NTM_SPACE)) {
57-
logChange("MIXIN - Not loading mixin " + mixinName + " because mod hbm (" + SpoolCompat.SpecialModVersions.NTM_SPACE.name() + ") is not loaded.\n");
56+
if (!SpoolCompat.isModLoaded("hbm", SpoolCompat.SpecialModVersions.NTM_SPACE)) {
57+
logChange(
58+
"MIXIN - Not loading mixin " + mixinName
59+
+ " because mod hbm ("
60+
+ SpoolCompat.SpecialModVersions.NTM_SPACE.name()
61+
+ ") is not loaded.\n");
5862
return false;
5963
}
6064
modIDs = new ObjectArrayList<>();
@@ -69,7 +73,8 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
6973

7074
// Do not load if one of the target mods is not loaded.
7175
if (!SpoolCompat.isModLoaded(section)) {
72-
logChange("MIXIN - Not loading mixin " + mixinName + " because mod " + section + " is not loaded.\n");
76+
logChange(
77+
"MIXIN - Not loading mixin " + mixinName + " because mod " + section + " is not loaded.\n");
7378
return false;
7479
}
7580

src/main/java/com/gamma/spool/mixin/compat/hbm_space/concurrent/ImpactWorldHandlerMixin.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package com.gamma.spool.mixin.compat.hbm_space.concurrent;
22

3-
import com.gamma.spool.concurrent.providers.ConcurrentChunkProviderServer;
4-
import com.hbm.handler.ImpactWorldHandler;
3+
import java.util.List;
4+
55
import net.minecraft.world.chunk.Chunk;
66
import net.minecraft.world.gen.ChunkProviderServer;
7+
78
import org.objectweb.asm.Opcodes;
89
import org.spongepowered.asm.mixin.Mixin;
910
import org.spongepowered.asm.mixin.injection.At;
1011
import org.spongepowered.asm.mixin.injection.Redirect;
1112

12-
import java.util.List;
13+
import com.gamma.spool.concurrent.providers.ConcurrentChunkProviderServer;
14+
import com.hbm.handler.ImpactWorldHandler;
1315

1416
@Mixin(ImpactWorldHandler.class)
1517
public abstract class ImpactWorldHandlerMixin {

src/main/java/com/gamma/spool/mixin/compat/hbm_space/concurrent/TileEntityMachineRadarNTMixin.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package com.gamma.spool.mixin.compat.hbm_space.concurrent;
22

3-
import com.hbm.tileentity.machine.TileEntityMachineRadarNT;
4-
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
3+
import java.util.Iterator;
4+
import java.util.List;
5+
56
import org.spongepowered.asm.mixin.Mixin;
67
import org.spongepowered.asm.mixin.injection.At;
78
import org.spongepowered.asm.mixin.injection.Redirect;
89

9-
import java.util.Iterator;
10-
import java.util.List;
10+
import com.hbm.tileentity.machine.TileEntityMachineRadarNT;
11+
12+
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
1113

1214
@Mixin(TileEntityMachineRadarNT.class)
1315
public abstract class TileEntityMachineRadarNTMixin {

0 commit comments

Comments
 (0)