Flatten petalblocks

This commit is contained in:
Vincent Lee committed 2018-03-08 13:40:31 -06:00
1 parent 2d567f04cb
commit 99d34a7980
65 files changed
+355 -279

No files matched your search

@@ -22,6 +22,7 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockCamo;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.BlockPetalBlock;
import vazkii.botania.common.block.mana.BlockPool;
import vazkii.botania.common.block.tile.TileCamo;
import vazkii.botania.common.block.tile.mana.TilePool;
@@ -72,11 +73,11 @@ public final class ColorHandler {
);
// Petal Block
blocks.registerBlockColorHandler((state, world, pos, tintIndex) -> {
int meta = ModBlocks.petalBlock.getMetaFromState(state);
return EnumDyeColor.byMetadata(meta).getColorValue();
},
ModBlocks.petalBlock
blocks.registerBlockColorHandler((state, world, pos, tintIndex) -> ((BlockPetalBlock) state.getBlock()).color.getColorValue(),
ModBlocks.petalBlockWhite, ModBlocks.petalBlockOrange, ModBlocks.petalBlockMagenta, ModBlocks.petalBlockLightBlue,
ModBlocks.petalBlockYellow, ModBlocks.petalBlockLime, ModBlocks.petalBlockPink, ModBlocks.petalBlockGray,
ModBlocks.petalBlockSilver, ModBlocks.petalBlockCyan, ModBlocks.petalBlockPurple, ModBlocks.petalBlockBlue,
ModBlocks.petalBlockBrown, ModBlocks.petalBlockGreen, ModBlocks.petalBlockRed, ModBlocks.petalBlockBlack
);
// Platforms
@@ -114,7 +115,11 @@ public final class ColorHandler {
items.registerItemColorHandler(handler, petals);
items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t),
ModBlocks.petalBlock, ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.gaiaSpreader);
ModBlocks.petalBlockWhite, ModBlocks.petalBlockOrange, ModBlocks.petalBlockMagenta, ModBlocks.petalBlockLightBlue,
ModBlocks.petalBlockYellow, ModBlocks.petalBlockLime, ModBlocks.petalBlockPink, ModBlocks.petalBlockGray,
ModBlocks.petalBlockSilver, ModBlocks.petalBlockCyan, ModBlocks.petalBlockPurple, ModBlocks.petalBlockBlue,
ModBlocks.petalBlockBrown, ModBlocks.petalBlockGreen, ModBlocks.petalBlockRed, ModBlocks.petalBlockBlack,
ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.gaiaSpreader);
items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, (float) ((ItemManaMirror) ModItems.manaMirror).getMana(s) / (float) TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror);
@@ -13,6 +13,7 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -216,7 +217,22 @@ public final class ModBlocks {
public static final Block manaFlame = new BlockManaFlame();
public static final Block prism = new BlockPrism();
public static final Block enchantedSoil = new BlockEnchantedSoil();
public static final Block petalBlock = new BlockPetalBlock();
public static final Block petalBlockWhite = new BlockPetalBlock(EnumDyeColor.WHITE);
public static final Block petalBlockOrange = new BlockPetalBlock(EnumDyeColor.ORANGE);
public static final Block petalBlockMagenta = new BlockPetalBlock(EnumDyeColor.MAGENTA);
public static final Block petalBlockLightBlue = new BlockPetalBlock(EnumDyeColor.LIGHT_BLUE);
public static final Block petalBlockYellow = new BlockPetalBlock(EnumDyeColor.YELLOW);
public static final Block petalBlockLime = new BlockPetalBlock(EnumDyeColor.LIME);
public static final Block petalBlockPink = new BlockPetalBlock(EnumDyeColor.PINK);
public static final Block petalBlockGray = new BlockPetalBlock(EnumDyeColor.GRAY);
public static final Block petalBlockSilver = new BlockPetalBlock(EnumDyeColor.SILVER);
public static final Block petalBlockCyan = new BlockPetalBlock(EnumDyeColor.CYAN);
public static final Block petalBlockPurple = new BlockPetalBlock(EnumDyeColor.PURPLE);
public static final Block petalBlockBlue = new BlockPetalBlock(EnumDyeColor.BLUE);
public static final Block petalBlockBrown = new BlockPetalBlock(EnumDyeColor.BROWN);
public static final Block petalBlockGreen = new BlockPetalBlock(EnumDyeColor.GREEN);
public static final Block petalBlockRed = new BlockPetalBlock(EnumDyeColor.RED);
public static final Block petalBlockBlack = new BlockPetalBlock(EnumDyeColor.BLACK);
public static final Block corporeaIndex = new BlockCorporeaIndex();
public static final Block corporeaFunnel = new BlockCorporeaFunnel();
public static final Block mushroom = new BlockModMushroom();
@@ -350,7 +366,22 @@ public final class ModBlocks {
r.register(manaFlame);
r.register(prism);
r.register(enchantedSoil);
r.register(petalBlock);
r.register(petalBlockWhite);
r.register(petalBlockOrange);
r.register(petalBlockMagenta);
r.register(petalBlockLightBlue);
r.register(petalBlockYellow);
r.register(petalBlockLime);
r.register(petalBlockPink);
r.register(petalBlockGray);
r.register(petalBlockSilver);
r.register(petalBlockCyan);
r.register(petalBlockPurple);
r.register(petalBlockBlue);
r.register(petalBlockBrown);
r.register(petalBlockGreen);
r.register(petalBlockRed);
r.register(petalBlockBlack);
r.register(corporeaIndex);
r.register(corporeaFunnel);
r.register(mushroom);
@@ -484,7 +515,22 @@ public final class ModBlocks {
r.register(new ItemBlockFloatingSpecialFlower(floatingSpecialFlower).setRegistryName(floatingSpecialFlower.getRegistryName()));
r.register(new ItemBlockMod(prism).setRegistryName(prism.getRegistryName()));
r.register(new ItemBlockMod(enchantedSoil).setRegistryName(enchantedSoil.getRegistryName()));
r.register(new ItemBlockWithMetadataAndName(petalBlock).setRegistryName(petalBlock.getRegistryName()));
r.register(new ItemBlockMod(petalBlockWhite).setRegistryName(petalBlockWhite.getRegistryName()));
r.register(new ItemBlockMod(petalBlockOrange).setRegistryName(petalBlockOrange.getRegistryName()));
r.register(new ItemBlockMod(petalBlockMagenta).setRegistryName(petalBlockMagenta.getRegistryName()));
r.register(new ItemBlockMod(petalBlockLightBlue).setRegistryName(petalBlockLightBlue.getRegistryName()));
r.register(new ItemBlockMod(petalBlockYellow).setRegistryName(petalBlockYellow.getRegistryName()));
r.register(new ItemBlockMod(petalBlockLime).setRegistryName(petalBlockLime.getRegistryName()));
r.register(new ItemBlockMod(petalBlockPink).setRegistryName(petalBlockPink.getRegistryName()));
r.register(new ItemBlockMod(petalBlockGray).setRegistryName(petalBlockGray.getRegistryName()));
r.register(new ItemBlockMod(petalBlockSilver).setRegistryName(petalBlockSilver.getRegistryName()));
r.register(new ItemBlockMod(petalBlockCyan).setRegistryName(petalBlockCyan.getRegistryName()));
r.register(new ItemBlockMod(petalBlockPurple).setRegistryName(petalBlockPurple.getRegistryName()));
r.register(new ItemBlockMod(petalBlockBlue).setRegistryName(petalBlockBlue.getRegistryName()));
r.register(new ItemBlockMod(petalBlockBrown).setRegistryName(petalBlockBrown.getRegistryName()));
r.register(new ItemBlockMod(petalBlockGreen).setRegistryName(petalBlockGreen.getRegistryName()));
r.register(new ItemBlockMod(petalBlockRed).setRegistryName(petalBlockRed.getRegistryName()));
r.register(new ItemBlockMod(petalBlockBlack).setRegistryName(petalBlockBlack.getRegistryName()));
r.register(new ItemBlockMod(corporeaIndex).setRegistryName(corporeaIndex.getRegistryName()));
r.register(new ItemBlockMod(corporeaFunnel).setRegistryName(corporeaFunnel.getRegistryName()));
r.register(new ItemBlockWithMetadataAndName(mushroom).setRegistryName(mushroom.getRegistryName()));
@@ -37,54 +37,16 @@ import javax.annotation.Nonnull;
public class BlockPetalBlock extends BlockMod implements ILexiconable {
public BlockPetalBlock() {
super(Material.PLANTS, LibBlockNames.PETAL_BLOCK);
public final EnumDyeColor color;
public BlockPetalBlock(EnumDyeColor color) {
super(Material.PLANTS, color.getName() + LibBlockNames.PETAL_BLOCK_SUFFIX);
setHardness(0.4F);
setSoundType(SoundType.PLANT);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new BlockStateContainer(this, BotaniaStateProps.COLOR);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.COLOR).getMetadata();
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta >= EnumDyeColor.values().length) {
meta = 0;
}
return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta));
}
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list) {
for(int i = 0; i < 16; i++)
list.add(new ItemStack(this, 1, i));
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
this.color = color;
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.flowers;
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build());
ModelHandler.registerBlockToState(this, EnumDyeColor.values().length);
}
}
@@ -418,7 +418,22 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.shinyFlower);
addBlock(ModBlocks.floatingFlower);
addBlock(ModBlocks.floatingSpecialFlower);
addBlock(ModBlocks.petalBlock);
addBlock(ModBlocks.petalBlockWhite);
addBlock(ModBlocks.petalBlockOrange);
addBlock(ModBlocks.petalBlockMagenta);
addBlock(ModBlocks.petalBlockLightBlue);
addBlock(ModBlocks.petalBlockYellow);
addBlock(ModBlocks.petalBlockLime);
addBlock(ModBlocks.petalBlockPink);
addBlock(ModBlocks.petalBlockGray);
addBlock(ModBlocks.petalBlockSilver);
addBlock(ModBlocks.petalBlockCyan);
addBlock(ModBlocks.petalBlockPurple);
addBlock(ModBlocks.petalBlockBlue);
addBlock(ModBlocks.petalBlockBrown);
addBlock(ModBlocks.petalBlockGreen);
addBlock(ModBlocks.petalBlockRed);
addBlock(ModBlocks.petalBlockBlack);
addBlock(ModBlocks.mushroom);
addBlock(ModBlocks.blazeBlock);
@@ -420,7 +420,7 @@ public final class ModCraftingRecipes {
recipeFertilizerPowder = gogPath("fertilizer_powder");
recipeFerilizerDye = path("fertilizer_dye");
recipesPetalsDouble = allOfGroup("petal_double");
recipesPetalBlocks = allOfGroup(ModBlocks.petalBlock.getRegistryName());
recipesPetalBlocks = allOfGroup("petal_block");
recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct");
recipeApothecary = ModBlocks.defaultAltar.getRegistryName();
@@ -208,6 +208,7 @@ public class FlattenItems implements IFixableData {
case 3: return ModBlocks.gaiaSpreader.getRegistryName().toString();
}
});
LOOKUP.put("botania:petalblock", i -> LibMisc.MOD_ID + ":" + EnumDyeColor.byMetadata(i).getName() + LibBlockNames.PETAL_BLOCK_SUFFIX);
}
@Override
@@ -74,7 +74,7 @@ public final class LibBlockNames {
public static final String ENCHANTED_SOIL = "enchantedSoil";
public static final String BIOME_STONE_A = "biomeStoneA";
public static final String BIOME_STONE_B = "biomeStoneB";
public static final String PETAL_BLOCK = "petalBlock";
public static final String PETAL_BLOCK_SUFFIX = "_petal_block";
public static final String CORPOREA_INDEX = "corporeaIndex";
public static final String CORPOREA_FUNNEL = "corporeaFunnel";
public static final String END_STONE_BRICK = "endStoneBrick";