diff --git a/gradle.properties b/gradle.properties index d674c5b8..4e8f8b1e 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=20w08a - yarn_mappings=20w08a+build.6 + minecraft_version=20w09a + yarn_mappings=20w09a+build.1 loader_version=0.7.8+build.184 # Mod Properties diff --git a/src/main/java/carpet/helpers/EntityPlayerActionPack.java b/src/main/java/carpet/helpers/EntityPlayerActionPack.java index 5defa3a1..145d675e 100644 --- a/src/main/java/carpet/helpers/EntityPlayerActionPack.java +++ b/src/main/java/carpet/helpers/EntityPlayerActionPack.java @@ -420,7 +420,7 @@ public class EntityPlayerActionPack { if (action.limit == 1) { - if (player.onGround) player.jump(); + if (player.method_24828()) player.jump(); // onGround } else { diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index c584e470..19baf5e3 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -17,23 +17,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.OverworldChunkGenerator; 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.SingleStateFeatureConfig; -import net.minecraft.world.gen.feature.ConfiguredFeature; -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.MineshaftFeature; -import net.minecraft.world.gen.feature.MineshaftFeatureConfig; -import net.minecraft.world.gen.feature.OceanRuinFeature; -import net.minecraft.world.gen.feature.OceanRuinFeatureConfig; -import net.minecraft.world.gen.feature.RandomPatchFeatureConfig; -import net.minecraft.world.gen.feature.SeaPickleFeatureConfig; -import net.minecraft.world.gen.feature.SeagrassFeatureConfig; -import net.minecraft.world.gen.feature.ShipwreckFeatureConfig; -import net.minecraft.world.gen.feature.StructureFeature; -import net.minecraft.world.gen.feature.VillageFeatureConfig; +import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.foliage.BlobFoliagePlacer; import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider; @@ -285,8 +269,8 @@ public class FeatureGenerator :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("crimson_fungus", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.CRIMSON_FUNGI_CONFIG))); - put("warped_fungus", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.WARPED_FUNGI_CONFIG))); + put("crimson_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungiFeatureConfig.field_22432))); + put("warped_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungiFeatureConfig.field_22434))); put("nether_sprouts", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.NETHER_SPROUTS_CONFIG))); put("crimson_roots", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.CRIMSON_ROOTS_CONFIG))); put("warped_roots", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.WARPED_ROOTS_CONFIG))); diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index a67cf374..8c2b2ea9 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -218,7 +218,7 @@ public class BlockInfo private static BaseText wander_chances(BlockPos pos, World worldIn) { - MobEntityWithAi creature = new ZombiePigmanEntity(EntityType.ZOMBIE_PIGMAN, worldIn); + MobEntityWithAi creature = new ZombiePigmanEntity(EntityType.ZOMBIFIED_PIGLIN, worldIn); creature.initialize(worldIn, worldIn.getLocalDifficulty(pos), SpawnType.NATURAL, null, null); creature.refreshPositionAndAngles(pos, 0.0F, 0.0F); WanderAroundGoal wander = new WanderAroundGoal(creature, 0.8D);