From 1c5340232b171e5ed5662e965ae42c5bc86fa79a Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 11 Aug 2020 18:11:55 -0300 Subject: [PATCH] 1.16.2 --- gradle.properties | 6 +++--- src/main/java/carpet/helpers/FeatureGenerator.java | 13 +++++++------ .../carpet/mixins/BastionRemnantFeatureMixin.java | 6 +++--- .../java/carpet/mixins/World_movableTEMixin.java | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index 96361a3b..3c18d357 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.16.2-pre3 - yarn_mappings=1.16.2-pre3+build.2 - loader_version=0.9.0+build.204 + minecraft_version=1.16.2 + yarn_mappings=1.16.2+build.1 + loader_version=0.9.1+build.205 # Mod Properties mod_version = 1.4.7+v200806 diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 3ca5bb96..ce7102e8 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -19,6 +19,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; +import net.minecraft.world.biome.BuiltInBiomes; import net.minecraft.world.biome.source.BiomeAccess; import net.minecraft.world.gen.ChunkRandom; import net.minecraft.world.gen.chunk.ChunkGenerator; @@ -53,7 +54,7 @@ public class FeatureGenerator { return ((StructureFeatureInterface)structureFeature.feature).plopAnywhere( world, pos, world.getChunkManager().getChunkGenerator(), - false, world.getRegistryManager().get(Registry.BIOME_KEY).method_31140(Biomes.PLAINS), structureFeature.config); + false, world.getRegistryManager().get(Registry.BIOME_KEY).method_31140(BuiltInBiomes.PLAINS), structureFeature.config); } @@ -90,7 +91,7 @@ public class FeatureGenerator { return ((StructureFeatureInterface)structureFeature.feature).plopAnywhere( world, pos, world.getChunkManager().getChunkGenerator(), - true, world.getRegistryManager().get(Registry.BIOME_KEY).method_31140(Biomes.PLAINS), structureFeature.config); + true, Biomes.PLAINS, structureFeature.config); } @FunctionalInterface @@ -197,7 +198,7 @@ public class FeatureGenerator ), StructurePool.Projection.RIGID ), 6), - Biomes.NETHER_WASTES + BuiltInBiomes.NETHER_WASTES )); put("bastion_remnant_hoglin_stable", spawnCustomStructure( StructureFeature.BASTION_REMNANT, @@ -209,7 +210,7 @@ public class FeatureGenerator ), StructurePool.Projection.RIGID ), 6), - Biomes.NETHER_WASTES + BuiltInBiomes.NETHER_WASTES )); put("bastion_remnant_treasure", spawnCustomStructure( StructureFeature.BASTION_REMNANT, @@ -221,7 +222,7 @@ public class FeatureGenerator ), StructurePool.Projection.RIGID ), 6), - Biomes.NETHER_WASTES + BuiltInBiomes.NETHER_WASTES )); put("bastion_remnant_bridge", spawnCustomStructure( StructureFeature.BASTION_REMNANT, @@ -233,7 +234,7 @@ public class FeatureGenerator ), StructurePool.Projection.RIGID ), 6), - Biomes.NETHER_WASTES + BuiltInBiomes.NETHER_WASTES )); }}; diff --git a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java b/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java index d5099d25..ddbdf11d 100644 --- a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java +++ b/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java @@ -3,13 +3,13 @@ package carpet.mixins; import carpet.CarpetSettings; import com.google.common.collect.Lists; -import com.mojang.serialization.Codec; -import net.minecraft.class_5434; +import com.mojang.serialization.Codec;; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.SpawnSettings; import net.minecraft.world.gen.feature.BastionRemnantFeature; +import net.minecraft.world.gen.feature.JigsawFeature; import net.minecraft.world.gen.feature.StructurePoolFeatureConfig; import org.spongepowered.asm.mixin.Mixin; @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.List; @Mixin(BastionRemnantFeature.class) -public abstract class BastionRemnantFeatureMixin extends class_5434 +public abstract class BastionRemnantFeatureMixin extends JigsawFeature { private static final List spawnList = Lists.newArrayList( new SpawnSettings.SpawnEntry(EntityType.PIGLIN_BRUTE, 5, 1, 2), diff --git a/src/main/java/carpet/mixins/World_movableTEMixin.java b/src/main/java/carpet/mixins/World_movableTEMixin.java index 9e8b91ab..3e035b26 100644 --- a/src/main/java/carpet/mixins/World_movableTEMixin.java +++ b/src/main/java/carpet/mixins/World_movableTEMixin.java @@ -125,9 +125,9 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces if ((int_1 & 16) == 0) { int int_2 = int_1 & -34; - blockState_2.method_30102(this, blockPos_1, int_2); // prepare - blockState_1.method_30101(this, blockPos_1, int_2); // updateNeighbours - blockState_1.method_30102(this, blockPos_1, int_2); // prepare + blockState_2.prepare(this, blockPos_1, int_2); // prepare + blockState_1.updateNeighbors(this, blockPos_1, int_2); // updateNeighbours + blockState_1.prepare(this, blockPos_1, int_2); // prepare } this.onBlockChanged(blockPos_1, blockState_2, blockState_3); }