made TesseractPlatformUtils a java service instead of using expect pl…

…atform, plan to do this for all uses of expect platform
GregTech-Intergalactical · Mar 6, 2024 · 0eec28a · 0eec28a
1 parent cdef7d1
commit 0eec28a
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 52 deletions.
diff --git a/common/src/main/java/tesseract/Tesseract.java b/common/src/main/java/tesseract/Tesseract.java
@@ -43,9 +43,4 @@ public Tesseract() {
     public static boolean hadFirstTick(LevelAccessor world) {
         return TEST || firstTick.contains(world);
     }
-
-    @ExpectPlatform
-    public static ConfigHandler createConfig(Config config){
-        throw new AssertionError();
-    }
 }
diff --git a/common/src/main/java/tesseract/TesseractConfig.java b/common/src/main/java/tesseract/TesseractConfig.java
@@ -17,10 +17,10 @@ public static void createConfig(){
         ConfigSection section = config.add("general");
         EU_TO_FE_RATIO = section.addDouble("eu_to_fe_ratio", 8.0, "The ratio of the eu to the fe energy converting - Default: (1.0 EU = 8.0 FE)").setMin(Double.MIN_VALUE);
         EU_TO_TRE_RATIO = section.addDouble("eu_to_tre_ratio", 1.0, "The ratio of the eu to the tre energy converting - Default: (1.0 EU = 1.0 TRE)").setMin(Double.MIN_VALUE);
-        ENABLE_FE_OR_TRE_INPUT = section.addBool("enable_fe_or_tre_input", !TesseractPlatformUtils.isForge(), "Enables EU Machines and cables being able to input FE or TRE(Tech Reborn Energy),",
+        ENABLE_FE_OR_TRE_INPUT = section.addBool("enable_fe_or_tre_input", !TesseractPlatformUtils.INSTANCE.isForge(), "Enables EU Machines and cables being able to input FE or TRE(Tech Reborn Energy),",
                 "Please do not enable on forge unless you have balanced the fe compat to not be broken af due to power creep. - Default: false on forge, true on fabric");
         ENABLE_MI_COMPAT = section.addBool("enabled_mi_compat", true, "Enables Tesseract EU having compat with MI energy. - Default: true");
-        CONFIG = Tesseract.createConfig(config);
+        CONFIG = TesseractPlatformUtils.INSTANCE.createConfig(config);
         CONFIG.register();
     }
 }
diff --git a/common/src/main/java/tesseract/TesseractGraphWrappers.java b/common/src/main/java/tesseract/TesseractGraphWrappers.java
@@ -29,7 +29,7 @@ public class TesseractGraphWrappers {
     public static final GraphWrapper<ItemTransaction, IItemPipe, IItemNode> ITEM = new GraphWrapper<>(ItemController::new, IItemNode.GETTER);
 
     public static final GraphWrapper<RFTransaction, IRFCable, IRFNode> RF = new GraphWrapper<>(RFController::new, IRFNode.GETTER);
-    public static long dropletMultiplier = TesseractPlatformUtils.isForge() ? 1L : 81L;
+    public static long dropletMultiplier = TesseractPlatformUtils.INSTANCE.isForge() ? 1L : 81L;
     //public static GraphWrapper<Integer, IRFCable, IRFNode> FE_ENERGY = new GraphWrapper<>(RFController::new);
     public static GraphWrapper<GTTransaction, IGTCable, IGTNode> GT_ENERGY = new GraphWrapper<>(Energy::new, IGTNode.GT_GETTER);
 

diff --git a/common/src/main/java/tesseract/TesseractPlatformUtils.java b/common/src/main/java/tesseract/TesseractPlatformUtils.java
@@ -1,5 +1,7 @@
 package tesseract;
 
+import carbonconfiglib.config.Config;
+import carbonconfiglib.config.ConfigHandler;
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.Level;
@@ -8,30 +10,22 @@
 import tesseract.api.rf.IRFNode;
 import tesseract.graph.INode;
 
-public class TesseractPlatformUtils {
-    @ExpectPlatform
-    public static IGTNode getGTNode(Level level, long pos, Direction direction, Runnable invalidate){
-        throw new AssertionError();
-    }
+import java.util.ServiceLoader;
 
-    @ExpectPlatform
-    public static IRFNode getRFNode(Level level, long pos, Direction direction, Runnable invalidate){
-        throw new AssertionError();
-    }
+public interface TesseractPlatformUtils {
+    TesseractPlatformUtils INSTANCE =  ServiceLoader.load(TesseractPlatformUtils.class).findFirst().orElseThrow(() -> new IllegalStateException("No implementation of TesseractPlatformUtils found"));
 
-    @ExpectPlatform
-    public static IHeatNode getHeatNode(Level level, long pos, Direction direction, Runnable invalidate){
-        throw new AssertionError();
-    }
 
-    @ExpectPlatform
-    public static boolean isFeCap(Class<?> cap){
-        throw new AssertionError();
-    }
+    IGTNode getGTNode(Level level, long pos, Direction direction, Runnable invalidate);
 
+    IRFNode getRFNode(Level level, long pos, Direction direction, Runnable invalidate);
 
-    @ExpectPlatform
-    public static boolean isForge(){
-        throw new AssertionError();
-    }
+    IHeatNode getHeatNode(Level level, long pos, Direction direction, Runnable invalidate);
+
+    boolean isFeCap(Class<?> cap);
+
+
+    boolean isForge();
+
+    ConfigHandler createConfig(Config config);
 }
diff --git a/common/src/main/java/tesseract/api/gt/IGTNode.java b/common/src/main/java/tesseract/api/gt/IGTNode.java
@@ -123,5 +123,5 @@ default void tesseractTick() {
 
     }
 
-    GraphWrapper.ICapabilityGetter<IGTNode> GT_GETTER = TesseractPlatformUtils::getGTNode;
+    GraphWrapper.ICapabilityGetter<IGTNode> GT_GETTER = TesseractPlatformUtils.INSTANCE::getGTNode;
 }
diff --git a/common/src/main/java/tesseract/api/heat/IHeatNode.java b/common/src/main/java/tesseract/api/heat/IHeatNode.java
@@ -57,5 +57,5 @@ default int getTemperature() {
         return getHeat() / 100;
     }
 
-    GraphWrapper.ICapabilityGetter<IHeatNode> GETTER = TesseractPlatformUtils::getHeatNode;
+    GraphWrapper.ICapabilityGetter<IHeatNode> GETTER = TesseractPlatformUtils.INSTANCE::getHeatNode;
 }
