From 19edcbddd5bd1735043bada80a99ff287cd91ace Mon Sep 17 00:00:00 2001 From: DJtheRedstoner <52044242+DJtheRedstoner@users.noreply.github.com> Date: Sun, 2 May 2021 18:17:18 -0400 Subject: [PATCH 1/4] Fix mixin annotation processor issues These issues were caused by CompilationConfig.configureCompilation() overwriting JavaCompile's options.compilerArgs list which removed any previously added arguments, including those added by fabric-loom and mixingradle. --- buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt index a6619cc1f..a2d50f780 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt @@ -19,7 +19,7 @@ fun Project.configureCompilation() { tasks.withType { options.encoding = "UTF-8" doFirst { - options.compilerArgs = mutableListOf("-Xlint:all") + options.compilerArgs.add("-Xlint:all") } } From c41d60c38ff131b2314af545d3a103144a320f16 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 2 May 2021 15:43:12 -0700 Subject: [PATCH 2/4] remove manual refmap --- .../fabric/src/main/resources/terra-refmap.json | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 platforms/fabric/src/main/resources/terra-refmap.json diff --git a/platforms/fabric/src/main/resources/terra-refmap.json b/platforms/fabric/src/main/resources/terra-refmap.json deleted file mode 100644 index 8dbf41449..000000000 --- a/platforms/fabric/src/main/resources/terra-refmap.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "mappings": { - "com/dfsek/terra/fabric/mixin/GeneratorTypeAccessor": { - "VALUES": "field_25052:Ljava/util/List;", - "translationKey": "field_25060:Lnet/minecraft/class_2561;" - } - }, - "data": { - "named:intermediary": { - "com/dfsek/terra/fabric/mixin/GeneratorTypeAccessor": { - "VALUES": "field_25052:Ljava/util/List;", - "translationKey": "field_25060:Lnet/minecraft/class_2561;" - } - } - } -} \ No newline at end of file From ea3995afceb54e2258c62218aeb53360930fb675 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 2 May 2021 15:44:30 -0700 Subject: [PATCH 3/4] fix refmap name --- platforms/fabric/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index cece1888a..86ba8b1e1 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -33,6 +33,7 @@ dependencies { configure { accessWidener("src/main/resources/terra.accesswidener") + refmapName = "terra.refmap.json" } val remapped = tasks.register("remapShadedJar") { From f4ae2cac680373832abaacd822cd01617f4fff8a Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 2 May 2021 15:46:03 -0700 Subject: [PATCH 4/4] add MixinGeneratorOptions --- .../dfsek/terra/fabric/mixin/MixinGeneratorOptions.java | 9 +++++---- platforms/fabric/src/main/resources/terra.mixins.json | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/MixinGeneratorOptions.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/MixinGeneratorOptions.java index aa588249a..badfc176f 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/MixinGeneratorOptions.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/MixinGeneratorOptions.java @@ -13,16 +13,17 @@ import net.minecraft.world.dimension.DimensionOptions; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.GeneratorOptions; import net.minecraft.world.gen.chunk.ChunkGeneratorSettings; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.Properties; import java.util.Random; -// Mixins commented out until loom fixes multi-project builds. - -//@Mixin(GeneratorOptions.class) +@Mixin(GeneratorOptions.class) public class MixinGeneratorOptions { - //@Inject(method = "fromProperties(Lnet/minecraft/util/registry/DynamicRegistryManager;Ljava/util/Properties;)Lnet/minecraft/world/gen/GeneratorOptions;", at = @At("HEAD"), cancellable = true) + @Inject(method = "fromProperties(Lnet/minecraft/util/registry/DynamicRegistryManager;Ljava/util/Properties;)Lnet/minecraft/world/gen/GeneratorOptions;", at = @At("HEAD"), cancellable = true) private static void fromProperties(DynamicRegistryManager dynamicRegistryManager, Properties properties, CallbackInfoReturnable cir) { if(properties.get("level-type") == null) { return; diff --git a/platforms/fabric/src/main/resources/terra.mixins.json b/platforms/fabric/src/main/resources/terra.mixins.json index 8537843c7..ffbbb8bf4 100644 --- a/platforms/fabric/src/main/resources/terra.mixins.json +++ b/platforms/fabric/src/main/resources/terra.mixins.json @@ -4,6 +4,7 @@ "package": "com.dfsek.terra.fabric.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ + "MixinGeneratorOptions" ], "client": [ "GeneratorTypeAccessor"