The creative mode grind never ends

VazkiiMods · Dec 6, 2023 · b809d44 · b809d44
1 parent 1eec7c0
commit b809d44
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 34 deletions.
diff --git a/src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java b/src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java
@@ -89,7 +89,7 @@ public static WoodSet addWoodSet(ZRegister event, ZetaModule module, String name
 		WoodType type = WoodType.register(new WoodType(Quark.MOD_ID + ":" + name, setType));
 		WoodSet set = new WoodSet(name, module, type);
 
-		set.log = log(name + "_log", module, color, barkColor).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS, Blocks.STONE, true);
+		set.log = log(name + "_log", module, color, barkColor).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS, Blocks.BAMBOO_BLOCK, true);
 		set.wood = new ZetaPillarBlock(name + "_wood", module, OldMaterials.wood().mapColor(barkColor).strength(2.0F).sound(SoundType.WOOD)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
 		set.strippedLog = log("stripped_" + name + "_log", module, color, color).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
 		set.strippedWood = new ZetaPillarBlock("stripped_" + name + "_wood", module, OldMaterials.wood().mapColor(color).strength(2.0F).sound(SoundType.WOOD)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);

diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantBookshelvesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantBookshelvesModule.java
@@ -9,6 +9,7 @@
 import org.violetmoon.zeta.event.load.ZRegister;
 import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
+import org.violetmoon.zeta.registry.CreativeTabManager;
 
 import net.minecraft.world.level.block.Blocks;
 
@@ -19,8 +20,10 @@ public class VariantBookshelvesModule extends ZetaModule {
 
 	@LoadEvent
 	public final void register(ZRegister event) {
+		CreativeTabManager.daisyChain();
 		for(Wood type : VanillaWoods.NON_OAK)
 			new VariantBookshelfBlock(type.name(), this, !type.nether());
+		CreativeTabManager.endDaisyChain();
 	}
 
 	@LoadEvent

diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java
@@ -1,28 +1,13 @@
 package org.violetmoon.quark.content.building.module;
 
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
-import net.minecraft.core.Holder;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
-import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.CreativeModeTabs;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.ServerLevelAccessor;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.levelgen.structure.Structure;
-import net.minecraftforge.common.Tags;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BooleanSupplier;
+
+import org.jetbrains.annotations.Nullable;
 import org.violetmoon.quark.base.Quark;
 import org.violetmoon.quark.base.QuarkClient;
 import org.violetmoon.quark.base.config.Config;
@@ -49,9 +34,30 @@
 import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
 import org.violetmoon.zeta.registry.CreativeTabManager;
-import org.jetbrains.annotations.Nullable;
-import java.util.*;
-import java.util.function.BooleanSupplier;
+
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.ServerLevelAccessor;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.levelgen.structure.Structure;
+import net.minecraftforge.common.Tags;
 
 @ZetaLoadModule(category = "building", antiOverlap = { "woodworks" })
 public class VariantChestsModule extends ZetaModule {
@@ -97,7 +103,17 @@ public final void register(ZRegister event) {
 		makeChestBlocks("nether_brick", Blocks.NETHER_BRICKS);
 		makeChestBlocks("purpur", Blocks.PURPUR_BLOCK);
 		makeChestBlocks("prismarine", Blocks.PRISMARINE);
-
+
+		CreativeTabManager.daisyChain();
+		for(Block regularChest : regularChests)
+			CreativeTabManager.addToCreativeTabNextTo(CreativeModeTabs.FUNCTIONAL_BLOCKS, regularChest, Blocks.CHEST, false);
+		CreativeTabManager.endDaisyChain();
+
+		CreativeTabManager.daisyChain();
+		for(Block trappedChest : trappedChests)
+			CreativeTabManager.addToCreativeTabNextTo(CreativeModeTabs.REDSTONE_BLOCKS, trappedChest, Blocks.TRAPPED_CHEST, false);
+		CreativeTabManager.endDaisyChain();
+
 		StructureBlockReplacementHandler.addReplacement(this::getGenerationChestBlockState);
 	}
 
@@ -113,9 +129,6 @@ private void makeChestBlocks(ZetaModule module, String name, Block base, Boolean
 		VariantTrappedChestBlock trappedChest = new VariantTrappedChestBlock(name, module, () -> trappedChestTEType, BlockBehaviour.Properties.copy(base)).setCondition(condition);
 		trappedChests.add(trappedChest);
 		trappedChestMappings.put(TagKey.create(Registries.STRUCTURE, new ResourceLocation(Quark.MOD_ID, name + "_chest_structures")), trappedChest);
-
-		CreativeTabManager.addToCreativeTabNextTo(CreativeModeTabs.FUNCTIONAL_BLOCKS, regularChest, Blocks.CHEST, false);
-		CreativeTabManager.addToCreativeTabNextTo(CreativeModeTabs.REDSTONE_BLOCKS, trappedChest, Blocks.TRAPPED_CHEST, false);
 
 		Quark.LOOTR_INTEGRATION.makeChestBlocks(module, name, base, condition, regularChest, trappedChest);
 	}

diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantLaddersModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantLaddersModule.java
@@ -1,8 +1,5 @@
 package org.violetmoon.quark.content.building.module;
 
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-
 import java.util.LinkedList;
 import java.util.List;
 
@@ -17,6 +14,10 @@
 import org.violetmoon.zeta.event.load.ZRegister;
 import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
+import org.violetmoon.zeta.registry.CreativeTabManager;
+
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 
 @ZetaLoadModule(category = "building", antiOverlap = { "woodworks" })
 public class VariantLaddersModule extends ZetaModule {
@@ -29,8 +30,10 @@ public class VariantLaddersModule extends ZetaModule {
 
 	@LoadEvent
 	public final void register(ZRegister event) {
+		CreativeTabManager.daisyChain();
 		for(Wood type : VanillaWoods.NON_OAK)
 			variantLadders.add(new VariantLadderBlock(type.name(), this, !type.nether()));
+		CreativeTabManager.endDaisyChain();
 	}
 
 	@LoadEvent