disable fluids and world features

fix game crashing/not launching
obsilab · Aug 7, 2023 · 554bed4 · 554bed4
1 parent 785bcbb
commit 554bed4
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 8 deletions.
diff --git a/src/main/java/com/obsilab/mcsc/MCSC.java b/src/main/java/com/obsilab/mcsc/MCSC.java
@@ -2,11 +2,14 @@
 
 import com.mojang.logging.LogUtils;
 import com.obsilab.mcsc.block.ModBlocks;
-import com.obsilab.mcsc.block.custom.CrystalIngotBlock;
+//import com.obsilab.mcsc.block.custom.CrystalIngotBlock;
 import com.obsilab.mcsc.fluid.ModFluidTypes;
 import com.obsilab.mcsc.fluid.ModFluids;
 import com.obsilab.mcsc.item.ModItems;
 import com.obsilab.mcsc.networking.ModMessages;
+import com.obsilab.mcsc.world.feature.ModConfiguredFeatures;
+import com.obsilab.mcsc.world.feature.ModFeatures;
+import com.obsilab.mcsc.world.feature.ModPlacedFeatures;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
@@ -54,8 +57,8 @@ public MCSC()
         //ModFeatures.register(modEventBus); // registers features
 
         //ModFluids before ModFluidTypes?
-        ModFluids.register(modEventBus); // registers fluids
-        ModFluidTypes.register(modEventBus); // registers fluid types
+        //ModFluids.register(modEventBus); // registers fluids
+        //ModFluidTypes.register(modEventBus); // registers fluid types
 
         // Register the commonSetup method for modloading
         modEventBus.addListener(this::commonSetup);

diff --git a/src/main/java/com/obsilab/mcsc/block/ModBlocks.java b/src/main/java/com/obsilab/mcsc/block/ModBlocks.java
@@ -65,13 +65,15 @@ public class ModBlocks {
                     .lightLevel(state -> state.getValue(TestBlock.ACTIVE) ? 8 : 0) // light level of 8 if block's ACTIVE property is true, else light level of 0
             ));
 
