Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2020-11-16 09:43:22 -04:00
commit 24e8c00998
40 files changed
+409 -124

No files matched your search

@@ -0,0 +1,22 @@
package carpet.utils;
import carpet.CarpetServer;
import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
import java.lang.System;
/**
* Runs only from GitHub Actions to generate the wiki
* page with all Carpet rules on it.
* It is here so it can be managed by the IDE
*
* @author altrisi
*
*/
public class RulePrinter implements PreLaunchEntrypoint {
@Override
public void onPreLaunch() {
CarpetServer.onGameStarted();
CarpetServer.settingsManager.printAllRulesToLog(null);
System.exit(0);
}
}
@@ -231,8 +231,9 @@ public class SpawnReporter
return SpawnGroup.AMBIENT;
case CYAN:
return SpawnGroup.WATER_AMBIENT;
default:
return null;
}
return null;
}
public static SpawnGroup get_creature_type_from_code(String type_code)