From e6bfea837aef72ae1d0054fee28a65030c8b5d0f Mon Sep 17 00:00:00 2001 From: CM436 Date: Wed, 27 Mar 2024 16:16:47 -0600 Subject: [PATCH 1/6] config option for cooling tower particles added a config option to disable the particles emitted by cooling towers when on "all" or "decreased" particle settings --- src/main/java/com/hbm/config/GeneralConfig.java | 4 +++- src/main/java/com/hbm/main/ClientProxy.java | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index 282666a59..99eb1fed8 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -34,6 +34,7 @@ public class GeneralConfig { public static boolean enableFluidContainerCompat = true; public static boolean enableMOTD = true; public static boolean enableGuideBook = true; + public static boolean enableSteamParticles = true; public static int hintPos = 0; public static boolean enableExpensiveMode = false; @@ -98,7 +99,8 @@ public class GeneralConfig { enableFluidContainerCompat = config.get(CATEGORY_GENERAL, "1.35_enableFluidContainerCompat", true, "If enabled, fluid containers will be oredicted and interchangable in recipes with other mods' containers, as well as TrainCraft's diesel being considered a valid diesel canister.").getBoolean(true); enableMOTD = config.get(CATEGORY_GENERAL, "1.36_enableMOTD", true, "If enabled, shows the 'Loaded mod!' chat message as well as update notifications when joining a world").getBoolean(true); enableGuideBook = config.get(CATEGORY_GENERAL, "1.37_enableGuideBook", true, "If enabled, gives players the guide book when joining the world for the first time").getBoolean(true); - + enableSteamParticles = config.get(CATEGORY_GENERAL, "1.38_enableSteamParticles",true, "If disabled, auxiliary cooling towers and large cooling towers will not emit steam particles when in use.").getBoolean(true); + enableExpensiveMode = config.get(CATEGORY_GENERAL, "1.99_enableExpensiveMode", false, "It does what the name implies.").getBoolean(false); final String CATEGORY_528 = CommonConfig.CATEGORY_528; diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index d0beabbc7..f0c090322 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -55,6 +55,7 @@ import com.hbm.blocks.generic.BlockSnowglobe.TileEntitySnowglobe; import com.hbm.blocks.machine.MachineFan.TileEntityFan; import com.hbm.blocks.machine.PistonInserter.TileEntityPistonInserter; import com.hbm.blocks.machine.WatzPump.TileEntityWatzPump; +import com.hbm.config.GeneralConfig; import com.hbm.entity.cart.*; import com.hbm.entity.effect.*; import com.hbm.entity.grenade.*; @@ -126,11 +127,12 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.ReflectionHelper; +import scala.tools.nsc.backend.icode.analysis.TypeFlowAnalysis; -public class ClientProxy extends ServerProxy { + public class ClientProxy extends ServerProxy { public RenderInfoSystem theInfoSystem = new RenderInfoSystem(); - + @Override public void registerRenderInfo() { @@ -1742,7 +1744,7 @@ public class ClientProxy extends ServerProxy { } if("tower".equals(type)) { - if(particleSetting == 0 || (particleSetting == 1 && rand.nextBoolean())) { + if(GeneralConfig.enableSteamParticles && (particleSetting == 0 || (particleSetting == 1 && rand.nextBoolean()))) { ParticleCoolingTower fx = new ParticleCoolingTower(man, world, x, y, z); fx.setLift(data.getFloat("lift")); fx.setBaseScale(data.getFloat("base")); From f4c0ed3f4c89e93fce36301bd5ee482ce2a72639 Mon Sep 17 00:00:00 2001 From: CM436 Date: Thu, 28 Mar 2024 10:58:18 -0600 Subject: [PATCH 2/6] removed one line of code intellij added this thing and i have no clue what it does, removing it doesn't break anything --- src/main/java/com/hbm/main/ClientProxy.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index f0c090322..19efe888a 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -127,7 +127,6 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.ReflectionHelper; -import scala.tools.nsc.backend.icode.analysis.TypeFlowAnalysis; public class ClientProxy extends ServerProxy { From 628a9474acf831ec7f1148b1fc6b49637a5cb700 Mon Sep 17 00:00:00 2001 From: CM436 Date: Thu, 28 Mar 2024 11:03:47 -0600 Subject: [PATCH 3/6] added whitespace why not --- src/main/java/com/hbm/config/GeneralConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index 99eb1fed8..df431a227 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -35,6 +35,7 @@ public class GeneralConfig { public static boolean enableMOTD = true; public static boolean enableGuideBook = true; public static boolean enableSteamParticles = true; + public static int hintPos = 0; public static boolean enableExpensiveMode = false; From f1b444bac99e7fc0914c857bcd7ebed2e6a11ec3 Mon Sep 17 00:00:00 2001 From: CM436 Date: Thu, 28 Mar 2024 11:12:13 -0600 Subject: [PATCH 4/6] Revert "added whitespace" This reverts commit 628a9474acf831ec7f1148b1fc6b49637a5cb700. --- src/main/java/com/hbm/config/GeneralConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index df431a227..99eb1fed8 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -35,7 +35,6 @@ public class GeneralConfig { public static boolean enableMOTD = true; public static boolean enableGuideBook = true; public static boolean enableSteamParticles = true; - public static int hintPos = 0; public static boolean enableExpensiveMode = false; From 20499eb80eedb5792c2cf672cbe53f726f2d3b35 Mon Sep 17 00:00:00 2001 From: CM436 Date: Thu, 28 Mar 2024 11:17:52 -0600 Subject: [PATCH 5/6] remove a single character most useless change ever but i'm new to this stuff and overly cautious of fucking things up --- src/main/java/com/hbm/main/ClientProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 19efe888a..bc4f5994a 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -128,7 +128,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.ReflectionHelper; - public class ClientProxy extends ServerProxy { +public class ClientProxy extends ServerProxy { public RenderInfoSystem theInfoSystem = new RenderInfoSystem(); From b28d34d5542249bed320bf105fea2be6e96aea30 Mon Sep 17 00:00:00 2001 From: CM436 Date: Fri, 29 Mar 2024 11:19:45 -0600 Subject: [PATCH 6/6] fix indentation once again some random minor thing got changed by accident --- src/main/java/com/hbm/main/ClientProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index bc4f5994a..914978f35 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -131,7 +131,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends ServerProxy { public RenderInfoSystem theInfoSystem = new RenderInfoSystem(); - + @Override public void registerRenderInfo() {