diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java deleted file mode 100644 index 37c2e64db..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java +++ /dev/null @@ -1,25 +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 PlatformVariant implements IStringSerializable { - ABSTRUSE, - SPECTRAL, - INFRANGIBLE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java deleted file mode 100644 index 3bb9a1ea2..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java +++ /dev/null @@ -1,27 +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 QuartzVariant implements IStringSerializable { - NORMAL, - CHISELED, - PILLAR_Y, - PILLAR_X, - PILLAR_Z; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 371adc20e..68c001f6e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -32,6 +32,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.ColorHelper; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModBlocks; @@ -92,7 +93,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { } else if (target instanceof ItemEntity) { ItemStack stack = ((ItemEntity) target).getItem(); - if(!stack.isEmpty()) { + if(!stack.isEmpty() && ColorHelper.WOOL_MAP.containsValue(Block.getBlockFromItem(stack.getItem()))) { Block expected = ModBlocks.getWool(nextColor); if(expected.asItem() == stack.getItem()) {