misc changes

RecursivePineapple · Aug 15, 2024 · 21dd6d6 · 21dd6d6
1 parent 8a8240f
commit 21dd6d6
Show file tree

Hide file tree

Showing 7 changed files with 211 additions and 28 deletions.
diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/ClientProxy.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/ClientProxy.java
@@ -5,9 +5,15 @@
 
 import codechicken.nei.guihook.GuiContainerManager;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.relauncher.Side;
 
 public class ClientProxy extends CommonProxy {
 
+    @Override
+    public Side getSide() {
+        return Side.CLIENT;
+    }
+
     @Override
     public void preInit(FMLPreInitializationEvent event) {
         super.preInit(event);

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/CommonProxy.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/CommonProxy.java
@@ -10,9 +10,14 @@
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.relauncher.Side;
 
 public class CommonProxy {
 
+    public Side getSide() {
+        return null;
+    }
+
     public void preInit(FMLPreInitializationEvent event) {
         NuclearHorizons.LOG.info("Loading Nuclear Horizons version " + Tags.VERSION);
 

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/NuclearHorizons.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/NuclearHorizons.java
@@ -23,7 +23,7 @@ public class NuclearHorizons {
 
     @SidedProxy(
         clientSide = "com.recursive_pineapple.nuclear_horizons.ClientProxy",
-        serverSide = "com.recursive_pineapple.nuclear_horizons.CommonProxy")
+        serverSide = "com.recursive_pineapple.nuclear_horizons.ServerProxy")
     public static CommonProxy proxy;
 
     @Instance

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/ServerProxy.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/ServerProxy.java
@@ -0,0 +1,12 @@
+package com.recursive_pineapple.nuclear_horizons;
+
+import cpw.mods.fml.relauncher.Side;
+
+public class ServerProxy extends CommonProxy {
+
+    @Override
+    public Side getSide() {
+        return Side.SERVER;
+    }
+
+}
diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/FluidList.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/FluidList.java
@@ -1,10 +1,11 @@
 package com.recursive_pineapple.nuclear_horizons.reactors.fluids;
 
+import com.recursive_pineapple.nuclear_horizons.reactors.blocks.BlockList;
+
+// import gregtech.api.enums.Materials;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
-import com.recursive_pineapple.nuclear_horizons.reactors.blocks.BlockList;
-
 public class FluidList {
 
     public static final String COOLANT_NAME = "nh_coolant";
@@ -62,6 +63,6 @@ public net.minecraft.util.IIcon getFlowingIcon() {
     public static void registerCoolants() {
         CoolantRegistry.registerCoolant(COOLANT, HOT_COOLANT, 1);
 
-        CoolantRegistry.registerCoolant(FluidRegistry.getFluid("supercoolant"), HOT_SUPER_COOLANT, 5);
+        // CoolantRegistry.registerCoolant(Materials.Lead.mStandardMoltenFluid, HOT_SUPER_COOLANT, 10);
     }
 }
diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/BasicHeatVentItem.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/BasicHeatVentItem.java
@@ -125,7 +125,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer player, List<String
                 desc.add(I18n.format("nh_tooltip.vent.fluid_disclaimer"));
             }
         } else {
-            desc.add("Hold Shift for more info.");
+            desc.add(I18n.format("nh_tooltip.more_info"));
         }
     }
 }