re-enable Block Transformer when not running with rfb (#1418)

src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java

@@ -142,6 +142,9 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
                 boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
                 if (!rfbLoaded) {
                     tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.AngelicaLateTweaker");
+                    if (AngelicaConfig.enableCeleritas) {
+                        tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.CeleritasLateTweaker");
+                    }
                 }
             }
         }

src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/CeleritasBlockTransformer.java

@@ -2,26 +2,25 @@ package com.gtnewhorizons.angelica.loading.fml.transformers;
 
 import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
 import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump;
-import com.gtnewhorizons.angelica.loading.shared.transformers.AngelicaRedirector;
-import com.gtnewhorizons.angelica.loading.shared.transformers.SodiumBlockTransform;
+import com.gtnewhorizons.angelica.loading.shared.transformers.CeleritasBlockTransform;
 import net.minecraft.launchwrapper.IClassTransformer;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 
-public class SodiumBlockTransformer implements IClassTransformer {
+public class CeleritasBlockTransformer implements IClassTransformer {
 
-    private final SodiumBlockTransform inner;
+    private final CeleritasBlockTransform inner;
     private final String[] exclusions;
 
-    public SodiumBlockTransformer() {
-        this.inner = new SodiumBlockTransform(AngelicaTweaker.isObfEnv());
+    public CeleritasBlockTransformer() {
+        this.inner = new CeleritasBlockTransform(AngelicaTweaker.isObfEnv());
         this.exclusions = inner.getTransformerExclusions();
         this.inner.setCeleritasSetting();
     }
 
     /**
-     * Delete the global vanilla bounding box fields off the Block object. {@link AngelicaRedirector}
+     * Delete the global vanilla bounding box fields off the Block object. {@link CeleritasBlockTransform}
      * replaces these with a thread-safe alternative.
      */
     @Override

src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/CeleritasLateTweaker.java

@@ -0,0 +1,35 @@
+package com.gtnewhorizons.angelica.loading.fml.tweakers;
+
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import net.minecraft.launchwrapper.ITweaker;
+import net.minecraft.launchwrapper.Launch;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import java.io.File;
+import java.util.List;
+
+public class CeleritasLateTweaker implements ITweaker {
+
+    @Override
+    public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
+        // no-op
+    }
+
+    @Override
+    public void injectIntoClassLoader(LaunchClassLoader classLoader) {
+        // no-op
+    }
+
+    @Override
+    public String getLaunchTarget() {
+        return null;
+    }
+
+    @Override
+    public String[] getLaunchArguments() {
+        String transformer = "com.gtnewhorizons.angelica.loading.fml.transformers.CeleritasBlockTransformer";
+        FMLRelaunchLog.finer("Registering transformer %s", transformer);
+        Launch.classLoader.registerTransformer(transformer);
+        return new String[0];
+    }
+}

src/main/java/com/gtnewhorizons/angelica/loading/rfb/AngelicaRfbPlugin.java

@@ -1,7 +1,7 @@
 package com.gtnewhorizons.angelica.loading.rfb;
 
 import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBAngelicaRedirector;
-import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBSodiumBlockTransformer;
+import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBCeleritasBlockTransformer;
 import com.gtnewhorizons.retrofuturabootstrap.api.PluginContext;
 import com.gtnewhorizons.retrofuturabootstrap.api.RetroFuturaBootstrap;
 import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
@@ -27,7 +27,7 @@ public class AngelicaRfbPlugin implements RfbPlugin {
         final boolean isObf = RetroFuturaBootstrap.API.launchClassLoader().findClassMetadata("net.minecraft.world.World") == null;
         return new RfbClassTransformer[] {
             new RFBAngelicaRedirector(),
-            new RFBSodiumBlockTransformer(isObf)
+            new RFBCeleritasBlockTransformer(isObf)
         };
     }
 }

src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBCeleritasBlockTransformer.java

@@ -1,7 +1,7 @@
 package com.gtnewhorizons.angelica.loading.rfb.transformers;
 
 import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump;
-import com.gtnewhorizons.angelica.loading.shared.transformers.SodiumBlockTransform;
+import com.gtnewhorizons.angelica.loading.shared.transformers.CeleritasBlockTransform;
 import com.gtnewhorizons.retrofuturabootstrap.api.ClassNodeHandle;
 import com.gtnewhorizons.retrofuturabootstrap.api.ExtensibleClassLoader;
 import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
@@ -11,12 +11,12 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.jar.Manifest;
 
-public class RFBSodiumBlockTransformer implements RfbClassTransformer {
+public class RFBCeleritasBlockTransformer implements RfbClassTransformer {
 
-    private final SodiumBlockTransform inner;
+    private final CeleritasBlockTransform inner;
 
-    public RFBSodiumBlockTransformer(boolean isObf) {
-        inner = new SodiumBlockTransform(isObf);
+    public RFBCeleritasBlockTransformer(boolean isObf) {
+        inner = new CeleritasBlockTransform(isObf);
     }
 
     @Pattern("[a-z0-9-]+")

src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/CeleritasBlockTransform.java

@@ -26,12 +26,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-public final class SodiumBlockTransform {
+public final class CeleritasBlockTransform {
 
     private final List<String> blockFieldNames = new ArrayList<>();
     private final Map<String, String> blockFieldRedirects = new HashMap<>();
 
-    public SodiumBlockTransform(boolean isObf) {
+    public CeleritasBlockTransform(boolean isObf) {
         final List<Pair<String, String>> mappings = ImmutableList.of(
             Pair.of("minX", "field_149759_B"),
             Pair.of("minY", "field_149760_C"),
@@ -48,7 +48,7 @@ public final class SodiumBlockTransform {
     }
 
     private static final boolean LOG_SPAM = Boolean.getBoolean("angelica.redirectorLogspam");
-    private static final Logger LOGGER = LogManager.getLogger("SodiumBlockTransformer");
+    private static final Logger LOGGER = LogManager.getLogger("CeleritasBlockTransformer");
     private static final String BlockClass = "net/minecraft/block/Block";
     private static final String BlockPackage = "net/minecraft/block/Block";
     private static final String ThreadedBlockData = "com/gtnewhorizons/angelica/glsm/ThreadedBlockData";