neo almost working... i think

Player005 · Oct 14, 2024 · 85a8a6e · 85a8a6e
1 parent 0be2858
commit 85a8a6e
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 27 deletions.
diff --git a/common/src/main/java/net/player005/vegandelightfabric/VeganCreativeTab.java b/common/src/main/java/net/player005/vegandelightfabric/VeganCreativeTab.java
@@ -0,0 +1,24 @@
+package net.player005.vegandelightfabric;
+
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.ItemStack;
+
+public class VeganCreativeTab {
+    @SuppressWarnings("DataFlowIssue")
+    public static final ResourceKey<CreativeModeTab> VEGAN_ITEMS_KEY = ResourceKey.create(
+            Registries.CREATIVE_MODE_TAB,
+            ResourceLocation.tryBuild(VeganDelightMod.modID, "vegan_ingredients")
+    );
+    public static final CreativeModeTab VEGAN_ITEM_TAB = VeganDelightMod.platform
+            .registerItemTab(new ItemStack(VeganItems.SMOKED_TOFISH_ROLL), Component.translatable("itemGroup.vegan_delight"), VeganItems.all);
+
+    public static void initialise() {
+        Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, VEGAN_ITEMS_KEY, VEGAN_ITEM_TAB);
+    }
+}
diff --git a/common/src/main/java/net/player005/vegandelightfabric/VeganDelightMod.java b/common/src/main/java/net/player005/vegandelightfabric/VeganDelightMod.java
@@ -17,20 +17,25 @@ public class VeganDelightMod {
     public static String modID = "vegandelight";
     public static VeganDelightPlatform platform;
 
-    public static void initialize(VeganDelightPlatform platform) {
-        VeganDelightMod.platform = platform;
-
-        VeganItems.initialize();
-        VeganFluids.initialise();
-        VeganBlocks.initialise();
-
+    public static void initialize() {
         registerBiomeModifers();
         registerTrades();
 
         ComposterBlock.COMPOSTABLES.put(VeganItems.SOYBEAN, 0.45f);
         ComposterBlock.COMPOSTABLES.put(VeganBlocks.WILD_SOYBEAN.asItem(), 0.65f);
     }
 
+    public static void initializeAll(VeganDelightPlatform platform) {
+        initPlatform(platform);
+
+        VeganItems.initialise();
+        VeganFluids.initialise();
+        VeganBlocks.initialise();
+        VeganCreativeTab.initialise();
+
+        initialize();
+    }
+
     private static void registerBiomeModifers() {
         platform.registerBiomeModifier(0.4f, 0.9f,
                 platform.overworldBiomeTag(),
@@ -54,4 +59,13 @@ private static void registerTrades() {
                         12, 15, 0.1f
                 ));
     }
+
+
+    public static VeganDelightPlatform getPlatform() {
+        return platform;
+    }
+
+    public static void initPlatform(VeganDelightPlatform platform) {
+        VeganDelightMod.platform = platform;
+    }
 }
diff --git a/common/src/main/java/net/player005/vegandelightfabric/VeganItems.java b/common/src/main/java/net/player005/vegandelightfabric/VeganItems.java
@@ -2,9 +2,6 @@
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.*;
@@ -146,32 +143,22 @@ public class VeganItems {
             )
     );
 
