chore: datagen

Zepalesque · Jan 5, 2025 · c035ad6 · c035ad6
1 parent 0e07905
commit c035ad6
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 39 deletions.
diff --git a/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 b/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367
@@ -1,2 +1,2 @@
-// 1.21.1	2025-01-05T14:57:04.0231144	Languages: en_us for mod: aether_redux
-8a736bc8a79fd232d61332ba1d8a7929f6d760a4 assets/aether_redux/lang/en_us.json
+// 1.21.1	2025-01-05T15:02:12.6236146	Languages: en_us for mod: aether_redux
+29154806c6f93b839f170d57a9d364fbee1f27e8 assets/aether_redux/lang/en_us.json
diff --git a/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 b/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5
@@ -1,4 +1,4 @@
-// 1.21.1	2025-01-05T14:57:04.025113	Block States: aether_redux
+// 1.21.1	2025-01-05T15:02:12.6246132	Block States: aether_redux
 6d5a134587a37ec8ac1798d9ca3e527d0a1d99b9 assets/aether_redux/blockstates/aurum.json
 f433d1039df84e5eda2ee884c561b89a7d192634 assets/aether_redux/blockstates/bleakmoss_block.json
 7bf476bc0929c45c938b439e80604f1e425efb82 assets/aether_redux/blockstates/bleakmoss_carpet.json
@@ -75,7 +75,7 @@ e4a4d10ceb7ca8da8230ae385d0e937d72eede53 assets/aether_redux/blockstates/raw_ver
 7033907fbae21b5426d807f7bc4b5cd61ae5c86d assets/aether_redux/blockstates/runelight.json
 efc3a38e6517408652a86923b564e45b2022ec59 assets/aether_redux/blockstates/runic_lantern.json
 ddf80e03b9d60dbd6e2fe38929a54e149481e7b3 assets/aether_redux/blockstates/sentrite.json
-24e171d4ad61dc42d6bc923ae93e5b96641b9f5a assets/aether_redux/blockstates/sentrite_bars.json
+1243937fe6fd33f9910354a0ae224ee7cadf0db6 assets/aether_redux/blockstates/sentrite_bars.json
 32325c658f9a9ae024be2ac574624a9273b991ea assets/aether_redux/blockstates/sentrite_bricks.json
 28987a7eeed5ddfcc524c1ab31e2e101085cee6f assets/aether_redux/blockstates/sentrite_brick_slab.json
 0f5747e4c532a5fdca904311c4291bba0d866ed0 assets/aether_redux/blockstates/sentrite_brick_stairs.json

diff --git a/src/generated/resources/.cache/5ed8a2935f6d13341cca9acf97e2eb148a0e73a1 b/src/generated/resources/.cache/5ed8a2935f6d13341cca9acf97e2eb148a0e73a1
@@ -1,5 +1,5 @@
-// 1.21.1	2025-01-05T14:57:04.0341072	Global Loot Modifiers : aether_redux
+// 1.21.1	2025-01-05T15:02:12.6376076	Global Loot Modifiers : aether_redux
 927ef7719b591908de35e0fd2b9c5e50ba0cedfc data/aether_redux/loot_modifiers/aerbound_cape.json
 af76ed495c7d2f9115c478eb073569402ad7251e data/aether_redux/loot_modifiers/raw_veridium.json
-65ddafdff0ab797aebb5d7bd9c3ad71e37f70522 data/aether_redux/loot_modifiers/sentrite_disc.json
+16d7da70c2a552a231ce94a0511ab3ebe9905ad1 data/aether_redux/loot_modifiers/sentrite_disc.json
 8aeb8ef99441e8c05543945ff51a8e19cce45d4e data/neoforge/loot_modifiers/global_loot_modifiers.json
diff --git a/src/generated/resources/.cache/9410d1e9b5c732d05e6ec677608e347515c8185f b/src/generated/resources/.cache/9410d1e9b5c732d05e6ec677608e347515c8185f
@@ -1,3 +1,4 @@
-// 1.21.1	2025-01-05T14:57:04.0141194	Tags for minecraft:entity_type mod id aether_redux
-5d55890f03431ddaefa201c89369e0dfcd1067b8 data/aether_redux/tags/entity_type/sentries.json
+// 1.21.1	2025-01-05T15:02:12.6196158	Tags for minecraft:entity_type mod id aether_redux
+85d3d04482664e42d405e183521203c39d5e7b15 data/aether_redux/tags/entity_type/sentries.json
+f3d2924a739f297564000bda40a0b892bf48973b data/aether_redux/tags/entity_type/sentrite_music_disc_dropping.json
 517c15463812a27fa02321072d0873731c0fd60a data/aether_redux/tags/entity_type/valid_pickaxe_targets.json
