diff --git a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java index 95844e90..2c198ad0 100644 --- a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java +++ b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java @@ -1,13 +1,12 @@ package binnie.extrabees.alveary; -import binnie.extrabees.client.gui2.AbstractAlvearyContainer; +import binnie.extrabees.client.gui.AbstractAlvearyContainer; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IIndividual; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java index aa0f8b7f..ae070a11 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java @@ -1,8 +1,8 @@ package binnie.extrabees.alveary; -import binnie.extrabees.client.gui2.AbstractAlvearyContainer; -import binnie.extrabees.client.gui2.ContainerFrameHousing; -import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; +import binnie.extrabees.client.gui.AbstractAlvearyContainer; +import binnie.extrabees.client.gui.ContainerFrameHousing; +import binnie.extrabees.client.gui.GuiContainerAlvearyPart; import binnie.extrabees.utils.Utils; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -28,7 +28,18 @@ public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic { public AlvearyLogicFrameHousing(TileEntityExtraBeesAlvearyPart tile){ this.tile = tile; - inv = new ItemStackHandler(1); + inv = new ItemStackHandler(1){ + + @Nonnull + @Override + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if (!(stack.getItem() instanceof IHiveFrame)){ + return stack; + } + return super.insertItem(slot, stack, simulate); + } + + }; } private TileEntityExtraBeesAlvearyPart tile; diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java index b0d01cc8..133abeb0 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java @@ -1,8 +1,8 @@ package binnie.extrabees.alveary; -import binnie.extrabees.client.gui2.AbstractAlvearyContainer; -import binnie.extrabees.client.gui2.ContainerHatchery; -import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; +import binnie.extrabees.client.gui.AbstractAlvearyContainer; +import binnie.extrabees.client.gui.ContainerHatchery; +import binnie.extrabees.client.gui.GuiContainerAlvearyPart; import binnie.extrabees.utils.Utils; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; @@ -25,7 +25,18 @@ import javax.annotation.Nullable; public class AlvearyLogicHatchery extends AbstractAlvearyLogic { public AlvearyLogicHatchery(){ - inv = new ItemStackHandler(5); + inv = new ItemStackHandler(5){ + + @Nonnull + @Override + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if (!stack.isEmpty() && Utils.getBeeRoot().getType(stack) != EnumBeeType.LARVAE){ + return stack; + } + return super.insertItem(slot, stack, simulate); + } + + }; } private final IItemHandlerModifiable inv; diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java index 224ea453..e2ca164d 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java @@ -1,9 +1,8 @@ package binnie.extrabees.alveary; -import binnie.extrabees.client.gui2.AbstractAlvearyContainer; -import binnie.extrabees.client.gui2.ContainerMutator; -import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; -import binnie.extrabees.client.gui2.GuiContainerMutator; +import binnie.extrabees.client.gui.AbstractAlvearyContainer; +import binnie.extrabees.client.gui.ContainerMutator; +import binnie.extrabees.client.gui.GuiContainerMutator; import binnie.extrabees.utils.AlvearyMutationHandler; import forestry.api.apiculture.IBeeGenome; import net.minecraft.client.gui.inventory.GuiContainer; @@ -23,7 +22,18 @@ import javax.annotation.Nullable; public class AlvearyLogicMutator extends AbstractAlvearyLogic { public AlvearyLogicMutator(){ - this.inv = new ItemStackHandler(1); + this.inv = new ItemStackHandler(1){ + + @Nonnull + @Override + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if (!AlvearyMutationHandler.isMutationItem(stack)){ + return stack; + } + return super.insertItem(slot, stack, simulate); + } + + }; } private final IItemHandlerModifiable inv; diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java index cc227f1f..7d7e11ec 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java @@ -1,10 +1,8 @@ package binnie.extrabees.alveary; import binnie.extrabees.circuit.StimulatorCircuit; -import binnie.extrabees.client.gui2.AbstractAlvearyContainer; -import binnie.extrabees.client.gui2.ContainerStimulator; -import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; -import binnie.extrabees.client.gui2.GuiContainerStimulator; +import binnie.extrabees.client.gui.ContainerStimulator; +import binnie.extrabees.client.gui.GuiContainerStimulator; import com.google.common.collect.Lists; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; @@ -13,6 +11,7 @@ import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.items.IItemHandlerModifiable; @@ -33,7 +32,18 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { this.powered = false; this.modifiers = new StimulatorCircuit[0]; this.energyStorage = new EnergyStorage(10000); - this.inv = new ItemStackHandler(1); + this.inv = new ItemStackHandler(1){ + + @Nonnull + @Override + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if (!ChipsetManager.circuitRegistry.isChipset(stack)){ + return stack; + } + return super.insertItem(slot, stack, simulate); + } + + }; } private int powerUsage; diff --git a/src/main/java/binnie/extrabees/alveary/BlockAlveary.java b/src/main/java/binnie/extrabees/alveary/BlockAlveary.java index 949b8507..7dabc967 100644 --- a/src/main/java/binnie/extrabees/alveary/BlockAlveary.java +++ b/src/main/java/binnie/extrabees/alveary/BlockAlveary.java @@ -33,7 +33,7 @@ public class BlockAlveary extends Block implements ITileEntityProvider { setRegistryName("alveary"); } - private static final PropertyEnum TYPE = PropertyEnum.create("type", AlvearyLogicType.class); + private static final PropertyEnum TYPE = PropertyEnum.create("type", EnumAlvearyLogicType.class); @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { @@ -50,14 +50,14 @@ public class BlockAlveary extends Block implements ITileEntityProvider { return new TileEntityExtraBeesAlvearyPart(getType(meta)); } - private AlvearyLogicType getType(int meta){ + private EnumAlvearyLogicType getType(int meta){ IBlockState state = getStateFromMeta(meta); return state.getValue(TYPE); } @Override public void getSubBlocks(@Nonnull Item itemIn, CreativeTabs tab, NonNullList list) { - for (int i = 0; i < AlvearyLogicType.VALUES.length; i++) { + for (int i = 0; i < EnumAlvearyLogicType.VALUES.length; i++) { list.add(new ItemStack(itemIn, 1, i)); } } @@ -87,8 +87,8 @@ public class BlockAlveary extends Block implements ITileEntityProvider { @Override @Nonnull public IBlockState getStateFromMeta(int meta) { - meta = meta >= 0 && meta < AlvearyLogicType.VALUES.length ? meta : 0; - return getDefaultState().withProperty(TYPE, AlvearyLogicType.VALUES[meta]); + meta = meta >= 0 && meta < EnumAlvearyLogicType.VALUES.length ? meta : 0; + return getDefaultState().withProperty(TYPE, EnumAlvearyLogicType.VALUES[meta]); } } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicType.java b/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java similarity index 92% rename from src/main/java/binnie/extrabees/alveary/AlvearyLogicType.java rename to src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java index 672ad989..88f91660 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicType.java +++ b/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java @@ -7,7 +7,7 @@ import javax.annotation.Nonnull; /** * Created by Elec332 on 13-5-2017. */ -public enum AlvearyLogicType implements IStringSerializable { +public enum EnumAlvearyLogicType implements IStringSerializable { FRAME { @@ -73,6 +73,6 @@ public enum AlvearyLogicType implements IStringSerializable { return toString().toLowerCase(); } - public static AlvearyLogicType[] VALUES = values(); + public static EnumAlvearyLogicType[] VALUES = values(); } diff --git a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java index d7870c3d..16edd777 100644 --- a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java +++ b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java @@ -34,7 +34,7 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry this(null); } - protected TileEntityExtraBeesAlvearyPart(AlvearyLogicType type) { + protected TileEntityExtraBeesAlvearyPart(EnumAlvearyLogicType type) { super(new MultiblockLogicAlveary()); if (type != null) { this.type = type; @@ -50,7 +50,7 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry } private String unlocalizedTitle; - private AlvearyLogicType type; + private EnumAlvearyLogicType type; private AbstractAlvearyLogic alvearyLogic; public boolean hasGui(){ @@ -64,7 +64,7 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry @Override public void readFromNBT(NBTTagCompound data) { - type = AlvearyLogicType.VALUES[data.getByte("avType")]; + type = EnumAlvearyLogicType.VALUES[data.getByte("avType")]; initFromType(); super.readFromNBT(data); } diff --git a/src/main/java/binnie/extrabees/client/gui2/AbstractAlvearyContainer.java b/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java similarity index 89% rename from src/main/java/binnie/extrabees/client/gui2/AbstractAlvearyContainer.java rename to src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java index 2873a9b1..97918889 100644 --- a/src/main/java/binnie/extrabees/client/gui2/AbstractAlvearyContainer.java +++ b/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java @@ -1,14 +1,13 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; import binnie.extrabees.ExtraBees; -import binnie.extrabees.alveary.AlvearyLogicType; +import binnie.extrabees.alveary.EnumAlvearyLogicType; import binnie.extrabees.utils.ExtraBeesResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.IItemHandlerModifiable; -import org.apache.commons.lang3.text.WordUtils; import javax.annotation.Nonnull; import java.awt.*; @@ -18,7 +17,7 @@ import java.awt.*; */ public abstract class AbstractAlvearyContainer extends Container { - public AbstractAlvearyContainer(EntityPlayer player, IItemHandlerModifiable inv, AlvearyLogicType type, Dimension dimension){ + public AbstractAlvearyContainer(EntityPlayer player, IItemHandlerModifiable inv, EnumAlvearyLogicType type, Dimension dimension){ this.player = player; this.inv = inv; this.dimension = dimension; diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerFrameHousing.java b/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java similarity index 74% rename from src/main/java/binnie/extrabees/client/gui2/ContainerFrameHousing.java rename to src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java index 34f35ae3..18493ffa 100644 --- a/src/main/java/binnie/extrabees/client/gui2/ContainerFrameHousing.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java @@ -1,7 +1,7 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; import binnie.extrabees.alveary.AlvearyLogicFrameHousing; -import binnie.extrabees.alveary.AlvearyLogicType; +import binnie.extrabees.alveary.EnumAlvearyLogicType; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.items.SlotItemHandler; @@ -11,7 +11,7 @@ import net.minecraftforge.items.SlotItemHandler; public class ContainerFrameHousing extends AbstractAlvearyContainer { public ContainerFrameHousing(EntityPlayer player, AlvearyLogicFrameHousing logic) { - super(player, logic.getInventory(), AlvearyLogicType.FRAME, DEFAULT_DIMENSION); + super(player, logic.getInventory(), EnumAlvearyLogicType.FRAME, DEFAULT_DIMENSION); } @Override diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerHatchery.java b/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java similarity index 75% rename from src/main/java/binnie/extrabees/client/gui2/ContainerHatchery.java rename to src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java index 90d8d715..0ef037f7 100644 --- a/src/main/java/binnie/extrabees/client/gui2/ContainerHatchery.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java @@ -1,7 +1,7 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; import binnie.extrabees.alveary.AlvearyLogicHatchery; -import binnie.extrabees.alveary.AlvearyLogicType; +import binnie.extrabees.alveary.EnumAlvearyLogicType; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.items.SlotItemHandler; @@ -11,7 +11,7 @@ import net.minecraftforge.items.SlotItemHandler; public class ContainerHatchery extends AbstractAlvearyContainer { public ContainerHatchery(EntityPlayer player, AlvearyLogicHatchery logic) { - super(player, logic.getInventory(), AlvearyLogicType.HATCHERY, DEFAULT_DIMENSION); + super(player, logic.getInventory(), EnumAlvearyLogicType.HATCHERY, DEFAULT_DIMENSION); } @Override diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerMutator.java b/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java similarity index 72% rename from src/main/java/binnie/extrabees/client/gui2/ContainerMutator.java rename to src/main/java/binnie/extrabees/client/gui/ContainerMutator.java index 7c8de755..b82bba4a 100644 --- a/src/main/java/binnie/extrabees/client/gui2/ContainerMutator.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java @@ -1,7 +1,7 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; import binnie.extrabees.alveary.AlvearyLogicMutator; -import binnie.extrabees.alveary.AlvearyLogicType; +import binnie.extrabees.alveary.EnumAlvearyLogicType; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.items.SlotItemHandler; @@ -13,7 +13,7 @@ import java.awt.*; public class ContainerMutator extends AbstractAlvearyContainer { public ContainerMutator(EntityPlayer player, AlvearyLogicMutator logic) { - super(player, logic.getInventory(), AlvearyLogicType.MUTATOR, new Dimension(176, 176)); + super(player, logic.getInventory(), EnumAlvearyLogicType.MUTATOR, new Dimension(176, 176)); } @Override diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java similarity index 85% rename from src/main/java/binnie/extrabees/client/gui2/ContainerStimulator.java rename to src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java index 8b875eeb..d11e0499 100644 --- a/src/main/java/binnie/extrabees/client/gui2/ContainerStimulator.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java @@ -1,22 +1,19 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; import binnie.extrabees.alveary.AlvearyLogicStimulator; -import binnie.extrabees.alveary.AlvearyLogicType; +import binnie.extrabees.alveary.EnumAlvearyLogicType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.items.SlotItemHandler; -import java.awt.*; -import java.awt.event.ContainerListener; - /** * Created by Elec332 on 13-5-2017. */ public class ContainerStimulator extends AbstractAlvearyContainer { public ContainerStimulator(EntityPlayer player, AlvearyLogicStimulator logic) { - super(player, logic.getInventory(), AlvearyLogicType.STIMULATOR, DEFAULT_DIMENSION); + super(player, logic.getInventory(), EnumAlvearyLogicType.STIMULATOR, DEFAULT_DIMENSION); this.storage = logic.getEnergyStorage(); this.logic = logic; this.maxPower = storage.getMaxEnergyStored(); diff --git a/src/main/java/binnie/extrabees/client/gui2/GuiContainerAlvearyPart.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java similarity index 94% rename from src/main/java/binnie/extrabees/client/gui2/GuiContainerAlvearyPart.java rename to src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java index f42aa806..8f6aaa22 100644 --- a/src/main/java/binnie/extrabees/client/gui2/GuiContainerAlvearyPart.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java @@ -1,6 +1,5 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; -import binnie.extrabees.utils.ExtraBeesResourceLocation; import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/binnie/extrabees/client/gui2/GuiContainerMutator.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java similarity index 97% rename from src/main/java/binnie/extrabees/client/gui2/GuiContainerMutator.java rename to src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java index 16b0dee9..8cafbfee 100644 --- a/src/main/java/binnie/extrabees/client/gui2/GuiContainerMutator.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; import binnie.extrabees.utils.AlvearyMutationHandler; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extrabees/client/gui2/GuiContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java similarity index 96% rename from src/main/java/binnie/extrabees/client/gui2/GuiContainerStimulator.java rename to src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java index cc226683..2bcee005 100644 --- a/src/main/java/binnie/extrabees/client/gui2/GuiContainerStimulator.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerStimulator.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui2; +package binnie.extrabees.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java index 7aee2d24..0df486e0 100644 --- a/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -7,7 +7,6 @@ import binnie.extrabees.blocks.BlockEctoplasm; import binnie.extrabees.blocks.BlockExtraBeeHive; import binnie.extrabees.blocks.type.EnumHiveType; import binnie.extrabees.genetics.ExtraBeesSpecies; -import binnie.extrabees.items.ItemBeehive; import binnie.extrabees.utils.HiveDrop; import binnie.extrabees.utils.Utils; import binnie.extrabees.utils.config.ConfigurationMain; diff --git a/src/main/java/binnie/extrabees/init/ItemRegister.java b/src/main/java/binnie/extrabees/init/ItemRegister.java index 87b90877..fb92ea12 100644 --- a/src/main/java/binnie/extrabees/init/ItemRegister.java +++ b/src/main/java/binnie/extrabees/init/ItemRegister.java @@ -1,8 +1,8 @@ package binnie.extrabees.init; import binnie.extrabees.ExtraBees; -import binnie.extrabees.alveary.AlvearyLogicType; import binnie.extrabees.alveary.BlockAlveary; +import binnie.extrabees.alveary.EnumAlvearyLogicType; import binnie.extrabees.blocks.type.EnumHiveType; import binnie.extrabees.items.*; import binnie.extrabees.items.types.EnumHiveFrame; @@ -47,7 +47,7 @@ public final class ItemRegister { } }.setRegistryName(ExtraBees.alveary.getRegistryName())); - for (int j = 0; j < AlvearyLogicType.VALUES.length; j++) { + for (int j = 0; j < EnumAlvearyLogicType.VALUES.length; j++) { ExtraBees.proxy.registerModel(i, j); } i = GameRegistry.register(new ItemBeehive(ExtraBees.hive)); diff --git a/src/main/java/binnie/extrabees/init/RecipeRegister.java b/src/main/java/binnie/extrabees/init/RecipeRegister.java index 58164c6e..a7325569 100644 --- a/src/main/java/binnie/extrabees/init/RecipeRegister.java +++ b/src/main/java/binnie/extrabees/init/RecipeRegister.java @@ -1,10 +1,11 @@ package binnie.extrabees.init; import binnie.extrabees.ExtraBees; +import binnie.extrabees.alveary.EnumAlvearyLogicType; import binnie.extrabees.circuit.AlvearySimulatorCircuitType; -import binnie.extrabees.items.types.*; import binnie.extrabees.circuit.BinnieCircuitLayout; import binnie.extrabees.circuit.BinnieCircuitSocketType; +import binnie.extrabees.items.types.*; import binnie.extrabees.utils.Utils; import forestry.api.circuits.ICircuitLayout; import forestry.api.recipes.RecipeManagers; @@ -47,19 +48,23 @@ public final class RecipeRegister { Item thermionicTubes = PluginCore.getItems().tubes; Item chipsets = PluginCore.getItems().circuitboards; - //GameRegistry.addRecipe(AlvearyMachine.Mutator.get(1), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); - //GameRegistry.addRecipe(AlvearyMachine.Frame.get(1), "iii", "tat", " t ", 'i', Items.IRON_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - //GameRegistry.addRecipe(AlvearyMachine.RainShield.get(1), " b ", "bab", "t t", 'b', Items.BRICK, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - //GameRegistry.addRecipe(AlvearyMachine.Lighting.get(1), "iii", "iai", " t ", 'i', Items.GLOWSTONE_DUST, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - //GameRegistry.addRecipe(AlvearyMachine.Stimulator.get(1), "kik", "iai", " t ", 'i', Items.GOLD_NUGGET, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4), 'k', new ItemStack(chipsets, 1, 2)); - //GameRegistry.addRecipe(AlvearyMachine.Hatchery.get(1), "i i", " a ", "iti", 'i', Blocks.GLASS_PANE, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); - //GameRegistry.addRecipe(new ShapedOreRecipe(AlvearyMachine.Transmission.get(1), " t ", "tat", " t ", 'a', alveary, 't', "gearTin")); + GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.MUTATOR), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); + GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.FRAME), "iii", "tat", " t ", 'i', Items.IRON_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.RAINSHIELD), " b ", "bab", "t t", 'b', Items.BRICK, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.LIGHTING), "iii", "iai", " t ", 'i', Items.GLOWSTONE_DUST, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.STIMULATOR), "kik", "iai", " t ", 'i', Items.GOLD_NUGGET, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4), 'k', new ItemStack(chipsets, 1, 2)); + GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.HATCHERY), "i i", " a ", "iti", 'i', Blocks.GLASS_PANE, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); + GameRegistry.addRecipe(new ShapedOreRecipe(getAlvearyPart(EnumAlvearyLogicType.TRANSMISSION), " t ", "tat", " t ", 'a', alveary, 't', "gearTin")); ICircuitLayout stimulatorLayout = new BinnieCircuitLayout("Stimulator", BinnieCircuitSocketType.STIMULATOR); for (final AlvearySimulatorCircuitType type : AlvearySimulatorCircuitType.values()) { type.createCircuit(stimulatorLayout); } } + private static ItemStack getAlvearyPart(EnumAlvearyLogicType type){ + return new ItemStack(ExtraBees.alveary, 1, type.ordinal()); + } + private static void addForestryRecipes(){ RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java index ad42d3f8..6bfcc23f 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesClientProxy.java @@ -1,21 +1,18 @@ package binnie.extrabees.proxy; import binnie.extrabees.ExtraBees; -import binnie.extrabees.alveary.AlvearyLogicType; -import binnie.extrabees.blocks.type.EnumHiveType; import binnie.extrabees.utils.ExtraBeesResourceLocation; import com.google.common.collect.ImmutableList; import forestry.core.models.BlankModel; import forestry.core.models.ModelManager; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.*; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; import net.minecraft.world.World; diff --git a/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java b/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java index 22433c5b..235797d0 100644 --- a/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java +++ b/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java @@ -21,7 +21,7 @@ public class AlvearyMutationHandler { private static final List> MUTATIONS = new ArrayList<>(); public static boolean isMutationItem(final ItemStack item) { - return getMutationMult(item) > 0.0f; + return getMutationMult(item) > 1.0f; } public static float getMutationMult(final ItemStack item) {