switch to caelus for flight (closes #88)

Up-Mods · Apr 22, 2024 · f47b436 · f47b436
1 parent 73bbb1b
commit f47b436
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 95 deletions.
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
@@ -13,6 +13,13 @@ if(usingJarJar) {
 }
 jar.finalizedBy('reobfJar')
 
+repositories {
+    maven {
+        name = "TheIllusiveC4"
+        url = "https://maven.theillusivec4.top"
+    }
+}
+
 dependencies {
     minecraft neoforge.neoforge.get()
     compileOnly project(":Common")
@@ -24,6 +31,8 @@ dependencies {
 
     implementation fg.deobf(neoforge.curios.get())
 
+    implementation fg.deobf(neoforge.caelus.get())
+
     compileOnly fg.deobf(neoforge.cameraoverhaul.get())
     // NOT UPDATED YET!
 //    runtimeOnly fg.deobf(neoforge.cameraoverhaul.get())

diff --git a/NeoForge/libs.versions.toml b/NeoForge/libs.versions.toml
@@ -7,13 +7,17 @@ neoforge = "1.20.1-47.1.104"
 
 curios = "5266541"
 
+caelus = "3.2.0+1.20.1"
+
 cameraoverhaul = "4057605"
 
 [libraries]
 neoforge = { module = "net.neoforged:forge", version.ref = "neoforge" }
 
 curios = { module = "curse.maven:curios-309927", version.ref = "curios" }
 
+caelus = { module = "top.theillusivec4.caelus:caelus-forge", version.ref = "caelus" }
+
 cameraoverhaul = { module = "curse.maven:camera-overhaul-forge-443034", version.ref = "cameraoverhaul" }
 
 [plugins]

diff --git a/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/EventHandler.java b/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/EventHandler.java
@@ -4,21 +4,50 @@
 import dev.cammiescorner.icarus.client.IcarusClient;
 import dev.cammiescorner.icarus.util.IcarusHelper;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import top.theillusivec4.caelus.api.CaelusApi;
+
+import java.util.UUID;
 
 @Mod.EventBusSubscriber(modid = Icarus.MODID)
 public class EventHandler {
 
+    public static final UUID WINGS_FLIGHT_MODIFIER_ID = UUID.fromString("4b6eac76-f013-4382-8b22-5d43bc37939c");
+    public static final AttributeModifier WINGS_FLIGHT = new AttributeModifier(WINGS_FLIGHT_MODIFIER_ID, "icarus_wings", 1.0D, AttributeModifier.Operation.ADDITION);
+
+    @SuppressWarnings("UnreachableCode")
     @SubscribeEvent
     public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
         if(event.phase == TickEvent.Phase.START) {
-            if(event.side.isServer()) {
-                IcarusHelper.onPlayerTick(event.player);
+            var attributeInstance = event.player.getAttribute(CaelusApi.getInstance().getFlightAttribute());
+
+            if(attributeInstance != null) {
+                if (attributeInstance.hasModifier(WINGS_FLIGHT)) {
+                    if(event.player.isFallFlying()) {
+                        if (!IcarusHelper.onFallFlyingTick(event.player, IcarusHelper.getEquippedWings.apply(event.player), true)) {
+                            attributeInstance.removeModifier(WINGS_FLIGHT);
+                        }
+                    }
+                    else {
+                        if(!IcarusHelper.hasWings.test(event.player)) {
+                            attributeInstance.removeModifier(WINGS_FLIGHT);
+                        }
+                    }
+                }
+                else {
+                    if (IcarusHelper.hasWings.test(event.player)) {
+                        attributeInstance.addTransientModifier(WINGS_FLIGHT);
+                    }
+                }
             }
-            else {
+
+            if (event.side.isServer()) {
+                IcarusHelper.onPlayerTick(event.player);
+            } else {
                 IcarusClient.onPlayerTick(event.player);
             }
         }

diff --git a/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/mixin/LivingEntityMixin.java b/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/mixin/LivingEntityMixin.java
diff --git a/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/mixin/PlayerMixin.java b/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/mixin/PlayerMixin.java
diff --git a/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/mixin/client/LocalPlayerMixin.java b/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/mixin/client/LocalPlayerMixin.java
diff --git a/NeoForge/src/main/resources/META-INF/mods.toml b/NeoForge/src/main/resources/META-INF/mods.toml
@@ -25,6 +25,7 @@ config = "${mod_id}.neoforge.mixins.json"
         { modId = "forge", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { ignore = true } },
         { modId = "minecraft", mandatory = true, versionRange = "[${minecraft_version}]", ordering = "NONE", side = "BOTH" },
         { modId = "curios", mandatory = true, versionRange = "[5.8.0,)", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "309927", modrinth = "vvuO3ImH" } },
+        { modId = "caelus", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "308989", modrinth = "40FYwb4z" } },
         { modId = "resourcefulconfig", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "714059", modrinth = "M1953qlQ" } },
         { modId = "commonnetworking", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "806044", modrinth = "HIuqnQpi" } }
     ]

diff --git a/NeoForge/src/main/resources/icarus.neoforge.mixins.json b/NeoForge/src/main/resources/icarus.neoforge.mixins.json
@@ -6,14 +6,11 @@
   "refmap": "${mod_id}.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "LivingEntityMixin",
-    "PlayerMixin",
     "WingItemMixin"
   ],
   "injectors": {
     "defaultRequire": 1
   },
   "client": [
-    "client.LocalPlayerMixin"
   ]
 }