Flatten azulejos

This commit is contained in:
Vincent Lee committed 2018-03-06 01:03:42 -06:00
1 parent 174183332f
commit d8d0d0ff13
66 files changed
+523 -513

No files matched your search

@@ -27,7 +27,6 @@ import vazkii.botania.api.state.enums.BiomeBrickVariant;
import vazkii.botania.api.state.enums.BiomeStoneVariant;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.api.state.enums.CrateVariant;
import vazkii.botania.api.state.enums.CustomBrickVariant;
import vazkii.botania.api.state.enums.LivingRockVariant;
import vazkii.botania.api.state.enums.LivingWoodVariant;
import vazkii.botania.api.state.enums.LuminizerVariant;
@@ -104,9 +103,6 @@ public final class BotaniaStateProps {
}
});
// BlockCustomBrick
public static final PropertyEnum<CustomBrickVariant> CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class);
// BlockDreamWood, BlockLivingWood
public static final PropertyEnum<LivingWoodVariant> LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class);
@@ -1,41 +0,0 @@
/**
* This class was created by <williewillus>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
* <p>
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.api.state.enums;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum CustomBrickVariant implements IStringSerializable {
/* Azulejos 0, 13, 14, and 15 replaced the old bricks
They are here at the top because putting them at the bottom while deleting the bricks
would shift the variants of azulejos in older worlds.*/
AZULEJO_0,
AZULEJO_13,
AZULEJO_14,
AZULEJO_15,
AZULEJO_1,
AZULEJO_2,
AZULEJO_3,
AZULEJO_4,
AZULEJO_5,
AZULEJO_6,
AZULEJO_7,
AZULEJO_8,
AZULEJO_9,
AZULEJO_10,
AZULEJO_11,
AZULEJO_12;
@Override
public String getName() {
return name().toLowerCase(Locale.ROOT);
}
}
@@ -33,7 +33,7 @@ import vazkii.botania.common.block.corporea.BlockCorporeaInterceptor;
import vazkii.botania.common.block.corporea.BlockCorporeaRetainer;
import vazkii.botania.common.block.decor.BlockBlaze;
import vazkii.botania.common.block.decor.BlockBuriedPetals;
import vazkii.botania.common.block.decor.BlockCustomBrick;
import vazkii.botania.common.block.decor.BlockAzulejo;
import vazkii.botania.common.block.decor.BlockElfGlass;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.block.decor.BlockManaFlame;
@@ -164,7 +164,22 @@ public final class ModBlocks {
public static final Block floatingFlower = new BlockFloatingFlower();
public static final Block tinyPotato = new BlockTinyPotato();
public static final Block spawnerClaw = new BlockSpawnerClaw();
public static final Block customBrick = new BlockCustomBrick();
public static final Block azulejo0 = new BlockAzulejo(0);
public static final Block azulejo1 = new BlockAzulejo(1);
public static final Block azulejo2 = new BlockAzulejo(2);
public static final Block azulejo3 = new BlockAzulejo(3);
public static final Block azulejo4 = new BlockAzulejo(4);
public static final Block azulejo5 = new BlockAzulejo(5);
public static final Block azulejo6 = new BlockAzulejo(6);
public static final Block azulejo7 = new BlockAzulejo(7);
public static final Block azulejo8 = new BlockAzulejo(8);
public static final Block azulejo9 = new BlockAzulejo(9);
public static final Block azulejo10 = new BlockAzulejo(10);
public static final Block azulejo11 = new BlockAzulejo(11);
public static final Block azulejo12 = new BlockAzulejo(12);
public static final Block azulejo13 = new BlockAzulejo(13);
public static final Block azulejo14 = new BlockAzulejo(14);
public static final Block azulejo15 = new BlockAzulejo(15);
public static final Block enderEye = new BlockEnderEye();
public static final Block starfield = new BlockStarfield();
public static final Block rfGenerator = new BlockRFGenerator();
@@ -263,7 +278,22 @@ public final class ModBlocks {
r.register(floatingFlower);
r.register(tinyPotato);
r.register(spawnerClaw);
r.register(customBrick);
r.register(azulejo0);
r.register(azulejo1);
r.register(azulejo2);
r.register(azulejo3);
r.register(azulejo4);
r.register(azulejo5);
r.register(azulejo6);
r.register(azulejo7);
r.register(azulejo8);
r.register(azulejo9);
r.register(azulejo10);
r.register(azulejo11);
r.register(azulejo12);
r.register(azulejo13);
r.register(azulejo14);
r.register(azulejo15);
r.register(enderEye);
r.register(starfield);
r.register(rfGenerator);
@@ -363,7 +393,22 @@ public final class ModBlocks {
r.register(new ItemBlockWithMetadataAndName(floatingFlower).setRegistryName(floatingFlower.getRegistryName()));
r.register(new ItemBlockTinyPotato(tinyPotato).setRegistryName(tinyPotato.getRegistryName()));
r.register(new ItemBlockMod(spawnerClaw).setRegistryName(spawnerClaw.getRegistryName()));
r.register(new ItemBlockWithMetadataAndName(customBrick).setRegistryName(customBrick.getRegistryName()));
r.register(new ItemBlockMod(azulejo0).setRegistryName(azulejo0.getRegistryName()));
r.register(new ItemBlockMod(azulejo1).setRegistryName(azulejo1.getRegistryName()));
r.register(new ItemBlockMod(azulejo2).setRegistryName(azulejo2.getRegistryName()));
r.register(new ItemBlockMod(azulejo3).setRegistryName(azulejo3.getRegistryName()));
r.register(new ItemBlockMod(azulejo4).setRegistryName(azulejo4.getRegistryName()));
r.register(new ItemBlockMod(azulejo5).setRegistryName(azulejo5.getRegistryName()));
r.register(new ItemBlockMod(azulejo6).setRegistryName(azulejo6.getRegistryName()));
r.register(new ItemBlockMod(azulejo7).setRegistryName(azulejo7.getRegistryName()));
r.register(new ItemBlockMod(azulejo8).setRegistryName(azulejo8.getRegistryName()));
r.register(new ItemBlockMod(azulejo9).setRegistryName(azulejo9.getRegistryName()));
r.register(new ItemBlockMod(azulejo10).setRegistryName(azulejo10.getRegistryName()));
r.register(new ItemBlockMod(azulejo11).setRegistryName(azulejo11.getRegistryName()));
r.register(new ItemBlockMod(azulejo12).setRegistryName(azulejo12.getRegistryName()));
r.register(new ItemBlockMod(azulejo13).setRegistryName(azulejo13.getRegistryName()));
r.register(new ItemBlockMod(azulejo14).setRegistryName(azulejo14.getRegistryName()));
r.register(new ItemBlockMod(azulejo15).setRegistryName(azulejo15.getRegistryName()));
r.register(new ItemBlockMod(enderEye).setRegistryName(enderEye.getRegistryName()));
r.register(new ItemBlockMod(starfield).setRegistryName(starfield.getRegistryName()));
r.register(new ItemBlockMod(rfGenerator).setRegistryName(rfGenerator.getRegistryName()));
@@ -0,0 +1,39 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jul 28, 2014, 9:51:48 PM (GMT)]
*/
package vazkii.botania.common.block.decor;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockAzulejo extends BlockMod implements ILexiconable {
public BlockAzulejo(int variant) {
super(Material.ROCK, LibBlockNames.AZULEJO_PREFIX + variant);
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.STONE);
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.azulejo;
}
}
@@ -1,95 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jul 28, 2014, 9:51:48 PM (GMT)]
*/
package vazkii.botania.common.block.decor;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.CustomBrickVariant;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
public class BlockCustomBrick extends BlockMod implements ILexiconable {
public BlockCustomBrick() {
super(Material.ROCK, LibBlockNames.CUSTOM_BRICK);
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.AZULEJO_0));
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new BlockStateContainer(this, BotaniaStateProps.CUSTOMBRICK_VARIANT);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT).ordinal();
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta >= CustomBrickVariant.values().length) {
meta = 0;
}
return getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.values()[meta]);
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> stacks) {
for(int i = 0; i < CustomBrickVariant.values().length; i++)
stacks.add(new ItemStack(this, 1, i));
}
@Nonnull
@Override
public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) {
return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos)));
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.azulejo;
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerBlockToState(this, CustomBrickVariant.values().length);
}
}
@@ -403,7 +403,22 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.blazeBlock);
addBlock(ModBlocks.customBrick);
addBlock(ModBlocks.azulejo0);
addBlock(ModBlocks.azulejo1);
addBlock(ModBlocks.azulejo2);
addBlock(ModBlocks.azulejo3);
addBlock(ModBlocks.azulejo4);
addBlock(ModBlocks.azulejo5);
addBlock(ModBlocks.azulejo6);
addBlock(ModBlocks.azulejo7);
addBlock(ModBlocks.azulejo8);
addBlock(ModBlocks.azulejo9);
addBlock(ModBlocks.azulejo10);
addBlock(ModBlocks.azulejo11);
addBlock(ModBlocks.azulejo12);
addBlock(ModBlocks.azulejo13);
addBlock(ModBlocks.azulejo14);
addBlock(ModBlocks.azulejo15);
addBlock(ModFluffBlocks.livingwoodStairs);
addBlock(ModFluffBlocks.livingwoodSlab);
@@ -678,7 +678,7 @@ public final class ModCraftingRecipes {
recipeSunnyQuartz = ModItems.sunnyQuartz.getRegistryName();
recipesShinyFlowers = allOfGroup(ModBlocks.shinyFlower.getRegistryName());
recipesMiniIsland = allOfGroup(ModBlocks.floatingFlower.getRegistryName());
recipeAzulejo = path("custombrick_4");
recipeAzulejo = ModBlocks.azulejo0.getRegistryName();
recipesAzulejoCycling = allOfGroup("azulejo_cycling");
recipeStarfield = ModBlocks.starfield.getRegistryName();
recipesMushrooms = allOfGroup(ModBlocks.mushroom.getRegistryName());
@@ -9,6 +9,7 @@ import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
@@ -146,6 +147,24 @@ public class FlattenItems implements IFixableData {
case 4: return ModBlocks.dragonstoneBlock.getRegistryName().toString();
}
});
LOOKUP.put("botania:custombrick", i -> {
int new_variant = 0;
// azulejos 1-12 in metas 4-15
if (i >= 4) {
new_variant = i - 3;
} else {
// azulejos 0, 13, 14, 15 in metas 0-3
switch (i) {
default:
case 0: new_variant = 0; break;
case 1: new_variant = 13; break;
case 2: new_variant = 14; break;
case 3: new_variant = 15; break;
}
}
return LibMisc.MOD_ID + ":" + LibBlockNames.AZULEJO_PREFIX + new_variant;
});
}
@Override
@@ -49,7 +49,7 @@ public final class LibBlockNames {
public static final String SPAWNER_CLAW = "spawnerClaw";
public static final String REED_BLOCK = "reedBlock";
public static final String THATCH = "thatch";
public static final String CUSTOM_BRICK = "customBrick";
public static final String AZULEJO_PREFIX = "azulejo_";
public static final String ENDER_EYE_BLOCK = "enderEyeBlock";
public static final String STARFIELD = "starfield";
public static final String RF_GENERATOR = "rfGenerator";