diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java
index c275fe9f..c5afb45b 100644
--- a/src/main/java/crazypants/enderio/ClientProxy.java
+++ b/src/main/java/crazypants/enderio/ClientProxy.java
@@ -103,8 +103,6 @@ import crazypants.enderio.machine.spawner.BrokenSpawnerRenderer;
import crazypants.enderio.machine.spawnguard.BlockSpawnGuard;
import crazypants.enderio.machine.spawnguard.SpawnGuardRenderer;
import crazypants.enderio.machine.spawnguard.TileSpawnGuard;
-import crazypants.enderio.machine.still.BlockVat;
-import crazypants.enderio.machine.still.VatRenderer;
import crazypants.enderio.machine.tank.TankFluidRenderer;
import crazypants.enderio.machine.tank.TankItemRenderer;
import crazypants.enderio.machine.tank.TileTank;
@@ -112,6 +110,8 @@ import crazypants.enderio.machine.transceiver.TileTransceiver;
import crazypants.enderio.machine.transceiver.render.TransceiverRenderer;
import crazypants.enderio.machine.vacuum.BlockVacuumChest;
import crazypants.enderio.machine.vacuum.VacuumChestRenderer;
+import crazypants.enderio.machine.vat.BlockVat;
+import crazypants.enderio.machine.vat.VatRenderer;
import crazypants.enderio.machine.xp.BlockExperienceObelisk;
import crazypants.enderio.machine.xp.ExperienceObliskRenderer;
import crazypants.enderio.machine.xp.TileExperienceOblisk;
diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java
index e7ffb50f..f1571606 100644
--- a/src/main/java/crazypants/enderio/EnderIO.java
+++ b/src/main/java/crazypants/enderio/EnderIO.java
@@ -53,6 +53,7 @@ import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
import crazypants.enderio.conduit.me.ItemMEConduit;
import crazypants.enderio.conduit.power.ItemPowerConduit;
import crazypants.enderio.conduit.redstone.ConduitBundledRedstoneProvider;
+import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
import crazypants.enderio.conduit.redstone.ItemRedstoneConduit;
import crazypants.enderio.config.Config;
import crazypants.enderio.enchantment.Enchantments;
@@ -119,12 +120,12 @@ import crazypants.enderio.machine.spawner.BlockPoweredSpawner;
import crazypants.enderio.machine.spawner.ItemBrokenSpawner;
import crazypants.enderio.machine.spawner.PoweredSpawnerConfig;
import crazypants.enderio.machine.spawnguard.BlockSpawnGuard;
-import crazypants.enderio.machine.still.BlockVat;
-import crazypants.enderio.machine.still.VatRecipeManager;
import crazypants.enderio.machine.tank.BlockTank;
import crazypants.enderio.machine.transceiver.BlockTransceiver;
import crazypants.enderio.machine.transceiver.ServerChannelRegister;
import crazypants.enderio.machine.vacuum.BlockVacuumChest;
+import crazypants.enderio.machine.vat.BlockVat;
+import crazypants.enderio.machine.vat.VatRecipeManager;
import crazypants.enderio.machine.wireless.BlockWirelessCharger;
import crazypants.enderio.machine.xp.BlockExperienceObelisk;
import crazypants.enderio.machine.xp.ItemXpTransfer;
@@ -654,11 +655,11 @@ public class EnderIO {
if(msg.isStringMessage()) {
String value = msg.getStringValue();
if(IMC.VAT_RECIPE.equals(key)) {
- VatRecipeManager.getInstance().addCustumRecipes(value);
+ VatRecipeManager.getInstance().addCustomRecipes(value);
} else if(IMC.SAG_RECIPE.equals(key)) {
CrusherRecipeManager.getInstance().addCustomRecipes(value);
} else if(IMC.ALLOY_RECIPE.equals(key)) {
- AlloyRecipeManager.getInstance().addCustumRecipes(value);
+ AlloyRecipeManager.getInstance().addCustomRecipes(value);
} else if(IMC.POWERED_SPAWNER_BLACKLIST_ADD.equals(key)) {
PoweredSpawnerConfig.getInstance().addToBlacklist(value);
} else if(IMC.TELEPORT_BLACKLIST_ADD.equals(key)) {
@@ -668,7 +669,7 @@ public class EnderIO {
} else if(IMC.ENCHANTER_RECIPE.equals(key)) {
EnchanterRecipeManager.getInstance().addCustomRecipes(value);
} else if(IMC.SLINE_N_SPLICE_RECIPE.equals(key)) {
- SliceAndSpliceRecipeManager.getInstance().addCustumRecipes(key);
+ SliceAndSpliceRecipeManager.getInstance().addCustomRecipes(key);
}
} else if(msg.isNBTMessage()) {
if(IMC.SOUL_BINDER_RECIPE.equals(key)) {
@@ -679,6 +680,8 @@ public class EnderIO {
FluidFuelRegister.instance.addFuel(msg.getNBTValue());
} else if(IMC.FLUID_COOLANT_ADD.equals(key)) {
FluidFuelRegister.instance.addCoolant(msg.getNBTValue());
+ } else if(IMC.REDSTONE_CONNECTABLE_ADD.equals(key)) {
+ InsulatedRedstoneConduit.addConnectableBlock(msg.getNBTValue());
}
} else if(msg.isItemStackMessage()) {
if(IMC.PAINTER_WHITELIST_ADD.equals(key)) {
diff --git a/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java b/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java
index 704f9d3b..6d4e4275 100644
--- a/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java
+++ b/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java
@@ -4,6 +4,6 @@ public final class EnderIOAPIProps {
private EnderIOAPIProps() {}
- public static final String VERSION = "0.0.1";
+ public static final String VERSION = "0.0.2";
}
diff --git a/src/main/java/crazypants/enderio/api/IMC.java b/src/main/java/crazypants/enderio/api/IMC.java
index 5648a5d3..d157e02a 100644
--- a/src/main/java/crazypants/enderio/api/IMC.java
+++ b/src/main/java/crazypants/enderio/api/IMC.java
@@ -1,5 +1,6 @@
package crazypants.enderio.api;
+import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
import crazypants.enderio.fluid.FluidFuelRegister;
import crazypants.enderio.item.ItemSoulVessel;
import crazypants.enderio.machine.alloy.AlloyRecipeManager;
@@ -9,7 +10,7 @@ import crazypants.enderio.machine.painter.PaintSourceValidator;
import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager;
import crazypants.enderio.machine.soul.SoulBinderRecipeManager;
import crazypants.enderio.machine.spawner.PoweredSpawnerConfig;
-import crazypants.enderio.machine.still.VatRecipeManager;
+import crazypants.enderio.machine.vat.VatRecipeManager;
import crazypants.enderio.teleport.TravelController;
/**
@@ -21,21 +22,21 @@ public final class IMC {
/**
* Key for a string message to add Vat recipes. Calls
- * {@link VatRecipeManager#addCustumRecipes(String)} with the string value of
+ * {@link VatRecipeManager#addCustomRecipes(String)} with the string value of
* the message.
*/
public static final String VAT_RECIPE = "recipe:vat";
/**
* Key for a string message to add SAGMill recipes. Calls
- * {@link CrusherRecipeManager#addCustumRecipes(String)} with the string value
+ * {@link CrusherRecipeManager#addCustomRecipes(String)} with the string value
* of the message.
*/
public static final String SAG_RECIPE = "recipe:sagmill";
/**
* Key for a string message to add Alloy Smelter recipes. Calls
- * {@link AlloyRecipeManager#addCustumRecipes(String)} with the string value
+ * {@link AlloyRecipeManager#addCustomRecipes(String)} with the string value
* of the message.
*/
public static final String ALLOY_RECIPE = "recipe:alloysmelter";
@@ -50,7 +51,7 @@ public final class IMC {
/**
* Key for a string message to add Slice'N'Splice recipes. Calls
- * {@link SliceAndSpliceRecipeManager#addCustumRecipes(String)} with the
+ * {@link SliceAndSpliceRecipeManager#addCustomRecipes(String)} with the
* string value of the message.
*/
public static final String SLINE_N_SPLICE_RECIPE = "recipe:slicensplice";
@@ -121,6 +122,14 @@ public final class IMC {
*/
public static final String TELEPORT_BLACKLIST_ADD = "teleport:blacklist:add";
+ /**
+ * Key for an NBT message to register a block or tile entity as connectable to
+ * insulated redstone conduits. Calls
+ * {@link InsulatedRedstoneConduit#addConnectableBlock(net.minecraft.nbt.NBTTagCompound)}
+ * with the NBT value of the message.
+ */
+ public static final String REDSTONE_CONNECTABLE_ADD = "redstone:connectable:add";
+
private IMC() {
}
diff --git a/src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java b/src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java
new file mode 100644
index 00000000..d64b9c0d
--- /dev/null
+++ b/src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java
@@ -0,0 +1,16 @@
+package crazypants.enderio.api.redstone;
+
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+/**
+ * Implement this on your Block or TileEntity to control whether insulated
+ * restone conduits will automatically connect to your block.
+ *
+ * Implementing on both is not recommended and will likely not work as expected.
+ */
+public interface IRedstoneConnectable {
+
+ boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from);
+
+}
diff --git a/src/main/java/crazypants/enderio/api/redstone/package-info.java b/src/main/java/crazypants/enderio/api/redstone/package-info.java
new file mode 100644
index 00000000..3511e2b5
--- /dev/null
+++ b/src/main/java/crazypants/enderio/api/redstone/package-info.java
@@ -0,0 +1,6 @@
+@API(apiVersion = EnderIOAPIProps.VERSION, owner = "EnderIO", provides = "EnderIOAPI|Redstone")
+package crazypants.enderio.api.redstone;
+
+import cpw.mods.fml.common.API;
+import crazypants.enderio.api.EnderIOAPIProps;
+
diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java
index 67c99d28..b9093130 100644
--- a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java
+++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java
@@ -137,6 +137,7 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements I
return super.colorMultiplier(world, x, y, z);
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item arg0, CreativeTabs arg1, List items) {
diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java
index 1ba5944c..f736f9a1 100644
--- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java
+++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java
@@ -24,6 +24,8 @@ import cofh.api.tileentity.IRedstoneControl;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
+import crazypants.enderio.Log;
+import crazypants.enderio.api.redstone.IRedstoneConnectable;
import crazypants.enderio.conduit.ConduitUtil;
import crazypants.enderio.conduit.ConnectionMode;
import crazypants.enderio.conduit.IConduit;
@@ -31,8 +33,6 @@ import crazypants.enderio.conduit.RaytraceResult;
import crazypants.enderio.conduit.geom.CollidableCache.CacheKey;
import crazypants.enderio.conduit.geom.CollidableComponent;
import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
-import crazypants.enderio.machine.AbstractMachineEntity;
-import crazypants.enderio.machine.RedstoneControlMode;
import crazypants.enderio.tool.ToolUtil;
import crazypants.render.BoundingBox;
import crazypants.render.IconUtil;
@@ -62,13 +62,71 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula
});
}
- private static List VANILLA_CONECTABLES = Arrays.asList(Blocks.redstone_lamp, Blocks.redstone_torch, Blocks.redstone_wire, Blocks.redstone_block,
+ private static final List CONECTABLE_BLOCKS = Arrays.asList(Blocks.redstone_lamp, Blocks.redstone_torch, Blocks.redstone_wire, Blocks.redstone_block,
Blocks.dispenser, Blocks.lever, Blocks.wooden_button, Blocks.stone_button, Blocks.wooden_pressure_plate, Blocks.stone_pressure_plate,
Blocks.dropper, Blocks.daylight_detector, Blocks.command_block, Blocks.golden_rail, Blocks.trapped_chest);
private static Map, Boolean> CONNECTABLE_CLASSES = null;
+ public static void addConnectableBlock(NBTTagCompound nbt) {
+ if(nbt == null) {
+ Log.warn("InsulatedRedstoneConduit: An attempt was made to register a redstone connectable using a null NBT");
+ return;
+ }
+ boolean connectable = true;
+ if(nbt.hasKey("isConnectable")) {
+ connectable = nbt.getBoolean("isConnectable");
+ }
+ String className = nbt.getString("className");
+ addConnectableInterface(className, connectable);
+ }
+
+ public static void addConnectableBlock(Block block) {
+ if(block == null) {
+ Log.warn("InsulatedRedstoneConduit: An attempt was made to register a redstone connectable using a null Block");
+ return;
+ }
+ CONECTABLE_BLOCKS.add(block);
+ }
+
+ public static void addConnectableInterface(String className, boolean connectable) {
+ try {
+ Class> clz = Class.forName(className);
+ addConnectableInterface(clz, connectable);
+ } catch (Exception e) {
+ Log.warn("InsulatedRedstoneConduit: An attempt was made to register " + className + " as connectable but it could not be loaded");
+ }
+ }
+
+ public static void addConnectableInterface(Class> clazz, boolean connectable) {
+ if(clazz == null) {
+ Log.warn("InsulatedRedstoneConduit: An attempt was made to register a null class as a connectable");
+ return;
+ }
+ getConnectableInterfaces().put(clazz, connectable);
+ }
+
+ private static Map, Boolean> getConnectableInterfaces() {
+ if(CONNECTABLE_CLASSES == null) {
+ CONNECTABLE_CLASSES = new HashMap, Boolean>();
+ CONNECTABLE_CLASSES.put(IRedstoneControl.class, false);
+ try {
+ Class> conInterface = Class.forName("powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection");
+ CONNECTABLE_CLASSES.put(conInterface, false);
+ } catch (Throwable e) {
+ //NO-OP
+ }
+ try {
+ Class> ccInterface = Class.forName("dan200.computercraft.shared.computer.blocks.IComputerTile");
+ CONNECTABLE_CLASSES.put(ccInterface, true);
+ } catch (Throwable e) {
+ //NO-OP
+ }
+ }
+ return CONNECTABLE_CLASSES;
+ }
+
private Map forcedConnections = new HashMap();
private Map signalColors = new HashMap();
@@ -281,31 +339,26 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula
}
//Not set so figure it out
BlockCoord loc = getLocation().getLocation(direction);
- Block block = getBundle().getEntity().getWorldObj().getBlock(loc.x, loc.y, loc.z);
-
- if(VANILLA_CONECTABLES.contains(block)) {
- return true;
- }
-
- if(block == EnderIO.blockConduitBundle) {
- return false;
- }
-
- if(block == EnderIO.blockCapacitorBank) {
- return true;
- }
-
- if(block == EnderIO.blockElectricLight) {
- return true;
- }
-
- if(block == null) {
- return false;
- }
-
World world = getBundle().getEntity().getWorldObj();
+ Block block = world.getBlock(loc.x, loc.y, loc.z);
TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z);
+ if(block == null || block == EnderIO.blockConduitBundle) {
+ return false;
+ }
+
+ if(CONECTABLE_BLOCKS.contains(block)) {
+ return true;
+ }
+
+ if (block instanceof IRedstoneConnectable) {
+ return ((IRedstoneConnectable) block).shouldRedstoneConduitConnect(world, loc.x, loc.y, loc.z, direction);
+ }
+
+ if (te instanceof IRedstoneConnectable) {
+ return ((IRedstoneConnectable) te).shouldRedstoneConduitConnect(world, loc.x, loc.y, loc.z, direction);
+ }
+
Map, Boolean> connectableInterfaces = getConnectableInterfaces();
for(Class> connectable : connectableInterfaces.keySet()) {
if((te != null && connectable.isAssignableFrom(te.getClass())) || (connectable.isAssignableFrom(block.getClass()))) {
@@ -316,27 +369,6 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula
return false;
}
- private static Map, Boolean> getConnectableInterfaces() {
- if(CONNECTABLE_CLASSES == null) {
- CONNECTABLE_CLASSES = new HashMap, Boolean>();
- CONNECTABLE_CLASSES.put(IRedstoneControl.class, false);
- CONNECTABLE_CLASSES.put(AbstractMachineEntity.class, false);
- try{
- Class> conInterface = Class.forName("powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection");
- CONNECTABLE_CLASSES.put(conInterface, false);
- } catch(Throwable e) {
- //NO-OP
- }
- try{
- Class> ccInterface = Class.forName("dan200.computercraft.shared.computer.blocks.IComputerTile");
- CONNECTABLE_CLASSES.put(ccInterface, true);
- } catch(Throwable e) {
- //NO-OP
- }
- }
- return CONNECTABLE_CLASSES;
- }
-
@Override
public boolean isSpecialConnection(ForgeDirection dir){
BlockCoord loc = getLocation().getLocation(dir);
diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java
index 14e7eeec..de728aa4 100644
--- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java
+++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java
@@ -14,20 +14,22 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.TileEntityEio;
+import crazypants.enderio.api.redstone.IRedstoneConnectable;
import crazypants.enderio.config.Config;
import crazypants.util.BlockCoord;
import crazypants.util.InventoryWrapper;
import crazypants.util.ItemUtil;
import crazypants.util.Lang;
-public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IMachine, IRedstoneModeControlable,
- IIoConfigurable {
+public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IMachine, IRedstoneModeControlable,
+ IRedstoneConnectable, IIoConfigurable {
public short facing;
@@ -64,7 +66,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
public AbstractMachineEntity(SlotDefinition slotDefinition) {
this.slotDefinition = slotDefinition;
facing = 3;
-
+
inventory = new ItemStack[slotDefinition.getNumSlots()];
redstoneControlMode = RedstoneControlMode.IGNORE;
soundRes = getSoundFor(getSoundName());
@@ -102,7 +104,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
faceModes.put(faceHit, mode);
forceClientUpdate = true;
notifyNeighbours = true;
-
+
updateBlock();
}
@@ -224,8 +226,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
return result;
}
-
-
// --- Process Loop
// --------------------------------------------------------------------------
@@ -275,8 +275,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
requiresClientSync |= processTasks(redstoneCheckPassed);
-
-
if(requiresClientSync) {
// this will cause 'getPacketDescription()' to be called and its result
@@ -607,8 +605,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
}
}
-
-
@Override
public ItemStack getStackInSlotOnClosing(int i) {
return null;
@@ -674,5 +670,11 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
public void onNeighborBlockChange(Block blockId) {
redstoneStateDirty = true;
}
-
+
+ /* IRedstoneConnectable */
+
+ @Override
+ public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) {
+ return true;
+ }
}
diff --git a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java
index b57063a1..6ecbd66d 100644
--- a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java
+++ b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java
@@ -104,8 +104,10 @@ public class VanillaSmeltingRecipe implements IMachineRecipe {
if(output == null) {
return new ResultStack[0];
}
+ int stackSize = output.stackSize;
output = OreDictionaryPreferences.instance.getPreferred(output);
ItemStack result = output.copy();
+ result.stackSize = stackSize;
result.stackSize = result.stackSize * getNumInputs(inputs);
return new ResultStack[] { new ResultStack(result) };
}
diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java
index acbe22e3..68de5b30 100644
--- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java
+++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java
@@ -30,6 +30,7 @@ import crazypants.enderio.BlockEio;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
+import crazypants.enderio.api.redstone.IRedstoneConnectable;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
import crazypants.enderio.gui.TooltipAddera;
import crazypants.enderio.machine.IoMode;
@@ -52,7 +53,7 @@ import crazypants.util.Lang;
import crazypants.util.Util;
import crazypants.vecmath.Vector3d;
-public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider {
+public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider, IRedstoneConnectable {
public static int renderId = -1;
@@ -574,4 +575,11 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool
public int getDefaultDisplayMask(World world, int x, int y, int z) {
return IWailaInfoProvider.BIT_DETAILED;
}
+
+ /* IRedstoneConnectable */
+
+ @Override
+ public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) {
+ return true;
+ }
}
diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java
index 5d1f6fa7..0a340147 100644
--- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java
+++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java
@@ -49,12 +49,14 @@ public class GuiFarmStation extends GuiPoweredMachineBase {
@Override
protected void drawForegroundImpl(int mouseX, int mouseY) {
super.drawForegroundImpl(mouseX, mouseY);
-
+
if(inventorySlots.inventorySlots.size() >= farm.maxSupSlot && !isConfigOverlayEnabled()) {
for (int i : farm.lockedSlots) {
- Slot slot = inventorySlots.getSlot(i);
- GL11.glEnable(GL11.GL_BLEND);
- RenderUtil.renderQuad2D(slot.xDisplayPosition, slot.yDisplayPosition, 0, 16, 16, new Vector4f(0, 0, 0, 0.5));
+ if (i < inventorySlots.inventorySlots.size()) { // hack to allow old broken farms to be opened
+ Slot slot = inventorySlots.getSlot(i);
+ GL11.glEnable(GL11.GL_BLEND);
+ RenderUtil.renderQuad2D(slot.xDisplayPosition, slot.yDisplayPosition, 0, 16, 16, new Vector4f(0, 0, 0, 0.5));
+ }
}
}
}
@@ -83,7 +85,10 @@ public class GuiFarmStation extends GuiPoweredMachineBase {
@Override
protected void actionPerformed(GuiButton b) {
- farm.toggleLockedState(b.id);
+ if (b instanceof ToggleButtonEIO) {
+ farm.toggleLockedState(b.id);
+ }
+ super.actionPerformed(b);
}
@Override
diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java
index 30b5ee0c..101f4ef6 100644
--- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java
+++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java
@@ -20,11 +20,12 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.BlockEio;
import crazypants.enderio.ModObject;
+import crazypants.enderio.api.redstone.IRedstoneConnectable;
import crazypants.enderio.api.tool.ITool;
import crazypants.enderio.tool.ToolUtil;
import crazypants.vecmath.Vector3f;
-public class BlockElectricLight extends BlockEio {
+public class BlockElectricLight extends BlockEio implements IRedstoneConnectable {
static final float BLOCK_HEIGHT = 0.05f;
static final float BLOCK_WIDTH = 0.3f;
@@ -268,4 +269,11 @@ public class BlockElectricLight extends BlockEio {
}
return new ItemStack(this);
}
+
+ /* IRedstoneConnectable */
+
+ @Override
+ public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) {
+ return true;
+ }
}
diff --git a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java
index ad43a8c1..9429e03a 100644
--- a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java
+++ b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java
@@ -41,7 +41,7 @@ public class ManyToOneRecipeManager {
return null;
}
- public void addCustumRecipes(String xmlDef) {
+ public void addCustomRecipes(String xmlDef) {
RecipeConfig config;
CustomTagHandler tagHandler = createCustomTagHandler();
try {
diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java
index 175660ea..fa959bea 100644
--- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java
+++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java
@@ -27,12 +27,13 @@ import crazypants.enderio.machine.SlotDefinition;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.power.BasicCapacitor;
import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.IInternalPowerHandler;
import crazypants.enderio.power.PowerDistributor;
import crazypants.enderio.rail.EnderRailController;
import crazypants.util.FluidUtil;
import crazypants.util.ItemUtil;
-public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluidHandler, IItemBuffer {
+public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluidHandler, IItemBuffer, IInternalPowerHandler {
//Power will only be sent to other transceivers is the buffer is higher than this amount
private static final float MIN_POWER_TO_SEND = 0.5f;
@@ -338,6 +339,11 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
//---------------- Power Handling
+ @Override
+ public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
+ return 0;
+ }
+
private void processPower() {
List sendTo = getSendChannels(ChannelType.POWER);
int canSend = getMaxSendableEnergy();
diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java
similarity index 99%
rename from src/main/java/crazypants/enderio/machine/still/BlockVat.java
rename to src/main/java/crazypants/enderio/machine/vat/BlockVat.java
index b076734d..b6d64776 100644
--- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java
+++ b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import java.util.Random;
diff --git a/src/main/java/crazypants/enderio/machine/still/ContainerVat.java b/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java
similarity index 95%
rename from src/main/java/crazypants/enderio/machine/still/ContainerVat.java
rename to src/main/java/crazypants/enderio/machine/vat/ContainerVat.java
index 07141e57..2c870e87 100644
--- a/src/main/java/crazypants/enderio/machine/still/ContainerVat.java
+++ b/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot;
diff --git a/src/main/java/crazypants/enderio/machine/still/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java
similarity index 99%
rename from src/main/java/crazypants/enderio/machine/still/GuiVat.java
rename to src/main/java/crazypants/enderio/machine/vat/GuiVat.java
index 40250167..6f249989 100644
--- a/src/main/java/crazypants/enderio/machine/still/GuiVat.java
+++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import java.awt.Color;
import java.awt.Rectangle;
diff --git a/src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java
similarity index 96%
rename from src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java
rename to src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java
index 93432370..2d85bdd0 100644
--- a/src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java
+++ b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fluids.FluidTank;
diff --git a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java
similarity index 98%
rename from src/main/java/crazypants/enderio/machine/still/PacketTanks.java
rename to src/main/java/crazypants/enderio/machine/vat/PacketTanks.java
index 81a52941..1cabb95a 100644
--- a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java
+++ b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/crazypants/enderio/machine/still/PacketVatProgress.java b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java
similarity index 98%
rename from src/main/java/crazypants/enderio/machine/still/PacketVatProgress.java
rename to src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java
index 5ab11ba5..6be33b1d 100644
--- a/src/main/java/crazypants/enderio/machine/still/PacketVatProgress.java
+++ b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fluids.FluidRegistry;
diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/vat/TileVat.java
similarity index 99%
rename from src/main/java/crazypants/enderio/machine/still/TileVat.java
rename to src/main/java/crazypants/enderio/machine/vat/TileVat.java
index a02b2cb9..a361664e 100644
--- a/src/main/java/crazypants/enderio/machine/still/TileVat.java
+++ b/src/main/java/crazypants/enderio/machine/vat/TileVat.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java
similarity index 97%
rename from src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java
rename to src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java
index 7373cc2a..5ff7b0cf 100644
--- a/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java
+++ b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java
similarity index 99%
rename from src/main/java/crazypants/enderio/machine/still/VatRecipe.java
rename to src/main/java/crazypants/enderio/machine/vat/VatRecipe.java
index 20701ffe..ddccd02d 100644
--- a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java
+++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java
similarity index 97%
rename from src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java
rename to src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java
index c390ea66..4e1b7e53 100644
--- a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java
+++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +44,7 @@ public class VatRecipeManager {
}
- public void addCustumRecipes(String xmlDef) {
+ public void addCustomRecipes(String xmlDef) {
RecipeConfig config;
try {
config = RecipeConfigParser.parse(xmlDef, null);
diff --git a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java b/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java
similarity index 99%
rename from src/main/java/crazypants/enderio/machine/still/VatRenderer.java
rename to src/main/java/crazypants/enderio/machine/vat/VatRenderer.java
index ec58cd31..174be697 100644
--- a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java
+++ b/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java
@@ -1,4 +1,4 @@
-package crazypants.enderio.machine.still;
+package crazypants.enderio.machine.vat;
import java.util.List;
diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java
index 02901310..520489fe 100644
--- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java
+++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java
@@ -22,8 +22,8 @@ import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.enderio.machine.recipe.IRecipe;
import crazypants.enderio.machine.recipe.RecipeInput;
-import crazypants.enderio.machine.still.GuiVat;
-import crazypants.enderio.machine.still.VatRecipeManager;
+import crazypants.enderio.machine.vat.GuiVat;
+import crazypants.enderio.machine.vat.VatRecipeManager;
import crazypants.render.RenderUtil;
import crazypants.util.FluidUtil;