+    /*
     public static final RegistryObject<LiquidBlock> TEST_FLUID_BLOCK = registerBlock(true,
             "test_fluid_block",
             () -> new LiquidBlock(
                     ModFluids.SOURCE_TEST_FLUID,
                     BlockBehaviour.Properties
                             .copy(Blocks.WATER)
             ));
+     */
 
     public static final RegistryObject<Block> CRYSTAL_INGOT_BLOCK = registerBlock(false, // crop block, so do not register BlockItem
             "crystal_ingot",
@@ -85,7 +87,7 @@ public class ModBlocks {
 
 
     private static <T extends Block> RegistryObject<T> registerBlock(Boolean register_block_item, String name, Supplier<T> block){
-        LOGGER.info("MCSC: Registering Block >> {} : {}", name, block.get()); //? .get() ?
+        LOGGER.info("MCSC: Registering Block >> {} : {}", name, block.toString()); //? .toString() ? .get() ?
         RegistryObject<T> toReturn = BLOCKS.register(name, block);
         if (register_block_item) {
             registerBlockItem(name, toReturn);
@@ -94,7 +96,7 @@ private static <T extends Block> RegistryObject<T> registerBlock(Boolean registe
     }
 
     private static <T extends Block> RegistryObject<Item> registerBlockItem(String name, RegistryObject<T> block){
-        LOGGER.info("MCSC: Registering its blockItem >> {} : {}", name, block.get()); //? .get() ?
+        LOGGER.info("MCSC: Registering its blockItem >> {} : {}", name, block.toString()); //? .toString() ? .get() ?
         return ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()));
     }
 

diff --git a/src/main/java/com/obsilab/mcsc/fluid/ModFluids.java b/src/main/java/com/obsilab/mcsc/fluid/ModFluids.java
@@ -18,6 +18,7 @@ public class ModFluids {
     public static final DeferredRegister<Fluid> FLUIDS =
             DeferredRegister.create(ForgeRegistries.FLUIDS, MCSC.MOD_ID);
 
+    /*
     public static final RegistryObject<FlowingFluid> SOURCE_TEST_FLUID =
             FLUIDS.register("test_fluid", () -> new ForgeFlowingFluid.Source(ModFluids.TEST_FLUID_PROPERTIES));
 
@@ -34,6 +35,7 @@ public class ModFluids {
                     .block(ModBlocks.TEST_FLUID_BLOCK)
                     .bucket(ModItems.TEST_FLUID_BUCKET)
             ;
+     */
 
     public static void register(IEventBus eventBus) {
         FLUIDS.register(eventBus);

diff --git a/src/main/java/com/obsilab/mcsc/item/ModItems.java b/src/main/java/com/obsilab/mcsc/item/ModItems.java
@@ -132,6 +132,7 @@ public class ModItems {
                             //.tab(ModCreativeModeTab.MCSC_TAB)
             ));
 
+    /*
     public static final RegistryObject<Item> TEST_FLUID_BUCKET = registerItem(
             "test_fluid_bucket", () -> new BucketItem(
                     ModFluids.SOURCE_TEST_FLUID,
@@ -141,9 +142,10 @@ public class ModItems {
                             //.group(MCSC.MCSC_GROUP)
                             //.tab(ModCreativeModeTab.MCSC_TAB)
             ));
+     */
 
     private static <T extends Item> RegistryObject<T> registerItem(String name, Supplier<T> item){
-        LOGGER.info("MCSC: Registering Item >> {} : {}", name, item.get()); //? .get() ?
+        LOGGER.info("MCSC: Registering Item >> {} : {}", name, item.toString()); //? .toString() ? .get() ?
         return ITEMS.register(name, item);
     }
 

diff --git a/src/main/java/com/obsilab/mcsc/world/feature/ModConfiguredFeatures.java b/src/main/java/com/obsilab/mcsc/world/feature/ModConfiguredFeatures.java
@@ -6,7 +6,6 @@
 import com.obsilab.mcsc.block.ModBlocks;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.worldgen.features.FeatureUtils;
-import net.minecraft.data.worldgen.features.OreFeatures;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;

diff --git a/src/main/java/com/obsilab/mcsc/world/feature/ModPlacedFeatures.java b/src/main/java/com/obsilab/mcsc/world/feature/ModPlacedFeatures.java
@@ -2,7 +2,6 @@
 
 import com.obsilab.mcsc.MCSC;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.worldgen.features.FeatureUtils;
 import net.minecraft.world.level.levelgen.VerticalAnchor;
 import net.minecraft.world.level.levelgen.placement.*;
 import net.minecraftforge.eventbus.api.IEventBus;

diff --git a/...c/forge/biome_modifier/add_borax_ore.json → ...ge/test_biome_modifier/add_borax_ore.json b/...c/forge/biome_modifier/add_borax_ore.json → ...ge/test_biome_modifier/add_borax_ore.json
diff --git a/...rge/biome_modifier/add_phosphate_ore.json → ...est_biome_modifier/add_phosphate_ore.json b/...rge/biome_modifier/add_phosphate_ore.json → ...est_biome_modifier/add_phosphate_ore.json
diff --git a/...orldgen/configured_feature/ore_borax.json → ...en/test_configured_feature/ore_borax.json b/...orldgen/configured_feature/ore_borax.json → ...en/test_configured_feature/ore_borax.json
diff --git a/...gen/configured_feature/ore_phosphate.json → ...est_configured_feature/ore_phosphate.json b/...gen/configured_feature/ore_phosphate.json → ...est_configured_feature/ore_phosphate.json
diff --git a/...dgen/placed_feature/ore_borax_placed.json → ...test_placed_feature/ore_borax_placed.json b/...dgen/placed_feature/ore_borax_placed.json → ...test_placed_feature/ore_borax_placed.json
diff --git a/.../placed_feature/ore_phosphate_placed.json → ..._placed_feature/ore_phosphate_placed.json b/.../placed_feature/ore_phosphate_placed.json → ..._placed_feature/ore_phosphate_placed.json