Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaz492 committed Jan 7, 2024
1 parent 4073a01 commit 5a7c945
Show file tree
Hide file tree
Showing 11 changed files with 191 additions and 26 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## [4.0.0]

- Update to 1.20.4 and support neoforge

## [3.0.4]

- Fix long break times
Expand Down
37 changes: 20 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
id "com.matthewprenger.cursegradle" version "1.4.0" apply false
id "me.modmuss50.mod-publish-plugin" version "0.3.0"
id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
id "me.modmuss50.mod-publish-plugin" version "0.4.5"
}

ext.isSnapshot = providers.environmentVariable("SNAPSHOT").map { it == "true" }.getOrElse(false)
Expand All @@ -28,13 +27,14 @@ allprojects {
apply plugin: "java"
apply plugin: "architectury-plugin"
apply plugin: "maven-publish"
apply plugin: 'com.matthewprenger.cursegradle'

archivesBaseName = rootProject.archives_base_name
version = "${mod_version}+mc${minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
group = rootProject.maven_group

repositories {
// maven { url "https://maven.wuffs.wtf/releases"}
maven { url "https://maven.neomc.dev/releases"}
}

tasks.withType(JavaCompile) {
Expand Down Expand Up @@ -65,6 +65,12 @@ publishMods {
modLoaders.add("forge")
}

def neoOptions = publishOptions {
file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
displayName = "${project.name} NeoForged ${mod_version}+mc${minecraft_version}"
modLoaders.add("neoforge")
}

def curseForgeOptions = curseforgeOptions {
accessToken = providers.environmentVariable("CURSE_TOKEN")
projectId = "${curseforge_id}"
Expand All @@ -82,16 +88,14 @@ publishMods {
requires {
slug = "fabric-api"
}
requires {
slug = "architectury-api"
}
}

curseforge("curseforgeForge") {
from(curseForgeOptions, forgeOptions)
requires {
slug = "architectury-api"
}
}

curseforge("curseforgeNeo") {
from(curseForgeOptions, neoOptions)
}

if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
Expand All @@ -100,24 +104,23 @@ publishMods {
requires {
slug = "fabric-api"
}
requires {
slug = "architectury-api"
}
}

modrinth("modrinthForge") {
from(modrinthOptions, forgeOptions)
requires {
slug = "architectury-api"
}
}

modrinth("modrinthNeo") {
from(modrinthOptions, neoOptions)
}
}

github {
file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
additionalFiles.from project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
repository = "${github_repo}"
accessToken = providers.environmentVariable("GITHUB_TOKEN")
commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class PlayerPlateBlock extends PressurePlateBlock {
private boolean isInvisible;

public PlayerPlateBlock(Sensitivity sensitivity, boolean invisible, Block copy, BlockSetType type) {
super(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.copy(copy).noCollission().sound(SoundType.WOOD), type);
super(type, BlockBehaviour.Properties.ofFullCopy(copy).noCollission().sound(SoundType.WOOD));
this.sensitivity = sensitivity;
this.isInvisible = invisible;

Expand Down
18 changes: 11 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
# Project
mod_version=3.0.4
mod_version=4.0.0
maven_group=dev.wuffs.playerplates
enabled_platforms=fabric,forge
enabled_platforms=fabric,forge,neoforge
archives_base_name=playerplates

# Common
minecraft_version=1.20.1
architectury_version=9.1.12
minecraft_version=1.20.4
architectury_version=11.0.10

# Fabric
fabric_loader_version=0.14.22
fabric_api_version=0.86.1+1.20.1
fabric_loader_version=0.15.3
fabric_api_version=0.92.1+1.20.4

# Forge
forge_version=1.20.1-47.1.5
forge_version=1.20.4-49.0.14

# Neo
neo_version=20.4.80-beta
neo_gradle=[7.0.60,)

# Publishing
curseforge_id=311645
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
97 changes: 97 additions & 0 deletions neoforge/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
plugins {
id "com.github.johnrengelman.shadow" version "8.1.1"
}

architectury {
platformSetupLoomIde()
neoForge()
}

loom {
accessWidenerPath = project(":common").loom.accessWidenerPath

// neoforge {
// convertAccessWideners = true
// extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
// }
}

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
}

dependencies {
neoForge "net.neoforged:neoforge:${rootProject.neo_version}"
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"

common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
}

processResources {
inputs.property "version", project.version

filesMatching("META-INF/mods.toml") {
expand "version": project.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}"
setArchiveClassifier(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()
}
}

def ENV = System.getenv()

publishing {
publications {
mavenNeoForge(MavenPublication) {
artifactId = rootProject.archives_base_name + "-" + project.name
from components.java
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
if (ENV.NANITE_TOKEN) {
maven {
url "https://maven.nanite.dev/releases"
credentials {
username = "nanite"
password = "${ENV.NANITE_TOKEN}"
}
}
}
}
}
1 change: 1 addition & 0 deletions neoforge/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loom.platform=neoforge
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package dev.wuffs.playerplates.forge;

import dev.wuffs.playerplates.PlayerPlates;
import net.neoforged.fml.common.Mod;

@Mod(PlayerPlates.MOD_ID)
public class PlayerPlatesForge {
public PlayerPlatesForge() {
// EventBuses.registerModEventBus(PlayerPlates.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
PlayerPlates.init();
}
}
35 changes: 35 additions & 0 deletions neoforge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
modLoader = "javafml"
loaderVersion = "[1,)"
#issueTrackerURL = ""
license = "All rights reserved"

[[mods]]
modId = "playerplates"
version = "${version}"
displayName = "Player Plates"
authors = "Gaz"
description = '''
Obsidian pressure plates and mossy plates
'''
#logoFile = ""

[[dependencies.playerplates]]
modId = "neoforge"
required = true
versionRange = "[1,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.playerplates]]
modId = "minecraft"
required = true
versionRange = "[1.20.4,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.playerplates]]
modId = "architectury"
required = true
versionRange = "[11.0.10,)"
ordering = "AFTER"
side = "BOTH"
6 changes: 6 additions & 0 deletions neoforge/src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"pack": {
"description": "Example Mod",
"pack_format": 9
}
}
3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
pluginManagement {
repositories {
maven { url "https://maven.wuffs.wtf/releases" }
maven { url "https://maven.neomc.dev/releases" }
maven { url "https://maven.fabricmc.net/" }
maven { url "https://maven.architectury.dev/" }
maven { url "https://maven.minecraftforge.net/" }
Expand All @@ -10,5 +12,6 @@ pluginManagement {
include("common")
include("fabric")
include("forge")
include("neoforge")

rootProject.name = "PlayerPlates"

0 comments on commit 5a7c945

Please sign in to comment.