1.20.1

3.3.6 Fix potential Turkish OS Language issue Fix some compat recipes
xanthian · Nov 23, 2023 · 5ee5078 · 5ee5078
1 parent e3f7532
commit 5ee5078
Show file tree

Hide file tree

Showing 27 changed files with 97 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,6 +8,6 @@ loader_version=0.14.24
 #Fabric api
 fabric_version=0.90.7+1.20.1
 # Mod Properties
-mod_version=3.3.5
+mod_version=3.3.6
 maven_group=xanthian
 archives_base_name=variantbarrels
diff --git a/src/main/java/net/xanthian/variantbarrels/block/Vanilla.java b/src/main/java/net/xanthian/variantbarrels/block/Vanilla.java
@@ -41,8 +41,8 @@ public static void registerBarrels() {
         registerBarrelBlock("warped_barrel", WARPED_BARREL);
     }
 
-    private static void registerBarrelBlock(String Id, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, Id.toLowerCase());
+    private static void registerBarrelBlock(String name, Block block) {
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         VANILLA_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/AdAstra.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/AdAstra.java
@@ -27,7 +27,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         AA_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/BeachParty.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/BeachParty.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         LDBP_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/BetterArcheology.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/BetterArcheology.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         BA_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/Bewitchment.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/Bewitchment.java
@@ -29,7 +29,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         BW_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/BiomeMakeover.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/BiomeMakeover.java
@@ -29,7 +29,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         BM_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/DeeperAndDarker.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/DeeperAndDarker.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         DAD_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/EldritchEnd.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/EldritchEnd.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         EE_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/MineCells.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/MineCells.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     private static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         MC_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/NaturesSpirit.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/NaturesSpirit.java
@@ -41,7 +41,7 @@ public static void registerBarrels() {
     }
 
     private static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         NS_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/Promenade.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/Promenade.java
@@ -29,7 +29,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         PROM_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/RegionsUnexplored.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/RegionsUnexplored.java
@@ -106,7 +106,7 @@ public static void register05Barrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         RU_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/SnifferPlus.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/SnifferPlus.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         SP_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/TechReborn.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/TechReborn.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         TR_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/src/main/java/net/xanthian/variantbarrels/block/compatability/Vinery.java b/src/main/java/net/xanthian/variantbarrels/block/compatability/Vinery.java
@@ -23,7 +23,7 @@ public static void registerBarrels() {
     }
 
     public static Block register(String name, Block block) {
-        Identifier identifier = new Identifier(Initialise.MOD_ID, name.toLowerCase());
+        Identifier identifier = new Identifier(Initialise.MOD_ID, name);
         Registry.register(Registries.BLOCK, identifier, block);
         LDV_BARRELS.put(identifier, block);
         Registry.register(Registries.ITEM, identifier, new BlockItem(block, new FabricItemSettings()));

diff --git a/...s/mcwtrpdoors_acacia_barrel_trapdoor.json → ...t/mcwtrpdoors_acacia_barrel_trapdoor.json b/...s/mcwtrpdoors_acacia_barrel_trapdoor.json → ...t/mcwtrpdoors_acacia_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...s/mcwtrpdoors_bamboo_barrel_trapdoor.json → ...t/mcwtrpdoors_bamboo_barrel_trapdoor.json b/...s/mcwtrpdoors_bamboo_barrel_trapdoor.json → ...t/mcwtrpdoors_bamboo_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...es/mcwtrpdoors_birch_barrel_trapdoor.json → ...at/mcwtrpdoors_birch_barrel_trapdoor.json b/...es/mcwtrpdoors_birch_barrel_trapdoor.json → ...at/mcwtrpdoors_birch_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...s/mcwtrpdoors_cherry_barrel_trapdoor.json → ...t/mcwtrpdoors_cherry_barrel_trapdoor.json b/...s/mcwtrpdoors_cherry_barrel_trapdoor.json → ...t/mcwtrpdoors_cherry_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/.../mcwtrpdoors_crimson_barrel_trapdoor.json → .../mcwtrpdoors_crimson_barrel_trapdoor.json b/.../mcwtrpdoors_crimson_barrel_trapdoor.json → .../mcwtrpdoors_crimson_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...mcwtrpdoors_dark_oak_barrel_trapdoor.json → ...mcwtrpdoors_dark_oak_barrel_trapdoor.json b/...mcwtrpdoors_dark_oak_barrel_trapdoor.json → ...mcwtrpdoors_dark_oak_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...s/mcwtrpdoors_jungle_barrel_trapdoor.json → ...t/mcwtrpdoors_jungle_barrel_trapdoor.json b/...s/mcwtrpdoors_jungle_barrel_trapdoor.json → ...t/mcwtrpdoors_jungle_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...mcwtrpdoors_mangrove_barrel_trapdoor.json → ...mcwtrpdoors_mangrove_barrel_trapdoor.json b/...mcwtrpdoors_mangrove_barrel_trapdoor.json → ...mcwtrpdoors_mangrove_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...ipes/mcwtrpdoors_oak_barrel_trapdoor.json → ...mpat/mcwtrpdoors_oak_barrel_trapdoor.json b/...ipes/mcwtrpdoors_oak_barrel_trapdoor.json → ...mpat/mcwtrpdoors_oak_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...s/mcwtrpdoors_warped_barrel_trapdoor.json → ...t/mcwtrpdoors_warped_barrel_trapdoor.json b/...s/mcwtrpdoors_warped_barrel_trapdoor.json → ...t/mcwtrpdoors_warped_barrel_trapdoor.json
@@ -1,4 +1,12 @@
 {
+    "fabric:load_conditions": [
+        {
+            "condition": "fabric:all_mods_loaded",
+            "values": [
+                "mcwtrpdoors"
+            ]
+        }
+    ],
     "type": "minecraft:crafting_shaped",
 	"group": "barrel_trapdoors",
 

diff --git a/...ls/recipes/reinfbarrel_copper_barrel.json → ...pes/compat/reinfbarrel_copper_barrel.json b/...ls/recipes/reinfbarrel_copper_barrel.json → ...pes/compat/reinfbarrel_copper_barrel.json