Dropped 1.20.6 support and made modern commons module for 1.21+

Auxilor · Jun 22, 2024 · 9b47e47 · 9b47e47
1 parent e2a6d6d
commit 9b47e47
Show file tree

Hide file tree

Showing 96 changed files with 440 additions and 1,579 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,6 @@ dependencies {
     implementation(project(path = ":eco-core:core-nms:v1_20_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_20_R2", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_20_R3", configuration = "reobf"))
-    implementation(project(path = ":eco-core:core-nms:v1_20_6", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_21", configuration = "reobf"))
 }
 

diff --git a/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java
@@ -28,7 +28,6 @@ public final class ProxyConstants {
             "v1_20_R1",
             "v1_20_R2",
             "v1_20_R3",
-            "v1_20_6",
             "v1_21"
     );
 

diff --git a/...core/core-nms/nms-common/build.gradle.kts → eco-core/core-nms/common/build.gradle.kts b/...core/core-nms/nms-common/build.gradle.kts → eco-core/core-nms/common/build.gradle.kts
diff --git a/...nternal/spigot/proxy/common/NMSCommons.kt → ...nternal/spigot/proxy/common/NMSCommons.kt b/...nternal/spigot/proxy/common/NMSCommons.kt → ...nternal/spigot/proxy/common/NMSCommons.kt
diff --git a/...eco/internal/spigot/proxy/common/Skull.kt → ...eco/internal/spigot/proxy/common/Skull.kt b/...eco/internal/spigot/proxy/common/Skull.kt → ...eco/internal/spigot/proxy/common/Skull.kt
diff --git a/...nal/spigot/proxy/common/ai/CustomGoals.kt → ...nal/spigot/proxy/common/ai/CustomGoals.kt b/...nal/spigot/proxy/common/ai/CustomGoals.kt → ...nal/spigot/proxy/common/ai/CustomGoals.kt
diff --git a/...ot/proxy/common/ai/EcoEntityController.kt → ...ot/proxy/common/ai/EcoEntityController.kt b/...ot/proxy/common/ai/EcoEntityController.kt → ...ot/proxy/common/ai/EcoEntityController.kt
diff --git a/...nal/spigot/proxy/common/ai/EntityGoals.kt → ...nal/spigot/proxy/common/ai/EntityGoals.kt b/...nal/spigot/proxy/common/ai/EntityGoals.kt → ...nal/spigot/proxy/common/ai/EntityGoals.kt
diff --git a/...nal/spigot/proxy/common/ai/TargetGoals.kt → ...nal/spigot/proxy/common/ai/TargetGoals.kt b/...nal/spigot/proxy/common/ai/TargetGoals.kt → ...nal/spigot/proxy/common/ai/TargetGoals.kt
diff --git a/...ommon/ai/entity/AvoidEntityGoalFactory.kt → ...ommon/ai/entity/AvoidEntityGoalFactory.kt b/...ommon/ai/entity/AvoidEntityGoalFactory.kt → ...ommon/ai/entity/AvoidEntityGoalFactory.kt
diff --git a/...common/ai/entity/BreakDoorsGoalFactory.kt → ...common/ai/entity/BreakDoorsGoalFactory.kt b/...common/ai/entity/BreakDoorsGoalFactory.kt → ...common/ai/entity/BreakDoorsGoalFactory.kt
diff --git a/...common/ai/entity/BreatheAirGoalFactory.kt → ...common/ai/entity/BreatheAirGoalFactory.kt b/...common/ai/entity/BreatheAirGoalFactory.kt → ...common/ai/entity/BreatheAirGoalFactory.kt
diff --git a/...roxy/common/ai/entity/BreedGoalFactory.kt → ...roxy/common/ai/entity/BreedGoalFactory.kt b/...roxy/common/ai/entity/BreedGoalFactory.kt → ...roxy/common/ai/entity/BreedGoalFactory.kt
diff --git a/...ommon/ai/entity/CatLieOnBedGoalFactory.kt → ...ommon/ai/entity/CatLieOnBedGoalFactory.kt b/...ommon/ai/entity/CatLieOnBedGoalFactory.kt → ...ommon/ai/entity/CatLieOnBedGoalFactory.kt
diff --git a/...ommon/ai/entity/CatSitOnBedGoalFactory.kt → ...ommon/ai/entity/CatSitOnBedGoalFactory.kt b/...ommon/ai/entity/CatSitOnBedGoalFactory.kt → ...ommon/ai/entity/CatSitOnBedGoalFactory.kt
diff --git a/...y/common/ai/entity/EatGrassGoalFactory.kt → ...y/common/ai/entity/EatGrassGoalFactory.kt b/...y/common/ai/entity/EatGrassGoalFactory.kt → ...y/common/ai/entity/EatGrassGoalFactory.kt
diff --git a/...xy/common/ai/entity/FleeSunGoalFactory.kt → ...xy/common/ai/entity/FleeSunGoalFactory.kt b/...xy/common/ai/entity/FleeSunGoalFactory.kt → ...xy/common/ai/entity/FleeSunGoalFactory.kt
diff --git a/...roxy/common/ai/entity/FloatGoalFactory.kt → ...roxy/common/ai/entity/FloatGoalFactory.kt b/...roxy/common/ai/entity/FloatGoalFactory.kt → ...roxy/common/ai/entity/FloatGoalFactory.kt
diff --git a/...ommon/ai/entity/FollowBoatsGoalFactory.kt → ...ommon/ai/entity/FollowBoatsGoalFactory.kt b/...ommon/ai/entity/FollowBoatsGoalFactory.kt → ...ommon/ai/entity/FollowBoatsGoalFactory.kt
diff --git a/...common/ai/entity/FollowMobsGoalFactory.kt → ...common/ai/entity/FollowMobsGoalFactory.kt b/...common/ai/entity/FollowMobsGoalFactory.kt → ...common/ai/entity/FollowMobsGoalFactory.kt
diff --git a/...ty/IllusionerBlindnessSpellGoalFactory.kt → ...ty/IllusionerBlindnessSpellGoalFactory.kt b/...ty/IllusionerBlindnessSpellGoalFactory.kt → ...ty/IllusionerBlindnessSpellGoalFactory.kt
diff --git a/...ntity/IllusionerMirrorSpellGoalFactory.kt → ...ntity/IllusionerMirrorSpellGoalFactory.kt b/...ntity/IllusionerMirrorSpellGoalFactory.kt → ...ntity/IllusionerMirrorSpellGoalFactory.kt
diff --git a/...y/common/ai/entity/InteractGoalFactory.kt → ...y/common/ai/entity/InteractGoalFactory.kt b/...y/common/ai/entity/InteractGoalFactory.kt → ...y/common/ai/entity/InteractGoalFactory.kt
diff --git a/...mmon/ai/entity/LeapAtTargetGoalFactory.kt → ...mmon/ai/entity/LeapAtTargetGoalFactory.kt b/...mmon/ai/entity/LeapAtTargetGoalFactory.kt → ...mmon/ai/entity/LeapAtTargetGoalFactory.kt
diff --git a/...mmon/ai/entity/LookAtPlayerGoalFactory.kt → ...mmon/ai/entity/LookAtPlayerGoalFactory.kt b/...mmon/ai/entity/LookAtPlayerGoalFactory.kt → ...mmon/ai/entity/LookAtPlayerGoalFactory.kt
diff --git a/...ommon/ai/entity/MeleeAttackGoalFactory.kt → ...ommon/ai/entity/MeleeAttackGoalFactory.kt b/...ommon/ai/entity/MeleeAttackGoalFactory.kt → ...ommon/ai/entity/MeleeAttackGoalFactory.kt
diff --git a/...ai/entity/MoveBackToVillageGoalFactory.kt → ...ai/entity/MoveBackToVillageGoalFactory.kt b/...ai/entity/MoveBackToVillageGoalFactory.kt → ...ai/entity/MoveBackToVillageGoalFactory.kt
diff --git a/...i/entity/MoveThroughVillageGoalFactory.kt → ...i/entity/MoveThroughVillageGoalFactory.kt b/...i/entity/MoveThroughVillageGoalFactory.kt → ...i/entity/MoveThroughVillageGoalFactory.kt
diff --git a/...tity/MoveTowardsRestrictionGoalFactory.kt → ...tity/MoveTowardsRestrictionGoalFactory.kt b/...tity/MoveTowardsRestrictionGoalFactory.kt → ...tity/MoveTowardsRestrictionGoalFactory.kt
diff --git a/...ai/entity/MoveTowardsTargetGoalFactory.kt → ...ai/entity/MoveTowardsTargetGoalFactory.kt b/...ai/entity/MoveTowardsTargetGoalFactory.kt → ...ai/entity/MoveTowardsTargetGoalFactory.kt
diff --git a/...mmon/ai/entity/OcelotAttackGoalFactory.kt → ...mmon/ai/entity/OcelotAttackGoalFactory.kt b/...mmon/ai/entity/OcelotAttackGoalFactory.kt → ...mmon/ai/entity/OcelotAttackGoalFactory.kt
diff --git a/.../common/ai/entity/OpenDoorsGoalFactory.kt → .../common/ai/entity/OpenDoorsGoalFactory.kt b/.../common/ai/entity/OpenDoorsGoalFactory.kt → .../common/ai/entity/OpenDoorsGoalFactory.kt
diff --git a/...roxy/common/ai/entity/PanicGoalFactory.kt → ...roxy/common/ai/entity/PanicGoalFactory.kt b/...roxy/common/ai/entity/PanicGoalFactory.kt → ...roxy/common/ai/entity/PanicGoalFactory.kt
diff --git a/.../ai/entity/RandomLookAroundGoalFactory.kt → .../ai/entity/RandomLookAroundGoalFactory.kt b/.../ai/entity/RandomLookAroundGoalFactory.kt → .../ai/entity/RandomLookAroundGoalFactory.kt
diff --git a/...mmon/ai/entity/RandomStrollGoalFactory.kt → ...mmon/ai/entity/RandomStrollGoalFactory.kt b/...mmon/ai/entity/RandomStrollGoalFactory.kt → ...mmon/ai/entity/RandomStrollGoalFactory.kt
diff --git a/...on/ai/entity/RandomSwimmingGoalFactory.kt → ...on/ai/entity/RandomSwimmingGoalFactory.kt b/...on/ai/entity/RandomSwimmingGoalFactory.kt → ...on/ai/entity/RandomSwimmingGoalFactory.kt
diff --git a/...mmon/ai/entity/RangedAttackGoalFactory.kt → ...mmon/ai/entity/RangedAttackGoalFactory.kt b/...mmon/ai/entity/RangedAttackGoalFactory.kt → ...mmon/ai/entity/RangedAttackGoalFactory.kt
diff --git a/...n/ai/entity/RangedBowAttackGoalFactory.kt → ...n/ai/entity/RangedBowAttackGoalFactory.kt b/...n/ai/entity/RangedBowAttackGoalFactory.kt → ...n/ai/entity/RangedBowAttackGoalFactory.kt
diff --git a/...entity/RangedCrossbowAttackGoalFactory.kt → ...entity/RangedCrossbowAttackGoalFactory.kt b/...entity/RangedCrossbowAttackGoalFactory.kt → ...entity/RangedCrossbowAttackGoalFactory.kt
diff --git a/...ommon/ai/entity/RestrictSunGoalFactory.kt → ...ommon/ai/entity/RestrictSunGoalFactory.kt b/...ommon/ai/entity/RestrictSunGoalFactory.kt → ...ommon/ai/entity/RestrictSunGoalFactory.kt
diff --git a/...entity/StrollThroughVillageGoalFactory.kt → ...entity/StrollThroughVillageGoalFactory.kt b/...entity/StrollThroughVillageGoalFactory.kt → ...entity/StrollThroughVillageGoalFactory.kt
diff --git a/...roxy/common/ai/entity/TemptGoalFactory.kt → ...roxy/common/ai/entity/TemptGoalFactory.kt b/...roxy/common/ai/entity/TemptGoalFactory.kt → ...roxy/common/ai/entity/TemptGoalFactory.kt
diff --git a/...mmon/ai/entity/TryFindWaterGoalFactory.kt → ...mmon/ai/entity/TryFindWaterGoalFactory.kt b/...mmon/ai/entity/TryFindWaterGoalFactory.kt → ...mmon/ai/entity/TryFindWaterGoalFactory.kt
diff --git a/...xy/common/ai/entity/UseItemGoalFactory.kt → ...xy/common/ai/entity/UseItemGoalFactory.kt b/...xy/common/ai/entity/UseItemGoalFactory.kt → ...xy/common/ai/entity/UseItemGoalFactory.kt
diff --git a/...y/WaterAvoidingRandomFlyingGoalFactory.kt → ...y/WaterAvoidingRandomFlyingGoalFactory.kt b/...y/WaterAvoidingRandomFlyingGoalFactory.kt → ...y/WaterAvoidingRandomFlyingGoalFactory.kt
diff --git a/...y/WaterAvoidingRandomStrollGoalFactory.kt → ...y/WaterAvoidingRandomStrollGoalFactory.kt b/...y/WaterAvoidingRandomStrollGoalFactory.kt → ...y/WaterAvoidingRandomStrollGoalFactory.kt
diff --git a/...xy/common/ai/entity/WolfBegGoalFactory.kt → ...xy/common/ai/entity/WolfBegGoalFactory.kt b/...xy/common/ai/entity/WolfBegGoalFactory.kt → ...xy/common/ai/entity/WolfBegGoalFactory.kt
diff --git a/...mon/ai/target/DefendVillageGoalFactory.kt → ...mon/ai/target/DefendVillageGoalFactory.kt b/...mon/ai/target/DefendVillageGoalFactory.kt → ...mon/ai/target/DefendVillageGoalFactory.kt
diff --git a/...oxy/common/ai/target/HurtByGoalFactory.kt → ...oxy/common/ai/target/HurtByGoalFactory.kt b/...oxy/common/ai/target/HurtByGoalFactory.kt → ...oxy/common/ai/target/HurtByGoalFactory.kt
diff --git a/...ai/target/NearestAttackableGoalFactory.kt → ...ai/target/NearestAttackableGoalFactory.kt b/...ai/target/NearestAttackableGoalFactory.kt → ...ai/target/NearestAttackableGoalFactory.kt
diff --git a/...rget/NearestAttackableWitchGoalFactory.kt → ...rget/NearestAttackableWitchGoalFactory.kt b/...rget/NearestAttackableWitchGoalFactory.kt → ...rget/NearestAttackableWitchGoalFactory.kt
diff --git a/...arget/NearestHealableRaiderGoalFactory.kt → ...arget/NearestHealableRaiderGoalFactory.kt b/...arget/NearestHealableRaiderGoalFactory.kt → ...arget/NearestHealableRaiderGoalFactory.kt
diff --git a/...mon/ai/target/NonTameRandomGoalFactory.kt → ...mon/ai/target/NonTameRandomGoalFactory.kt b/...mon/ai/target/NonTameRandomGoalFactory.kt → ...mon/ai/target/NonTameRandomGoalFactory.kt
diff --git a/...ommon/ai/target/OwnerHurtByGoalFactory.kt → ...ommon/ai/target/OwnerHurtByGoalFactory.kt b/...ommon/ai/target/OwnerHurtByGoalFactory.kt → ...ommon/ai/target/OwnerHurtByGoalFactory.kt
diff --git a/...ommon/ai/target/OwnerTargetGoalFactory.kt → ...ommon/ai/target/OwnerTargetGoalFactory.kt b/...ommon/ai/target/OwnerTargetGoalFactory.kt → ...ommon/ai/target/OwnerTargetGoalFactory.kt
diff --git a/.../target/ResetUniversalAngerGoalFactory.kt → .../target/ResetUniversalAngerGoalFactory.kt b/.../target/ResetUniversalAngerGoalFactory.kt → .../target/ResetUniversalAngerGoalFactory.kt
diff --git a/...got/proxy/common/item/EcoFastItemStack.kt → ...got/proxy/common/item/EcoFastItemStack.kt b/...got/proxy/common/item/EcoFastItemStack.kt → ...got/proxy/common/item/EcoFastItemStack.kt
diff --git a/.../common/packet/EcoChannelDuplexHandler.kt → .../common/packet/EcoChannelDuplexHandler.kt b/.../common/packet/EcoChannelDuplexHandler.kt → .../common/packet/EcoChannelDuplexHandler.kt
diff --git a/...y/common/packet/PacketInjectorListener.kt → ...y/common/packet/PacketInjectorListener.kt b/...y/common/packet/PacketInjectorListener.kt → ...y/common/packet/PacketInjectorListener.kt
diff --git a/...common/packet/display/PacketAutoRecipe.kt → ...common/packet/display/PacketAutoRecipe.kt b/...common/packet/display/PacketAutoRecipe.kt → ...common/packet/display/PacketAutoRecipe.kt
diff --git a/...mmon/packet/display/PacketHeldItemSlot.kt → ...mmon/packet/display/PacketHeldItemSlot.kt b/...mmon/packet/display/PacketHeldItemSlot.kt → ...mmon/packet/display/PacketHeldItemSlot.kt
diff --git a/...acket/display/PacketOpenWindowMerchant.kt → ...acket/display/PacketOpenWindowMerchant.kt b/...acket/display/PacketOpenWindowMerchant.kt → ...acket/display/PacketOpenWindowMerchant.kt
diff --git a/...n/packet/display/PacketSetCreativeSlot.kt → ...n/packet/display/PacketSetCreativeSlot.kt b/...n/packet/display/PacketSetCreativeSlot.kt → ...n/packet/display/PacketSetCreativeSlot.kt
diff --git a/...xy/common/packet/display/PacketSetSlot.kt → ...xy/common/packet/display/PacketSetSlot.kt b/...xy/common/packet/display/PacketSetSlot.kt → ...xy/common/packet/display/PacketSetSlot.kt
diff --git a/...ommon/packet/display/PacketWindowItems.kt → ...ommon/packet/display/PacketWindowItems.kt b/...ommon/packet/display/PacketWindowItems.kt → ...ommon/packet/display/PacketWindowItems.kt
diff --git a/...mmon/packet/display/frame/DisplayFrame.kt → ...mmon/packet/display/frame/DisplayFrame.kt b/...mmon/packet/display/frame/DisplayFrame.kt → ...mmon/packet/display/frame/DisplayFrame.kt
diff --git a/eco-core/core-nms/modern/build.gradle.kts b/eco-core/core-nms/modern/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+
+group = "com.willfp"
+version = rootProject.version
+
+dependencies {
+    compileOnly(project(":eco-core:core-nms:common"))
+    paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT")
+}
+
+tasks {
+    compileJava {
+        options.release = 21
+    }
+
+    compileKotlin {
+        kotlinOptions {
+            jvmTarget = "21"
+        }
+    }
+}