From f9eaecf150d128ee814c80cfb8b7eab2dc8616eb Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 21 Jun 2020 22:52:05 -0300 Subject: [PATCH] 1.16-rc1 --- gradle.properties | 6 +++--- src/main/java/carpet/helpers/FeatureGenerator.java | 4 ++-- src/main/java/carpet/mixins/CoralBlockMixin.java | 3 +-- src/main/java/carpet/mixins/ServerWorld_tickMixin.java | 4 ++-- src/main/java/carpet/mixins/World_fillUpdatesMixin.java | 4 ++-- src/main/java/carpet/utils/BlockInfo.java | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5b321aea..d0995dd3 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-pre8 - yarn_mappings=1.16-pre8+build.1 - loader_version=0.8.7+build.201 + minecraft_version=1.16-rc1 + yarn_mappings=1.16-rc1+build.12 + loader_version=0.8.8+build.202 # Mod Properties mod_version = 1.3.32+v200617 diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 34d2f1e0..7026c653 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -29,12 +29,12 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; //import net.minecraft.world.gen.chunk.OverworldChunkGeneratorConfig; import net.minecraft.world.gen.decorator.BeehiveTreeDecorator; import net.minecraft.world.gen.feature.BastionRemnantFeatureConfig; -import net.minecraft.world.gen.feature.BoulderFeatureConfig; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredStructureFeature; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.FeatureConfig; +import net.minecraft.world.gen.feature.ForestRockFeatureConfig; import net.minecraft.world.gen.feature.HugeFungusFeatureConfig; import net.minecraft.world.gen.feature.MineshaftFeature; import net.minecraft.world.gen.feature.MineshaftFeatureConfig; @@ -288,7 +288,7 @@ public class FeatureGenerator simplePlop(Feature.CORAL_TREE).plop(w, p)) :simplePlop(Feature.CORAL_CLAW).plop(w, p)); put("sea_pickle", simplePlop(Feature.SEA_PICKLE.configure( new SeaPickleFeatureConfig(20)))); - put("boulder", simplePlop(Feature.FOREST_ROCK.configure( new BoulderFeatureConfig(Blocks.MOSSY_COBBLESTONE.getDefaultState(), 0)))); + put("boulder", simplePlop(Feature.FOREST_ROCK.configure( new ForestRockFeatureConfig(Blocks.MOSSY_COBBLESTONE.getDefaultState(), 0)))); put("crimson_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungusFeatureConfig.CRIMSON_FUNGUS_NOT_PLANTED_CONFIG))); put("warped_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungusFeatureConfig.WARPED_FUNGUS_NOT_PLANTED_CONFIG))); put("nether_sprouts", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.NETHER_SPROUTS_CONFIG))); diff --git a/src/main/java/carpet/mixins/CoralBlockMixin.java b/src/main/java/carpet/mixins/CoralBlockMixin.java index 9db6647e..ea6db8e0 100644 --- a/src/main/java/carpet/mixins/CoralBlockMixin.java +++ b/src/main/java/carpet/mixins/CoralBlockMixin.java @@ -25,12 +25,11 @@ import org.spongepowered.asm.mixin.Mixin; import java.util.Random; @Mixin(CoralBlock.class) -//@Interface(iface = Fertilizable.class, prefix = "fert$") public abstract class CoralBlockMixin implements Fertilizable { public boolean isFertilizable(BlockView var1, BlockPos var2, BlockState var3, boolean var4) { - return CarpetSettings.renewableCoral && var3.get(CoralParentBlock.WATERLOGGED) && var1.getFluidState(var2.up()).matches(FluidTags.WATER); + return CarpetSettings.renewableCoral && var3.get(CoralParentBlock.WATERLOGGED) && var1.getFluidState(var2.up()).isIn(FluidTags.WATER); } public boolean canGrow(World var1, Random var2, BlockPos var3, BlockState var4) diff --git a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java b/src/main/java/carpet/mixins/ServerWorld_tickMixin.java index d1337397..20607218 100644 --- a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java +++ b/src/main/java/carpet/mixins/ServerWorld_tickMixin.java @@ -2,10 +2,10 @@ package carpet.mixins; import carpet.helpers.TickSpeed; import carpet.utils.CarpetProfiler; -import net.minecraft.entity.raid.RaidManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.profiler.Profiler; import net.minecraft.util.registry.RegistryKey; +import net.minecraft.village.raid.RaidManager; import net.minecraft.world.MutableWorldProperties; import net.minecraft.world.WanderingTraderManager; import net.minecraft.world.World; @@ -160,7 +160,7 @@ public abstract class ServerWorld_tickMixin extends World @Redirect(method = "tick", at = @At( value = "INVOKE", - target = "Lnet/minecraft/entity/raid/RaidManager;tick()V" + target = "Lnet/minecraft/village/raid/RaidManager;tick()V" )) private void tickConditionally(RaidManager raidManager) { diff --git a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java b/src/main/java/carpet/mixins/World_fillUpdatesMixin.java index 1d5c15f6..8e9c6e1e 100644 --- a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/World_fillUpdatesMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(World.class) public abstract class World_fillUpdatesMixin { - @ModifyConstant(method = "method_30092", //setBlockState main + @ModifyConstant(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z", //setBlockState main constant = @Constant(intValue = 16)) private int addFillUpdatesInt(int original) { if (CarpetSettings.impendingFillSkipUpdates) @@ -21,7 +21,7 @@ public abstract class World_fillUpdatesMixin return original; } - @Redirect(method = "method_30092", at = @At( //setBlockState main + @Redirect(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z", at = @At( //setBlockState main value = "INVOKE", target = "Lnet/minecraft/world/World;updateNeighbors(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;)V" )) diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index e4281224..8383aec0 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -69,7 +69,7 @@ public class BlockInfo }}; public static final Map mapColourName = new HashMap() {{ - put(MaterialColor.AIR , "air" ); + put(MaterialColor.CLEAR , "air" ); put(MaterialColor.GRASS , "grass" ); put(MaterialColor.SAND , "sand" ); put(MaterialColor.WEB , "wool" );