WIP 1.20.6

PolyhedralDev · May 1, 2024 · dd272bc · dd272bc
1 parent 01e011a
commit dd272bc
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 33 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -17,10 +17,10 @@ repositories {
 dependencies {
     //TODO Allow pulling from Versions.kt
     implementation("com.github.johnrengelman", "shadow", "8.1.1")
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.11")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.7.0")
 
-    implementation("org.ow2.asm", "asm", "9.6")
-    implementation("org.ow2.asm", "asm-tree", "9.6")
+    implementation("org.ow2.asm", "asm", "9.7")
+    implementation("org.ow2.asm", "asm-tree", "9.7")
     implementation("com.dfsek.tectonic", "common", "4.2.1")
     implementation("org.yaml", "snakeyaml", "2.2")
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -12,23 +12,22 @@ object Versions {
 
         const val caffeine = "3.1.8"
 
-        const val slf4j = "2.0.9"
-        const val log4j_slf4j_impl = "2.20.0"
-
+        const val slf4j = "2.0.13"
+
         object Internal {
             const val shadow = "8.1.1"
-            const val apacheText = "1.11.0"
-            const val apacheIO = "2.15.1"
-            const val guava = "32.1.3-jre"
-            const val asm = "9.6"
+            const val apacheText = "1.12.0"
+            const val apacheIO = "2.16.1"
+            const val guava = "33.1.0-jre"
+            const val asm = "9.7"
             const val snakeYml = "2.2"
             const val jetBrainsAnnotations = "24.1.0"
-            const val junit = "5.10.1"
+            const val junit = "5.10.2"
         }
     }
 
     object Fabric {
-        const val fabricAPI = "0.91.2+${Mod.minecraft}"
+        const val fabricAPI = "0.97.8+${Mod.minecraft}"
     }
 //
 //    object Quilt {
@@ -39,12 +38,12 @@ object Versions {
     object Mod {
         const val mixin = "0.12.5+mixin.0.8.5"
 
-        const val minecraft = "1.20.4"
+        const val minecraft = "1.20.6"
         const val yarn = "$minecraft+build.1"
-        const val fabricLoader = "0.15.1"
+        const val fabricLoader = "0.15.10"
 
-        const val architecuryLoom = "1.4.369"
-        const val architecturyPlugin = "3.4.151"
+        const val architecuryLoom = "1.6.395"
+        const val architecturyPlugin = "3.4.155"
     }
 //
 //    object Forge {
@@ -53,14 +52,14 @@ object Versions {
 //    }
 
     object Bukkit {
-        const val minecraft = "1.20.4"
-        const val paperBuild = "$minecraft-R0.1-20231209.173338-2"
+        const val minecraft = "1.20.6"
+        const val paperBuild = "$minecraft-R0.1-20240501.172135-12"
         const val paper = paperBuild
         const val paperLib = "1.0.8"
-        const val reflectionRemapper = "0.1.0"
+        const val reflectionRemapper = "0.1.1"
         const val paperDevBundle = paperBuild
-        const val runPaper = "2.2.2"
-        const val paperWeight = "1.5.11"
+        const val runPaper = "2.3.0"
+        const val paperWeight = "1.7.0"
     }
 
     //

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...ms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java b/...ms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java
@@ -7,6 +7,7 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.command.argument.ParticleEffectArgumentType;
 import net.minecraft.registry.Registries;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.world.biome.BiomeParticleConfig;
 
 
@@ -27,7 +28,7 @@ public BiomeParticleConfig get() {
 
         try {
             return new BiomeParticleConfig(
-                ParticleEffectArgumentType.readParameters(new StringReader(particle), Registries.PARTICLE_TYPE.getReadOnlyWrapper()),
+                ParticleEffectArgumentType.readParameters(new StringReader(particle), (RegistryWrapper.WrapperLookup) Registries.PARTICLE_TYPE.getReadOnlyWrapper()),
                 probability);
         } catch(CommandSyntaxException e) {
             throw new RuntimeException(e);

diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java
@@ -1,6 +1,7 @@
 package com.dfsek.terra.mod.data;
 
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 
@@ -32,15 +33,15 @@ public final class Codecs {
                     "No such config pack " +
                     id)))));
 
-    public static final Codec<TerraBiomeSource> TERRA_BIOME_SOURCE = RecordCodecBuilder
-        .create(instance -> instance.group(
+    public static final MapCodec<TerraBiomeSource> TERRA_BIOME_SOURCE = RecordCodecBuilder
+        .mapCodec(instance -> instance.group(
                 CONFIG_PACK.fieldOf("pack")
                     .stable()
                     .forGetter(TerraBiomeSource::getPack))
             .apply(instance, instance.stable(TerraBiomeSource::new)));
 
-    public static final Codec<MinecraftChunkGeneratorWrapper> MINECRAFT_CHUNK_GENERATOR_WRAPPER = RecordCodecBuilder
-        .create(
+    public static final MapCodec<MinecraftChunkGeneratorWrapper> MINECRAFT_CHUNK_GENERATOR_WRAPPER = RecordCodecBuilder
+        .mapCodec(
             instance -> instance.group(
                 TERRA_BIOME_SOURCE.fieldOf("biome_source")
                     .stable()

diff --git a/...n-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java b/...n-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java
@@ -18,6 +18,7 @@
 package com.dfsek.terra.mod.generation;
 
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.entry.RegistryEntry;
@@ -85,7 +86,7 @@ public MinecraftChunkGeneratorWrapper(TerraBiomeSource biomeSource, ConfigPack c
     }
 
     @Override
-    protected Codec<? extends net.minecraft.world.gen.chunk.ChunkGenerator> getCodec() {
+    protected MapCodec<? extends net.minecraft.world.gen.chunk.ChunkGenerator> getCodec() {
         return Codecs.MINECRAFT_CHUNK_GENERATOR_WRAPPER;
     }
 

diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java
@@ -18,6 +18,7 @@
 package com.dfsek.terra.mod.generation;
 
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeSource;
@@ -47,7 +48,7 @@ public TerraBiomeSource(ConfigPack pack) {
     }
 
     @Override
-    protected Codec<? extends BiomeSource> getCodec() {
+    protected MapCodec<? extends BiomeSource> getCodec() {
         return Codecs.TERRA_BIOME_SOURCE;
     }
 

diff --git a/.../dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java b/.../dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java
@@ -50,7 +50,7 @@ private MobSpawnerBlockEntityMixin(BlockEntityType<?> type, BlockPos pos, BlockS
     public abstract MobSpawnerLogic getLogic();
 
     @Shadow
-    public abstract void method_46408(net.minecraft.entity.EntityType<?> entityType, Random random);
+    public abstract void setEntityType(net.minecraft.entity.EntityType<?> entityType, Random random);
 
     public EntityType terra$getSpawnedType() {
         return (EntityType) Registries.ENTITY_TYPE.get(
@@ -64,7 +64,7 @@ private MobSpawnerBlockEntityMixin(BlockEntityType<?> type, BlockPos pos, BlockS
         } else {
             rand = Random.create();
         }
-        method_46408((net.minecraft.entity.EntityType<?>) creatureType, rand);
+        setEntityType((net.minecraft.entity.EntityType<?>) creatureType, rand);
     }
 
     public int terra$getDelay() {

diff --git a/...ain/java/com/dfsek/terra/mod/mixin/implementations/terra/block/state/BlockStateMixin.java b/...ain/java/com/dfsek/terra/mod/mixin/implementations/terra/block/state/BlockStateMixin.java
@@ -3,6 +3,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.serialization.MapCodec;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
 import net.minecraft.block.AbstractBlock.AbstractBlockState;
 import net.minecraft.block.Block;
 import net.minecraft.registry.Registries;
@@ -24,7 +25,7 @@
 @Mixin(AbstractBlockState.class)
 @Implements(@Interface(iface = BlockState.class, prefix = "terra$"))
 public abstract class BlockStateMixin extends State<Block, net.minecraft.block.BlockState> {
-    private BlockStateMixin(Block owner, ImmutableMap<net.minecraft.state.property.Property<?>, Comparable<?>> entries,
+    private BlockStateMixin(Block owner, Reference2ObjectArrayMap<net.minecraft.state.property.Property<?>, Comparable<?>> entries,
                             MapCodec<net.minecraft.block.BlockState> codec) {
         super(owner, entries, codec);
     }

diff --git a/platforms/mixin-common/src/main/resources/terra.accesswidener b/platforms/mixin-common/src/main/resources/terra.accesswidener
@@ -1,3 +1,4 @@
 accessWidener v1 named
 accessible class net/minecraft/world/biome/Biome$Weather
 accessible class net/minecraft/world/gen/WorldPresets$Registrar
+accessible method net/minecraft/block/FluidBlock getFluidState (Lnet/minecraft/block/BlockState;)Lnet/minecraft/fluid/FluidState