Skip to content
Closed

26.1 #269

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
66 changes: 16 additions & 50 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,13 @@ import com.google.gson.Gson
import com.google.gson.GsonBuilder

plugins {
id "java-library"
id "net.neoforged.moddev"
id "me.shedaniel.unified-publishing"
id "com.diffplug.spotless"
id "maven-publish"
id 'java-library'
id 'net.neoforged.moddev'
id 'me.shedaniel.unified-publishing'
id 'com.diffplug.spotless'
id 'maven-publish'
}

repositories {
maven {
url = "https://maven.theillusivec4.top"
content {
includeGroup "top.theillusivec4.curios"
}
}
maven {
name = "blamejared"
url = "https://maven.blamejared.com/"
content {
includeGroup "mezz.jei"
}
}
maven {
name 'modmaven'
url "https://modmaven.dev/"
content {
includeGroup "mezz.jei"
}
}
maven {
url "https://maven.shedaniel.me"
content {
includeGroup "me.shedaniel"
includeGroup "me.shedaniel.cloth"
includeGroup "dev.architectury"
}
}
maven {
name = "TerraformersMC"
url = "https://maven.terraformersmc.com/releases/"
content {
includeGroup "dev.emi"
}
}
mavenCentral()
}

apply plugin: "me.shedaniel.unified-publishing"

Expand Down Expand Up @@ -90,18 +52,16 @@ group = project.maven_group
java {
withSourcesJar()
toolchain {
languageVersion = JavaLanguageVersion.of(21)
languageVersion = JavaLanguageVersion.of(25)
}
}

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.compilerArgs += ["-Xmaxerrs", "9999"]
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}" }
}
from('guidebook') {
into 'assets/powah/guides/powah/book'
}
Expand All @@ -115,12 +75,13 @@ sourceSets {
}
}

final projectVersion = project.version.toString()
processResources {
inputs.property "version", project.version
inputs.property "version", projectVersion

filesMatching("META-INF/neoforge.mods.toml") {
filter { line ->
line.replace 'version="0.0.0"', "version=\"$version\""
line.replace 'version="0.0.0"', "version=\"$projectVersion\""
}
}
}
Expand All @@ -137,11 +98,16 @@ neoForge {
client()
systemProperty('guideme.powah.book.sources', file('guidebook').absolutePath)
}
gametestWorld {
client()
programArguments = ["--quickPlaySingleplayer", "GametestWorld"]
systemProperty('guideme.powah.book.sources', file('guidebook').absolutePath)
}
server {
server()
}
data {
data()
clientData()
programArguments = ['--mod', 'powah',
'--all',
'--output', file('src/generated/resources/').absolutePath,
Expand Down
32 changes: 9 additions & 23 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,38 +1,24 @@
# Enabling the Gradle build-cache is critical for performance
org.gradle.caching=true
org.gradle.configuration-cache=true
org.gradle.parallel=true

# Also add exports for google-java-format to work in modern java
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

mod_name=Powah
mod_version=5.1.0-alpha
mod_version=26.1.0-alpha
archives_base_name=Powah
maven_group=dev.technici4n

# Common
minecraft_version=1.21.1
cloth_config_version=15.0.127
neoforge_version=26.1.0.0-alpha.2+snapshot-1
minecraft_version=26.1-snapshot-1

cloth_config_version=21.11.153
rei_version=16.0.729
# latest emi versions: https://maven.terraformersmc.com/releases/dev/emi/emi-neoforge/maven-metadata.xml
emi_version=1.1.13+1.21.1
# latest jei versions: https://maven.blamejared.com/mezz/jei/jei-1.21.1-neoforge/maven-metadata.xml
jei_version=19.18.3.203
jei_minecraft_version=1.21.1
neoforge_version=21.1.113
jei_version=28.0.0.6
jei_minecraft_version=26.1-snapshot-1
curios_version=7.0.0-beta.3+1.20.4
guideme_version=21.1.7
guideme_version=26.1.0-alpha

# Switch between none, emi, rei, and jei
runtime_itemlist_mod=emi

#########################################################
# Parchment #
#########################################################
neoForge.parchment.minecraftVersion=1.21
neoForge.parchment.mappingsVersion=2024.07.28
runtime_itemlist_mod=jei
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.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
54 changes: 52 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,59 @@ pluginManagement {
maven { url "https://maven.architectury.dev/" }
}
plugins {
id 'net.neoforged.moddev' version '1.0.13'
id "me.shedaniel.unified-publishing" version "0.1.+"
id 'com.diffplug.spotless' version '6.25.0'
id 'net.neoforged.moddev' version '2.0.134'
id 'net.neoforged.moddev.repositories' version '2.0.134'
id 'me.shedaniel.unified-publishing' version '0.1.+'
}
}

plugins {
id 'net.neoforged.moddev.repositories'
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
}

dependencyResolutionManagement {
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
rulesMode = RulesMode.FAIL_ON_PROJECT_RULES
repositories {
maven {
url = "https://maven.theillusivec4.top"
content {
includeGroup "top.theillusivec4.curios"
}
}
maven {
name = "blamejared"
url = "https://maven.blamejared.com/"
content {
includeGroup "mezz.jei"
}
}
maven {
name 'modmaven'
url "https://modmaven.dev/"
content {
includeGroup "mezz.jei"
}
}
maven {
url "https://maven.shedaniel.me"
content {
includeGroup "me.shedaniel"
includeGroup "me.shedaniel.cloth"
includeGroup "dev.architectury"
}
}
maven {
name = "TerraformersMC"
url = "https://maven.terraformersmc.com/releases/"
content {
includeGroup "dev.emi"
}
}
mavenCentral()
mavenLocal()
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/blazing_crystal_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/deepslate_uraninite_ore"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/deepslate_uraninite_ore_dense"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/deepslate_uraninite_ore_poor"
}
}
}
7 changes: 7 additions & 0 deletions src/generated/resources/assets/powah/blockstates/dry_ice.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/dry_ice"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/ender_cell_basic"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/ender_cell_blazing"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/ender_cell_hardened"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/ender_cell_niotic"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/ender_cell_nitro"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/ender_cell_spirited"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "powah:block/ender_cell_starter"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"variants": {
"facing=down": {
"model": "powah:block/ender_gate_basic",
"x": 90
},
"facing=east": {
"model": "powah:block/ender_gate_basic",
"y": 90
},
"facing=north": {
"model": "powah:block/ender_gate_basic"
},
"facing=south": {
"model": "powah:block/ender_gate_basic",
"y": 180
},
"facing=up": {
"model": "powah:block/ender_gate_basic",
"x": 270
},
"facing=west": {
"model": "powah:block/ender_gate_basic",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"variants": {
"facing=down": {
"model": "powah:block/ender_gate_blazing",
"x": 90
},
"facing=east": {
"model": "powah:block/ender_gate_blazing",
"y": 90
},
"facing=north": {
"model": "powah:block/ender_gate_blazing"
},
"facing=south": {
"model": "powah:block/ender_gate_blazing",
"y": 180
},
"facing=up": {
"model": "powah:block/ender_gate_blazing",
"x": 270
},
"facing=west": {
"model": "powah:block/ender_gate_blazing",
"y": 270
}
}
}
Loading
Loading