Move stuff to API, fixes

terrarium-earth · Jan 30, 2024 · 5b4b431 · 5b4b431
1 parent b77d7c4
commit 5b4b431
Show file tree

Hide file tree

Showing 52 changed files with 153 additions and 142 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,8 @@
 ## WARNING
+
 This is an alpha release. Expect bugs and frequent updates until we reach a stable version.
 If you're updating from 1.15.5 or below, please back up your world and expect the following breaking changes:
+
 - Sliding doors will break and need to be placed again.
 - Launch pads will break and need to be placed again.
 - Cables and fluid pipes will break and need to be placed again.
@@ -10,4 +12,6 @@ See https://modrinth.com/mod/ad-astra/version/1.15.7 for the full changelog.
 
 ## Changes
 
-- Fixed JEI/REI not showing ingredients in recipes
+- Fixed `local_rotation` name in the planet renderer JSON API.
+- Fixed acid rain damaging entities even if they're immune.
+- Fixed portal sound playing on fabric when changing dimensions in a rocket.
diff --git a/common/src/main/generated/resources/.cache/7798cbb5d8b5531980dd295058c4f708ac699d1f b/common/src/main/generated/resources/.cache/7798cbb5d8b5531980dd295058c4f708ac699d1f
@@ -1,4 +1,4 @@
-// 1.20.1	2024-01-06T17:52:32.399687	Tags for minecraft:fluid mod id ad_astra
+// 1.20.1	2024-01-29T21:04:01.350615	Tags for minecraft:fluid mod id ad_astra
 177c9e2ff17d4101adeb82bf787abd6ab892330a data/ad_astra/tags/fluids/efficient_fuel.json
 cf3608bd187922aeb48c566c19e8482b0dca34c7 data/ad_astra/tags/fluids/evaporates_in_space.json
 cf3608bd187922aeb48c566c19e8482b0dca34c7 data/ad_astra/tags/fluids/freezes_in_space.json

diff --git a/common/src/main/generated/resources/.cache/bc28f3de8ab09e3608eaf789667b9a6bd9f6bf29 b/common/src/main/generated/resources/.cache/bc28f3de8ab09e3608eaf789667b9a6bd9f6bf29
@@ -1,12 +1,12 @@
-// 1.20.1	2024-01-25T00:00:20.057255	Planet Renderers
-7d78f2f1b5cf0fae4b528fea389e6579b3194cb7 assets/ad_astra/planet_renderers/earth_orbit.json
-a9a5dd44e11f33f02bdc0119e3740999001eb557 assets/ad_astra/planet_renderers/glacio.json
-886dc489ce268a05b595e770f1f7fff90a0f3dc6 assets/ad_astra/planet_renderers/glacio_orbit.json
-5216ddad81488a01a8a20400c4eab1497bdcd05b assets/ad_astra/planet_renderers/mars.json
-e3d54542fbc06654af586571fb6a7fbf5bdfe9af assets/ad_astra/planet_renderers/mars_orbit.json
-92094169278bb335da464ea2cb92c790cc76219e assets/ad_astra/planet_renderers/mercury.json
-3ad9c4dab8bb89c89de0e84286ee1cc608ed5841 assets/ad_astra/planet_renderers/mercury_orbit.json
-3d400191fe0d4c787ce486b42fb27f9bc16b499b assets/ad_astra/planet_renderers/moon.json
-dc93a84a968c06af8fb1999b3379c8d05ef6618e assets/ad_astra/planet_renderers/moon_orbit.json
-296d528d28cf203e932baf7e4fe91fe0b5c19530 assets/ad_astra/planet_renderers/venus.json
-6256eb56aa5ac92fb4b31fdc11899c37fde718c3 assets/ad_astra/planet_renderers/venus_orbit.json
+// 1.20.1	2024-01-29T20:51:15.602795	Planet Renderers
+02ec227fa7447c0f851f26683a18edb9b9d61ff7 assets/ad_astra/planet_renderers/earth_orbit.json
+e9b5760adb66ee4b7ff0a8b58256b86dd8a3d908 assets/ad_astra/planet_renderers/glacio.json
+0b2e925d1b185660bdbe54cf2499c249bf48f2cd assets/ad_astra/planet_renderers/glacio_orbit.json
+08af3e47313c967fc437c68e7d73ccf3cb696e7e assets/ad_astra/planet_renderers/mars.json
+d8908b55aa1b9fa124f69b93d0b2ab0b0367e8d9 assets/ad_astra/planet_renderers/mars_orbit.json
+22861d451ae96e8f5a8d374a962ab4ad28788425 assets/ad_astra/planet_renderers/mercury.json
+7aa3ee4245ca38c2505f19b242cc268d21d47377 assets/ad_astra/planet_renderers/mercury_orbit.json
+0dfd16d284434c26f1ac7bdc06977a9918fcd073 assets/ad_astra/planet_renderers/moon.json
+4d68530d43e97e3ea573cca9ab8aad8f72d28688 assets/ad_astra/planet_renderers/moon_orbit.json
+5a5faf09e2aeeec03135e70738cbc60034a847f9 assets/ad_astra/planet_renderers/venus.json
+c021c5bb2692fe84a7e04f402e65a4b010fa6441 assets/ad_astra/planet_renderers/venus_orbit.json
diff --git a/common/src/main/generated/resources/.cache/d42038fe9714d33270a7309ae9641fccc9001edf b/common/src/main/generated/resources/.cache/d42038fe9714d33270a7309ae9641fccc9001edf
@@ -1,8 +1,7 @@
-// 1.20.1	2023-12-30T20:48:06.728224	Tags for minecraft:entity_type mod id ad_astra
-0b80548f23bc5bee90b92328d46ae7e13cb3a2db data/ad_astra/tags/entity_types/acid_rain_immune.json
+// 1.20.1	2024-01-29T20:22:50.650155	Tags for minecraft:entity_type mod id ad_astra
 8fb6c3dafcd9086f49a8ea003414895786cd6d3d data/ad_astra/tags/entity_types/can_survive_extreme_cold.json
 68b0da066fd014874f1d7b886cd84b74d69bf3db data/ad_astra/tags/entity_types/can_survive_extreme_heat.json
