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

2023-12-23 21:39:34 +01:00
parent 0d6613c3ba 28d47a0cbb
commit 22670b6b4a
21 changed files with 12 additions and 12 deletions
--- a/src/main/resources/assets/effortlessbuilding/models/item/building_techniques_book.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/diamond_randomizer_bag.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/elastic_hand.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/golden_randomizer_bag.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/muscles.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/randomizer_bag.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade1.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade2.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade3.json
+++ b/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"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/textures/items/buildingtechniquesbook.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/buildingtechniquesbook.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/diamondrandomizerbag.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/diamondrandomizerbag.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/elastichand.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/elastichand.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/goldenrandomizerbag.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/goldenrandomizerbag.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/muscles.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/muscles.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/randomizerbag.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/randomizerbag.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade1.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade1.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade2.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade2.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade3.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade3.png
--- a/src/main/resources/data/effortlessbuilding/loot_modifiers/building_techniques_book_loot_modifier.json
+++ b/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",
--- a/src/main/resources/data/effortlessbuilding/loot_modifiers/elastic_hand_loot_modifier.json
+++ b/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",
--- a/src/main/resources/data/effortlessbuilding/loot_modifiers/muscles_loot_modifier.json
+++ b/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",