mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Fix spectrolus eating non-wool items. Wool items in the wrong sequence will still be destroyed, as in 1.12. Also remove a few unused classes
This commit is contained in:
1 parent
9fdc871d1e
commit
b21e154c8f
3 files changed
+2
-53
No files matched your search
@@ -1,25 +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 PlatformVariant implements IStringSerializable {
|
||||
ABSTRUSE,
|
||||
SPECTRAL,
|
||||
INFRANGIBLE;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,27 +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 QuartzVariant implements IStringSerializable {
|
||||
NORMAL,
|
||||
CHISELED,
|
||||
PILLAR_Y,
|
||||
PILLAR_X,
|
||||
PILLAR_Z;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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()) {
|
||||
|
||||
Reference in new issue
Block a user