Merge remote-tracking branch 'bysco/port/1.20' into 1.20-alternative

src/main/resources/assets/effortlessbuilding/models/item/building_techniques_book.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/buildingtechniquesbook"
+        "layer0": "effortlessbuilding:item/buildingtechniquesbook"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/diamond_randomizer_bag.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/diamondrandomizerbag"
+        "layer0": "effortlessbuilding:item/diamondrandomizerbag"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/elastic_hand.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/elastichand"
+        "layer0": "effortlessbuilding:item/elastichand"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/golden_randomizer_bag.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/goldenrandomizerbag"
+        "layer0": "effortlessbuilding:item/goldenrandomizerbag"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/muscles.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/muscles"
+        "layer0": "effortlessbuilding:item/muscles"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/randomizer_bag.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/randomizerbag"
+        "layer0": "effortlessbuilding:item/randomizerbag"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade1.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/reachupgrade1"
+        "layer0": "effortlessbuilding:item/reachupgrade1"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade2.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/reachupgrade2"
+        "layer0": "effortlessbuilding:item/reachupgrade2"
     }
 }

src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade3.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "effortlessbuilding:items/reachupgrade3"
+        "layer0": "effortlessbuilding:item/reachupgrade3"
     }
 }

src/main/resources/data/effortlessbuilding/loot_modifiers/building_techniques_book_loot_modifier.json

@@ -2,7 +2,7 @@
   "type": "effortlessbuilding:single_item_loot_modifier",
   "conditions": [
     {
-      "condition": "minecraft:alternative",
+      "condition": "minecraft:any_of",
       "terms": [
         {
           "condition": "forge:loot_table_id",

src/main/resources/data/effortlessbuilding/loot_modifiers/elastic_hand_loot_modifier.json

@@ -2,7 +2,7 @@
   "type": "effortlessbuilding:single_item_loot_modifier",
   "conditions": [
     {
-      "condition": "minecraft:alternative",
+      "condition": "minecraft:any_of",
       "terms": [
         {
           "condition": "forge:loot_table_id",

src/main/resources/data/effortlessbuilding/loot_modifiers/muscles_loot_modifier.json

@@ -2,7 +2,7 @@
   "type": "effortlessbuilding:single_item_loot_modifier",
   "conditions": [
     {
-      "condition": "minecraft:alternative",
+      "condition": "minecraft:any_of",
       "terms": [
         {
           "condition": "forge:loot_table_id",