From 554bed45e12c26931e1a9c294dafc080a649fc58 Mon Sep 17 00:00:00 2001 From: ticccco <23436953+LucasPlacentino@users.noreply.github.com> Date: Mon, 7 Aug 2023 17:32:08 +0200 Subject: [PATCH] disable fluids and world features fix game crashing/not launching --- src/main/java/com/obsilab/mcsc/MCSC.java | 9 ++++++--- src/main/java/com/obsilab/mcsc/block/ModBlocks.java | 6 ++++-- src/main/java/com/obsilab/mcsc/fluid/ModFluids.java | 2 ++ src/main/java/com/obsilab/mcsc/item/ModItems.java | 4 +++- .../mcsc/world/feature/ModConfiguredFeatures.java | 1 - .../obsilab/mcsc/world/feature/ModPlacedFeatures.java | 1 - .../add_borax_ore.json | 0 .../add_phosphate_ore.json | 0 .../test_configured_feature}/ore_borax.json | 0 .../test_configured_feature}/ore_phosphate.json | 0 .../test_placed_feature}/ore_borax_placed.json | 0 .../test_placed_feature}/ore_phosphate_placed.json | 0 12 files changed, 15 insertions(+), 8 deletions(-) rename src/main/resources/data/mcsc/forge/{biome_modifier => test_biome_modifier}/add_borax_ore.json (100%) rename src/main/resources/data/mcsc/forge/{biome_modifier => test_biome_modifier}/add_phosphate_ore.json (100%) rename src/main/resources/data/mcsc/{worldgen/configured_feature => test_worldgen/test_configured_feature}/ore_borax.json (100%) rename src/main/resources/data/mcsc/{worldgen/configured_feature => test_worldgen/test_configured_feature}/ore_phosphate.json (100%) rename src/main/resources/data/mcsc/{worldgen/placed_feature => test_worldgen/test_placed_feature}/ore_borax_placed.json (100%) rename src/main/resources/data/mcsc/{worldgen/placed_feature => test_worldgen/test_placed_feature}/ore_phosphate_placed.json (100%) diff --git a/src/main/java/com/obsilab/mcsc/MCSC.java b/src/main/java/com/obsilab/mcsc/MCSC.java index 0410580..7a5127c 100644 --- 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 index 1117b59..5901f60 100644 --- a/src/main/java/com/obsilab/mcsc/block/ModBlocks.java +++ b/src/main/java/com/obsilab/mcsc/block/ModBlocks.java @@ -65,6 +65,7 @@ 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 TEST_FLUID_BLOCK = registerBlock(true, "test_fluid_block", () -> new LiquidBlock( @@ -72,6 +73,7 @@ public class ModBlocks { BlockBehaviour.Properties .copy(Blocks.WATER) )); + */ public static final RegistryObject CRYSTAL_INGOT_BLOCK = registerBlock(false, // crop block, so do not register BlockItem "crystal_ingot", @@ -85,7 +87,7 @@ public class ModBlocks { private static RegistryObject registerBlock(Boolean register_block_item, String name, Supplier block){ - LOGGER.info("MCSC: Registering Block >> {} : {}", name, block.get()); //? .get() ? + LOGGER.info("MCSC: Registering Block >> {} : {}", name, block.toString()); //? .toString() ? .get() ? RegistryObject toReturn = BLOCKS.register(name, block); if (register_block_item) { registerBlockItem(name, toReturn); @@ -94,7 +96,7 @@ private static RegistryObject registerBlock(Boolean registe } private static RegistryObject registerBlockItem(String name, RegistryObject 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 index 33e0fd6..46ddf72 100644 --- 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 FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, MCSC.MOD_ID); + /* public static final RegistryObject 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 index e46ccb3..2c5f710 100644 --- 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 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 RegistryObject registerItem(String name, Supplier 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 index 309b912..7c4b281 100644 --- 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 index d1a9b1c..031280b 100644 --- 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/src/main/resources/data/mcsc/forge/biome_modifier/add_borax_ore.json b/src/main/resources/data/mcsc/forge/test_biome_modifier/add_borax_ore.json similarity index 100% rename from src/main/resources/data/mcsc/forge/biome_modifier/add_borax_ore.json rename to src/main/resources/data/mcsc/forge/test_biome_modifier/add_borax_ore.json diff --git a/src/main/resources/data/mcsc/forge/biome_modifier/add_phosphate_ore.json b/src/main/resources/data/mcsc/forge/test_biome_modifier/add_phosphate_ore.json similarity index 100% rename from src/main/resources/data/mcsc/forge/biome_modifier/add_phosphate_ore.json rename to src/main/resources/data/mcsc/forge/test_biome_modifier/add_phosphate_ore.json diff --git a/src/main/resources/data/mcsc/worldgen/configured_feature/ore_borax.json b/src/main/resources/data/mcsc/test_worldgen/test_configured_feature/ore_borax.json similarity index 100% rename from src/main/resources/data/mcsc/worldgen/configured_feature/ore_borax.json rename to src/main/resources/data/mcsc/test_worldgen/test_configured_feature/ore_borax.json diff --git a/src/main/resources/data/mcsc/worldgen/configured_feature/ore_phosphate.json b/src/main/resources/data/mcsc/test_worldgen/test_configured_feature/ore_phosphate.json similarity index 100% rename from src/main/resources/data/mcsc/worldgen/configured_feature/ore_phosphate.json rename to src/main/resources/data/mcsc/test_worldgen/test_configured_feature/ore_phosphate.json diff --git a/src/main/resources/data/mcsc/worldgen/placed_feature/ore_borax_placed.json b/src/main/resources/data/mcsc/test_worldgen/test_placed_feature/ore_borax_placed.json similarity index 100% rename from src/main/resources/data/mcsc/worldgen/placed_feature/ore_borax_placed.json rename to src/main/resources/data/mcsc/test_worldgen/test_placed_feature/ore_borax_placed.json diff --git a/src/main/resources/data/mcsc/worldgen/placed_feature/ore_phosphate_placed.json b/src/main/resources/data/mcsc/test_worldgen/test_placed_feature/ore_phosphate_placed.json similarity index 100% rename from src/main/resources/data/mcsc/worldgen/placed_feature/ore_phosphate_placed.json rename to src/main/resources/data/mcsc/test_worldgen/test_placed_feature/ore_phosphate_placed.json