Merge remote-tracking branch 'forge/mc1.18/dev' into mc1.18/fabric/next

# Conflicts: # build.gradle # src/generated/resources/.cache/cache
Fabricators-of-Create · Aug 10, 2024 · a3c07f5 · a3c07f5
2 parents 6c3d0e0 + 842e1bb
commit a3c07f5
Show file tree

Hide file tree

Showing 71 changed files with 15,582 additions and 4,550 deletions.
diff --git a/crowdin.yml b/crowdin.yml
@@ -10,26 +10,38 @@
         "translation": "src/main/resources/assets/create/lang/%locale_with_underscore%.json",
         "languages_mapping": {
             "locale_with_underscore": {
+                "ar": "ar_sa",
                 "be": "be_by",
+                "bel": "bel_tr",
+                "bg": "bg_bg",
                 "cs": "cs_cz",
                 "cy": "cy_gb",
                 "da": "da_dk",
                 "de": "de_de",
+                "el": "el_gr",
+                "en-GB": "en_gb",
                 "eo": "eo_uy",
                 "es-CL": "es_cl",
                 "es-ES": "es_es",
                 "es-MX": "es_mx",
                 "et": "et_ee",
+                "eu": "eu_es",
                 "fa": "fa_ir",
                 "fi": "fi_fi",
                 "fr": "fr_fr",
+                "fr-CA": "fr_ca",
+                "hr": "hr_hr",
                 "hu": "hu_hu",
+                "hy-AM": "hy_am",
                 "id": "id_id",
                 "is": "is_is",
                 "it": "it_it",
                 "ja": "ja_jp",
                 "kk": "kk_kz",
                 "ko": "ko_kr",
+                "ksh": "ksh",
+                "lol": "lol_us",
+                "lzh": "lzh",
                 "nl": "nl_nl",
                 "no": "no_no",
                 "pl": "pl_pl",

diff --git a/src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json b/src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json
@@ -12,7 +12,17 @@
       ],
       "conditions": [
         {
-          "condition": "minecraft:survives_explosion"
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:silk_touch",
+                "levels": {
+                  "min": 1
+                }
+              }
+            ]
+          }
         }
       ]
     }

diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_log.json
@@ -0,0 +1,20 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:cherry_log"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:stripped_cherry_log"
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_wood.json
@@ -0,0 +1,20 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:cherry_wood"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:stripped_cherry_wood"
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/...rated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json b/...rated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json
@@ -0,0 +1,21 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:stripped_cherry_log"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:cherry_planks",
+      "count": 6
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/...ated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json b/...ated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json
@@ -0,0 +1,21 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:stripped_cherry_wood"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:cherry_planks",
+      "count": 6
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/...rated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_log.json b/...rated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_log.json
@@ -0,0 +1,21 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:stripped_willow_log"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:willow_planks",
+      "count": 6
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/...ated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json b/...ated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json
@@ -0,0 +1,21 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:stripped_willow_wood"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:willow_planks",
+      "count": 6
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/...ted/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json b/...ted/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json
@@ -0,0 +1,21 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:stripped_wisteria_log"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:wisteria_planks",
+      "count": 6
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/...ed/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json b/...ed/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json
@@ -0,0 +1,21 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:stripped_wisteria_wood"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:wisteria_planks",
+      "count": 6
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_log.json
@@ -0,0 +1,20 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:willow_log"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:stripped_willow_log"
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_wood.json
@@ -0,0 +1,20 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:willow_wood"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:stripped_willow_wood"
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_log.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_log.json
@@ -0,0 +1,20 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:wisteria_log"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:stripped_wisteria_log"
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_wood.json
@@ -0,0 +1,20 @@
+{
+  "type": "create:cutting",
+  "ingredients": [
+    {
+      "item": "environmental:wisteria_wood"
+    }
+  ],
+  "results": [
+    {
+      "item": "environmental:stripped_wisteria_wood"
+    }
+  ],
+  "processingTime": 50,
+  "conditions": [
+    {
+      "modid": "environmental",
+      "type": "forge:mod_loaded"
+    }
+  ]
+}
diff --git a/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json b/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json
@@ -7,7 +7,7 @@
   ],
   "results": [
     {
-      "item": "upgrade_aquatic:strippped_driftwood"
+      "item": "upgrade_aquatic:stripped_driftwood"
     }
   ],
   "processingTime": 50,

diff --git a/.../upgrade_aquatic/strippped_driftwood.json → ...t/upgrade_aquatic/stripped_driftwood.json b/.../upgrade_aquatic/strippped_driftwood.json → ...t/upgrade_aquatic/stripped_driftwood.json
@@ -2,7 +2,7 @@
   "type": "create:cutting",
   "ingredients": [
     {
-      "item": "upgrade_aquatic:strippped_driftwood"
+      "item": "upgrade_aquatic:stripped_driftwood"
     }
   ],
   "results": [

diff --git a/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java
@@ -3,7 +3,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
 import com.simibubi.create.foundation.utility.Components;
@@ -28,7 +27,7 @@ default boolean addExceptionToTooltip(List<Component> tooltip) {
 		String text = e.component.getString();
 		Arrays.stream(text.split("\n"))
 			.forEach(l -> TooltipHelper.cutStringTextComponent(l, Palette.GRAY_AND_WHITE)
-				.forEach(c -> Lang.text(c.getString()).forGoggles(tooltip)));
+				.forEach(c -> Lang.builder().add(c).forGoggles(tooltip)));
 
 		return true;
 	}

diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java
@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -47,8 +47,8 @@ public class MountedStorageManager {
 	protected Map<BlockPos, MountedFluidStorage> fluidStorage;
 
 	public MountedStorageManager() {
-		storage = new HashMap<>();
-		fluidStorage = new HashMap<>();
+		storage = new TreeMap<>();
+		fluidStorage = new TreeMap<>();
 	}
 
 	public void entityTick(AbstractContraptionEntity entity) {

diff --git a/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java
@@ -41,6 +41,7 @@ public class AllPaletteBlocks {
 		.addLayer(() -> RenderType::cutout)
 		.recipe((c, p) -> p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_COLORLESS), c::get))
 		.blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/"))
+		.loot((t, g) -> t.dropWhenSilkTouch(g))
 		.tag(Tags.Blocks.GLASS_COLORLESS, BlockTags.IMPERMEABLE)
 		.item()
 		.tag(Tags.Items.GLASS_COLORLESS)