diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f571f1951..a2b9d00bc 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -153,9 +153,6 @@ public class BotaniaStateProps { // BlockStorage public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); - // BlockTinyPotato - public static final PropertyEnum POTATO_VARIANT = PropertyEnum.create("variant", PotatoVariant.class); - private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java b/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java deleted file mode 100644 index ed7ca2536..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This class was created by . 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 - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum PotatoVariant implements IStringSerializable { - DEFAULT, - HALLOWEEN, - GRAYSCALE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } -} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 6d6e7c944..62ab1aca4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -31,7 +31,6 @@ 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.PotatoVariant; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; @@ -51,13 +50,12 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { setBlockBounds(f, 0, f, 1F - f, f, 1F - f); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) - .withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.DEFAULT) ); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CARDINALS, BotaniaStateProps.POTATO_VARIANT); + return new BlockState(this, BotaniaStateProps.CARDINALS); } @Override @@ -86,19 +84,6 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } - @Override - @SideOnly(Side.CLIENT) - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - if (ClientProxy.dootDoot) { - return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.HALLOWEEN); - } else if (world.getTileEntity(pos) instanceof TileTinyPotato) { - if (((TileTinyPotato) world.getTileEntity(pos)).name.toLowerCase().equals("kyle hyde")) { - return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.GRAYSCALE); - } - } - return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.DEFAULT); - } - @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinyPotato.json index 6a38bbccd..fbf298eca 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPotato.json +++ b/src/main/resources/assets/botania/blockstates/tinyPotato.json @@ -8,15 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "variant": { - "default": {}, - "halloween": { - "textures": { "all": "botania:model/tinyPotato_halloweenCopy" } - }, - "grayscale": { - "textures": { "all": "botania:model/tinyPotatoGrayCopy" } - } - }, "facing": { "north": {}, "south": { "y": 180 }, diff --git a/src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png b/src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png deleted file mode 100644 index 5da02df33..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/tinyPotato_halloweenCopy.png b/src/main/resources/assets/botania/textures/model/tinyPotato_halloweenCopy.png deleted file mode 100644 index d3665eabe..000000000 Binary files a/src/main/resources/assets/botania/textures/model/tinyPotato_halloweenCopy.png and /dev/null differ