VazkiiMods · TheidenHD · Apr 26, 2024 · Apr 27, 2024 · Apr 27, 2024 · May 28, 2024
diff --git a/build.properties b/build.properties
@@ -1,9 +1,9 @@
 #Sun Apr 09 14:41:44 WEST 2023
 mapping_channel=parchment
 mod_id=psi
-forge_version=47.1.3
+forge_version=47.3.0
 jei_version=15.2.0.27
-build_number=101
+build_number=103
 patchy_version=1.20.1-83-FORGE
 dir_output=../Build Output/Psi/
 version=1.20

diff --git a/src/generated/resources/assets/psi/models/block/black_psimetal_plate.json b/src/generated/resources/assets/psi/models/block/black_psimetal_plate.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "psi:blocks/psimetal_plate_black"
+    "all": "psi:block/psimetal_plate_black"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/conjured.json b/src/generated/resources/assets/psi/models/block/conjured.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/block",
   "textures": {
-    "particle": "psi:blocks/empty"
+    "particle": "psi:block/empty"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/ebony_psimetal_block.json b/src/generated/resources/assets/psi/models/block/ebony_psimetal_block.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "psi:blocks/ebony_psimetal_block"
+    "all": "psi:block/ebony_psimetal_block"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/ivory_psimetal_block.json b/src/generated/resources/assets/psi/models/block/ivory_psimetal_block.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "psi:blocks/ivory_psimetal_block"
+    "all": "psi:block/ivory_psimetal_block"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/lit_black_psimetal_plate.json b/src/generated/resources/assets/psi/models/block/lit_black_psimetal_plate.json
@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
-    "bottom": "psi:blocks/psimetal_plate_black",
-    "side": "psi:blocks/psimetal_plate_black_light",
-    "top": "psi:blocks/psimetal_plate_black"
+    "bottom": "psi:block/psimetal_plate_black",
+    "side": "psi:block/psimetal_plate_black_light",
+    "top": "psi:block/psimetal_plate_black"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/lit_white_psimetal_plate.json b/src/generated/resources/assets/psi/models/block/lit_white_psimetal_plate.json
@@ -1,8 +1,8 @@
 {
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
-    "bottom": "psi:blocks/psimetal_plate_white",
-    "side": "psi:blocks/psimetal_plate_white_light",
-    "top": "psi:blocks/psimetal_plate_white"
+    "bottom": "psi:block/psimetal_plate_white",
+    "side": "psi:block/psimetal_plate_white_light",
+    "top": "psi:block/psimetal_plate_white"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/psidust_block.json b/src/generated/resources/assets/psi/models/block/psidust_block.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "psi:blocks/psidust_block"
+    "all": "psi:block/psidust_block"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/psigem_block.json b/src/generated/resources/assets/psi/models/block/psigem_block.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "psi:blocks/psigem_block"
+    "all": "psi:block/psigem_block"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/psimetal_block.json b/src/generated/resources/assets/psi/models/block/psimetal_block.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "psi:blocks/psimetal_block"
+    "all": "psi:block/psimetal_block"
   }
 }
