diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 83cdd51..e3d54ea 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -145,7 +145,7 @@ publisher { curseID = curse_id modrinthID = modrinth_id versionType = "release" - changelog = rootProject.file("changelog.md") + changelog = rootProject.file("changelog-fabric.md") version = "${minecraft_version}-${project.version}" displayName = "[FABRIC/QUILT 1.20] CraterLib - ${project.version}" gameVersions = ["1.20"] diff --git a/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java b/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java index 807565f..eda7fe0 100644 --- a/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java +++ b/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java @@ -3,7 +3,6 @@ package com.hypherionmc.craterlib; import com.hypherionmc.craterlib.api.event.server.CraterRegisterCommandEvent; import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent; import com.hypherionmc.craterlib.common.FabricCommonPlatform; -import com.hypherionmc.craterlib.core.event.CraterEvent; import com.hypherionmc.craterlib.core.event.CraterEventBus; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; diff --git a/Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientPlatform.java b/Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientPlatform.java index f222d83..a540589 100644 --- a/Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientPlatform.java +++ b/Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientPlatform.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.network.Connection; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/Fabric/src/main/resources/assets/craterlib/craterlib_logo.png b/Fabric/src/main/resources/assets/craterlib/craterlib_logo.png new file mode 100644 index 0000000..ce0159c Binary files /dev/null and b/Fabric/src/main/resources/assets/craterlib/craterlib_logo.png differ diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index a757083..e102407 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -3,17 +3,17 @@ "id": "craterlib", "version": "${version}", "name": "CraterLib", - "description": "A library mod used by HypherionSA's Mods", + "description": "A library mod used by First Dark Development and HypherionSA Mods", "authors": [ "HypherionSA", "Misha" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "homepage": "https://modrinth.com/mod/craterlib", + "sources": "https://github.com/firstdarkdev/craterLib/" }, "license": "MIT", - "icon": "assets/modid/icon.png", + "icon": "assets/craterlib/craterlib_logo.png", "environment": "*", "entrypoints": { "main": [ diff --git a/Forge/build.gradle b/Forge/build.gradle index 3ab5bca..d4e7b0d 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -173,7 +173,7 @@ publisher { curseID = curse_id modrinthID = modrinth_id versionType = "release" - changelog = rootProject.file("changelog.md") + changelog = rootProject.file("changelog-forge.md") version = "${minecraft_version}-${project.version}" displayName = "[FORGE 1.20] CraterLib - ${project.version}" gameVersions = ["1.20"] diff --git a/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java b/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java index 71a63dc..fb3f927 100644 --- a/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java +++ b/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java @@ -2,9 +2,11 @@ package com.hypherionmc.craterlib; import com.hypherionmc.craterlib.api.event.client.LateInitEvent; import com.hypherionmc.craterlib.client.CraterClientBus; +import com.hypherionmc.craterlib.common.ForgeServerEvents; import com.hypherionmc.craterlib.core.event.CraterEventBus; import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; @@ -13,7 +15,7 @@ public class CraterLib { public CraterLib() { CraterEventBus.INSTANCE.registerEventListener(CraterClientBus.class); - + MinecraftForge.EVENT_BUS.register(new ForgeServerEvents()); DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> { LateInitEvent event = new LateInitEvent(Minecraft.getInstance(), Minecraft.getInstance().options); CraterEventBus.INSTANCE.postEvent(event); diff --git a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCommonEvents.java b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCommonEvents.java index 99a49fb..fddc858 100644 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCommonEvents.java +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCommonEvents.java @@ -1,14 +1,9 @@ package com.hypherionmc.craterlib.common; import com.hypherionmc.craterlib.CraterConstants; -import com.hypherionmc.craterlib.api.event.server.CraterRegisterCommandEvent; -import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent; -import com.hypherionmc.craterlib.core.event.CraterEventBus; import com.hypherionmc.craterlib.core.systems.internal.CreativeTabRegistry; import net.minecraft.world.item.CreativeModeTab; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.event.RegisterCommandsEvent; -import net.minecraftforge.event.server.*; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -23,29 +18,4 @@ public class ForgeCommonEvents { .filter(p -> p.getLeft().get() == tab && p.getRight() != null) .forEach(itemPair -> event.accept(itemPair.getRight())); } - - @SubscribeEvent - public static void serverStarting(ServerStartingEvent event) { - CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Starting(event.getServer())); - } - - @SubscribeEvent - public static void serverStarted(ServerStartedEvent event) { - CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started()); - } - - @SubscribeEvent - public static void serverStopping(ServerStoppingEvent event) { - CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping()); - } - - @SubscribeEvent - public static void serverStopped(ServerStoppedEvent event) { - CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped()); - } - - @SubscribeEvent - public void onCommandRegister(RegisterCommandsEvent event) { - CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(event.getDispatcher())); - } } diff --git a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeServerEvents.java b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeServerEvents.java new file mode 100644 index 0000000..136ea01 --- /dev/null +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeServerEvents.java @@ -0,0 +1,40 @@ +package com.hypherionmc.craterlib.common; + +import com.hypherionmc.craterlib.api.event.server.CraterRegisterCommandEvent; +import com.hypherionmc.craterlib.api.event.server.CraterServerLifecycleEvent; +import com.hypherionmc.craterlib.core.event.CraterEventBus; +import net.minecraftforge.event.RegisterCommandsEvent; +import net.minecraftforge.event.server.ServerStartedEvent; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.event.server.ServerStoppedEvent; +import net.minecraftforge.event.server.ServerStoppingEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +public class ForgeServerEvents { + + @SubscribeEvent + public void serverStarting(ServerStartingEvent event) { + CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Starting(event.getServer())); + } + + @SubscribeEvent + public void serverStarted(ServerStartedEvent event) { + CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started()); + } + + @SubscribeEvent + public void serverStopping(ServerStoppingEvent event) { + CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping()); + } + + @SubscribeEvent + public void serverStopped(ServerStoppedEvent event) { + CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped()); + } + + @SubscribeEvent + public void onCommandRegister(RegisterCommandsEvent event) { + CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(event.getDispatcher())); + } + +} diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index 3bdc67a..d69f990 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -1,20 +1,20 @@ modLoader = "javafml" loaderVersion = "[46,)" license = "MIT" -#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" +issueTrackerURL="https://github.com/firstdarkdev/craterLib/issues" [[mods]] modId = "craterlib" version = "${file.jarVersion}" displayName = "CraterLib" -#updateJSONURL="https://change.me.example.invalid/updates.json" -#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" -logoFile = "multiloader.png" +displayURL="https://modrinth.com/mod/craterlib" +logoFile = "craterlib_logo.png" #credits="Thanks for this example mod goes to Java" -authors = "HypherionSA, Misha" +authors = "HypherionSA, Zenith" description = ''' -A library mod used by HypherionSA's Mods +A library mod used by First Dark Development and HypherionSA Mods ''' +displayTest = "MATCH_VERSION" [[dependencies.craterlib]] modId = "forge" diff --git a/Forge/src/main/resources/craterlib_logo.png b/Forge/src/main/resources/craterlib_logo.png new file mode 100644 index 0000000..ce0159c Binary files /dev/null and b/Forge/src/main/resources/craterlib_logo.png differ diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..8eba93d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,44 @@ +pipeline { + agent { + label "master" + } + tools { + jdk "JAVA17" + } + stages { + stage("Notify Discord") { + steps { + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "Deploy Started: CraterLib 1.20 Deploy #${BUILD_NUMBER}", + link: env.BUILD_URL, + result: 'SUCCESS', + description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" + } + } + stage("Prepare") { + steps { + sh "curl https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md --output changelog-forge.md" + sh "curl https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md --output changelog-fabric.md" + sh "chmod +x ./gradlew" + sh "./gradlew clean" + } + } + stage("Publish") { + steps { + sh "./gradlew publishMod publish -Prelease=true" + } + } + } + post { + always { + sh "./gradlew --stop" + deleteDir() + + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "CraterLib 1.20 Deploy #${BUILD_NUMBER}", + link: env.BUILD_URL, + result: currentBuild.currentResult, + description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}" + } + } +} diff --git a/changelog.md b/changelog-fabric.md similarity index 100% rename from changelog.md rename to changelog-fabric.md diff --git a/changelog-forge.md b/changelog-forge.md new file mode 100644 index 0000000..3ce015c --- /dev/null +++ b/changelog-forge.md @@ -0,0 +1 @@ +# Dummy file. To be filled by Jenkins \ No newline at end of file