aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-21 17:17:34 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-21 17:17:34 +0000
commiteff844b6e222b578bc0baadbe84f94912cb819f7 (patch)
treea08b01116fd4e44b873e9158885f30db83ab635d /src/main/java/gtPlusPlus/core
parent82f2d61465c1fcacfb5104115238c23da0783d0b (diff)
downloadGT5-Unofficial-eff844b6e222b578bc0baadbe84f94912cb819f7.tar.gz
GT5-Unofficial-eff844b6e222b578bc0baadbe84f94912cb819f7.tar.bz2
GT5-Unofficial-eff844b6e222b578bc0baadbe84f94912cb819f7.zip
Add Multiblock Forge Hammer.
Add base for Multiblock Molecular Transformer.
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/config/ConfigHandler.java1
-rw-r--r--src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java2
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java1
-rw-r--r--src/main/java/gtPlusPlus/core/lib/LoadedMods.java14
4 files changed, 17 insertions, 1 deletions
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index 61610a03e9..94193e8dab 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -206,6 +206,7 @@ public class ConfigHandler {
pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = config.get("pollution", "pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc", pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc,"pollution rate in gibbl/s for the Large processing factory in misc mode").getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc);
pollutionPerSecondMultiIndustrialPlatePress_ModeForming = config.get("pollution", "pollutionPerSecondMultiIndustrialPlatePress_ModeForming", pollutionPerSecondMultiIndustrialPlatePress_ModeForming,"pollution rate in gibbl/s for the Industrial material press in forming mode").getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeForming);
pollutionPerSecondMultiIndustrialPlatePress_ModeBending = config.get("pollution", "pollutionPerSecondMultiIndustrialPlatePress_ModeBending", pollutionPerSecondMultiIndustrialPlatePress_ModeBending,"pollution rate in gibbl/s for the Industrial material press in bending mode").getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeBending);
+ pollutionPerSecondMultiIndustrialForgeHammer = config.get("pollution", "pollutionPerSecondMultiIndustrialForgeHammer", pollutionPerSecondMultiIndustrialForgeHammer,"pollution rate in gibbl/s for the Industrial Forge Hammer").getInt(pollutionPerSecondMultiIndustrialForgeHammer);
pollutionPerSecondMultiIndustrialSifter = config.get("pollution", "pollutionPerSecondMultiIndustrialSifter", pollutionPerSecondMultiIndustrialSifter,"pollution rate in gibbl/s for the Large Sifter").getInt(pollutionPerSecondMultiIndustrialSifter);
pollutionPerSecondMultiIndustrialThermalCentrifuge = config.get("pollution", "pollutionPerSecondMultiIndustrialThermalCentrifuge", pollutionPerSecondMultiIndustrialThermalCentrifuge,"pollution rate in gibbl/s for the Large thermal refinery").getInt(pollutionPerSecondMultiIndustrialThermalCentrifuge);
pollutionPerSecondMultiIndustrialVacuumFreezer = config.get("pollution", "pollutionPerSecondMultiIndustrialVacuumFreezer", pollutionPerSecondMultiIndustrialVacuumFreezer,"pollution rate in gibbl/s for the Cryogenic freezer").getInt(pollutionPerSecondMultiIndustrialVacuumFreezer);
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 53d63499a6..3460d207b4 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -159,6 +159,8 @@ public class COMPAT_HANDLER {
GregtechIndustrialAlloySmelter.run();
GregtechIsaMill.run();
GregtechSteamMultis.run();
+ GregtechIndustrialForgeHammer.run();
+ GregtechMolecularTransformer.run();
//GregtechIndustrialElementDuplicator.run();
//New Horizons Content
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 1ef04aa154..cf5539e572 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -276,6 +276,7 @@ public class CORE {
public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = 600;
public static int pollutionPerSecondMultiIndustrialPlatePress_ModeForming = 240;
public static int pollutionPerSecondMultiIndustrialPlatePress_ModeBending = 480;
+ public static int pollutionPerSecondMultiIndustrialForgeHammer = 250;
public static int pollutionPerSecondMultiIndustrialSifter = 40;
public static int pollutionPerSecondMultiIndustrialThermalCentrifuge = 1000;
public static int pollutionPerSecondMultiIndustrialVacuumFreezer = 500;
diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
index 1eb8351d65..15b0d8629c 100644
--- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
@@ -24,6 +24,7 @@ public class LoadedMods {
public static boolean Simply_Jetpacks = false;
public static boolean RFTools = false;
public static boolean Thaumcraft = false;
+ public static boolean ThaumicBases = false;
public static boolean Baubles = false;
public static boolean Extra_Utils = false;
public static boolean PneumaticCraft = false;
@@ -41,6 +42,7 @@ public class LoadedMods {
public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper
public static boolean ThermalFoundation = false;
public static boolean IHL = false;
+ public static boolean AdvancedSolarPanel = false;
public static boolean OpenComputers = false; //OpenComputers
public static boolean OpenBlocks = false;
public static boolean Computronics = false; //computronics
@@ -117,6 +119,11 @@ public class LoadedMods {
Logger.INFO("Components enabled for: Tinkers Construct");
totalMods++;
}
+ if (isModLoaded("AdvancedSolarPanel")){
+ AdvancedSolarPanel = true;
+ Logger.INFO("Components enabled for: Advanced Solar Panels");
+ totalMods++;
+ }
if (isModLoaded("BuildCraft")){
BuildCraft = true;
Logger.INFO("Components enabled for: BuildCraft");
@@ -161,12 +168,17 @@ public class LoadedMods {
OpenBlocks = true;
Logger.INFO("Components enabled for: OpenBlocks");
totalMods++;
- }
+ }
if (isModLoaded("Thaumcraft")){
Thaumcraft = true;
Logger.INFO("Components enabled for: Thaumcraft");
totalMods++;
}
+ if (isModLoaded("thaumicbases")){
+ ThaumicBases = true;
+ Logger.INFO("Components enabled for: Thaumic Bases");
+ totalMods++;
+ }
if (isModLoaded("BiomesOPlenty")){
BiomesOPlenty = true;
Logger.INFO("Components enabled for: BiomesOPlenty");