Merge remote-tracking branch 'origin/1.20' into 1.20

MehVahdJukaar · Dec 14, 2024 · ce5b7de · ce5b7de
2 parents d0ce58f + 2ba22f5
commit ce5b7de
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 25 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,6 @@
 ### UPDATED:
 - **More Crafting Table (LieOnLion)** (FABRIC): Updated to support v1.2.7
+- **Create** (COMMON): Fixed the crash because a method in CreateModule should be only on CLIENT side
 
 ---
 

diff --git a/common/src/main/java/net/mehvahdjukaar/every_compat/modules/quark/QuarkModule.java b/common/src/main/java/net/mehvahdjukaar/every_compat/modules/quark/QuarkModule.java
@@ -31,9 +31,11 @@
 import net.mehvahdjukaar.moonlight.api.util.math.colors.HCLColor;
 import net.minecraft.client.resources.metadata.animation.AnimationMetadataSection;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
 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;
@@ -82,6 +84,7 @@ public class QuarkModule extends SimpleModule {
 
     public QuarkModule(String modId) {
         super(modId, "q");
+        ResourceKey<CreativeModeTab> tab = CreativeModeTabs.BUILDING_BLOCKS;
 
         verticalSlabs = QuarkSimpleEntrySet.builder(WoodType.class, "vertical_slab",
                         VerticalSlabsModule.class,
@@ -97,7 +100,7 @@ public QuarkModule(String modId) {
                 .addTag(modRes("wooden_vertical_slabs"), Registries.ITEM)
                 .addTag(modRes("vertical_slabs"), Registries.ITEM)
                 .addTag(modRes("vertical_slab"), Registries.ITEM)
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addRecipe(modRes("building/crafting/vertslabs/oak_vertical_slab"))
                 .addRecipe(modRes("building/crafting/vertslabs/oak_vertical_slab_revert"))
@@ -111,7 +114,7 @@ public QuarkModule(String modId) {
                         () -> WoodTypeRegistry.getValue(new ResourceLocation("acacia")),
                         (w) -> new VariantBookshelfBlock(shortenedId() + "/" + w.getAppendableId(),
                                 null, w.canBurn(), w.getSound()))
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .copyParentDrop()
                 .addTag(BlockTags.MINEABLE_WITH_AXE, Registries.BLOCK)
@@ -136,7 +139,7 @@ public QuarkModule(String modId) {
                 .addTag(modRes("posts"), Registries.BLOCK)
                 .addTag(modRes("posts"), Registries.ITEM)
                 .requiresChildren("fence")
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addRecipe(modRes("building/crafting/oak_post"))
                 .setRenderType(RenderLayer.CUTOUT)
@@ -158,7 +161,7 @@ public QuarkModule(String modId) {
                 .addTag(modRes("posts"), Registries.BLOCK)
                 .addTag(modRes("posts"), Registries.ITEM)
                 .requiresChildren("fence", "stripped_log")
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addRecipe(modRes("building/crafting/stripped_oak_post"))
                 .setRenderType(RenderLayer.CUTOUT_MIPPED)
@@ -182,7 +185,7 @@ public QuarkModule(String modId) {
                         }
                 )
                 .addCondition(w -> !w.getId().toString().equals("gardens_of_the_dead:whistle_planks")) //REASON: The look is no different from a normal plank
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addTag(BlockTags.MINEABLE_WITH_AXE, Registries.BLOCK)
                 .addTag(BlockTags.PLANKS, Registries.BLOCK)
@@ -197,7 +200,7 @@ public QuarkModule(String modId) {
                         () -> WoodTypeRegistry.getValue(new ResourceLocation("spruce")),
                         (w) -> new VariantLadderBlock(shortenedId() + "/" + w.getAppendableId(),
                                 null, BlockBehaviour.Properties.copy(Blocks.LADDER).sound(w.getSound()), w.canBurn()))
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addTag(BlockTags.CLIMBABLE, Registries.BLOCK)
                 .addTag(modRes("ladders"), Registries.BLOCK)
@@ -215,7 +218,7 @@ public QuarkModule(String modId) {
                         (w) -> new HollowLogBlock(shortenedId() + "/" + w.getAppendableId(),
                                 w.log, null, w.canBurn()))
                 .requiresChildren("stripped_log") // Texture
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addTag(BlockTags.MINEABLE_WITH_AXE, Registries.BLOCK)
                 .addTag(modRes("hollow_logs"), Registries.BLOCK)
@@ -231,7 +234,7 @@ public QuarkModule(String modId) {
                         (w) -> new CompatChestBlock(w,
                                 shortenedId() + "/" + w.getAppendableId(),
                                 Utils.copyPropertySafe(w.planks)))
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addTag(new ResourceLocation("forge:chests/wooden"), Registries.BLOCK)
                 .addTag(new ResourceLocation("forge:chests/wooden"), Registries.ITEM)
@@ -255,7 +258,7 @@ public QuarkModule(String modId) {
                             String name = shortenedId() + "/" + w.getAppendableId();
                             return new CompatTrappedChestBlock(w, name, Utils.copyPropertySafe(w.planks));
                         })
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addTag(new ResourceLocation("forge:chests/trapped"), Registries.BLOCK)
                 .addTag(new ResourceLocation("forge:chests/trapped"), Registries.ITEM)
@@ -281,7 +284,7 @@ public QuarkModule(String modId) {
                 .addTag(BlockTags.MINEABLE_WITH_AXE, Registries.BLOCK)
                 .addTag(modRes("hedges"), Registries.BLOCK)
                 .addTag(modRes("hedges"), Registries.ITEM)
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .copyParentTint()
 //              Recipe being created below blc the recipe has a tag as an ingredient
@@ -305,7 +308,7 @@ public QuarkModule(String modId) {
                         "leaves", s -> !s.contains("/snow") && !s.contains("_snow")))
                 .addTag(modRes("leaf_carpets"), Registries.BLOCK)
                 .addTag(modRes("leaf_carpets"), Registries.ITEM)
-                .setTabKey(CreativeModeTabs.BUILDING_BLOCKS)
+                .setTabKey(tab)
                 .setTabMode(TabAddMode.AFTER_SAME_WOOD)
                 .addRecipe(modRes("building/crafting/oak_leaf_carpet"))
                 .setRenderType(RenderLayer.CUTOUT_MIPPED)

diff --git a/common/src/main/resources/assets/everycomp/lang/zh_cn.json b/common/src/main/resources/assets/everycomp/lang/zh_cn.json
@@ -921,8 +921,8 @@
 
   "wood_type.ad_astra.aeronos": "空果木",
   "wood_type.ad_astra.strophar": "孑节木",
-  "wood_type.ad_astra.glacian": "融冰木",
-  "leaves_type.ad_astra.glacian": "融冰",
+  "wood_type.ad_astra.glacian": "霜原木",
+  "leaves_type.ad_astra.glacian": "霜原",
 
   "wood_type.aether.skyroot": "天根木",
   "leaves_type.aether.skyroot": "天根",
@@ -940,12 +940,12 @@
   "wood_type.aether_redux.jellyshroom": "果冻菇木",
   "leaves_type.aether_redux.blightwillow": "疫纤",
   "leaves_type.aether_redux.glacia": "冰川",
-  "leaves_type.aether_redux.fieldsproot": "域茁",
   "leaves_type.aether_redux.gilded_oak": "透金橡树",
   "leaves_type.aether_redux.blighted_skyroot": "染疫天根",
   "leaves_type.aether_redux.purple_glacia": "紫色冰川",
   "wood_type.aether_redux.fieldsprout": "域茁木",
   "wood_type.aether_redux.springshroom": "簧菇木",
+  "leaves_type.aether_redux.fieldsproot": "域茁",
   "leaves_type.aether_redux.azure_fieldsproot": "苍蓝域茁",
   "leaves_type.aether_redux.prismatic_fieldsproot": "棱光域茁",
   "leaves_type.aether_redux.spectral_fieldsproot": "灵蓝域茁",
@@ -1141,6 +1141,7 @@
   "leaves_type.biomesoplenty.red_maple": "红色枫树",
   "leaves_type.biomesoplenty.orange_maple": "橙色枫树",
   "leaves_type.biomesoplenty.yellow_maple": "黄色枫树",
+  "leaves_type.biomesoplenty.null": "� �� � �",
   "leaves_type.biomesoplenty.palm": "棕榈",
   "leaves_type.biomesoplenty.pine": "松树",
   "leaves_type.biomesoplenty.redwood": "红杉",
@@ -1421,17 +1422,72 @@
   "wood_type.charred_horizons.blight": "枯黄木",
   "wood_type.charred_horizons.withered": "凋零木",
 
-  "wood_type.chipped.nailed_acacia": "饰钉金合欢木",
-  "wood_type.chipped.nailed_birch": "饰钉白桦木",
-  "wood_type.chipped.nailed_dark_oak": "饰钉深色橡木",
-  "wood_type.chipped.nailed_jungle": "饰钉丛林木",
-  "wood_type.chipped.nailed_mangrove": "饰钉红树木",
-  "wood_type.chipped.nailed_oak": "饰钉橡木",
-  "wood_type.chipped.nailed_spruce": "饰钉云杉木",
-  "wood_type.chipped.nailed_crimson": "饰钉绯红木",
-  "wood_type.chipped.nailed_warped": "饰钉诡异木",
-  "wood_type.chipped.smooth_crimson": "平滑绯红木",
-  "wood_type.chipped.smooth_warped": "平滑诡异木",
+  "leaves_type.chipped.apple_acacia": "苹果金合欢",
+  "leaves_type.chipped.cherry_acacia": "樱桃金合欢",
+  "leaves_type.chipped.dead_acacia": "枯萎的金合欢",
+  "leaves_type.chipped.frosted_acacia": "结霜金合欢",
+  "leaves_type.chipped.golden_acacia": "金色金合欢",
+  "leaves_type.chipped.golden_cherry_acacia": "金樱桃金合欢",
+  "leaves_type.chipped.magenta_flower_acacia": "品红花金合欢",
+  "leaves_type.chipped.orange_acacia": "橙色金合欢",
+  "leaves_type.chipped.red_acacia": "红色金合欢",
+  "leaves_type.chipped.white_flower_acacia": "白花金合欢",
+  "leaves_type.chipped.apple_birch": "苹果白桦",
+  "leaves_type.chipped.cherry_birch": "樱桃白桦",
+  "leaves_type.chipped.dead_birch": "枯萎的白桦",
+  "leaves_type.chipped.frosted_birch": "结霜白桦",
+  "leaves_type.chipped.golden_birch": "金色白桦",
+  "leaves_type.chipped.golden_cherry_birch": "金樱桃白桦",
+  "leaves_type.chipped.magenta_flower_birch": "品红花白桦",
+  "leaves_type.chipped.orange_birch": "橙色白桦",
+  "leaves_type.chipped.red_birch": "红色白桦",
+  "leaves_type.chipped.white_flower_birch": "白花白桦",
+  "leaves_type.chipped.apple_dark_oak": "苹果深色橡树",
+  "leaves_type.chipped.cherry_dark_oak": "樱桃深色橡树",
+  "leaves_type.chipped.dead_dark_oak": "枯萎的深色橡树",
+  "leaves_type.chipped.frosted_dark_oak": "结霜深色橡树",
+  "leaves_type.chipped.golden_dark_oak": "金色深色橡树",
+  "leaves_type.chipped.golden_cherry_dark_oak": "金樱桃深色橡树",
+  "leaves_type.chipped.magenta_flower_dark_oak": "品红花深色橡树",
+  "leaves_type.chipped.orange_dark_oak": "橙色深色橡树",
+  "leaves_type.chipped.red_dark_oak": "红色深色橡树",
+  "leaves_type.chipped.white_flower_dark_oak": "白花深色橡树",
+  "leaves_type.chipped.apple_jungle": "苹果丛林",
+  "leaves_type.chipped.cherry_jungle": "樱桃丛林",
+  "leaves_type.chipped.dead_jungle": "枯萎的丛林",
+  "leaves_type.chipped.frosted_jungle": "结霜丛林",
+  "leaves_type.chipped.golden_jungle": "金色丛林",
+  "leaves_type.chipped.golden_cherry_jungle": "金樱桃丛林",
+  "leaves_type.chipped.magenta_flower_jungle": "品红花丛林",
+  "leaves_type.chipped.orange_jungle": "橙色丛林",
+  "leaves_type.chipped.red_jungle": "红色丛林",
+  "leaves_type.chipped.white_flower_jungle": "白花丛林",
+  "leaves_type.chipped.apple_oak": "苹果橡树",
+  "leaves_type.chipped.cherry_oak": "樱桃橡树",
+  "leaves_type.chipped.dead_oak": "枯萎的橡树",
+  "leaves_type.chipped.frosted_oak": "结霜橡树",
+  "leaves_type.chipped.golden_oak": "金色橡树",
+  "leaves_type.chipped.golden_cherry_oak": "金樱桃橡树",
+  "leaves_type.chipped.magenta_flower_oak": "品红花橡树",
+  "leaves_type.chipped.orange_oak": "橙色橡树",
+  "leaves_type.chipped.red_oak": "红色橡树",
+  "leaves_type.chipped.white_flower_oak": "白花橡树",
+  "leaves_type.chipped.apple_spruce": "苹果云杉",
+  "leaves_type.chipped.cherry_spruce": "樱桃云杉",
+  "leaves_type.chipped.dead_spruce": "枯萎的云杉",
+  "leaves_type.chipped.frosted_spruce": "结霜云杉",
+  "leaves_type.chipped.golden_spruce": "金色云杉",
+  "leaves_type.chipped.golden_cherry_spruce": "金樱桃云杉",
+  "leaves_type.chipped.magenta_flower_spruce": "品红花云杉",
+  "leaves_type.chipped.orange_spruce": "橙色云杉",
+  "leaves_type.chipped.red_spruce": "红色云杉",
+  "leaves_type.chipped.white_flower_spruce": "白花云杉",
+  "leaves_type.chipped.golden_apple_acacia": "金苹果金合欢",
+  "leaves_type.chipped.golden_apple_birch": "金苹果白桦",
+  "leaves_type.chipped.golden_apple_dark_oak": "金苹果深色橡树",
+  "leaves_type.chipped.golden_apple_jungle": "金苹果丛林",
+  "leaves_type.chipped.golden_apple_oak": "金苹果橡树",
+  "leaves_type.chipped.golden_apple_spruce": "金苹果云杉",
 
   "wood_type.cinderscapes.scorched": "焦灼木",
   "wood_type.cinderscapes.umbral": "暗影木",
@@ -1641,6 +1697,15 @@
   "wood_type.gardens_of_the_dead.soulblight": "枯魂木",
   "wood_type.gardens_of_the_dead.whistlecane": "鸣怨竹",
 
+  "wood_type.goety.haunted": "缠魂木",
+  "wood_type.goety.rotten": "朽木",
+  "wood_type.goety.windswept": "风袭木",
+  "wood_type.goety.pine": "松木",
+  "leaves_type.goety.haunted": "缠魂",
+  "leaves_type.goety.rotten": "朽木",
+  "leaves_type.goety.windswept": "风袭",
+  "leaves_type.goety.pine": "松树",
+
   "wood_type.gravitation.aerfin": "空翼木",
   "wood_type.gravitation.beladon": "莨菪木",
   "wood_type.gravitation.enchanted": "神祝木",