-90e1ebb1e309d0a7ab9f016d8aa69e08193be82d data/ad_astra/tags/entity_types/can_survive_in_acid_rain.json
+ae41cfc4a0317b0993a73cc0d737d15df6521d31 data/ad_astra/tags/entity_types/can_survive_in_acid_rain.json
 e48333a241d450d15ad28ac650f7cc3c54bcfc95 data/ad_astra/tags/entity_types/can_survive_in_space.json
 986ca8aa79b13bb6cb03aced4009597e607d57ac data/ad_astra/tags/entity_types/ignores_air_vortex.json
 2ab1ebb47d29a0796a1c73dfb0e5951e9c3b61ed data/ad_astra/tags/entity_types/lives_without_oxygen.json
diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/earth_orbit.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/earth_orbit.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -52,7 +52,7 @@
         0.0,
         30.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         -5.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/glacio.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/glacio.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         5.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         -5.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/glacio_orbit.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/glacio_orbit.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -52,7 +52,7 @@
         0.0,
         5.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         -5.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mars.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mars.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         20.0,
         180.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -52,7 +52,7 @@
         0.0,
         180.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         20.0,
         0.0
@@ -70,7 +70,7 @@
         0.0,
         160.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         100.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mars_orbit.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mars_orbit.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mercury.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mercury.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         140.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         100.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mercury_orbit.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/mercury_orbit.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/moon.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/moon.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         30.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         -5.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/moon_orbit.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/moon_orbit.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -52,7 +52,7 @@
         0.0,
         30.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         -5.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/venus.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/venus.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         160.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         100.0,
         0.0
@@ -52,7 +52,7 @@
         0.0,
         -10.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         100.0,
         0.0

diff --git a/common/src/main/generated/resources/assets/ad_astra/planet_renderers/venus_orbit.json b/common/src/main/generated/resources/assets/ad_astra/planet_renderers/venus_orbit.json
@@ -16,7 +16,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0
@@ -34,7 +34,7 @@
         0.0,
         0.0
       ],
-      "localRotation": [
+      "local_rotation": [
         0.0,
         0.0,
         0.0

diff --git a/common/src/main/generated/resources/data/ad_astra/tags/entity_types/acid_rain_immune.json b/common/src/main/generated/resources/data/ad_astra/tags/entity_types/acid_rain_immune.json
diff --git a/...rc/main/generated/resources/data/ad_astra/tags/entity_types/can_survive_in_acid_rain.json b/...rc/main/generated/resources/data/ad_astra/tags/entity_types/can_survive_in_acid_rain.json
@@ -1,5 +1,10 @@
 {
   "values": [
-    "#ad_astra:can_survive_extreme_heat"
+    "#ad_astra:can_survive_extreme_heat",
+    "ad_astra:tier_1_rocket",
+    "ad_astra:tier_2_rocket",
+    "ad_astra:tier_3_rocket",
+    "ad_astra:tier_4_rocket",
+    "ad_astra:lander"
   ]
 }
diff --git a/common/src/main/java/earth/terrarium/adastra/AdAstra.java b/common/src/main/java/earth/terrarium/adastra/AdAstra.java
@@ -3,9 +3,9 @@
 import com.teamresourceful.resourcefulconfig.common.config.Configurator;
 import earth.terrarium.adastra.api.systems.GravityApi;
 import earth.terrarium.adastra.api.systems.OxygenApi;
+import earth.terrarium.adastra.api.systems.PlanetData;
 import earth.terrarium.adastra.api.systems.TemperatureApi;
 import earth.terrarium.adastra.common.config.AdAstraConfig;
-import earth.terrarium.adastra.common.handlers.base.PlanetData;
 import earth.terrarium.adastra.common.network.NetworkHandler;
 import earth.terrarium.adastra.common.network.messages.ClientboundSyncLocalPlanetDataPacket;
 import earth.terrarium.adastra.common.network.messages.ClientboundSyncPlanetsPacket;
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
 .0,
 .0
           ],
-          "localRotation": [
+          "local_rotation": [
 .0,
 .0,
 .0
@@ Expand All / @@ -34,7 +34,7 @@ @@
 .0,
 .0
           ],
-          "localRotation": [
+          "local_rotation": [
 .0,
 .0,
             -5.0
@@ Expand Down @@