diff --git a/src/generated/resources/assets/aether_redux/blockstates/sentrite_bars.json b/src/generated/resources/assets/aether_redux/blockstates/sentrite_bars.json
@@ -18,82 +18,82 @@
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_cap_alt"
+        "model": "aether_redux:block/sentrite_bars_cap",
+        "y": 90
       },
       "when": {
-        "east": "false",
+        "east": "true",
         "north": "false",
-        "south": "true",
+        "south": "false",
         "west": "false"
       }
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_side_alt"
+        "model": "aether_redux:block/sentrite_bars_side",
+        "y": 90
       },
       "when": {
-        "south": "true"
+        "east": "true"
       }
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_cap"
+        "model": "aether_redux:block/sentrite_bars_cap_alt",
+        "y": 90
       },
       "when": {
         "east": "false",
-        "north": "true",
+        "north": "false",
         "south": "false",
-        "west": "false"
+        "west": "true"
       }
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_side"
+        "model": "aether_redux:block/sentrite_bars_side_alt",
+        "y": 90
       },
       "when": {
-        "north": "true"
+        "west": "true"
       }
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_cap_alt",
-        "y": 90
+        "model": "aether_redux:block/sentrite_bars_cap"
       },
       "when": {
         "east": "false",
-        "north": "false",
+        "north": "true",
         "south": "false",
-        "west": "true"
+        "west": "false"
       }
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_side_alt",
-        "y": 90
+        "model": "aether_redux:block/sentrite_bars_side"
       },
       "when": {
-        "west": "true"
+        "north": "true"
       }
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_cap",
-        "y": 90
+        "model": "aether_redux:block/sentrite_bars_cap_alt"
       },
       "when": {
-        "east": "true",
+        "east": "false",
         "north": "false",
-        "south": "false",
+        "south": "true",
         "west": "false"
       }
     },
     {
       "apply": {
-        "model": "aether_redux:block/sentrite_bars_side",
-        "y": 90
+        "model": "aether_redux:block/sentrite_bars_side_alt"
       },
       "when": {
-        "east": "true"
+        "south": "true"
       }
     }
   ]

diff --git a/src/generated/resources/assets/aether_redux/lang/en_us.json b/src/generated/resources/assets/aether_redux/lang/en_us.json
@@ -133,6 +133,7 @@
   "item.aether_redux.veridium_sword": "Veridium Sword",
   "item.aether_redux.wynd_oat_panicle": "Wynd Oat Panicle",
   "item.aether_redux.wynd_oats": "Wynd Oats",
+  "jukebox_song.aether_redux.sentience": "Emile van Krieken - Sentience",
   "lore.block.aether_redux.aurum": "A golden flower found in the Gilded Groves. Some say it brings good luck!",
   "lore.block.aether_redux.bleakmoss_block": "A corrupted, blighted variation of the Aether's Flutemoss. This can be found in the Blight.",
   "lore.block.aether_redux.bleakmoss_carpet": "A blanket-like, vegetative layer of Bleakmoss. This can be found in the Blight, and has the capacity to grow when bonemealed.",

diff --git a/src/generated/resources/data/aether_redux/loot_modifiers/sentrite_disc.json b/src/generated/resources/data/aether_redux/loot_modifiers/sentrite_disc.json
@@ -5,14 +5,14 @@
       "condition": "minecraft:entity_properties",
       "entity": "this",
       "predicate": {
-        "type": "#aether_redux:sentries"
+        "type": "#aether_redux:sentrite_music_disc_dropping"
       }
     },
     {
       "condition": "minecraft:entity_properties",
       "entity": "attacker",
       "predicate": {
-        "type": "#aether_redux:sentries"
+        "type": "#aether_redux:sentrite_music_disc_dropping"
       }
     }
   ],

diff --git a/src/generated/resources/data/aether_redux/tags/entity_type/sentries.json b/src/generated/resources/data/aether_redux/tags/entity_type/sentries.json
@@ -1,10 +1,6 @@
 {
-  "remove": [
-    "aether:slider"
-  ],
   "values": [
     "aether:slider",
-    "aether:sentry",
-    "#aether_redux:sentries"
+    "aether:sentry"
   ]
 }
diff --git a/src/generated/resources/data/aether_redux/tags/entity_type/sentrite_music_disc_dropping.json b/src/generated/resources/data/aether_redux/tags/entity_type/sentrite_music_disc_dropping.json
@@ -0,0 +1,8 @@
+{
+  "remove": [
+    "aether:slider"
+  ],
+  "values": [
+    "#aether_redux:sentries"
+  ]
+}