Skip to content

Commit

Permalink
Updated to 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
Buuz135 committed Aug 18, 2024
1 parent a18d53c commit 0c52531
Show file tree
Hide file tree
Showing 181 changed files with 5,064 additions and 2,181 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ jobs:
version-type: beta
version: ${{ github.ref_name }}
loaders: forge
game-versions: 1.20.1
java: 17
game-versions: |
1.21
1.21.1
java: 21
name: ""
changelog: "https://github.com/Buuz135/SushiGoCrafting/commits/1.20"
changelog: "https://github.com/Buuz135/SushiGoCrafting/commits/1.21"
dependencies: |
titanium | depends
patchouli | depends
patchouli | optional
197 changes: 96 additions & 101 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,129 +1,124 @@
buildscript {
repositories {
jcenter()
mavenCentral()
maven { url = "https://maven.minecraftforge.net" }
maven {
url "https://plugins.gradle.org/m2/"
}
plugins {
id 'java-library'
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.neoforged.moddev' version '0.1.112'
}

version = minecraft_version + "-" + mod_version
group = mod_group_id

repositories {
mavenLocal()
maven {
name = "BlameJared maven"
url = "https://maven.blamejared.com/"
}
configurations {
classpath.resolutionStrategy {
cacheDynamicVersionsFor 10, 'seconds'
cacheChangingModulesFor 0, 'seconds'
maven {
url "https://www.cursemaven.com"
content {
includeGroup "curse.maven"
}
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
}
}
plugins {
id 'java'

base {
archivesName = mod_id
}
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'

version = "${minecraftVersion}-${modVersion}"
group = "com.buuz135"
archivesBaseName = "sushigocrafting"
java.toolchain.languageVersion = JavaLanguageVersion.of(21)

java.toolchain.languageVersion = JavaLanguageVersion.of(17)
//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager

sourceSets.main.resources {
srcDir 'src/generated/resources'
}
// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
neoForge {
version = "${neo_version}"
//accessTransformers.add(file('src/main/resources/META-INF/accesstransformer.cfg'))
parchment {
minecraftVersion = '1.21'
mappingsVersion = '2024.06.23'
}

minecraft {
mappings channel: 'official', version: '1.20.1'
runs {
client = {
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
// recommended logging data for a userdev environment
properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP'
// recommended logging level for the console
properties 'forge.logging.console.level': 'info'
workingDirectory project.file('run').canonicalPath
source sourceSets.main
client {
client()
}
server = {
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
// recommended logging data for a userdev environment
properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP'
// recommended logging level for the console
properties 'forge.logging.console.level': 'info'
workingDirectory project.file('run').canonicalPath
source sourceSets.main
server {
server()
}
data = {
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
workingDirectory project.file('run')
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
property 'forge.logging.console.level', 'info'
args '--mod', 'sushigocrafting', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
environment 'target', 'fmluserdevdata'
source sourceSets.main
data{
data()
programArguments.addAll '--mod', 'sushigocrafting', '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
}
}
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
}

repositories {
mavenCentral()
jcenter()
maven {
// location of the maven that hosts JEI files
name = "Progwml6 maven"
url = "https://dvs1.progwml6.com/files/maven/"
}
maven { url 'https://maven.blamejared.com' }
maven {
url = "https://www.cursemaven.com"
mods {
sushigocrafting {
sourceSet sourceSets.main
}
}

}

// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' }


dependencies {
minecraft 'net.minecraftforge:forge:1.20.1-47.1.1'
compileOnly "mezz.jei:jei-1.21-common-api:$jei_version"
compileOnly "mezz.jei:jei-1.21-neoforge-api:$jei_version"
runtimeOnly "mezz.jei:jei-1.21-neoforge:$jei_version"
implementation project.dependencies.create('com.hrznstudio:titanium:1.21-4.0.12')
implementation "curse.maven:jade-324717:5444008"
implementation "curse.maven:crafttweaker-239197:5606075"
}

// This block of code expands all declared replace properties in the specified resource targets.
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
tasks.withType(ProcessResources).configureEach {
var replaceProperties = [
minecraft_version : minecraft_version,
minecraft_version_range: minecraft_version_range,
neo_version : neo_version,
neo_version_range : neo_version_range,
loader_version_range : loader_version_range,
mod_id : mod_id,
mod_name : mod_name,
mod_license : mod_license,
mod_version : mod_version,
mod_authors : mod_authors,
mod_description : mod_description
]
inputs.properties replaceProperties

if (findProject(':titanium') != null) {
implementation project(':titanium')
} else {
implementation fg.deobf(project.dependencies.create('com.hrznstudio:titanium:1.20.1-3.8.21'))
filesMatching(['META-INF/neoforge.mods.toml']) {
expand replaceProperties
}
compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.2.0.23")
compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.2.0.23")
// at runtime, use the full JEI jar for Forge
runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.1.0.19")
//runtimeOnly fg.deobf("curse.maven:diet-443570:3300992")
//runtimeOnly fg.deobf("curse.maven:appleskin-248787:3395800")
implementation fg.deobf("curse.maven:patchouli-306770:4636277")
compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-1.20.1:14.0.12")
implementation fg.deobf("curse.maven:appleskin-248787:4770828")
//runtimeOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:9.1.103")
}

afterEvaluate {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xmaxerrs" << "2000"
// Example configuration to allow publishing using the maven-publish plugin
publishing {
publications {
register('mavenJava', MavenPublication) {
from components.java
}
}
repositories {
maven {
url "file://${project.projectDir}/repo"
}
}
}

jar {
manifest {
attributes(["Specification-Title": project.name,
"Specification-Vendor": "Buuz135",
"Specification-Version": "2.0",
"Implementation-Title": project.name,
"Implementation-Version": "${modVersion}",
"Implementation-Vendor" :"Buuz135",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
"ModSide": "BOTH",
"Automatic-Module-Name": "com.buuz135.sushigocrafting"
],)

// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
idea {
module {
downloadSources = true
downloadJavadoc = true
}
}
}
42 changes: 38 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
org.gradle.jvmargs=-Xmx2G
modGroup=com.buuz135
modVersion=0.5.3
modBaseName=sushigocrafting
minecraftVersion=1.20.1
org.gradle.daemon=false
org.gradle.debug=false
## Environment Properties
# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
# The Minecraft version must agree with the Neo version to get a valid artifact
minecraft_version=1.21
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.21.0,1.22)
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=21.1.4
# The Neo version range can use any version of Neo as bounds
neo_version_range=[21,)
# The loader version range can only use the major version of FML as bounds
loader_version_range=[4,)
# Uncomment this to activate parchment
#neogradle.subsystems.parchment.minecraftVersion=1.21.0
#neogradle.subsystems.parchment.mappingsVersion=SET_ME
## Mod Properties
# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
# Must match the String constant located in the main mod class annotated with @Mod.
mod_id=sushigocrafting
# The human-readable display name for the mod.
mod_name=Sushi Go Crafting
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT
# The mod version. See https://semver.org/
mod_version=0.6.0
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
mod_group_id=com.buuz135
# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
mod_authors=Buuz135
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
mod_description=Sushi!
jei_version=19.8.2.99
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-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 11 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
maven { url = 'https://maven.neoforged.net/releases' }
}
}

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// 1.20.1 2024-02-28T20:06:47.340833 Tags for minecraft:block mod id sushigocrafting
1eb3932dc2e19470298938affe8bd08c6039397b data/minecraft/tags/blocks/bee_growables.json
1eb3932dc2e19470298938affe8bd08c6039397b data/minecraft/tags/blocks/crops.json
b310b9b8b01a9a63ac922bbdef060e8080520dfb data/minecraft/tags/blocks/leaves.json
a57b1227a346e6bb880267ad9f8348b763efe539 data/minecraft/tags/blocks/logs.json
369af28dc854397a05bc052039c2012306188cb3 data/minecraft/tags/blocks/mineable/axe.json
41d84ea55bfbda37b7d10d7e0c718f3af9eec838 data/minecraft/tags/blocks/mineable/pickaxe.json
519d0d6c760ab3e0dbf1490e14f3f22a2f9ebcc5 data/minecraft/tags/blocks/saplings.json
// 1.21.1 2024-08-18T02:39:29.5122122 Tags for minecraft:block mod id sushigocrafting
1eb3932dc2e19470298938affe8bd08c6039397b data/minecraft/tags/block/bee_growables.json
1eb3932dc2e19470298938affe8bd08c6039397b data/minecraft/tags/block/crops.json
b310b9b8b01a9a63ac922bbdef060e8080520dfb data/minecraft/tags/block/leaves.json
a57b1227a346e6bb880267ad9f8348b763efe539 data/minecraft/tags/block/logs.json
369af28dc854397a05bc052039c2012306188cb3 data/minecraft/tags/block/mineable/axe.json
41d84ea55bfbda37b7d10d7e0c718f3af9eec838 data/minecraft/tags/block/mineable/pickaxe.json
519d0d6c760ab3e0dbf1490e14f3f22a2f9ebcc5 data/minecraft/tags/block/saplings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-10-01T16:25:07.2885639 Block Models: sushigocrafting
// 1.21.1 2024-08-18T02:39:29.5132121 Block Models: sushigocrafting
2434d381450ff0d5e656d3d48bd95bb0621b90fa assets/sushigocrafting/models/block/cucumber_crop_0.json
5be2947612b32e2be42b21577dc32c34d3ef05a9 assets/sushigocrafting/models/block/cucumber_crop_1.json
84b28437d223f3c4cfefc9a3ea78694902b31323 assets/sushigocrafting/models/block/cucumber_crop_2.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-10-01T16:40:50.9403225 Block States: sushigocrafting
// 1.21.1 2024-08-18T02:39:29.5162122 Block States: sushigocrafting
e723ed89da166ca28521d95a6565ff513311ff5c assets/sushigocrafting/blockstates/avocado_leaves.json
aff2ac9aec03cc6c9608f6e978dc8ccce8bf7753 assets/sushigocrafting/blockstates/avocado_leaves_logged.json
cde5da82cf436113a444c8031d13242e62464f2f assets/sushigocrafting/blockstates/avocado_log.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
// 1.20.1 2023-10-01T16:25:07.2920645 Tags for minecraft:item mod id sushigocrafting
6f1b9961c64fcac0298de81fdef9bc69db03d466 data/diet/tags/items/fruits.json
2edb19c04f197d462b8d4572a3dba9c4fea2d883 data/diet/tags/items/grains.json
b7e226156b80da16f44d0af3472c64650df71a1d data/diet/tags/items/proteins.json
ff5430ea7930620e2ed34c0931c63ae268ddd382 data/diet/tags/items/vegetables.json
4c5b3a94213d51a2a4a608f95ecbed820b7f5e70 data/forge/tags/items/crops.json
59797b0de6d37c155d54c4ad2e24e0b7c441d098 data/forge/tags/items/crops/cucumber.json
45fc65804195794f80150238eaa3c6f9fbfea606 data/forge/tags/items/crops/rice.json
c30430446abeaf09dca457d20bc1dc0882685bb9 data/forge/tags/items/crops/sesame_seed.json
13ed228870403dee9732daa3c02c2109bd29bd39 data/forge/tags/items/crops/soy_bean.json
c06c6b6bb227233c1ee9425652d219976e86f0b3 data/forge/tags/items/crops/wasabi_root.json
3928f99669604c01e4214ab0f257a144cada698d data/forge/tags/items/fruits.json
3928f99669604c01e4214ab0f257a144cada698d data/forge/tags/items/fruits/avocado.json
b7a5dc99a61731d35bda6bcbb438af3946d804ed data/forge/tags/items/raw_fishes.json
3fe6df0882f02c83c296f5dfaed148dab475c556 data/forge/tags/items/raw_fishes/salmon.json
ec193d2be5d0dd269f12482a8b861fb11a953bef data/forge/tags/items/raw_fishes/shrimp.json
1a281932a855dc9fe6db01b007f18f9c7a9a0ded data/forge/tags/items/raw_fishes/tuna.json
942d8cf685dbcd80cb56b444f59262b6ef87bd64 data/forge/tags/items/seeds.json
5c3c2256a2c019ea2d05b964de015d53d235556c data/forge/tags/items/seeds/cucumber_seeds.json
84b971ebf27f2f52ef9038073f7fda1e9e07915b data/forge/tags/items/seeds/rice_seeds.json
8791a038e89fff147b9d90f74dcfc7f7c7deb2f1 data/forge/tags/items/seeds/sesame_seeds.json
c28eec1aa23cd82356737e2e4e79221c7c7c1f23 data/forge/tags/items/seeds/soy_seeds.json
44b9308d93e508da1e54417fae5ba0065f44ec30 data/forge/tags/items/seeds/wasabi_seeds.json
f9b8fb05d9ffb5c86ac06e71373c87cca426d587 data/forge/tags/items/tools/knife.json
b89fed35b1e5eb0ef971a076017a49fa65bfefdc data/minecraft/tags/items/fishes.json
a57b1227a346e6bb880267ad9f8348b763efe539 data/minecraft/tags/items/logs.json
519d0d6c760ab3e0dbf1490e14f3f22a2f9ebcc5 data/minecraft/tags/items/saplings.json
// 1.21.1 2024-08-18T02:39:29.5167121 Tags for minecraft:item mod id sushigocrafting
4c5b3a94213d51a2a4a608f95ecbed820b7f5e70 data/c/tags/item/crops.json
59797b0de6d37c155d54c4ad2e24e0b7c441d098 data/c/tags/item/crops/cucumber.json
45fc65804195794f80150238eaa3c6f9fbfea606 data/c/tags/item/crops/rice.json
c30430446abeaf09dca457d20bc1dc0882685bb9 data/c/tags/item/crops/sesame_seed.json
13ed228870403dee9732daa3c02c2109bd29bd39 data/c/tags/item/crops/soy_bean.json
c06c6b6bb227233c1ee9425652d219976e86f0b3 data/c/tags/item/crops/wasabi_root.json
3928f99669604c01e4214ab0f257a144cada698d data/c/tags/item/fruits.json
3928f99669604c01e4214ab0f257a144cada698d data/c/tags/item/fruits/avocado.json
b7a5dc99a61731d35bda6bcbb438af3946d804ed data/c/tags/item/raw_fishes.json
3fe6df0882f02c83c296f5dfaed148dab475c556 data/c/tags/item/raw_fishes/salmon.json
ec193d2be5d0dd269f12482a8b861fb11a953bef data/c/tags/item/raw_fishes/shrimp.json
1a281932a855dc9fe6db01b007f18f9c7a9a0ded data/c/tags/item/raw_fishes/tuna.json
942d8cf685dbcd80cb56b444f59262b6ef87bd64 data/c/tags/item/seeds.json
5c3c2256a2c019ea2d05b964de015d53d235556c data/c/tags/item/seeds/cucumber_seeds.json
84b971ebf27f2f52ef9038073f7fda1e9e07915b data/c/tags/item/seeds/rice_seeds.json
8791a038e89fff147b9d90f74dcfc7f7c7deb2f1 data/c/tags/item/seeds/sesame_seeds.json
c28eec1aa23cd82356737e2e4e79221c7c7c1f23 data/c/tags/item/seeds/soy_seeds.json
44b9308d93e508da1e54417fae5ba0065f44ec30 data/c/tags/item/seeds/wasabi_seeds.json
f9b8fb05d9ffb5c86ac06e71373c87cca426d587 data/c/tags/item/tools/knife.json
6f1b9961c64fcac0298de81fdef9bc69db03d466 data/diet/tags/item/fruits.json
2edb19c04f197d462b8d4572a3dba9c4fea2d883 data/diet/tags/item/grains.json
b7e226156b80da16f44d0af3472c64650df71a1d data/diet/tags/item/proteins.json
ff5430ea7930620e2ed34c0931c63ae268ddd382 data/diet/tags/item/vegetables.json
b89fed35b1e5eb0ef971a076017a49fa65bfefdc data/minecraft/tags/item/fishes.json
a57b1227a346e6bb880267ad9f8348b763efe539 data/minecraft/tags/item/logs.json
519d0d6c760ab3e0dbf1490e14f3f22a2f9ebcc5 data/minecraft/tags/item/saplings.json
Loading

0 comments on commit 0c52531

Please sign in to comment.