xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1151 from re7gog/master

Browse Source 
Fixes for Crucible (Thermos fork)
This commit is contained in:
HbmMods 2023-08-17 07:33:50 +02:00 committed by GitHub
commit 540183181f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/hbm/handler/pollution/PollutionHandler.java
View File

@ -153,8 +153,10 @@ public class PollutionHandler {
public String getDataDir(WorldServer world) { public String getDataDir(WorldServer world) {
String dir = world.getSaveHandler().getWorldDirectory().getAbsolutePath(); String dir = world.getSaveHandler().getWorldDirectory().getAbsolutePath();
if(world.provider.dimensionId != 0) { // Crucible and probably Thermos provide dimId by themselves
dir += File.separator + "DIM" + world.provider.dimensionId; String dimId = File.separator + "DIM" + world.provider.dimensionId;
if(world.provider.dimensionId != 0 && !dir.endsWith(dimId)) {
dir += dimId;
} }
dir += File.separator + "data"; dir += File.separator + "data";
return dir; return dir;

4
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -959,8 +959,8 @@ public class MainRegistry {
config.save(); config.save();
try { try {
if(GeneralConfig.enableThermosPreventer && Class.forName("thermos.Thermos") != null) { if(GeneralConfig.enableThermosPreventer && Class.forName("thermos.ThermosClassTransformer") != null) {
throw new IllegalStateException("The mod tried to start on a Thermos server and therefore stopped. To allow the server to start on Thermos, change the appropriate " throw new IllegalStateException("The mod tried to start on a Thermos or it's fork server and therefore stopped. To allow the server to start on Thermos, change the appropriate "
+ "config entry (0.00 in hbm.cfg). This was done because, by default, Thermos " + "config entry (0.00 in hbm.cfg). This was done because, by default, Thermos "
+ "uses a so-called \"optimization\" feature that reduces tile ticking a lot, which will inevitably break a lot of machines. Most people aren't even aware " + "uses a so-called \"optimization\" feature that reduces tile ticking a lot, which will inevitably break a lot of machines. Most people aren't even aware "
+ "of this, and start blaming random mods for all their stuff breaking. In order to adjust or even disable this feature, edit \"tileentities.yml\" in your " + "of this, and start blaming random mods for all their stuff breaking. In order to adjust or even disable this feature, edit \"tileentities.yml\" in your "