Merge branch 'release/v2.2.4'

src/main/java/slimeknights/tmechworks/common/MechworksContent.java

@@ -115,6 +115,7 @@ public void preInit(FMLCommonSetupEvent event) {
     }
 
     public void init(InterModEnqueueEvent event) {
+        MechworksWorld.getInstance().setupWorldGeneration();
     }
 
     public void postInit(InterModProcessEvent event) {

src/main/java/slimeknights/tmechworks/common/worldgen/MechworksWorld.java

@@ -23,13 +23,23 @@
 import java.util.function.Supplier;
 
 public class MechworksWorld {
+    private static MechworksWorld INSTANCE;
+
     private static final Logger log = LogManager.getLogger(TMechworks.modId + ".world");
 
     private static final List<OreProperties> OVERWORLD_ORES = ImmutableList.of(
             new OreProperties(() -> MechworksContent.Blocks.copper_ore.get().getDefaultState(), 8, ore -> ore.range(64).square().func_242731_b(20), MechworksConfig.COMMON_CONFIG.worldGen.copper),
             new OreProperties(() -> MechworksContent.Blocks.aluminum_ore.get().getDefaultState(), 8, ore -> ore.range(64).square().func_242731_b(20), MechworksConfig.COMMON_CONFIG.worldGen.aluminum)
     );
 
+    public MechworksWorld() {
+        INSTANCE = this;
+    }
+
+    public static MechworksWorld getInstance() {
+        return INSTANCE;
+    }
+
     public void setupWorldGeneration() {
         Registry<ConfiguredFeature<?, ?>> registry = WorldGenRegistries.CONFIGURED_FEATURE;