diff --git a/.gitignore b/.gitignore index e6a4d9d..e9fd876 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .settings lib/.settings lib/build +lib/bin # Ignore Gradle build output directory build diff --git a/lib/bin/main/org/punkcraft/oneworld/OneWorldSponge.class b/lib/bin/main/org/punkcraft/oneworld/OneWorldSponge.class deleted file mode 100644 index 5a192de..0000000 Binary files a/lib/bin/main/org/punkcraft/oneworld/OneWorldSponge.class and /dev/null differ diff --git a/lib/bin/main/org/punkcraft/oneworld/TestMessage.class b/lib/bin/main/org/punkcraft/oneworld/TestMessage.class deleted file mode 100644 index e527fa6..0000000 Binary files a/lib/bin/main/org/punkcraft/oneworld/TestMessage.class and /dev/null differ diff --git a/lib/bin/main/org/punkcraft/oneworld/WSListener.class b/lib/bin/main/org/punkcraft/oneworld/WSListener.class deleted file mode 100644 index 08699c3..0000000 Binary files a/lib/bin/main/org/punkcraft/oneworld/WSListener.class and /dev/null differ diff --git a/lib/bin/main/org/punkcraft/oneworld/Zone.class b/lib/bin/main/org/punkcraft/oneworld/Zone.class deleted file mode 100644 index 6bf9583..0000000 Binary files a/lib/bin/main/org/punkcraft/oneworld/Zone.class and /dev/null differ diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 8d7f2e7..4b4fbe0 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -10,11 +10,22 @@ repositories { } dependencies { - implementation("org.spongepowered:spongeapi:7.2.0") - // testImplementation("org.junit.jupiter:junit-jupiter") - // testRuntimeOnly("org.junit.platform:junit-platform-launcher") + implementation("org.spongepowered:spongeapi:7.4.0") +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } tasks.jar { + from("src/main/resources/plugin.json") { + include("plugin.json") + } + manifest { + attributes( + "Main-Class" to "org.punkcraft.zombienoburnsun.ZombieNoburnSun" + ) + } archiveBaseName.set("OneWorld") } diff --git a/lib/src/main/java/org/punkcraft/oneworld/OneWorldSponge.java b/lib/src/main/java/org/punkcraft/oneworld/OneWorldSponge.java deleted file mode 100644 index 9775f66..0000000 --- a/lib/src/main/java/org/punkcraft/oneworld/OneWorldSponge.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.punkcraft.oneworld; - -import org.spongepowered.api.plugin.Plugin; - - -@Plugin(id = "oneworldsponge", name = "OneWorldSponge", version = "1.0", description = "OneWorldSponge") -public class OneWorldSponge { - -} diff --git a/lib/src/main/java/org/punkcraft/zombienoburnsun/ZombieNoburnSun.java b/lib/src/main/java/org/punkcraft/zombienoburnsun/ZombieNoburnSun.java new file mode 100644 index 0000000..10bb4d7 --- /dev/null +++ b/lib/src/main/java/org/punkcraft/zombienoburnsun/ZombieNoburnSun.java @@ -0,0 +1,27 @@ +package org.punkcraft.zombienoburnsun; + +import org.spongepowered.api.entity.EntityTypes; +import org.spongepowered.api.event.Listener; +import com.google.inject.Inject; +import org.slf4j.Logger; +import org.spongepowered.api.event.Order; +import org.spongepowered.api.event.entity.IgniteEntityEvent; +import org.spongepowered.api.plugin.Plugin; + +@Plugin(id = "zombienoburnsun", name = "ZombieNoburnSun", version = "1.0", description = "Prevents zombies from burning in sunlight.") +public class ZombieNoburnSun { + + @Inject + private Logger logger; + + @Listener(order = Order.FIRST) + public void onEntityIgnite(IgniteEntityEvent event) { + if (event.getTargetEntity().getType() == EntityTypes.ZOMBIE) { + event.setCancelled(true); + } + } + + public Logger getLogger() { + return logger; + } +} diff --git a/lib/src/main/resources/META-INF/sponge_plugins.json b/lib/src/main/resources/META-INF/sponge_plugins.json index 50c21ae..ac0e105 100644 --- a/lib/src/main/resources/META-INF/sponge_plugins.json +++ b/lib/src/main/resources/META-INF/sponge_plugins.json @@ -6,10 +6,10 @@ "license": "All-Rights-Reserved", "plugins": [ { - "id": "worldswapper2", - "name": "WorldSwapper2", + "id": "zombienoburnsun", + "name": "ZombieNoburnSun", "version": "${version}", - "entrypoint": "org.punkcraft.worldswapper2.WorldSwapper2", + "entrypoint": "org.punkcraft.zombienoburnsun.ZombieNoburnSun", "description": "My plugin description", "branding": {}, "links": { @@ -19,7 +19,7 @@ "dependencies": [ { "id": "spongeapi", - "version": "7.2.0", + "version": "7.4.0", "load-order": "after", "optional": false }