shedaniel 4 years ago
parent
commit
0bb1d9c87e
3 changed files with 43 additions and 55 deletions
  1. 1 1
      build.gradle
  2. 0 53
      fabric/build.gradle
  3. 42 1
      fabric/src/main/resources/architectury.accessWidener

+ 1 - 1
build.gradle

@@ -1,6 +1,6 @@
 plugins {
 plugins {
     id "architectury-plugin" version "2.0.57"
     id "architectury-plugin" version "2.0.57"
-    id "forgified-fabric-loom" version "0.6.47" apply false
+    id "forgified-fabric-loom" version "0.6.49" apply false
     id "org.cadixdev.licenser" version "0.5.0"
     id "org.cadixdev.licenser" version "0.5.0"
     id "com.jfrog.bintray" version "1.8.4"
     id "com.jfrog.bintray" version "1.8.4"
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false

+ 0 - 53
fabric/build.gradle

@@ -55,9 +55,6 @@ processResources {
 
 
 shadowJar {
 shadowJar {
     relocate "net.jodah.typetools", "me.shedaniel.architectury.shadowed.impl.net.jodah.typetools"
     relocate "net.jodah.typetools", "me.shedaniel.architectury.shadowed.impl.net.jodah.typetools"
-    transform(MergeAccessWidenersTransformer.class) {
-        it.resource = "architectury.accessWidener"
-    }
     configurations = [project.configurations.shadow]
     configurations = [project.configurations.shadow]
     classifier "shadow"
     classifier "shadow"
 }
 }
@@ -109,53 +106,3 @@ curseforge {
 }
 }
 
 
 rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")
 rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")
-
-class MergeAccessWidenersTransformer implements Transformer {
-    String resource
-    ByteArrayOutputStream data
-
-    MergeAccessWidenersTransformer() {
-        data = new ByteArrayOutputStream()
-        data.write("accessWidener v1 named\n".bytes)
-    }
-
-    @Override
-    boolean canTransformResource(FileTreeElement element) {
-        def path = element.relativePath.pathString
-        if (resource != null && resource.equalsIgnoreCase(path)) {
-            return true
-        }
-
-        return false
-    }
-
-    @Override
-    void transform(TransformerContext context) {
-        def lines = context.is.readLines()
-        lines.removeIf { it == "accessWidener v1 named" }
-        IOUtil.copy(lines.join("\n"), data)
-        data.write('\n'.bytes)
-
-        context.is.close()
-    }
-
-    @Override
-    boolean hasTransformedResource() {
-        return data.size() > 0
-    }
-
-    void modifyOutputStream(org.apache.tools.zip.ZipOutputStream jos, boolean preserveFileTimestamps) {
-        throw new AbstractMethodError()
-    }
-
-    @Override
-    void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) {
-        ZipEntry entry = new ZipEntry(resource)
-        entry.time = TransformerContext.getEntryTimestamp(preserveFileTimestamps, entry.time)
-        os.putNextEntry(entry)
-
-        IOUtil.copy(new ByteArrayInputStream(data.toByteArray()), os)
-        data.reset()
-        data.write('accessWidener v1 named\n'.bytes)
-    }
-}

+ 42 - 1
fabric/src/main/resources/architectury.accessWidener

@@ -54,4 +54,45 @@ accessible field net/minecraft/world/item/DyeColor textureDiffuseColor I
 accessible method net/minecraft/world/entity/player/Player closeContainer ()V
 accessible method net/minecraft/world/entity/player/Player closeContainer ()V
 accessible method net/minecraft/advancements/CriteriaTriggers register (Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
 accessible method net/minecraft/advancements/CriteriaTriggers register (Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
 accessible method net/minecraft/world/inventory/MenuType <init> (Lnet/minecraft/world/inventory/MenuType$MenuSupplier;)V
 accessible method net/minecraft/world/inventory/MenuType <init> (Lnet/minecraft/world/inventory/MenuType$MenuSupplier;)V
-accessible class net/minecraft/world/inventory/MenuType$MenuSupplier
+accessible class net/minecraft/world/inventory/MenuType$MenuSupplier
+accessible method net/minecraft/world/level/block/state/BlockBehaviour$Properties <init> (Lnet/minecraft/world/level/material/Material;Ljava/util/function/Function;)V
+accessible field net/minecraft/world/level/biome/Biome climateSettings Lnet/minecraft/world/level/biome/Biome$ClimateSettings;
+accessible field net/minecraft/world/level/biome/Biome depth F
+mutable field net/minecraft/world/level/biome/Biome depth F
+accessible field net/minecraft/world/level/biome/Biome scale F
+mutable field net/minecraft/world/level/biome/Biome scale F
+accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
+mutable field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
+accessible field net/minecraft/world/level/biome/Biome$ClimateSettings precipitation Lnet/minecraft/world/level/biome/Biome$Precipitation;
+mutable field net/minecraft/world/level/biome/Biome$ClimateSettings precipitation Lnet/minecraft/world/level/biome/Biome$Precipitation;
+accessible field net/minecraft/world/level/biome/Biome$ClimateSettings temperature F
+mutable field net/minecraft/world/level/biome/Biome$ClimateSettings temperature F
+accessible field net/minecraft/world/level/biome/Biome$ClimateSettings temperatureModifier Lnet/minecraft/world/level/biome/Biome$TemperatureModifier;
+mutable field net/minecraft/world/level/biome/Biome$ClimateSettings temperatureModifier Lnet/minecraft/world/level/biome/Biome$TemperatureModifier;
+accessible field net/minecraft/world/level/biome/Biome$ClimateSettings downfall F
+mutable field net/minecraft/world/level/biome/Biome$ClimateSettings downfall F
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects fogColor I
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects fogColor I
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects waterColor I
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects waterColor I
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects waterFogColor I
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects waterFogColor I
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects skyColor I
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects skyColor I
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects foliageColorOverride Ljava/util/Optional;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects foliageColorOverride Ljava/util/Optional;
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorOverride Ljava/util/Optional;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorOverride Ljava/util/Optional;
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorModifier Lnet/minecraft/world/level/biome/BiomeSpecialEffects$GrassColorModifier;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorModifier Lnet/minecraft/world/level/biome/BiomeSpecialEffects$GrassColorModifier;
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects ambientParticleSettings Ljava/util/Optional;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects ambientParticleSettings Ljava/util/Optional;
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects ambientLoopSoundEvent Ljava/util/Optional;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects ambientLoopSoundEvent Ljava/util/Optional;
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects ambientMoodSettings Ljava/util/Optional;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects ambientMoodSettings Ljava/util/Optional;
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects ambientAdditionsSettings Ljava/util/Optional;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects ambientAdditionsSettings Ljava/util/Optional;
+accessible field net/minecraft/world/level/biome/BiomeSpecialEffects backgroundMusic Ljava/util/Optional;
+mutable field net/minecraft/world/level/biome/BiomeSpecialEffects backgroundMusic Ljava/util/Optional;
+accessible method net/minecraft/world/level/storage/LevelResource <init> (Ljava/lang/String;)V