Skip to content

Commit 5d84c2f

Browse files
authored
Translate ASM to mixins (#10)
1 parent 0fe9265 commit 5d84c2f

12 files changed

Lines changed: 188 additions & 285 deletions

dependencies.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Add your dependencies here
22

33
dependencies {
4-
compileOnly('com.github.GTNewHorizons:Natura:2.5.7:dev') {transitive=false}
5-
compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.11.5-GTNH:dev') {transitive=false}
6-
compileOnly('com.github.GTNewHorizons:ThaumicBases:1.5.6:dev') {transitive=false}
4+
compileOnly('com.github.GTNewHorizons:Natura:2.8.9:dev') {transitive=false}
5+
compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.6-GTNH:dev') {transitive=false}
6+
compileOnly('com.github.GTNewHorizons:ThaumicBases:1.9.2:dev') {transitive=false}
77
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
8-
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
8+
compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
99

10-
compileOnly(deobf('https://media.forgecdn.net/files/2234/410/witchery-1.7.10-0.24.1.jar'))
11-
compileOnly(deobf('https://media.forgecdn.net/files/2499/612/BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar'))
10+
compileOnly(deobfCurse('witchery-69673:2234410'))
11+
compileOnly(rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612"))
1212
}

gradle.properties

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ modId = croploadcore
1414
modGroup = com.github.bartimaeusnek
1515

1616
# Whether to use modGroup as the maven publishing group.
17-
# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
17+
# When false, com.github.GTNewHorizons is used.
1818
useModGroupForPublishing = false
1919

2020
# Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -33,7 +33,7 @@ channel = stable
3333
mappingsVersion = 12
3434

3535
# Defines other MCP mappings for dependency deobfuscation.
36-
remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
36+
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
3737

3838
# Select a default username for testing your mod. You can always override this per-run by running
3939
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
@@ -61,6 +61,9 @@ gradleTokenModId =
6161
# [DEPRECATED] Mod name replacement token.
6262
gradleTokenModName =
6363

64+
# [DEPRECATED] Mod Group replacement token.
65+
gradleTokenGroupName =
66+
6467
# [DEPRECATED]
6568
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
6669
# public static final String VERSION = "GRADLETOKEN_VERSION";
@@ -80,16 +83,23 @@ apiPackage =
8083
accessTransformersFile =
8184

8285
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
83-
usesMixins = false
86+
usesMixins = true
87+
88+
# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
89+
# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
90+
# Mixin classes will have access to "main" classes, but not the other way around.
91+
separateMixinSourceSet =
8492

8593
# Adds some debug arguments like verbose output and class export.
86-
usesMixinDebug = false
94+
usesMixinDebug = true
8795

8896
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
8997
mixinPlugin =
9098

91-
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
92-
mixinsPackage =
99+
# Specify the package that contains all of your Mixins. The package must exist or
100+
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
101+
# it must match with this or the build will fail.
102+
mixinsPackage = mixins
93103

94104
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
95105
# This parameter is for legacy compatibility only
@@ -114,16 +124,22 @@ minimizeShadowedDependencies = true
114124
# If disabled, won't rename the shadowed classes.
115125
relocateShadowedDependencies = true
116126

117-
# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
127+
# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
118128
includeWellKnownRepositories = true
119129

130+
# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
131+
# list of strings, with the acceptable keys being(case does not matter):
132+
# cursemaven
133+
# modrinth
134+
excludeWellKnownRepositories =
135+
120136
# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
121137
# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
122138
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
123139
usesMavenPublishing = true
124140

125141
# Maven repository to publish the mod to.
126-
# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/
142+
# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
127143

128144
# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
129145
#
@@ -137,7 +153,7 @@ modrinthProjectId =
137153
# type can be one of [project, version],
138154
# and the name is the Modrinth project or version slug/id of the other mod.
139155
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
140-
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
156+
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
141157
modrinthRelations =
142158

143159
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -158,6 +174,12 @@ curseForgeRelations =
158174
# projects. New projects should not use this parameter.
159175
customArchiveBaseName = CropLoadCore
160176

177+
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
178+
# runClientWorkingDirectory = run/client
179+
180+
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
181+
# runServerWorkingDirectory = run/server
182+
161183
# Optional parameter to have the build automatically fail if an illegal version is used.
162184
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
163185
# The check is ONLY performed if the version is a git tag.
@@ -187,5 +209,3 @@ customArchiveBaseName = CropLoadCore
187209
# This is meant to be set in $HOME/.gradle/gradle.properties.
188210
# ideaCheckSpotlessOnBuild = true
189211

190-
# Non-GTNH properties
191-
gradleTokenGroupName =

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8'
20+
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
2121
}
2222

2323

src/main/java/com/github/bartimaeusnek/ASM/CropStickTransformer.java

Lines changed: 0 additions & 191 deletions
This file was deleted.

0 commit comments

Comments
 (0)