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

src/main/resources/assets/portalcubed/lang/en_us.json

@@ -3,16 +3,16 @@
   "itemGroup.portalcubed.other_testing_elements": "Other Testing Elements",
   "itemGroup.portalcubed.portal_blocks": "Portal Blocks",
 
-  "subtitles.portalcubed.gel_bounce": "Repulsion gel bounces",
-  "subtitles.portalcubed.gel_run": "Propulsion gel accelerates",
+  "subtitles.portalcubed.gel_bounce": "Something bounces on propulsion gel",
+  "subtitles.portalcubed.gel_run": "Something slides on propulsion gel",
   "subtitles.portalcubed.portal_gun_secondary_fire": "Portal gun secondary fire",
   "subtitles.portalcubed.portal_gun_primary_fire": "Portal gun primary fire",
   "subtitles.portalcubed.portal_invalid_surface": "Portal gun failed",
 
   "subtitles.portalcubed.portal_open": "Portal opens",
   "subtitles.portalcubed.portal_close": "Portal closes",
   "subtitles.portalcubed.portal_fizzle": "Portal fizzles",
-  "subtitles.portalcubed.material_emancipation": "Object disintegrates",
+  "subtitles.portalcubed.material_emancipation": "Something disintegrates",
 
   "subtitles.portalcubed.pedestal_button_press": "Switch activates",
   "subtitles.portalcubed.pedestal_button_release": "Switch deactivates",

src/main/resources/assets/portalcubed/models/item/long_fall_boots.json

@@ -1,4 +1,68 @@
 {
-  "parent": "item/generated",
-  "textures": { "layer0": "portalcubed:item/long_fall_boots" }
-}
+  "parent": "minecraft:item/generated",
+  "overrides": [
+    {
+      "model": "portalcubed:item/long_fall_boots_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "portalcubed:item/long_fall_boots_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_amethyst_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_amethyst"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_copper_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_copper"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_diamond_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_diamond"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_emerald_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_emerald"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_gold_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_gold"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_iron_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_iron"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_lapis_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_lapis"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_netherite_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_netherite"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_quartz_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_quartz"
+  }
+}

src/main/resources/assets/portalcubed/models/item/long_fall_boots_redstone_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "portalcubed:item/long_fall_boots",
+    "layer1": "minecraft:trims/items/boots_trim_redstone"
+  }
+}

src/main/resources/data/minecraft/tags/blocks/doors.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "portalcubed:portal_1_door",
+    "portalcubed:portal_2_door",
+    "portalcubed:old_ap_door",
+    "portalcubed:octopus_door"
+  ]
+}

src/main/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json

@@ -0,0 +1,48 @@
+{
+  "replace": false,
+  "values": [
+    "portalcubed:repulsion_gel",
+    "portalcubed:propulsion_gel",
+    "portalcubed:conversion_gel",
+    "portalcubed:adhesion_gel",
+    "portalcubed:reflection_gel",
+    "portalcubed:light_bridge",
+    "portalcubed:portal_1_white_panel_facade",
+    "portalcubed:portal_1_white_half_panel_facade",
+    "portalcubed:dirty_portal_1_white_panel_facade",
+    "portalcubed:dirty_portal_1_white_half_panel_facade",
+    "portalcubed:portal_1_smooth_gray_panel_facade",
+    "portalcubed:portal_1_smooth_gray_half_panel_facade",
+    "portalcubed:dirty_portal_1_smooth_gray_panel_facade",
+    "portalcubed:dirty_portal_1_smooth_gray_half_panel_facade",
+    "portalcubed:portal_1_smooth_tile_facade",
+    "portalcubed:dirty_borderless_panel_facade",
+    "portalcubed:portal_1_rusted_plating_facade",
+    "portalcubed:portal_1_rusted_tread_plating_side_facade",
+    "portalcubed:portal_1_rusted_tread_plating_top_facade",
+    "portalcubed:white_panel_facade",
+    "portalcubed:white_half_panel_facade",
+    "portalcubed:aged_white_panel_facade",
+    "portalcubed:aged_white_half_panel_facade",
+    "portalcubed:padded_gray_panel_facade",
+    "portalcubed:padded_gray_half_panel_facade",
+    "portalcubed:aged_padded_gray_panel_facade",
+    "portalcubed:aged_padded_gray_half_panel_facade",
+    "portalcubed:smooth_gray_panel_facade",
+    "portalcubed:smooth_gray_half_panel_facade",
+    "portalcubed:aged_smooth_gray_panel_facade",
+    "portalcubed:aged_smooth_gray_half_panel_facade",
+    "portalcubed:old_ap_white_panel_facade",
+    "portalcubed:old_ap_white_checkered_panel_facade",
+    "portalcubed:old_ap_green_panel_facade",
+    "portalcubed:old_ap_blue_panel_facade",
+    "portalcubed:insulation_facade",
+    "portalcubed:exposed_panel_facade",
+    "portalcubed:partially_exposed_panel_facade",
+    "portalcubed:old_ap_metal_grating_facade",
+    "portalcubed:portal_1_metal_grating_facade",
+    "portalcubed:portal_2_metal_grating_facade",
+    "portalcubed:portal_1_mesh_grating_facade"
+
+  ]
+}

