Adds&Fixes config

lilypuree · Jan 23, 2024 · 993c04e · 993c04e
1 parent 93a49bd
commit 993c04e
Show file tree

Hide file tree

Showing 11 changed files with 87 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## 1.20.1 Changelog
 
+### 2.1.2
+- Fabric Configs mod menu screen fixed
+- Removed doTemperature gamerule
+- Added server configs to disable heat & conversion of resources
+
 ### 2.1.1
 - Fabric Configs now exist
 - Metabolism HUD shows behind chat

diff --git a/common/src/main/java/lilypuree/metabolism/core/Metabolism.java b/common/src/main/java/lilypuree/metabolism/core/Metabolism.java
@@ -8,7 +8,6 @@
 import lilypuree.metabolism.network.ProgressSyncMessage;
 import lilypuree.metabolism.network.ResultSyncMessage;
 import lilypuree.metabolism.platform.Services;
-import lilypuree.metabolism.registration.MetabolismGameRules;
 import lilypuree.metabolism.registration.Registration;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerLevel;
@@ -85,10 +84,7 @@ public void tick(Player player) {
             //apply environmental effects
             ServerLevel level = (ServerLevel) player.level();
             EnvironmentEffect.Combined effect = Environment.get().getCurrentEffect(level, player);
-            if (level.getGameRules().getBoolean(MetabolismGameRules.RULE_DO_TEMPERATURE))
-                applyHeatTarget(effect.getCombinedHeatTarget());
-            else
-                applyHeatTarget(0);
+            applyHeatTarget(Config.SERVER.disableHeat() ? 0 : effect.getCombinedHeatTarget());
             warm(effect.getCombinedWarmthEffect());
             envCounter = 0;
         }
