From c9438aefa47ebc6d4a3f04d3d588a4f14a796a07 Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 6 Feb 2020 21:30:14 -0400 Subject: [PATCH] 20w06a-6 --- gradle.properties | 2 +- .../java/carpet/helpers/FeatureGenerator.java | 9 ++--- .../carpet/helpers/OptimizedExplosion.java | 4 +-- src/main/java/carpet/utils/BlockInfo.java | 36 +++++++++---------- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index a7184b43..3a54c635 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w06a - yarn_mappings=20w06a+build.3 + yarn_mappings=20w06a+build.6 loader_version=0.7.8+build.184 # Mod Properties diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index d22fb2a3..fa58d84f 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -5,7 +5,6 @@ import carpet.fakes.StructureFeatureInterface; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import net.minecraft.block.Blocks; -import net.minecraft.class_4780; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; @@ -286,9 +285,11 @@ 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_fungi", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.field_22052))); // crimson - put("warped_fungi", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.field_22053))); // warped - put("nether_forest_vegatation", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.field_22054))); + put("crimson_fungi", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.CRIMSON_FUNGI_CONFIG))); // crimson + put("warped_fungi", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.WARPED_FUNGI_CONFIG))); // warped + 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))); put("weeping_vines", simplePlop(Feature.WEEPING_VINES)); put("basalt_pillar", simplePlop(Feature.BASALT_PILLAR)); diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java index e5352b27..a0eb7838 100644 --- a/src/main/java/carpet/helpers/OptimizedExplosion.java +++ b/src/main/java/carpet/helpers/OptimizedExplosion.java @@ -288,8 +288,8 @@ public class OptimizedExplosion for(int j = 0; j < i; ++j) { Pair pair = (Pair)objectArrayList.get(j); ItemStack itemStack2 = pair.getLeft(); - if (ItemEntity.method_24017(itemStack2, itemStack)) { - ItemStack itemStack3 = ItemEntity.method_24018(itemStack2, itemStack, 16); + if (ItemEntity.canMerge(itemStack2, itemStack)) { + ItemStack itemStack3 = ItemEntity.merge(itemStack2, itemStack, 16); objectArrayList.set(j, Pair.of(itemStack3, pair.getRight())); if (itemStack.isEmpty()) { return; diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index 043465b1..a67cf374 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -45,23 +45,23 @@ public class BlockInfo put(BlockSoundGroup.STEM , "stem" ); put(BlockSoundGroup.NETHER_WART , "wart" ); put(BlockSoundGroup.LANTERN , "lantern" ); - put(BlockSoundGroup.field_22152, "fungi_stem"); - put(BlockSoundGroup.field_22153, "nylium"); - put(BlockSoundGroup.field_22154, "fungi"); - put(BlockSoundGroup.field_22138, "roots"); - put(BlockSoundGroup.field_22139, "shroomlight"); - put(BlockSoundGroup.field_22140, "weeping_vines"); - put(BlockSoundGroup.field_22141, "soul_sand"); - put(BlockSoundGroup.field_22142, "soul_soil"); - put(BlockSoundGroup.field_22143, "basalt"); - put(BlockSoundGroup.field_22144, "wart"); - put(BlockSoundGroup.field_22145, "netherrack"); - put(BlockSoundGroup.field_22146, "nether_bricks"); - put(BlockSoundGroup.field_22147, "nether_sprouts"); - put(BlockSoundGroup.field_22148, "nether_ore"); - put(BlockSoundGroup.field_22149, "bone"); - put(BlockSoundGroup.field_22150, "netherite"); - put(BlockSoundGroup.field_22151, "ancient_debris"); + put(BlockSoundGroup.NETHER_STEM, "fungi_stem"); + put(BlockSoundGroup.NYLIUM, "nylium"); + put(BlockSoundGroup.FUNGI, "fungi"); + put(BlockSoundGroup.ROOTS, "roots"); + put(BlockSoundGroup.SHROOMLIGHT, "shroomlight"); + put(BlockSoundGroup.WEEPING_VINES, "weeping_vines"); + put(BlockSoundGroup.SOUL_SAND, "soul_sand"); + put(BlockSoundGroup.SOUL_SOIL, "soul_soil"); + put(BlockSoundGroup.BASALT, "basalt"); + put(BlockSoundGroup.WART_BLOCK, "wart"); + put(BlockSoundGroup.NETHERRACK, "netherrack"); + put(BlockSoundGroup.NETHER_BRICK, "nether_bricks"); + put(BlockSoundGroup.NETHER_SPROUTS, "nether_sprouts"); + put(BlockSoundGroup.NETHER_ORE, "nether_ore"); + put(BlockSoundGroup.BONE, "bone"); + put(BlockSoundGroup.NETHERITE, "netherite"); + put(BlockSoundGroup.ANCIENT_DEBRIS, "ancient_debris"); }}; public static final Map mapColourName = new HashMap() {{ @@ -144,7 +144,7 @@ public class BlockInfo put(Material.SPONGE , "sponge" ); put(Material.SHULKER_BOX , "shulker" ); put(Material.WOOD , "wood" ); - put(Material.field_22223 , "nether_wood" ); + put(Material.NETHER_WOOD , "nether_wood" ); put(Material.BAMBOO_SAPLING , "shoots" ); put(Material.BAMBOO , "bamboo" ); put(Material.WOOL , "wool" );