Merge pull request #2128 from stellanera98/1.20-qol

Misc QoL stuff

Author: wrincewind

changelog.txt

@@ -1,9 +1,25 @@
 ------------------------------------------------------
 Version 3.3.6
 ------------------------------------------------------
+Added:
+- Upgrade Tomes holding the same Up- or Downgrade can now be combined in a crafting grid to add their points together
+- Commands to manipulate a players soul network
+- ARC input tank can be emptied by putting buckets or other fluid handler items into the input bucket slot. It will also try to transfer as much as possible instead of only ever 1 bucket at a time
+- ARC tanks can be interacted with from in-world now. Order of operations tried is Fill input tank > Empty output tank > Empty input tank > Open GUI
+- Sigil of the Frozen Lake is now craftable
+- Weak and Saturated Tau now count towards tranquility
+- Froglight variants are now valid in place of glowstone for the altar
+
 Fixed:
 - Ritual of the Beating Anvil didnt check to see if the recipe as valid and just produced the result. Recipe checking has been added, so you do now actually need the correct inputs
 - MagiChem's fully grown clusters have been added to the geode_harvestable tag to work out of the box rather than requiring a datapack. The budding blocks are already in the forge:budding tag which is already part of geode_acceleratable
+- Apparently Oculus doesnt take _s to mean steadfast version but something else and doesnt put the texture into the texture atlas, so we've literally spelled it out for it
+- Blood Orbs could be used without getting damaged while spawn protection lasts. It now does the same thing the rest of the sacrifice stuff does and first gets rid of invulnerability
+- Hellfire Forge does not let item automation stuff place items into the autput slot anymore. Its also learned some other handy things like prioritizing a different input slot for each of the different sides as well as targeting the gem slot first from above and only ever taking from the output slot from below
+- Composite Item Filters didnt work, now they do
+- forge:storage_blocks/hellforged block and item tags were not added to the respective forge:storage_blocks tag
+- prevent a crash when opening the Edit HUD position screen while looking at an entity
+
 ------------------------------------------------------
 Version 3.3.5
 ------------------------------------------------------

src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json

@@ -1,153 +1,153 @@
 {
   "variants": {
     "facing=east,lit=false,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c",
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive",
       "y": 90
     },
     "facing=east,lit=false,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber",
       "y": 90
     },
     "facing=east,lit=false,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d",
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive",
       "y": 90
     },
     "facing=east,lit=false,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s",
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast",
       "y": 90
     },
     "facing=east,lit=false,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v",
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful",
       "y": 90
     },
     "facing=east,lit=true,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive_lit",
       "y": 90
     },
     "facing=east,lit=true,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber_lit",
       "y": 90
     },
     "facing=east,lit=true,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive_lit",
       "y": 90
     },
     "facing=east,lit=true,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast_lit",
       "y": 90
     },
     "facing=east,lit=true,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful_lit",
       "y": 90
     },
     "facing=north,lit=false,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c"
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive"
     },
     "facing=north,lit=false,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber"
     },
     "facing=north,lit=false,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d"
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive"
     },
     "facing=north,lit=false,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s"
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast"
     },
     "facing=north,lit=false,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v"
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful"
     },
     "facing=north,lit=true,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c_lit"
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive_lit"
     },
     "facing=north,lit=true,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber_lit"
     },
     "facing=north,lit=true,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d_lit"
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive_lit"
     },
     "facing=north,lit=true,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s_lit"
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast_lit"
     },
     "facing=north,lit=true,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v_lit"
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful_lit"
     },
     "facing=south,lit=false,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c",
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive",
       "y": 180
     },
     "facing=south,lit=false,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber",
       "y": 180
     },
     "facing=south,lit=false,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d",
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive",
       "y": 180
     },
     "facing=south,lit=false,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s",
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast",
       "y": 180
     },
     "facing=south,lit=false,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v",
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful",
       "y": 180
     },
     "facing=south,lit=true,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive_lit",
       "y": 180
     },
     "facing=south,lit=true,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber_lit",
       "y": 180
     },
     "facing=south,lit=true,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive_lit",
       "y": 180
     },
     "facing=south,lit=true,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast_lit",
       "y": 180
     },
     "facing=south,lit=true,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful_lit",
       "y": 180
     },
     "facing=west,lit=false,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c",
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive",
       "y": 270
     },
     "facing=west,lit=false,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber",
       "y": 270
     },
     "facing=west,lit=false,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d",
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive",
       "y": 270
     },
     "facing=west,lit=false,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s",
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast",
       "y": 270
     },
     "facing=west,lit=false,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v",
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful",
       "y": 270
     },
     "facing=west,lit=true,type=corrosive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_c_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_corrosive_lit",
       "y": 270
     },
     "facing=west,lit=true,type=default": {
       "model": "bloodmagic:block/alchemicalreactionchamber_lit",
       "y": 270
     },
     "facing=west,lit=true,type=destructive": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_d_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_destructive_lit",
       "y": 270
     },
     "facing=west,lit=true,type=steadfast": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_s_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_steadfast_lit",
       "y": 270
     },
     "facing=west,lit=true,type=vengeful": {
-      "model": "bloodmagic:block/alchemicalreactionchamber_v_lit",
+      "model": "bloodmagic:block/alchemicalreactionchamber_vengeful_lit",
       "y": 270
     }
   }

src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1_c.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "bloodmagic:block/dungeon_brick1_corrosive"
+    }
+  }
+}

src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1_corrosive.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "bloodmagic:block/dungeon_brick1_destructive"
+    }
+  }
+}