@@ -178,15 +174,19 @@ private MetabolismResult metabolismEffect(ServerPlayer player) {
                 consumeHydration(1.0F);
                 warmIgnoreHeat(1.0F);
                 return MetabolismResult.WARMING;
-            } else if (heat > 0 && food > hydration && food > 1.0F) {
-                consumeFood(1.0F);
-                setHydration(hydration + CONVERSION_RATIO);
-                return MetabolismResult.HYDRATION;
-            } else if (heat < 0 && food < hydration && hydration > 1.0F) {
-                consumeHydration(1.0F);
-                setFood(food + CONVERSION_RATIO);
-                return MetabolismResult.FOOD;
-            } else if (effectLevel > 0 && warmth < maxWarmth && food > 1.0F && hydration > 1.0F) {
+            }
+            if (Config.SERVER.convertResources()) {
+                if (heat > 0 && food > hydration && food > 1.0F) {
+                    consumeFood(1.0F);
+                    setHydration(hydration + CONVERSION_RATIO);
+                    return MetabolismResult.HYDRATION;
+                } else if (heat < 0 && food < hydration && hydration > 1.0F) {
+                    consumeHydration(1.0F);
+                    setFood(food + CONVERSION_RATIO);
+                    return MetabolismResult.FOOD;
+                }
+            }
+            if (effectLevel > 0 && warmth < maxWarmth && food > 1.0F && hydration > 1.0F) {
                 consumeFood(1.0F);
                 consumeHydration(1.0F);
                 warmIgnoreHeat(1.0F);

diff --git a/common/src/main/java/lilypuree/metabolism/platform/services/MetabolismServerConfig.java b/common/src/main/java/lilypuree/metabolism/platform/services/MetabolismServerConfig.java
@@ -3,7 +3,10 @@
 public interface MetabolismServerConfig {
 
     boolean preciseFeedback();
+
+    boolean disableHeat();
 
+    boolean convertResources();
 
 
     void reload();

diff --git a/common/src/main/java/lilypuree/metabolism/registration/MetabolismGameRules.java b/common/src/main/java/lilypuree/metabolism/registration/MetabolismGameRules.java
diff --git a/common/src/main/resources/assets/metabolism/lang/en_us.json b/common/src/main/resources/assets/metabolism/lang/en_us.json
@@ -1,30 +1,38 @@
 {
   "metabolism.midnightconfig.title": "Metabolism Configs",
-  "metabolism.midnightconfig.server": "Server",
+  "metabolism.midnightconfig.category.server": "Server",
+  "metabolism.midnightconfig.category.debug": "Debug Overlay",
+  "metabolism.midnightconfig.category.metabolism_hud": "Metabolism HUD",
+  "metabolism.midnightconfig.category.tooltip": "Tooltips",
+
   "metabolism.midnightconfig.preciseFeedback": "Enable more precise heat feedback",
-
-  "metabolism.midnightconfig.client": "Client",
-  "metabolism.midnightconfig.debug": "Debug Overlay",
+  "metabolism.midnightconfig.disableHeat": "Set the heat target to 0",
+  "metabolism.midnightconfig.convertResources": "Enable food/hydration conversion",
   "metabolism.midnightconfig.debugShowOverlay": "Enable the Debug Overlay",
   "metabolism.midnightconfig.debugOverlayAnchor": "Position of the Debug Overlay",
   "metabolism.midnightconfig.debugOverlayTextScale": "Scale Text",
-  "metabolism.midnightconfig.metabolismHud": "Metabolism HUD",
   "metabolism.midnightconfig.metabolismOverlayShow": "Enable the Metabolism HUD",
   "metabolism.midnightconfig.metabolismOverlayAnchor": "Position of the Metabolism HUD",
   "metabolism.midnightconfig.metabolismOverlayOffsetX": "Fine-tune the X position",
   "metabolism.midnightconfig.metabolismOverlayOffsetY": "Fine-tune the Y position",
   "metabolism.midnightconfig.metabolismOverlayTextScale": "Scale Text",
-  "metabolism.midnightconfig.tooltip": "Metabolite Tooltips",
   "metabolism.midnightconfig.showToolTip": "Show metabolite data in detailed tooltips",
   "metabolism.midnightconfig.alwaysShowToolTip": "Always show metabolite tooltips",
 
-
+  "metabolism.midnightconfig.enum.Anchor.TOP_LEFT": "Top Left",
+  "metabolism.midnightconfig.enum.Anchor.TOP_CENTER": "Top Center",
+  "metabolism.midnightconfig.enum.Anchor.TOP_RIGHT": "Top Right",
+  "metabolism.midnightconfig.enum.Anchor.CENTER_LEFT": "Center Left",
+  "metabolism.midnightconfig.enum.Anchor.CENTER_CENTER": "Center",
+  "metabolism.midnightconfig.enum.Anchor.CENTER_RIGHT": "Center Right",
+  "metabolism.midnightconfig.enum.Anchor.BOTTOM_LEFT": "Bottom Left",
+  "metabolism.midnightconfig.enum.Anchor.BOTTOM_CENTER": "Bottom Center",
+  "metabolism.midnightconfig.enum.Anchor.BOTTOM_RIGHT": "Bottom Right",
 
 
   "effect.metabolism.metabolism": "metabolism",
   "command.metabolism.warmth": "Player Warmth: %s",
   "command.metabolism.heat": "Player Heat: %s",
   "command.metabolism.hydration": "Player Hydration: %s",
-  "command.metabolism.food": "Player Food: %s",
-  "gamerule.doTemperature": "Enable Environment Effects"
+  "command.metabolism.food": "Player Food: %s"
 }
diff --git a/fabric/src/main/java/lilypuree/metabolism/MetabolismMod.java b/fabric/src/main/java/lilypuree/metabolism/MetabolismMod.java
@@ -5,26 +5,18 @@
 import lilypuree.metabolism.core.metabolite.Metabolites;
 import lilypuree.metabolism.data.FabricEnvironments;
 import lilypuree.metabolism.data.FabricMetabolites;
-import lilypuree.metabolism.network.FabricNetwork;
 import lilypuree.metabolism.platform.FabricConfig;
-import lilypuree.metabolism.registration.MetabolismGameRules;
 import lilypuree.metabolism.registration.Registration;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.event.player.UseItemCallback;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.server.packs.PackType;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.InteractionResultHolder;
-import net.minecraft.world.item.ItemStack;
 
 public class MetabolismMod implements ModInitializer {
     @Override
     public void onInitialize() {
         Registration.init();
-        MetabolismGameRules.init();
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
             MetabolismCommand.register(dispatcher);
         });

diff --git a/fabric/src/main/java/lilypuree/metabolism/platform/FabricConfig.java b/fabric/src/main/java/lilypuree/metabolism/platform/FabricConfig.java
@@ -5,74 +5,68 @@
 import lilypuree.metabolism.platform.services.MetabolismServerConfig;
 import lilypuree.metabolism.util.Anchor;
 
-public class FabricConfig extends MidnightConfig implements MetabolismServerConfig, MetabolismClientConfig {
-
+public class FabricConfig extends MidnightConfig implements MetabolismServerConfig, MetabolismClientConfig { 
+    
     //Server Config
     @Server
-    @Comment(category = "text", centered = true)
-    public static Comment server;
+    @Entry(category = "server")
+    public static boolean preciseFeedback = false;
+    @Server
+    @Entry(category = "server")
+    public static boolean disableHeat = false;
 
     @Server
-    @Entry(category = "numbers")
-    public static boolean preciseFeedback = false;
-
+    @Entry(category = "server")
+    public static boolean convertResources = true;
+    
     @Override
     public boolean preciseFeedback() {
         return preciseFeedback;
     }
-
 
-//Client Config
+    @Override
+    public boolean disableHeat() {
+        return disableHeat;
+    }
 
-    @Client
-    @Comment(category = "text", centered = true)
-    public static Comment client;
+    @Override
+    public boolean convertResources() {
+        return convertResources;
+    }
+
+    //Client Config
 
     @Client
-    @Comment(category = "text")
-    public static Comment debug;
-    @Client
-
-    @Entry(category = "text")
+    @Entry(category = "debug")
     public static boolean debugShowOverlay = false;
     @Client
-
-    @Entry(category = "text")
+    @Entry(category = "debug")
     public static Anchor debugOverlayAnchor = Anchor.TOP_RIGHT;
     @Client
-
-    @Entry(category = "numbers")
+    @Entry(category = "debug")
     public static float debugOverlayTextScale = 0.75f;
+
     @Client
-
-
-    @Comment(category = "metabolism hud")
-    public static Comment metabolismHud;
-    @Client
-
-    @Entry(category = "text")
+    @Entry(category = "metabolism_hud")
     public static boolean metabolismOverlayShow = true;
     @Client
-    @Entry(category = "text")
+    @Entry(category = "metabolism_hud")
     public static Anchor metabolismOverlayAnchor = Anchor.BOTTOM_LEFT;
     @Client
-    @Entry(category = "numbers")
+    @Entry(category = "metabolism_hud")
     public static int metabolismOverlayOffsetX = 0;
     @Client
-    @Entry(category = "numbers")
+    @Entry(category = "metabolism_hud")
     public static int metabolismOverlayOffsetY = 0;
     @Client
-    @Entry(category = "numbers")
+    @Entry(category = "metabolism_hud")
     public static float metabolismOverlayTextScale = 0.75F;
+
     @Client
-
-    @Comment(category = "text")
-    public static Comment tooltip;
-    @Client
-    @Entry(category = "text")
+    @Entry(category = "tooltip")
     public static boolean showToolTip = true;
     @Client
-    @Entry(category = "text")
+    @Entry(category = "tooltip")
     public static boolean alwaysShowToolTip = true;
 
 

diff --git a/forge/src/main/java/lilypuree/metabolism/MetabolismMod.java b/forge/src/main/java/lilypuree/metabolism/MetabolismMod.java
@@ -6,15 +6,11 @@
 import lilypuree.metabolism.config.Config;
 import lilypuree.metabolism.core.environment.Environment;
 import lilypuree.metabolism.core.metabolite.Metabolites;
-import lilypuree.metabolism.network.MetabolitesPacket;
 import lilypuree.metabolism.network.Network;
 import lilypuree.metabolism.platform.ForgePlatformHelper;
-import lilypuree.metabolism.registration.MetabolismGameRules;
 import lilypuree.metabolism.registration.Registration;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RegisterClientTooltipComponentFactoriesEvent;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddReloadListenerEvent;
@@ -30,7 +26,6 @@
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.network.NetworkDirection;
 
 @Mod(Constants.MOD_ID)
 public class MetabolismMod {
@@ -72,7 +67,6 @@ else if (event.getConfig().getType() == ModConfig.Type.COMMON)
     }
 
     private void commonSetup(final FMLCommonSetupEvent event) {
-        MetabolismGameRules.init();
     }
 
     private void addListener(AddReloadListenerEvent event) {

diff --git a/forge/src/main/java/lilypuree/metabolism/platform/ForgeServerConfig.java b/forge/src/main/java/lilypuree/metabolism/platform/ForgeServerConfig.java
@@ -6,11 +6,15 @@
 
 public class ForgeServerConfig implements MetabolismServerConfig {
     public final ForgeConfigSpec.BooleanValue preciseFeedback;
+    public final ForgeConfigSpec.BooleanValue disableHeat;
+    public final ForgeConfigSpec.BooleanValue convertResources;
 
     public ForgeServerConfig() {
         ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
 
-        preciseFeedback = builder.comment("enable more precise heat feedback").define("result.heat.preciseFeedback", false);
+        preciseFeedback = builder.comment("enable more precise heat feedback").define("heat.preciseFeedback", false);
+        disableHeat = builder.comment("set the heat target to 0").define("heat.disable", false);
+        convertResources = builder.comment("enable food/hydration conversion").define("metabolization.convertResources", true);
 
         MetabolismMod.SERVER_SPEC = builder.build();
     }
@@ -19,6 +23,16 @@ public ForgeServerConfig() {
     public boolean preciseFeedback() {
         return preciseFeedback.get();
     }
+
+    @Override
+    public boolean disableHeat() {
+        return disableHeat.get();
+    }
+
+    @Override
+    public boolean convertResources() {
+        return convertResources.get();
+    }
 
     @Override
     public void reload() {

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Project
-version=2.1.1
+version=2.1.2
 group=lilypuree.metabolism
 
 # Common

diff --git a/forge/logo.png → logo.png b/forge/logo.png → logo.png