diff --git a/common/src/main/java/tesseract/api/rf/IRFNode.java b/common/src/main/java/tesseract/api/rf/IRFNode.java
@@ -39,5 +39,5 @@ default void update(BlockEntity object) {
 
     }
 
-    GraphWrapper.ICapabilityGetter<IRFNode> GETTER = TesseractPlatformUtils::getRFNode;
+    GraphWrapper.ICapabilityGetter<IRFNode> GETTER = TesseractPlatformUtils.INSTANCE::getRFNode;
 }
diff --git a/fabric/src/main/java/tesseract/fabric/TesseractImpl.java b/fabric/src/main/java/tesseract/fabric/TesseractImpl.java
@@ -104,8 +104,4 @@ public static <T extends BlockEntity> void registerTRETile(BiFunction<T, Directi
     public static void registerTREItem(BiFunction<ItemStack, ContainerItemContext, IEnergyHandler> function, Item type){
         EnergyStorage.ITEM.registerForItems((stack, context) -> (EnergyStorage) function.apply(stack, context), type);
     }
-
-    public static ConfigHandler createConfig(Config config){
-        return CarbonConfig.createConfig(Tesseract.API_ID, config);
-    }
 }
diff --git a/fabric/src/main/java/tesseract/fabric/TesseractPlatformUtilsImpl.java b/fabric/src/main/java/tesseract/fabric/TesseractPlatformUtilsImpl.java
@@ -1,14 +1,19 @@
 package tesseract.fabric;
 
 
+import carbonconfiglib.CarbonConfig;
+import carbonconfiglib.config.Config;
+import carbonconfiglib.config.ConfigHandler;
 import earth.terrarium.botarium.common.energy.base.EnergyAttachment;
 import earth.terrarium.botarium.common.energy.base.EnergyContainer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import team.reborn.energy.api.EnergyStorage;
+import tesseract.Tesseract;
 import tesseract.TesseractCapUtils;
+import tesseract.TesseractPlatformUtils;
 import tesseract.api.fabric.TileListeners;
 import tesseract.api.fabric.wrapper.RFWrapper;
 import tesseract.api.gt.IEnergyHandler;
@@ -21,8 +26,8 @@
 import java.util.Optional;
 
 @SuppressWarnings("UnstableApiUsage")
