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

mappings. More colors and materials

Browse Source
This commit is contained in:
gnembon committed 2020-11-06 23:10:43 -04:00
1 parent 94b47c1272
commit d48896ad8b
25 files changed
+174 -154
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/utils/BlockInfo.java
+86 -65
View File
@@ -3,7 +3,7 @@ package carpet.utils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Material;
import net.minecraft.block.MaterialColor;
import net.minecraft.block.MapColor;
import net.minecraft.class_5532; // TargetFinder
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnReason;
@@ -68,61 +68,81 @@ public class BlockInfo
put(BlockSoundGroup.BONE, "bone");
put(BlockSoundGroup.NETHERITE, "netherite");
put(BlockSoundGroup.ANCIENT_DEBRIS, "ancient_debris");
put(BlockSoundGroup.LODESTONE, "lodestone");
put(BlockSoundGroup.CHAIN, "chain");
put(BlockSoundGroup.NETHER_GOLD_ORE, "nether_gold_ore");
put(BlockSoundGroup.GILDED_BLACKSTONE, "gilded_blackstone");
put(BlockSoundGroup.field_27196, "candle");
put(BlockSoundGroup.field_27197, "amethyst");
put(BlockSoundGroup.field_27198, "amethyst_cluster");
put(BlockSoundGroup.field_27199, "small_amethyst_bud");
put(BlockSoundGroup.field_27200, "large_amethyst_bud");
put(BlockSoundGroup.field_27201, "medium_amethyst_bud");
put(BlockSoundGroup.field_27202, "tuff");
put(BlockSoundGroup.field_27203, "calcite");
put(BlockSoundGroup.field_27204, "copper");
}};
public static final Map<MaterialColor, String> mapColourName = new HashMap<MaterialColor, String>() {{
put(MaterialColor.CLEAR , "air" );
put(MaterialColor.GRASS , "grass" );
put(MaterialColor.SAND , "sand" );
put(MaterialColor.WEB , "wool" );
put(MaterialColor.LAVA , "tnt" );
put(MaterialColor.ICE , "ice" );
put(MaterialColor.IRON , "iron" );
put(MaterialColor.FOLIAGE , "foliage" );
put(MaterialColor.WHITE , "snow" );
put(MaterialColor.CLAY , "clay" );
put(MaterialColor.DIRT , "dirt" );
put(MaterialColor.STONE , "stone" );
put(MaterialColor.WATER , "water" );
put(MaterialColor.WOOD , "wood" );
put(MaterialColor.QUARTZ , "quartz" );
put(MaterialColor.ORANGE , "adobe" );
put(MaterialColor.MAGENTA , "magenta" );
put(MaterialColor.LIGHT_BLUE, "light_blue");
put(MaterialColor.YELLOW , "yellow" );
put(MaterialColor.LIME , "lime" );
put(MaterialColor.PINK , "pink" );
put(MaterialColor.GRAY , "gray" );
put(MaterialColor.LIGHT_GRAY, "light_gray");
put(MaterialColor.CYAN , "cyan" );
put(MaterialColor.PURPLE , "purple" );
put(MaterialColor.BLUE , "blue" );
put(MaterialColor.BROWN , "brown" );
put(MaterialColor.GREEN , "green" );
put(MaterialColor.RED , "red" );
put(MaterialColor.BLACK , "black" );
put(MaterialColor.GOLD , "gold" );
put(MaterialColor.DIAMOND , "diamond" );
put(MaterialColor.LAPIS , "lapis" );
put(MaterialColor.EMERALD , "emerald" );
put(MaterialColor.SPRUCE , "obsidian" );
put(MaterialColor.NETHER , "netherrack"); //TODO fix these
put(MaterialColor.WHITE_TERRACOTTA , "white_terracotta" );
put(MaterialColor.ORANGE_TERRACOTTA , "orange_terracotta" );
put(MaterialColor.MAGENTA_TERRACOTTA , "magenta_terracotta" );
put(MaterialColor.LIGHT_BLUE_TERRACOTTA, "light_blue_terracotta" );
put(MaterialColor.YELLOW_TERRACOTTA , "yellow_terracotta" );
put(MaterialColor.LIME_TERRACOTTA , "lime_terracotta" );
put(MaterialColor.PINK_TERRACOTTA , "pink_terracotta" );
put(MaterialColor.GRAY_TERRACOTTA , "gray_terracotta" );
put(MaterialColor.LIGHT_GRAY_TERRACOTTA, "light_gray_terracotta" );
put(MaterialColor.CYAN_TERRACOTTA , "cyan_terracotta" );
put(MaterialColor.PURPLE_TERRACOTTA , "purple_terracotta" );
put(MaterialColor.BLUE_TERRACOTTA , "blue_terracotta" );
put(MaterialColor.BROWN_TERRACOTTA , "brown_terracotta" );
put(MaterialColor.GREEN_TERRACOTTA , "green_terracotta" );
put(MaterialColor.RED_TERRACOTTA , "red_terracotta" );
put(MaterialColor.BLACK_TERRACOTTA , "black_terracotta" );
public static final Map<MapColor, String> mapColourName = new HashMap<MapColor, String>() {{
put(MapColor.CLEAR , "air" );
put(MapColor.GRASS , "grass" );
put(MapColor.SAND , "sand" );
put(MapColor.WEB , "wool" );
put(MapColor.LAVA , "tnt" );
put(MapColor.ICE , "ice" );
put(MapColor.IRON , "iron" );
put(MapColor.FOLIAGE , "foliage" );
put(MapColor.WHITE , "snow" );
put(MapColor.CLAY , "clay" );
put(MapColor.DIRT , "dirt" );
put(MapColor.STONE , "stone" );
put(MapColor.WATER , "water" );
put(MapColor.WOOD , "wood" );
put(MapColor.QUARTZ , "quartz" );
put(MapColor.ORANGE , "adobe" );
put(MapColor.MAGENTA , "magenta" );
put(MapColor.LIGHT_BLUE, "light_blue");
put(MapColor.YELLOW , "yellow" );
put(MapColor.LIME , "lime" );
put(MapColor.PINK , "pink" );
put(MapColor.GRAY , "gray" );
put(MapColor.LIGHT_GRAY, "light_gray");
put(MapColor.CYAN , "cyan" );
put(MapColor.PURPLE , "purple" );
put(MapColor.BLUE , "blue" );
put(MapColor.BROWN , "brown" );
put(MapColor.GREEN , "green" );
put(MapColor.RED , "red" );
put(MapColor.BLACK , "black" );
put(MapColor.GOLD , "gold" );
put(MapColor.DIAMOND , "diamond" );
put(MapColor.LAPIS , "lapis" );
put(MapColor.EMERALD , "emerald" );
put(MapColor.SPRUCE , "obsidian" );
put(MapColor.NETHER , "netherrack"); //TODO fix these
put(MapColor.WHITE_TERRACOTTA , "white_terracotta" );
put(MapColor.ORANGE_TERRACOTTA , "orange_terracotta" );
put(MapColor.MAGENTA_TERRACOTTA , "magenta_terracotta" );
put(MapColor.LIGHT_BLUE_TERRACOTTA, "light_blue_terracotta" );
put(MapColor.YELLOW_TERRACOTTA , "yellow_terracotta" );
put(MapColor.LIME_TERRACOTTA , "lime_terracotta" );
put(MapColor.PINK_TERRACOTTA , "pink_terracotta" );
put(MapColor.GRAY_TERRACOTTA , "gray_terracotta" );
put(MapColor.LIGHT_GRAY_TERRACOTTA, "light_gray_terracotta" );
put(MapColor.CYAN_TERRACOTTA , "cyan_terracotta" );
put(MapColor.PURPLE_TERRACOTTA , "purple_terracotta" );
put(MapColor.BLUE_TERRACOTTA , "blue_terracotta" );
put(MapColor.BROWN_TERRACOTTA , "brown_terracotta" );
put(MapColor.GREEN_TERRACOTTA , "green_terracotta" );
put(MapColor.RED_TERRACOTTA , "red_terracotta" );
put(MapColor.BLACK_TERRACOTTA , "black_terracotta" );
put(MapColor.CRIMSON_NYLIUM , "crimson_nylium" );
put(MapColor.CRIMSON_STEM , "crimson_stem" );
put(MapColor.CRIMSON_HYPHAE , "crimson_hyphae" );
put(MapColor.WARPED_NYLIUM , "warped_nylium" );
put(MapColor.WARPED_STEM , "warped_stem" );
put(MapColor.WARPED_HYPHAE , "warped_hyphae" );
put(MapColor.WARPED_WART , "warped_wart" );
}};
public static final Map<Material, String> materialName = new HashMap<Material, String>() {{
@@ -133,20 +153,20 @@ public class BlockInfo
put(Material.PLANT , "plant" );
put(Material.UNDERWATER_PLANT, "water_plant" );
put(Material.REPLACEABLE_PLANT, "vegetation" );
put(Material.REPLACEABLE_UNDERWATER_PLANT , "sea_grass" );
put(Material.REPLACEABLE_UNDERWATER_PLANT, "sea_grass" );
put(Material.WATER , "water" );
put(Material.BUBBLE_COLUMN , "bubble_column");
put(Material.LAVA , "lava" );
put(Material.SNOW_LAYER , "snow_layer" );
put(Material.SNOW_LAYER , "snow_layer" );
put(Material.FIRE , "fire" );
put(Material.SUPPORTED , "decoration" );
put(Material.SUPPORTED , "decoration" );
put(Material.COBWEB , "cobweb" );
put(Material.REDSTONE_LAMP , "redstone_lamp");
put(Material.ORGANIC_PRODUCT , "clay" );
put(Material.SOIL , "dirt" );
put(Material.SOLID_ORGANIC , "grass" );
put(Material.DENSE_ICE , "packed_ice" );
put(Material.AGGREGATE , "sand" );
put(Material.ORGANIC_PRODUCT, "clay" );
put(Material.SOIL , "dirt" );
put(Material.SOLID_ORGANIC , "grass" );
put(Material.DENSE_ICE , "packed_ice" );
put(Material.AGGREGATE , "sand" );
put(Material.SPONGE , "sponge" );
put(Material.SHULKER_BOX , "shulker" );
put(Material.WOOD , "wood" );
@@ -162,13 +182,14 @@ public class BlockInfo
put(Material.STONE , "stone" );
put(Material.METAL , "metal" );
put(Material.SNOW_BLOCK , "snow" );
put(Material.REPAIR_STATION , "anvil" );
put(Material.REPAIR_STATION , "anvil" );
put(Material.BARRIER , "barrier" );
put(Material.PISTON , "piston" );
put(Material.UNUSED_PLANT , "coral" );
put(Material.GOURD , "gourd" );
put(Material.GOURD , "gourd" );
put(Material.EGG , "dragon_egg" );
put(Material.CAKE , "cake" );
put(Material.AMETHYST , "amethyst" );
}};
public static List<BaseText> blockInfo(BlockPos pos, ServerWorld world)
@@ -186,7 +207,7 @@ public class BlockInfo
lst.add(Messenger.s("====================================="));
lst.add(Messenger.s(String.format("Block info for %s%s (id %d%s):",Registry.BLOCK.getId(block),metastring, Registry.BLOCK.getRawId(block), metastring )));
lst.add(Messenger.s(String.format(" - Material: %s", materialName.get(material))));
lst.add(Messenger.s(String.format(" - Map colour: %s", mapColourName.get(state.getTopMaterialColor(world, pos)))));
lst.add(Messenger.s(String.format(" - Map colour: %s", mapColourName.get(state.getMapColor(world, pos)))));
lst.add(Messenger.s(String.format(" - Sound type: %s", soundName.get(block.getSoundGroup(state)))));
lst.add(Messenger.s(""));
lst.add(Messenger.s(String.format(" - Full block: %s", state.isFullCube(world, pos)))); // isFullCube() )));
src/main/java/carpet/utils/WoolTool.java
+4 -4
View File
@@ -3,7 +3,7 @@ package carpet.utils;
import carpet.CarpetSettings;
import carpet.helpers.HopperCounter;
import net.minecraft.block.Material;
import net.minecraft.block.MaterialColor;
import net.minecraft.block.MapColor;
import net.minecraft.block.BlockState;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.entity.player.PlayerEntity;
@@ -20,12 +20,12 @@ import java.util.List;
public class WoolTool
{
private static final HashMap<MaterialColor,DyeColor> Material2Dye = new HashMap<>();
private static final HashMap<MapColor,DyeColor> Material2Dye = new HashMap<>();
static
{
for (DyeColor color: DyeColor.values())
{
Material2Dye.put(color.getMaterialColor(),color);
Material2Dye.put(color.getMapColor(),color);
}
}
@@ -98,6 +98,6 @@ public class WoolTool
BlockState state = worldIn.getBlockState(pos);
if (state.getMaterial() != Material.WOOL || !state.isSolidBlock(worldIn, pos)) //isSimpleFullBlock
return null;
return Material2Dye.get(state.getTopMaterialColor(worldIn, pos));
return Material2Dye.get(state.getMapColor(worldIn, pos));
}
}