From d279696c184652862a75522f7e343ec163ca5e10 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 11 Dec 2019 00:04:38 -0400 Subject: [PATCH] 1.15 --- gradle.properties | 4 ++-- src/main/java/carpet/helpers/FeatureGenerator.java | 10 +++++----- .../carpet/mixins/BiomeArray_getBiomeArrayMixin.java | 2 +- .../carpet/mixins/PlayerEntity_antiCheatDisabled.java | 2 +- .../ServerPlayerInteractionManager_antiCheatMixin.java | 10 +--------- .../java/carpet/mixins/World_scarpetPlopMixin.java | 2 +- 6 files changed, 11 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index 047c5e2d..5e23a40d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.15-pre7 - yarn_mappings=1.15-pre7+build.1 + minecraft_version=1.15 + yarn_mappings=1.15+build.1 loader_version=0.7.2+build.174 # Mod Properties diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 5661f682..8acd7904 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -19,7 +19,7 @@ import net.minecraft.world.gen.chunk.OverworldChunkGeneratorConfig; import net.minecraft.world.gen.decorator.BeehiveTreeDecorator; import net.minecraft.world.gen.feature.BoulderFeatureConfig; import net.minecraft.world.gen.feature.BranchedTreeFeatureConfig; -import net.minecraft.world.gen.feature.BushFeatureConfig; +import net.minecraft.world.gen.feature.SingleStateFeatureConfig; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; @@ -177,10 +177,10 @@ public class FeatureGenerator put("sugarcane", simplePatch(DefaultBiomeFeatures.SUGAR_CANE_CONFIG)); put("lilypad", simplePatch(DefaultBiomeFeatures.LILY_PAD_CONFIG)); put("dungeon", simplePlop(Feature.MONSTER_ROOM)); - put("iceberg", simplePlop(Feature.ICEBERG.configure(new BushFeatureConfig(Blocks.PACKED_ICE.getDefaultState())))); - put("iceberg_blue", simplePlop(Feature.ICEBERG.configure(new BushFeatureConfig(Blocks.BLUE_ICE.getDefaultState())))); - put("lake", simplePlop(Feature.LAKE.configure(new BushFeatureConfig(Blocks.WATER.getDefaultState())))); - put("lake_lava", simplePlop(Feature.LAKE.configure(new BushFeatureConfig(Blocks.LAVA.getDefaultState())))); + put("iceberg", simplePlop(Feature.ICEBERG.configure(new SingleStateFeatureConfig(Blocks.PACKED_ICE.getDefaultState())))); + put("iceberg_blue", simplePlop(Feature.ICEBERG.configure(new SingleStateFeatureConfig(Blocks.BLUE_ICE.getDefaultState())))); + put("lake", simplePlop(Feature.LAKE.configure(new SingleStateFeatureConfig(Blocks.WATER.getDefaultState())))); + put("lake_lava", simplePlop(Feature.LAKE.configure(new SingleStateFeatureConfig(Blocks.LAVA.getDefaultState())))); //put("end tower", simplePlop(Feature.END_SPIKE.configure(new EndSpikeFeatureConfig(false, )))); put("end_island", simplePlop(Feature.END_ISLAND)); put("chorus", simplePlop(Feature.CHORUS_PLANT)); diff --git a/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java b/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java index f25841fc..a6d8ddf4 100644 --- a/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java +++ b/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java @@ -1,7 +1,7 @@ package carpet.mixins; import carpet.fakes.BiomeArrayInterface; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; diff --git a/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java b/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java index 8092d810..2f211d34 100644 --- a/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java +++ b/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java @@ -1,7 +1,7 @@ package carpet.mixins; import carpet.CarpetServer; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ElytraItem; diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java index a976a5d9..45b52c31 100644 --- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java @@ -1,20 +1,12 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; +import carpet.CarpetSettings; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerInteractionManager; -import net.minecraft.server.network.packet.PlayerActionC2SPacket; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; -import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ServerPlayerInteractionManager.class) public class ServerPlayerInteractionManager_antiCheatMixin diff --git a/src/main/java/carpet/mixins/World_scarpetPlopMixin.java b/src/main/java/carpet/mixins/World_scarpetPlopMixin.java index f378f03c..284ff0e3 100644 --- a/src/main/java/carpet/mixins/World_scarpetPlopMixin.java +++ b/src/main/java/carpet/mixins/World_scarpetPlopMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.world.Heightmap; import net.minecraft.world.World; import net.minecraft.world.chunk.WorldChunk;