CreateModule: Fixed tab null

MehVahdJukaar · Nov 28, 2024 · c617cda · c617cda
1 parent 32f9235
commit c617cda
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 33 deletions.
diff --git a/...rc/main/java/net/mehvahdjukaar/every_compat/modules/fabric/create/CreateClientModule.java b/...rc/main/java/net/mehvahdjukaar/every_compat/modules/fabric/create/CreateClientModule.java
diff --git a/fabric/src/main/java/net/mehvahdjukaar/every_compat/modules/fabric/create/CreateModule.java b/fabric/src/main/java/net/mehvahdjukaar/every_compat/modules/fabric/create/CreateModule.java
@@ -1,7 +1,11 @@
 package net.mehvahdjukaar.every_compat.modules.fabric.create;
 
+import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.decoration.palettes.ConnectedGlassPaneBlock;
 import com.simibubi.create.content.decoration.palettes.WindowBlock;
+import com.simibubi.create.foundation.block.connected.*;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.mehvahdjukaar.every_compat.EveryCompat;
 import net.mehvahdjukaar.every_compat.api.RenderLayer;
 import net.mehvahdjukaar.every_compat.api.SimpleEntrySet;
@@ -10,7 +14,11 @@
 import net.mehvahdjukaar.moonlight.api.set.wood.WoodTypeRegistry;
 import net.mehvahdjukaar.moonlight.api.util.Utils;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 
@@ -23,30 +31,31 @@ public class CreateModule extends SimpleModule {
 
     public CreateModule(String modId) {
         super(modId, "c");
+        ResourceKey<CreativeModeTab> tab = CreativeModeTabs.BUILDING_BLOCKS;
 
         windows = SimpleEntrySet.builder(WoodType.class, "window",
                         getModBlock("oak_window"), () -> WoodTypeRegistry.OAK_TYPE, //AllPaletteBlocks.OAK_WINDOW
                         this::makeWindow)
                 .addTag(BlockTags.IMPERMEABLE, Registries.BLOCK)
-                //.setTabKey(() -> CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .defaultRecipe()
                 .setRenderType(RenderLayer.CUTOUT_MIPPED)
                 .createPaletteFromOak(p -> p.remove(p.getDarkest()))
+                //TEXTURES: planks
                 .addTextureM(modRes("block/palettes/oak_window"), EveryCompat.res("block/palettes/oak_window_m"))
                 .addTextureM(modRes("block/palettes/oak_window_connected"), EveryCompat.res("block/palettes/oak_window_connected_m"))
                 .build();
-
         this.addEntry(windows);
 
         windowPanes = SimpleEntrySet.builder(WoodType.class, "window_pane",
                         getModBlock("oak_window_pane"), () -> WoodTypeRegistry.OAK_TYPE, //AllPaletteBlocks.OAK_WINDOW_PANE
                         s -> new ConnectedGlassPaneBlock(Utils.copyPropertySafe(Blocks.GLASS_PANE)))
-                //.addTag(Tags.Items.GLASS_PANES, Registries.BLOCK)
-                //.setTabKey(() -> CreativeModeTabs.BUILDING_BLOCKS)
+                .addTag(new ResourceLocation("c:glass_panes"), Registries.BLOCK)
+                .addTag(new ResourceLocation("c:glass_panes"), Registries.ITEM)
+                .setTabKey(tab)
                 .defaultRecipe()
                 .setRenderType(RenderLayer.CUTOUT_MIPPED)
                 .build();
-
         this.addEntry(windowPanes);
 
     }
@@ -58,9 +67,20 @@ private WindowBlock makeWindow(WoodType w) {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     public void onClientSetup() {
         super.onClientSetup();
-        CreateClientModule.onClientSetup(this);
+        windows.blocks.forEach((w, b) -> {
+            String path = "block/" + shortenedId() + "/" + w.getNamespace() + "/palettes/" + w.getTypeName() + "_window";
+
+            CTSpriteShiftEntry spriteShift = CTSpriteShifter.getCT(AllCTTypes.VERTICAL,
+                    EveryCompat.res(path), EveryCompat.res(path + "_connected"));
+
+            CreateClient.MODEL_SWAPPER.getCustomBlockModels().register(Utils.getID(b),
+                    (model) -> new CTModel(model, new HorizontalCTBehaviour(spriteShift)));
+            CreateClient.MODEL_SWAPPER.getCustomBlockModels().register(Utils.getID(windowPanes.blocks.get(w)),
+                    (model) -> new CTModel(model, new GlassPaneCTBehaviour(spriteShift)));
+        });
     }
 
 }