made FluidPlatformUtils instance manually set instead of using java s…

…ervices for it

common/src/main/java/tesseract/FluidPlatformUtils.java

@@ -19,31 +19,31 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public interface FluidPlatformUtils {
-    FluidPlatformUtils INSTANCE =  ServiceLoader.load(FluidPlatformUtils.class).findFirst().orElseThrow(() -> new IllegalStateException("No implementation of FluidPlatformUtils found"));
+public abstract class FluidPlatformUtils {
+    public static FluidPlatformUtils INSTANCE; // =  ServiceLoader.load(FluidPlatformUtils.class).findFirst().orElseThrow(() -> new IllegalStateException("No implementation of FluidPlatformUtils found"));
     //public static FluidPlatformUtils INSTANCE = new FluidPlatformUtils();
 
-    static FluidHolder createFluidStack(Fluid fluid, long amount){
+    public static FluidHolder createFluidStack(Fluid fluid, long amount){
         return FluidHooks.newFluidHolder(fluid,amount, null);
     }
 
-    ResourceLocation getStillTexture(Fluid fluid);
+    public abstract ResourceLocation getStillTexture(Fluid fluid);
 
-    ResourceLocation getFlowingTexture(Fluid fluid);
+    public abstract ResourceLocation getFlowingTexture(Fluid fluid);
 
-    ResourceLocation getFluidId(Fluid fluid);
+    public abstract ResourceLocation getFluidId(Fluid fluid);
 
-    int getFluidTemperature(Fluid fluid);
+    public abstract int getFluidTemperature(Fluid fluid);
 
-    int getFluidDensity(Fluid fluid);
+    public abstract int getFluidDensity(Fluid fluid);
 
-    boolean isFluidGaseous(Fluid fluid);
+    public abstract boolean isFluidGaseous(Fluid fluid);
 
-    int getFluidColor(Fluid fluid);
+    public abstract int getFluidColor(Fluid fluid);
 
-    SoundEvent getFluidSound(Fluid fluid, boolean fill);
+    public abstract SoundEvent getFluidSound(Fluid fluid, boolean fill);
 
-    Component getFluidDisplayName(FluidHolder fluid);
+    public abstract Component getFluidDisplayName(FluidHolder fluid);
 
     /**
      * Fill a destination fluid handler from a source fluid handler with a max amount.
@@ -57,7 +57,7 @@ static FluidHolder createFluidStack(Fluid fluid, long amount){
      * @return the fluidStack that was transferred from the source to the destination. null on failure.
      */
     @NotNull
-    default FluidHolder tryFluidTransfer(PlatformFluidHandler fluidDestination, PlatformFluidHandler fluidSource, long maxAmount, boolean doTransfer) {
+    public FluidHolder tryFluidTransfer(PlatformFluidHandler fluidDestination, PlatformFluidHandler fluidSource, long maxAmount, boolean doTransfer) {
         for (int i = 0; i < fluidSource.getTankAmount(); i++) {
             FluidHolder fluid = fluidSource.getFluidInTank(i);
             FluidHolder transfer = tryFluidTransfer(fluidDestination, fluidSource, fluid.copyWithAmount(Math.min(fluid.getFluidAmount(), maxAmount)), doTransfer);
@@ -78,7 +78,7 @@ default FluidHolder tryFluidTransfer(PlatformFluidHandler fluidDestination, Plat
      * @return the FluidHolder that was transferred from the source to the destination. null on failure.
      */
     @NotNull
-    default FluidHolder tryFluidTransfer(PlatformFluidHandler fluidDestination, PlatformFluidHandler fluidSource, FluidHolder resource, boolean doTransfer)
+    public FluidHolder tryFluidTransfer(PlatformFluidHandler fluidDestination, PlatformFluidHandler fluidSource, FluidHolder resource, boolean doTransfer)
     {
         FluidHolder drainable = fluidSource.extractFluid(resource, true);
         if (!drainable.isEmpty() && resource.matches(drainable))
@@ -119,15 +119,15 @@ private static FluidHolder tryFluidTransfer_Internal(PlatformFluidHandler fluidD
         return FluidHooks.emptyFluid();
     }
 
-    default boolean fillItemFromContainer(ItemStack stack, PlatformFluidHandler handler, Consumer<ItemStack> consumer){
+    public boolean fillItemFromContainer(ItemStack stack, PlatformFluidHandler handler, Consumer<ItemStack> consumer){
         return fillItemFromContainer(stack, handler, s -> true, consumer);
     }
 
-    default boolean emptyItemIntoContainer(ItemStack stack, PlatformFluidHandler handler, Consumer<ItemStack> consumer){
+    public boolean emptyItemIntoContainer(ItemStack stack, PlatformFluidHandler handler, Consumer<ItemStack> consumer){
         return emptyItemIntoContainer(stack, handler, s -> true, consumer);
     }
 
-    default boolean fillItemFromContainer(ItemStack stack, PlatformFluidHandler handler, Predicate<ItemStack> tester, Consumer<ItemStack> consumer){
+    public boolean fillItemFromContainer(ItemStack stack, PlatformFluidHandler handler, Predicate<ItemStack> tester, Consumer<ItemStack> consumer){
         PlatformFluidItemHandler itemHandler = FluidHooks.safeGetItemFluidManager(stack.copy()).orElse(null);
         if (itemHandler == null) return false;
         for (int i = 0; i < handler.getTankAmount(); i++) {
@@ -149,7 +149,7 @@ default boolean fillItemFromContainer(ItemStack stack, PlatformFluidHandler hand
         return false;
     }
 
-    default boolean emptyItemIntoContainer(ItemStack stack, PlatformFluidHandler handler, Predicate<ItemStack> tester, Consumer<ItemStack> consumer){
+    public boolean emptyItemIntoContainer(ItemStack stack, PlatformFluidHandler handler, Predicate<ItemStack> tester, Consumer<ItemStack> consumer){
         PlatformFluidItemHandler itemHandler = FluidHooks.safeGetItemFluidManager(stack.copy()).orElse(null);
         if (itemHandler == null) return false;
         for (int i = 0; i < itemHandler.getTankAmount(); i++) {
@@ -173,7 +173,7 @@ default boolean emptyItemIntoContainer(ItemStack stack, PlatformFluidHandler han
         return false;
     }
 
-    default void writeToPacket(FriendlyByteBuf buffer, FluidHolder holder) {
+    public void writeToPacket(FriendlyByteBuf buffer, FluidHolder holder) {
         if (holder.isEmpty()) {
             buffer.writeBoolean(false);
         } else {
@@ -184,7 +184,7 @@ default void writeToPacket(FriendlyByteBuf buffer, FluidHolder holder) {
         }
     }
 
-    default FluidHolder readFromPacket(FriendlyByteBuf buffer) {
+    public FluidHolder readFromPacket(FriendlyByteBuf buffer) {
         if (!buffer.readBoolean()) return FluidHooks.emptyFluid();
         Fluid fluid = Registry.FLUID.byId(buffer.readVarInt());
         long amount = buffer.readVarLong();

fabric/src/main/java/tesseract/fabric/FluidPlatformUtilsImpl.java

@@ -15,7 +15,7 @@
 import net.minecraft.world.level.material.Fluid;
 import tesseract.FluidPlatformUtils;
 
-public class FluidPlatformUtilsImpl implements FluidPlatformUtils {
+public class FluidPlatformUtilsImpl extends FluidPlatformUtils {
 
     public ResourceLocation getStillTexture(Fluid fluid){
         if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {

fabric/src/main/java/tesseract/fabric/TesseractPreLoad.java

@@ -0,0 +1,11 @@
+package tesseract.fabric;
+
+import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
+import tesseract.FluidPlatformUtils;
+
+public class TesseractPreLoad implements PreLaunchEntrypoint {
+    @Override
+    public void onPreLaunch() {
+        FluidPlatformUtils.INSTANCE = new FluidPlatformUtilsImpl();
+    }
+}

fabric/src/main/resources/fabric.mod.json

@@ -24,6 +24,9 @@
   "entrypoints": {
     "main": [
       "tesseract.fabric.TesseractImpl"
+    ],
+    "preLaunch" : [
+      "tesseract.fabric.TesseractPreLoad"
     ]
   },
   "depends": {

forge/src/main/java/tesseract/forge/FluidPlatformUtilsImpl.java

@@ -8,7 +8,7 @@
 import net.minecraft.world.level.material.Fluid;
 import tesseract.FluidPlatformUtils;
 
-public class FluidPlatformUtilsImpl implements FluidPlatformUtils {
+public class FluidPlatformUtilsImpl extends FluidPlatformUtils {
 
     public ResourceLocation getStillTexture(Fluid fluid){
         return fluid.getAttributes().getStillTexture();

forge/src/main/java/tesseract/forge/TesseractImpl.java

@@ -12,6 +12,7 @@
 import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.common.Mod;
+import tesseract.FluidPlatformUtils;
 import tesseract.Tesseract;
 import tesseract.api.GraphWrapper;
 import tesseract.api.context.TesseractItemContext;
@@ -30,6 +31,7 @@ public class TesseractImpl extends Tesseract {
     public static GraphWrapper<GTTransaction, IGTCable, IGTNode> GT_ENERGY = new GraphWrapper<>(Energy::new, IGTNode.GT_GETTER);
 
     public TesseractImpl() {
+        FluidPlatformUtils.INSTANCE = new FluidPlatformUtilsImpl();
         Tesseract.init();
         MinecraftForge.EVENT_BUS.addListener(this::serverStoppedEvent);
         MinecraftForge.EVENT_BUS.addListener(this::worldUnloadEvent);