icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20w06a-6

Browse Source
This commit is contained in:
gnembon committed 2020-02-06 21:30:14 -04:00
1 parent 05895209ff
commit c9438aefa4
4 files changed
+26 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/helpers/FeatureGenerator.java
+5 -4
View File
@@ -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));
src/main/java/carpet/helpers/OptimizedExplosion.java
+2 -2
View File
@@ -288,8 +288,8 @@ public class OptimizedExplosion
for(int j = 0; j < i; ++j) {
Pair<ItemStack, BlockPos> 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;
src/main/java/carpet/utils/BlockInfo.java
+18 -18
View File
@@ -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<MaterialColor, String> mapColourName = new HashMap<MaterialColor, String>() {{
@@ -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" );