-public class TesseractPlatformUtilsImpl {
-    public static IGTNode getGTNode(Level level, long pos, Direction direction, Runnable invalidate){
+public class TesseractPlatformUtilsImpl implements TesseractPlatformUtils {
+    public IGTNode getGTNode(Level level, long pos, Direction direction, Runnable invalidate){
         BlockEntity tile = level.getBlockEntity(BlockPos.of(pos));
         Optional<IEnergyHandler> capability = TesseractCapUtilsImpl.getEnergyHandler(tile, direction);
         if (capability.isPresent()) {
@@ -32,7 +37,7 @@ public static IGTNode getGTNode(Level level, long pos, Direction direction, Runn
         return null;
     }
 
-    public static IRFNode getRFNode(Level level, long pos, Direction capSide, Runnable capCallback){
+    public IRFNode getRFNode(Level level, long pos, Direction capSide, Runnable capCallback){
         BlockEntity tile = level.getBlockEntity(BlockPos.of(pos));
         if (tile == null) {
             return null;
@@ -55,7 +60,7 @@ public static IRFNode getRFNode(Level level, long pos, Direction capSide, Runnab
         return null;
     }
 
-    public static IHeatNode getHeatNode(Level level, long pos, Direction direction, Runnable invalidate){
+    public IHeatNode getHeatNode(Level level, long pos, Direction direction, Runnable invalidate){
         BlockEntity tile = level.getBlockEntity(BlockPos.of(pos));
         if (tile == null) return null;
         Optional<IHeatHandler> capability = TesseractCapUtils.getHeatHandler(tile, direction);
@@ -66,11 +71,15 @@ public static IHeatNode getHeatNode(Level level, long pos, Direction direction,
         return null;
     }
 
-    public static boolean isFeCap(Class<?> cap){
+    public boolean isFeCap(Class<?> cap){
         return false;
     }
 
-    public static boolean isForge(){
+    public boolean isForge(){
         return false;
     }
+
+    public ConfigHandler createConfig(Config config){
+        return CarbonConfig.createConfig(Tesseract.API_ID, config);
+    }
 }
diff --git a/fabric/src/main/resources/META-INF/services/tesseract.TesseractPlatformUtils b/fabric/src/main/resources/META-INF/services/tesseract.TesseractPlatformUtils
@@ -0,0 +1 @@
+tesseract.fabric.TesseractPlatformUtilsImpl
diff --git a/forge/src/main/java/tesseract/forge/TesseractImpl.java b/forge/src/main/java/tesseract/forge/TesseractImpl.java
@@ -75,8 +75,4 @@ public void onServerTick(TickEvent.WorldTickEvent event) {
             GraphWrapper.getWrappers().forEach(GraphWrapper::healthCheck);
         }
     }
-
-    public static ConfigHandler createConfig(Config config){
-        return CarbonConfig.CONFIGS.createConfig(config);
-    }
 }
diff --git a/forge/src/main/java/tesseract/forge/TesseractPlatformUtilsImpl.java b/forge/src/main/java/tesseract/forge/TesseractPlatformUtilsImpl.java
@@ -1,5 +1,8 @@
 package tesseract.forge;
 
+import carbonconfiglib.CarbonConfig;
+import carbonconfiglib.config.Config;
+import carbonconfiglib.config.ConfigHandler;
 import earth.terrarium.botarium.common.energy.base.EnergyContainer;
 import earth.terrarium.botarium.forge.energy.ForgeEnergyContainer;
 import net.minecraft.core.BlockPos;
@@ -10,6 +13,7 @@
 import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
 import tesseract.TesseractCapUtils;
+import tesseract.TesseractPlatformUtils;
 import tesseract.api.forge.TesseractCaps;
 import tesseract.api.forge.wrapper.RFWrapper;
 import tesseract.api.gt.IEnergyHandler;
@@ -20,8 +24,8 @@
 
 import java.util.Optional;
 
-public class TesseractPlatformUtilsImpl {
-    public static IGTNode getGTNode(Level level, long pos, Direction direction, Runnable invalidate){
+public class TesseractPlatformUtilsImpl implements TesseractPlatformUtils {
+    public IGTNode getGTNode(Level level, long pos, Direction direction, Runnable invalidate){
         BlockEntity tile = level.getBlockEntity(BlockPos.of(pos));
         LazyOptional<IEnergyHandler> capability = TesseractCapUtilsImpl.getEnergyHandler(tile, direction).map(e -> LazyOptional.of(() -> e)).orElse(LazyOptional.empty());
         if (capability.isPresent()) {
@@ -31,7 +35,7 @@ public static IGTNode getGTNode(Level level, long pos, Direction direction, Runn
         return null;
     }
 
-    public static IRFNode getRFNode(Level level, long pos, Direction capSide, Runnable capCallback){
+    public IRFNode getRFNode(Level level, long pos, Direction capSide, Runnable capCallback){
         BlockEntity tile = level.getBlockEntity(BlockPos.of(pos));
         if (tile == null) {
             return null;
@@ -50,7 +54,7 @@ public static IRFNode getRFNode(Level level, long pos, Direction capSide, Runnab
         }
     }
 
-    public static IHeatNode getHeatNode(Level level, long pos, Direction direction, Runnable invalidate){
+    public IHeatNode getHeatNode(Level level, long pos, Direction direction, Runnable invalidate){
         BlockEntity tile = level.getBlockEntity(BlockPos.of(pos));
         if (tile == null) return null;
         LazyOptional<IHeatHandler> capability = tile.getCapability(TesseractCaps.HEAT_CAPABILITY, direction);
@@ -61,11 +65,15 @@ public static IHeatNode getHeatNode(Level level, long pos, Direction direction,
         return null;
     }
 
-    public static boolean isFeCap(Class<?> cap){
+    public boolean isFeCap(Class<?> cap){
         return cap == IEnergyStorage.class;
     }
 
-    public static boolean isForge(){
+    public boolean isForge(){
         return true;
     }
+
+    public ConfigHandler createConfig(Config config){
+        return CarbonConfig.CONFIGS.createConfig(config);
+    }
 }
diff --git a/forge/src/main/resources/META-INF/services/tesseract.TesseractPlatformUtils b/forge/src/main/resources/META-INF/services/tesseract.TesseractPlatformUtils
@@ -0,0 +1 @@
+tesseract.forge.TesseractPlatformUtilsImpl