diff --git a/src/generated/resources/assets/psi/models/block/white_psimetal_plate.json b/src/generated/resources/assets/psi/models/block/white_psimetal_plate.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "psi:blocks/psimetal_plate_white"
+    "all": "psi:block/psimetal_plate_white"
   }
 }
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_shield.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_shield.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
diff --git a/...advancements/recipes/psi/ebony_block.json → .../recipes/building_blocks/ebony_block.json b/...advancements/recipes/psi/ebony_block.json → .../recipes/building_blocks/ebony_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ebony_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ts/recipes/psi/ebony_ingot_shapeless.json → ...uilding_blocks/ebony_ingot_shapeless.json b/...ts/recipes/psi/ebony_ingot_shapeless.json → ...uilding_blocks/ebony_ingot_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ebony_ingot_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...advancements/recipes/psi/ivory_block.json → .../recipes/building_blocks/ivory_block.json b/...advancements/recipes/psi/ivory_block.json → .../recipes/building_blocks/ivory_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ivory_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ts/recipes/psi/ivory_ingot_shapeless.json → ...uilding_blocks/ivory_ingot_shapeless.json b/...ts/recipes/psi/ivory_ingot_shapeless.json → ...uilding_blocks/ivory_ingot_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ivory_ingot_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...vancements/recipes/psi/psidust_block.json → ...ecipes/building_blocks/psidust_block.json b/...vancements/recipes/psi/psidust_block.json → ...ecipes/building_blocks/psidust_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psidust_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ements/recipes/psi/psidust_shapeless.json → ...es/building_blocks/psidust_shapeless.json b/...ements/recipes/psi/psidust_shapeless.json → ...es/building_blocks/psidust_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psidust_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...dvancements/recipes/psi/psigem_block.json → ...recipes/building_blocks/psigem_block.json b/...dvancements/recipes/psi/psigem_block.json → ...recipes/building_blocks/psigem_block.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:psigem_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...cements/recipes/psi/psigem_shapeless.json → ...pes/building_blocks/psigem_shapeless.json b/...cements/recipes/psi/psigem_shapeless.json → ...pes/building_blocks/psigem_shapeless.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:psigem_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ancements/recipes/psi/psimetal_block.json → ...cipes/building_blocks/psimetal_block.json b/...ancements/recipes/psi/psimetal_block.json → ...cipes/building_blocks/psimetal_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ments/recipes/psi/psimetal_shapeless.json → ...s/building_blocks/psimetal_shapeless.json b/...ments/recipes/psi/psimetal_shapeless.json → ...s/building_blocks/psimetal_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...dvancements/recipes/psi/psimetal_axe.json → ...ncements/recipes/combat/psimetal_axe.json b/...dvancements/recipes/psi/psimetal_axe.json → ...ncements/recipes/combat/psimetal_axe.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_axe"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...s/recipes/psi/psimetal_exosuit_boots.json → ...ecipes/combat/psimetal_exosuit_boots.json b/...s/recipes/psi/psimetal_exosuit_boots.json → ...ecipes/combat/psimetal_exosuit_boots.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_boots"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ipes/psi/psimetal_exosuit_chestplate.json → ...s/combat/psimetal_exosuit_chestplate.json b/...ipes/psi/psimetal_exosuit_chestplate.json → ...s/combat/psimetal_exosuit_chestplate.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_chestplate"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/.../recipes/psi/psimetal_exosuit_helmet.json → ...cipes/combat/psimetal_exosuit_helmet.json b/.../recipes/psi/psimetal_exosuit_helmet.json → ...cipes/combat/psimetal_exosuit_helmet.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_helmet"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ecipes/psi/psimetal_exosuit_leggings.json → ...pes/combat/psimetal_exosuit_leggings.json b/...ecipes/psi/psimetal_exosuit_leggings.json → ...pes/combat/psimetal_exosuit_leggings.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_leggings"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...cements/recipes/psi/psimetal_pickaxe.json → ...ents/recipes/combat/psimetal_pickaxe.json b/...cements/recipes/psi/psimetal_pickaxe.json → ...ents/recipes/combat/psimetal_pickaxe.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_pickaxe"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ncements/recipes/psi/psimetal_shovel.json → ...ments/recipes/combat/psimetal_shovel.json b/...ncements/recipes/psi/psimetal_shovel.json → ...ments/recipes/combat/psimetal_shovel.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_shovel"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ancements/recipes/psi/psimetal_sword.json → ...ements/recipes/combat/psimetal_sword.json b/...ancements/recipes/psi/psimetal_sword.json → ...ements/recipes/combat/psimetal_sword.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_sword"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...nts/recipes/psi/psimetal_plate_black.json → ...pes/decorations/psimetal_plate_black.json b/...nts/recipes/psi/psimetal_plate_black.json → ...pes/decorations/psimetal_plate_black.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_black"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...cipes/psi/psimetal_plate_black_light.json → ...corations/psimetal_plate_black_light.json b/...cipes/psi/psimetal_plate_black_light.json → ...corations/psimetal_plate_black_light.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_black_light"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...nts/recipes/psi/psimetal_plate_white.json → ...pes/decorations/psimetal_plate_white.json b/...nts/recipes/psi/psimetal_plate_white.json → ...pes/decorations/psimetal_plate_white.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_white"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...cipes/psi/psimetal_plate_white_light.json → ...corations/psimetal_plate_white_light.json b/...cipes/psi/psimetal_plate_white_light.json → ...corations/psimetal_plate_white_light.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_white_light"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...i/advancements/recipes/psi/assembler.json → .../advancements/recipes/misc/assembler.json b/...i/advancements/recipes/psi/assembler.json → .../advancements/recipes/misc/assembler.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:assembler"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ancements/recipes/psi/ebony_psimetal.json → ...ncements/recipes/misc/ebony_psimetal.json b/...ancements/recipes/psi/ebony_psimetal.json → ...ncements/recipes/misc/ebony_psimetal.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:ebony_psimetal"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ents/recipes/psi/exosuit_sensor_heat.json → ...nts/recipes/misc/exosuit_sensor_heat.json b/...ents/recipes/psi/exosuit_sensor_heat.json → ...nts/recipes/misc/exosuit_sensor_heat.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_heat"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...nts/recipes/psi/exosuit_sensor_light.json → ...ts/recipes/misc/exosuit_sensor_light.json b/...nts/recipes/psi/exosuit_sensor_light.json → ...ts/recipes/misc/exosuit_sensor_light.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_light"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ts/recipes/psi/exosuit_sensor_stress.json → ...s/recipes/misc/exosuit_sensor_stress.json b/...ts/recipes/psi/exosuit_sensor_stress.json → ...s/recipes/misc/exosuit_sensor_stress.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_stress"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...s/recipes/psi/exosuit_sensor_trigger.json → .../recipes/misc/exosuit_sensor_trigger.json b/...s/recipes/psi/exosuit_sensor_trigger.json → .../recipes/misc/exosuit_sensor_trigger.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_trigger"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }