-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: ported to 1.20.4, added neoforge
- Loading branch information
Showing
15 changed files
with
343 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,23 @@ | ||
| org.gradle.jvmargs=-Xmx3G | ||
|
|
||
| enabled_platforms=fabric,forge | ||
| enabled_platforms=fabric,forge,neoforge | ||
| mod_id=ftbessentials | ||
| archives_base_name=ftb-essentials | ||
| maven_group=dev.ftb.mods | ||
| minecraft_version=1.20.1 | ||
| mod_version=2001.2.2 | ||
| minecraft_version=1.20.4 | ||
| mod_version=2004.1.0 | ||
| mod_author=FTB Team | ||
|
|
||
| architectury_version=9.0.8 | ||
| fabric_loader_version=0.14.21 | ||
| fabric_api_version=0.83.1+1.20.1 | ||
| ftb_library_version=2001.1.2 | ||
| forge_version=47.0.1 | ||
| ftb_ranks_version=2001.1.3 | ||
| # Deps | ||
| forge_version=49.0.3 | ||
| neoforge_version=20.4.20-beta | ||
| neoforge_loader_version=1 | ||
| fabric_loader_version=0.15.1 | ||
| fabric_api_version=0.91.2+1.20.4 | ||
| architectury_version=11.0.8 | ||
|
|
||
| ftb_library_version=2004.1.1-SNAPSHOT | ||
| ftb_ranks_version=2004.1.0-SNAPSHOT | ||
|
|
||
| # common curseforge project for forge and fabric | ||
| curseforge_id=410811 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| plugins { | ||
| id "com.github.johnrengelman.shadow" version "7.1.2" | ||
| id "com.matthewprenger.cursegradle" version "1.4.0" | ||
| } | ||
|
|
||
| def ENV = System.getenv() | ||
|
|
||
| architectury { | ||
| platformSetupLoomIde() | ||
| neoForge() | ||
| } | ||
|
|
||
| loom { | ||
| accessWidenerPath = project(":common").loom.accessWidenerPath | ||
| } | ||
|
|
||
| configurations { | ||
| common | ||
| shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. | ||
| compileClasspath.extendsFrom common | ||
| runtimeClasspath.extendsFrom common | ||
| developmentNeoForge.extendsFrom common | ||
| dev | ||
| } | ||
|
|
||
| repositories { | ||
| maven { | ||
| url "https://maven.neoforged.net/releases/" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}" | ||
|
|
||
| modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" | ||
|
|
||
| common(project(path: ":common", configuration: "namedElements")) { transitive false } | ||
| shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } | ||
|
|
||
| modImplementation("dev.ftb.mods:ftb-library-neoforge:${rootProject.ftb_library_version}") { | ||
| exclude module: 'me.shedaniel:RoughlyEnoughItems-neoforge' | ||
| transitive false | ||
| } | ||
|
|
||
| modImplementation "dev.ftb.mods:ftb-ranks-neoforge:${rootProject.ftb_ranks_version}" | ||
|
|
||
| compileOnly "net.luckperms:api:5.4" | ||
| } | ||
|
|
||
| processResources { | ||
| exclude '.cache' | ||
|
|
||
| inputs.property "version", project.version | ||
|
|
||
| filesMatching("META-INF/mods.toml") { | ||
| expand "version": project.version, | ||
| "neoforgeversion": project.neoforge_version, | ||
| "neoforgeloaderversion": project.neoforge_loader_version, | ||
| "mcversion": project.minecraft_version, | ||
| "libraryversion": project.ftb_library_version, | ||
| "ranksversion": project.ftb_ranks_version | ||
| } | ||
| } | ||
|
|
||
| shadowJar { | ||
| exclude "fabric.mod.json" | ||
| exclude "architectury.common.json" | ||
|
|
||
| configurations = [project.configurations.shadowCommon] | ||
| setArchiveClassifier("dev-shadow") | ||
| } | ||
|
|
||
| remapJar { | ||
| input.set shadowJar.archiveFile | ||
| dependsOn shadowJar | ||
| archiveBaseName.set "${rootProject.archives_base_name}-${project.name}" | ||
| archiveClassifier.set null | ||
| } | ||
|
|
||
| jar { | ||
| setArchiveClassifier("dev") | ||
| } | ||
|
|
||
| sourcesJar { | ||
| def commonSources = project(":common").sourcesJar | ||
| dependsOn commonSources | ||
| from commonSources.archiveFile.map { zipTree(it) } | ||
| } | ||
|
|
||
| components.java { | ||
| withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { | ||
| skip() | ||
| } | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenForge(MavenPublication) { | ||
| artifactId = "${rootProject.archives_base_name}-${project.name}" | ||
| version ftbPublishing.mavenVersion | ||
| from components.java | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| if (ftbPublishing.ftbToken) { | ||
| maven { | ||
| url ftbPublishing.ftbURL | ||
| credentials { | ||
| username = ftbPublishing.ftbUser | ||
| password = ftbPublishing.ftbToken | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (ftbPublishing.sapsToken) { | ||
| maven { | ||
| url ftbPublishing.sapsURL | ||
| credentials { | ||
| username = ftbPublishing.sapsUser | ||
| password = ftbPublishing.sapsToken | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (ENV.CURSEFORGE_KEY) { | ||
| curseforge { | ||
| apiKey = ENV.CURSEFORGE_KEY | ||
| project { | ||
| id = project.curseforge_id | ||
| releaseType = ftbPublishing.relType | ||
| addGameVersion project.minecraft_version | ||
| addGameVersion "Forge" | ||
| mainArtifact(remapJar.archiveFile) | ||
| relations { | ||
| requiredDependency 'ftb-library-forge' | ||
| optionalDependency 'ftb-ranks-forge' | ||
| } | ||
| changelog = ENV.CHANGELOG // expected to exist if ENV.CURSEFORGE_KEY does | ||
| changelogType = 'markdown' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| loom.platform=neoforge |
53 changes: 53 additions & 0 deletions
53
neoforge/src/main/java/dev/ftb/mods/ftbessentials/neoforge/FTBEssentialsNeoForge.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package dev.ftb.mods.ftbessentials.neoforge; | ||
|
|
||
| import dev.ftb.mods.ftbessentials.FTBEssentials; | ||
| import dev.ftb.mods.ftbessentials.config.FTBEConfig; | ||
| import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.server.level.ServerPlayer; | ||
| import net.neoforged.bus.api.EventPriority; | ||
| import net.neoforged.fml.IExtensionPoint.DisplayTest; | ||
| import net.neoforged.fml.ModLoadingContext; | ||
| import net.neoforged.fml.common.Mod; | ||
| import net.neoforged.neoforge.common.NeoForge; | ||
| import net.neoforged.neoforge.event.entity.EntityTeleportEvent; | ||
| import net.neoforged.neoforge.event.entity.player.PlayerEvent; | ||
| import net.neoforged.neoforge.network.NetworkConstants; | ||
|
|
||
| @Mod(FTBEssentials.MOD_ID) | ||
| public class FTBEssentialsNeoForge { | ||
| public FTBEssentialsNeoForge() { | ||
| ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); | ||
|
|
||
| NeoForge.EVENT_BUS.addListener(EventPriority.HIGHEST, this::playerName); | ||
| NeoForge.EVENT_BUS.addListener(EventPriority.LOWEST, this::playerNameLow); | ||
| NeoForge.EVENT_BUS.addListener(EventPriority.LOWEST, this::vanillaTeleportCommand); | ||
|
|
||
| FTBEssentials.init(); | ||
| } | ||
|
|
||
| public void playerName(PlayerEvent.NameFormat event) { | ||
| if (event.getEntity() instanceof ServerPlayer sp) { | ||
| FTBEPlayerData.getOrCreate(sp).ifPresent(data -> { | ||
| if (!data.getNick().isEmpty()) event.setDisplayname(Component.literal(data.getNick())); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| public void playerNameLow(PlayerEvent.NameFormat event) { | ||
| if (event.getEntity() instanceof ServerPlayer sp) { | ||
| FTBEPlayerData.getOrCreate(sp).ifPresent(data -> { | ||
| if (data.getRecording() != FTBEPlayerData.RecordingStatus.NONE) { | ||
| event.setDisplayname(Component.literal("⏺ ").withStyle(data.getRecording().getStyle()) | ||
| .append(event.getDisplayname())); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| public void vanillaTeleportCommand(EntityTeleportEvent.TeleportCommand event) { | ||
| if (event.getEntity() instanceof ServerPlayer sp && !FTBEConfig.BACK_ON_DEATH_ONLY.get()) { | ||
| FTBEPlayerData.addTeleportHistory(sp); | ||
| } | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
neoforge/src/main/java/dev/ftb/mods/ftbessentials/neoforge/FTBEssentialsPlatformImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package dev.ftb.mods.ftbessentials.neoforge; | ||
|
|
||
| import net.minecraft.server.level.ServerPlayer; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.Items; | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public class FTBEssentialsPlatformImpl { | ||
| public static void curePotionEffects(ServerPlayer player) { | ||
| player.curePotionEffects(new ItemStack(Items.MILK_BUCKET)); | ||
| } | ||
| } |
Oops, something went wrong.