src/main/resources/data/minecraft/tags/items/doors.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "portalcubed:portal_1_door",
+    "portalcubed:portal_2_door",
+    "portalcubed:old_ap_door",
+    "portalcubed:octopus_door"
+  ]
+}

src/main/resources/data/minecraft/tags/items/tools.json

@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "portalcubed:crowbar",
+    "portalcubed:hammer"
+  ]
+}

src/main/resources/data/minecraft/tags/items/trimmable_armor.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "portalcubed:long_fall_boots"
+  ]
+}

src/main/resources/data/portalcubed/recipes/adhesion_gel_blob_crafting.json

@@ -5,7 +5,7 @@
             "item": "portalcubed:base_gel"
         },
         {
-            "item": "minecraft:purple_dye"
+            "tag": "c:purple_dyes"
         },
         {
             "item": "minecraft:honey_bottle"

src/main/resources/data/portalcubed/recipes/adventure_core_crafting.json

@@ -8,7 +8,7 @@
       "item": "minecraft:map"
     },
     {
-      "item": "minecraft:lime_dye"
+      "tag": "c:lime_dyes"
     }
   ],
   "result": {

src/main/resources/data/portalcubed/recipes/anger_core_crafting.json

@@ -8,7 +8,7 @@
       "item": "minecraft:tnt"
     },
     {
-      "item": "minecraft:red_dye"
+      "tag": "c:red_dyes"
     }
   ],
   "result": {

src/main/resources/data/portalcubed/recipes/companion_cube_crafting.json

@@ -13,7 +13,7 @@
             "item": "minecraft:redstone_lamp"
         },
         "Y": {
-            "item": "minecraft:pink_dye"
+            "tag": "c:pink_dyes"
         }
     },
     "result": {

src/main/resources/data/portalcubed/recipes/computer_crafting.json

@@ -9,7 +9,7 @@
             "item": "minecraft:iron_nugget"
         },
         "Y": {
-            "item": "minecraft:orange_dye"
+            "tag": "c:orange_dyes"
         }
     },
     "result": {

src/main/resources/data/portalcubed/recipes/conversion_gel_blob_crafting.json

@@ -5,7 +5,7 @@
             "item": "portalcubed:base_gel"
         },
         {
-            "item": "minecraft:white_dye"
+            "tag": "c:white_dyes"
         },
         {
             "item": "minecraft:end_stone"

src/main/resources/data/portalcubed/recipes/curiosity_core_crafting.json

@@ -8,7 +8,7 @@
       "item": "minecraft:observer"
     },
     {
-      "item": "minecraft:orange_dye"
+      "tag": "c:orange_dyes"
     }
   ],
   "result": {

src/main/resources/data/portalcubed/recipes/excursion_funnel_emitter_crafting.json

@@ -14,10 +14,10 @@
             "item": "minecraft:dispenser"
         },
         "Z": {
-            "item": "minecraft:light_blue_dye"
+            "tag": "c:light_blue_dyes"
         },
         "A": {
-            "item": "minecraft:orange_dye"
+            "tag": "c:orange_dyes"
         }
     },
     "result": {

src/main/resources/data/portalcubed/recipes/fact_core_crafting.json

@@ -8,7 +8,7 @@
       "item": "minecraft:writable_book"
     },
     {
-      "item": "minecraft:pink_dye"
+      "tag": "c:pink_dyes"
     }
   ],
   "result": {

src/main/resources/data/portalcubed/recipes/faith_plate_target_crafting.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "X": {
-            "item": "minecraft:cyan_dye"
+            "tag": "c:cyan_dyes"
         },
         "Y": {
             "item": "minecraft:glow_ink_sac"

src/main/resources/data/portalcubed/recipes/intelligence_core_crafting.json

@@ -8,7 +8,7 @@
       "item": "minecraft:cake"
     },
     {
-      "item": "minecraft:blue_dye"
+      "tag": "c:blue_dyes"
     }
   ],
   "result": {

src/main/resources/data/portalcubed/recipes/morality_core_crafting.json

@@ -5,7 +5,7 @@
       "item": "portalcubed:core_frame"
     },
     {
-      "item": "minecraft:purple_dye"
+      "tag": "c:purple_dyes"
     }
   ],
   "result": {