-    public static ItemLike[] all = {
-            VeganBlocks.SOYBEAN_BAG, VeganBlocks.WILD_SOYBEAN, SILKEN_TOFU, TOFU, TOFU_SLICES, COOKED_TOFU,
+    public static ItemLike[] all = { // TODO
+            /*VeganBlocks.SOYBEAN_BAG, VeganBlocks.WILD_SOYBEAN, */SILKEN_TOFU, TOFU, TOFU_SLICES, COOKED_TOFU,
             COOKED_TOFU_SLICES, SMOKED_TOFU, SMOKED_TOFU_SLICES, COOKED_SMOKED_TOFU, COOKED_SMOKED_TOFU_SLICES,
             MINCED_TOFU, TOFU_PATTY, TOFISH, COOKED_TOFISH, SMOKED_TOFISH, COOKED_SMOKED_TOFISH, TOFISH_ROLL,
             SMOKED_TOFISH_ROLL, SOYMILK_BUCKET, SOYMILK_BOTTLE, SOYBEAN, SALT, APPLESAUCE, APPLESAUCE_BUCKET,
             LEATHER_SUBSTITUTE
     };
 
 
-    @SuppressWarnings("DataFlowIssue")
-    public static final ResourceKey<CreativeModeTab> VEGAN_ITEMS_KEY = ResourceKey.create(
-            Registries.CREATIVE_MODE_TAB,
-            ResourceLocation.tryBuild(VeganDelightMod.modID, "vegan_ingredients")
-    );
-
-    public static final CreativeModeTab VEGAN_ITEM_TAB = VeganDelightMod.platform
-            .registerItemTab(new ItemStack(SMOKED_TOFISH_ROLL), Component.translatable("itemGroup.vegan_delight"), all);
-
     public static @NotNull Item register(String id, Item item) {
         ResourceLocation itemID = ResourceLocation.tryBuild(VeganDelightMod.modID, id);
 
         assert itemID != null;
         return Registry.register(BuiltInRegistries.ITEM, itemID, item);
     }
 
-    public static void initialize() {
-        Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, VEGAN_ITEMS_KEY, VEGAN_ITEM_TAB);
+    public static void initialise() {
     }
 }
diff --git a/fabric/src/main/java/net/player005/vegandelightfabric/VeganDelightFabric.java b/fabric/src/main/java/net/player005/vegandelightfabric/VeganDelightFabric.java
@@ -23,7 +23,7 @@ public class VeganDelightFabric implements ModInitializer {
 
     @Override
     public void onInitialize() {
-        VeganDelightMod.initialize(new VeganDelightFabricPlatform());
+        VeganDelightMod.initializeAll(new VeganDelightFabricPlatform());
     }
 
     public static class VeganDelightFabricPlatform implements VeganDelightPlatform {

diff --git a/neoforge/src/main/java/net/player005/vegandelightfabric/VeganDelightNeo.java b/neoforge/src/main/java/net/player005/vegandelightfabric/VeganDelightNeo.java
@@ -1,5 +1,6 @@
 package net.player005.vegandelightfabric;
 
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceKey;
@@ -11,13 +12,19 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.event.village.VillagerTradesEvent;
 import net.neoforged.neoforge.registries.DeferredRegister;
+import net.neoforged.neoforge.registries.RegisterEvent;
+import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
+import net.player005.vegandelightfabric.blocks.VeganBlocks;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -29,9 +36,18 @@ public class VeganDelightNeo {
 
     public VeganDelightNeo(@NotNull IEventBus eventBus) {
         VeganDelightNeo.eventBus = eventBus;
-        eventBus.addListener(VeganDelightNeo::onVillagerTrades);
+//        eventBus.addListener(VeganDelightNeo::onVillagerTrades);
 
-        VeganDelightMod.initialize(new VDNeoforgePlatform());
+        VeganDelightMod.initPlatform(new VDNeoforgePlatform());
+//        VeganDelightMod.initialize(); TODO
+
+        eventBus.<RegisterEvent>addListener(event -> {
+            event.register(BuiltInRegistries.BLOCK.key(), helper -> VeganBlocks.initialise());
+            event.register(BuiltInRegistries.ITEM.key(), helper -> VeganItems.initialise());
+            event.register(BuiltInRegistries.CREATIVE_MODE_TAB.key(), helper -> VeganCreativeTab.initialise());
+            event.register(BuiltInRegistries.FLUID.key(), helper -> VeganFluids.initialise());
+//            event.register(NeoForgeDataMaps.COMPOSTABLES.registryKey(), helper -> VeganDelightMod.initialize());
+        });
     }
 
     @SubscribeEvent
@@ -62,7 +78,7 @@ public void registerVillagerTrade(VillagerProfession profession, int level, Vill
         @Override
         public CreativeModeTab registerItemTab(ItemStack icon, @NotNull Component title, ItemLike... items) {
             var tabDeferredRegister = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, VeganDelightMod.modID);
-            var tab = tabDeferredRegister.register(title.getString(), () -> CreativeModeTab.builder()
+            var tab = tabDeferredRegister.register(VeganDelightMod.modID, () -> CreativeModeTab.builder()
                     .icon(() -> icon)
                     .title(title)
                     .displayItems((parameters, output) -> {