Merge remote-tracking branch 'upstream/1.11' into feature-CTM

This commit is contained in:
Tom Elfring committed 2017-08-01 19:52:30 +02:00
commit 1de4ebf67a
310 files changed
+367 -7742

No files matched your search

@@ -212,6 +212,11 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
transmittersAdded.add(transmitter);
}
for(IGridTransmitter<A, N> transmitter : net.transmittersToAdd)
{
transmittersToAdd.add(transmitter);
}
possibleAcceptors.putAll(net.possibleAcceptors);
for(Entry<Coord4D, EnumSet<EnumFacing>> entry : net.acceptorDirections.entrySet())
@@ -394,7 +399,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
public void queueClientUpdate(Collection<IGridTransmitter<A, N>> newTransmitters)
{
transmittersAdded.addAll(newTransmitters);
updateDelay = 3;
updateDelay = 5;
}
public static class TransmittersAddedEvent extends Event
@@ -246,10 +246,10 @@ public class TransmitterNetworkRegistry
public void start()
{
iterate(startPoint.coord(), null);
iterate(startPoint.coord());
}
public void iterate(Coord4D from, EnumFacing fromDirection)
public void iterate(Coord4D from)
{
if(iterated.contains(from))
{
@@ -269,14 +269,11 @@ public class TransmitterNetworkRegistry
for(EnumFacing direction : EnumFacing.VALUES)
{
if(direction != fromDirection)
Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction);
if(directionCoord != null && !iterated.contains(directionCoord))
{
Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction);
if(!(directionCoord == null || iterated.contains(directionCoord)))
{
iterate(directionCoord, direction.getOpposite());
}
iterate(directionCoord);
}
}
}
@@ -161,7 +161,8 @@ public class RenderResizableCuboid {
wr.begin(GL11.GL_QUADS, shadeTypes.vertexFormat);
for (EnumFacing face : EnumFacing.values()) {
renderCuboidFace(wr, face, sprites, flips, textureStart, textureSize, size, textureOffset, shadeTypes, formula, faceFormula, world);
if(cube.shouldSideRender(face))
renderCuboidFace(wr, face, sprites, flips, textureStart, textureSize, size, textureOffset, shadeTypes, formula, faceFormula, world);
}
tess.draw();
@@ -19,37 +19,67 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
import java.util.Arrays;
@SideOnly(Side.CLIENT)
public class RenderThermalEvaporationController extends TileEntitySpecialRenderer<TileEntityThermalEvaporationController>
{
private static Map<SalinationRenderData, HashMap<Fluid, DisplayInteger[]>> cachedCenterFluids = new HashMap<SalinationRenderData, HashMap<Fluid, DisplayInteger[]>>();
private static HashMap<Fluid, DisplayInteger[]> cachedCenterFluids = new HashMap<Fluid, DisplayInteger[]>();
private static final int LEVELS = 16;
private static final int ALL_LEVELS = LEVELS + 2;
private static final int RING_INDEX = ALL_LEVELS-2;
private static final int CONCAVE_INDEX = ALL_LEVELS-1;
@Override
public void renderTileEntityAt(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage)
{
if(tileEntity.structured && tileEntity.inputTank.getFluid() != null)
{
SalinationRenderData data = new SalinationRenderData();
data.height = tileEntity.height-2;
data.side = tileEntity.facing;
bindTexture(MekanismRenderer.getBlocksTexture());
if(data.height >= 1 && tileEntity.inputTank.getCapacity() > 0)
if(tileEntity.height-2 >= 1 && tileEntity.inputTank.getCapacity() > 0)
{
push();
FluidRenderer.translateToOrigin(tileEntity.getRenderLocation());
MekanismRenderer.glowOn(tileEntity.inputTank.getFluid().getFluid().getLuminosity());
DisplayInteger[] displayList = getListAndRender(tileEntity.inputTank.getFluid().getFluid());
DisplayInteger[] displayList = getListAndRender(data, tileEntity.inputTank.getFluid().getFluid());
float levels = Math.min(((float)tileEntity.inputTank.getFluidAmount()/tileEntity.inputTank.getCapacity()), 1);
levels *= (tileEntity.height-2);
float tankFillPercentage = Math.min(((float)tileEntity.inputTank.getFluidAmount()/tileEntity.inputTank.getCapacity()), 1);
int partialLevels = (int)((levels-(int)levels)*16);
displayList[(int)(tankFillPercentage * ((float)getStages(data.height)-1))].render();
switch(tileEntity.facing)
{
case SOUTH:
GlStateManager.translate(-1, 0, -1);
break;
case EAST:
GlStateManager.translate(-1, 0, 0);
break;
case WEST:
GlStateManager.translate(0, 0, -1);
break;
default:
break;
}
GlStateManager.translate(0, 0.01, 0);
if((int)levels>0)
{
displayList[CONCAVE_INDEX].render();
GlStateManager.translate(0, 1, 0);
for(int i = 1; i < (int)levels; i++)
{
displayList[RING_INDEX].render();
GlStateManager.translate(0, 1, 0);
}
}
displayList[partialLevels].render();
MekanismRenderer.glowOff();
@@ -74,118 +104,67 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
}
@SuppressWarnings("incomplete-switch")
private DisplayInteger[] getListAndRender(SalinationRenderData data, Fluid fluid)
private DisplayInteger[] getListAndRender(Fluid fluid)
{
if(cachedCenterFluids.containsKey(data) && cachedCenterFluids.get(data).containsKey(fluid))
if(cachedCenterFluids.containsKey(fluid))
{
return cachedCenterFluids.get(data).get(fluid);
return cachedCenterFluids.get(fluid);
}
Model3D toReturn = new Model3D();
toReturn.baseBlock = Blocks.WATER;
toReturn.setTexture(MekanismRenderer.getFluidTexture(fluid, FluidType.STILL));
DisplayInteger[] displays = new DisplayInteger[ALL_LEVELS];
final int stages = getStages(data.height);
DisplayInteger[] displays = new DisplayInteger[stages];
if(cachedCenterFluids.containsKey(data))
{
cachedCenterFluids.get(data).put(fluid, displays);
}
else {
HashMap<Fluid, DisplayInteger[]> map = new HashMap<Fluid, DisplayInteger[]>();
map.put(fluid, displays);
cachedCenterFluids.put(data, map);
}
Model3D model = new Model3D();
model.baseBlock = fluid.getBlock();
model.setTexture(MekanismRenderer.getFluidTexture(fluid, FluidType.STILL));
MekanismRenderer.colorFluid(fluid);
for(int i = 0; i < stages; i++)
if(fluid.getStill() == null)
{
displays[i] = DisplayInteger.createAndStart();
if(fluid.getStill() != null)
DisplayInteger empty = DisplayInteger.createAndStart();
DisplayInteger.endList();
Arrays.fill(displays, 0, LEVELS, empty);
}
else {
model.setSideRender(EnumFacing.DOWN, false);
for(int i = 0; i < LEVELS; i++)
{
switch(data.side)
{
case NORTH:
toReturn.minX = 0 + .01;
toReturn.minY = 0 + .01;
toReturn.minZ = 0 + .01;
toReturn.maxX = 2 - .01;
toReturn.maxY = ((float)i/(float)stages)*data.height - .01;
toReturn.maxZ = 2 - .01;
break;
case SOUTH:
toReturn.minX = -1 + .01;
toReturn.minY = 0 + .01;
toReturn.minZ = -1 + .01;
toReturn.maxX = 1 - .01;
toReturn.maxY = ((float)i/(float)stages)*data.height - .01;
toReturn.maxZ = 1 - .01;
break;
case WEST:
toReturn.minX = 0 + .01;
toReturn.minY = 0 + .01;
toReturn.minZ = -1 + .01;
toReturn.maxX = 2 - .01;
toReturn.maxY = ((float)i/(float)stages)*data.height - .01;
toReturn.maxZ = 1 - .01;
break;
case EAST:
toReturn.minX = -1 + .01;
toReturn.minY = 0 + .01;
toReturn.minZ = 0 + .01;
toReturn.maxX = 1 - .01;
toReturn.maxY = ((float)i/(float)stages)*data.height - .01;
toReturn.maxZ = 2 - .01;
break;
}
MekanismRenderer.renderObject(toReturn);
displays[i] = generateLevel(i, model);
}
displays[i].endList();
model.setSideRender(EnumFacing.UP, false);
displays[RING_INDEX] = generateLevel(LEVELS-1, model);
model.setSideRender(EnumFacing.DOWN, true);
displays[CONCAVE_INDEX] = generateLevel(LEVELS-1, model);
}
MekanismRenderer.resetColor();
cachedCenterFluids.put(fluid, displays);
return displays;
}
private int getStages(int height)
private DisplayInteger generateLevel(int height, Model3D model)
{
return height*(TankUpdateProtocol.FLUID_PER_TANK/10);
}
DisplayInteger displayInteger = DisplayInteger.createAndStart();
public static class SalinationRenderData
{
public int height;
public EnumFacing side;
model.minX = 0 + .01;
model.minY = 0;
model.minZ = 0 + .01;
model.maxX = 2 - .01;
model.maxY = (float)height/(float)(LEVELS-1) + (height==0?.02:0);
model.maxZ = 2 - .01;
@Override
public int hashCode()
{
int code = 1;
code = 31 * code + height;
return code;
}
MekanismRenderer.renderObject(model);
DisplayInteger.endList();
@Override
public boolean equals(Object data)
{
return data instanceof SalinationRenderData && ((SalinationRenderData)data).height == height &&
((SalinationRenderData)data).side == side;
}
return displayInteger;
}
public static void resetDisplayInts()
{
cachedCenterFluids.clear();
}
}
}
@@ -65,37 +65,16 @@ public class VoiceClient extends Thread
Mekanism.logger.info("VoiceServer: Stopping client connection...");
try {
try {
inputThread.interrupt();
outputThread.interrupt();
} catch(Exception e) {}
try {
interrupt();
} catch(Exception e) {}
try {
inputThread.close();
outputThread.close();
} catch(Exception e) {}
try {
output.flush();
output.close();
output = null;
} catch(Exception e) {}
try {
input.close();
input = null;
} catch(Exception e) {}
try {
socket.close();
socket = null;
} catch(Exception e) {}
inputThread.interrupt();
outputThread.interrupt();
inputThread.close();
outputThread.close();
output.close();
input.close();
socket.close();
interrupt();
running = false;
} catch(Exception e) {
Mekanism.logger.error("VoiceServer: Error while stopping client connection.");
+2 -2
View File
@@ -159,7 +159,7 @@ import com.mojang.authlib.GameProfile;
* @author AidanBrady
*
*/
@Mod(modid = "mekanism", name = "Mekanism", version = "9.3.3", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
@Mod(modid = "mekanism", name = "Mekanism", version = "9.3.4", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:mcmultipart;" +
"after:jei;" +
"after:buildcraft;" +
@@ -192,7 +192,7 @@ public class Mekanism
public static Configuration configuration;
/** Mekanism version number */
public static Version versionNumber = new Version(9, 3, 3);
public static Version versionNumber = new Version(9, 3, 4);
/** MultiblockManagers for various structrures */
public static MultiblockManager<SynchronizedTankData> tankManager = new MultiblockManager<SynchronizedTankData>("dynamicTank");
@@ -5,8 +5,8 @@ import mekanism.api.IConfigCardAccess.ISpecialConfigData;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.security.ISecurityTile;
import net.minecraft.block.Block;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
@@ -18,7 +18,7 @@ import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID),
})
public interface IAdvancedBoundingBlock extends ICapabilityProvider, IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData, ISecurityTile
{
@@ -3,12 +3,10 @@ package mekanism.common.base;
import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource;
import ic2.api.tile.IEnergyStorage;
import java.util.EnumSet;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyOutputter;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.integration.ic2.IC2Integration;
import net.minecraft.inventory.IInventory;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.Optional.Interface;
@@ -17,17 +15,15 @@ import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"),
@Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = "IC2"),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2")
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = IC2Integration.MODID)
})
public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory
{
public EnumSet<EnumFacing> getOutputtingSides();
public boolean sideIsOutput(EnumFacing side);
public EnumSet<EnumFacing> getConsumingSides();
public boolean sideIsConsumer(EnumFacing side);
public double getMaxOutput();
@@ -16,6 +16,7 @@ import mekanism.common.Resource;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.integration.computer.CCPeripheral;
import mekanism.common.integration.computer.OCDriver;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.storagedrawer.StorageDrawerRecipeHandler;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.util.MekanismUtils;
@@ -48,10 +49,10 @@ public final class MekanismHooks
public void hook()
{
if(Loader.isModLoaded("CoFHCore")) CoFHCoreLoaded = true;
if(Loader.isModLoaded("IC2")) IC2Loaded = true;
if(Loader.isModLoaded("Railcraft")) RailcraftLoaded = true;
if(Loader.isModLoaded("ThermalExpansion")) TELoaded = true;
if(Loader.isModLoaded("cofhcore")) CoFHCoreLoaded = true;
if(Loader.isModLoaded("ic2")) IC2Loaded = true;
if(Loader.isModLoaded("railcraft")) RailcraftLoaded = true;
if(Loader.isModLoaded("thermalexpansion")) TELoaded = true;
if(Loader.isModLoaded("ComputerCraft")) CCLoaded = true;
if(Loader.isModLoaded("appliedenergistics2")) AE2Loaded = true;
if(Loader.isModLoaded("tesla")) TeslaLoaded = true;
@@ -86,7 +87,7 @@ public final class MekanismHooks
}
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void hookIC2Recipes()
{
for(MachineRecipe<IRecipeInput, Collection<ItemStack>> entry : Recipes.macerator.getRecipes())
@@ -140,7 +141,7 @@ public final class MekanismHooks
} catch(Exception e) {}
}
@Method(modid = "OpenComputers")
@Method(modid = "opencomputers")
public void loadOCDrivers()
{
try {
@@ -2,7 +2,6 @@ package mekanism.common.integration;
import ic2.api.recipe.Recipes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -14,6 +13,7 @@ import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
import mekanism.common.MekanismItems;
import mekanism.common.Resource;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.util.MekanismUtils;
@@ -25,14 +25,13 @@ import net.minecraft.init.Items;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fml.common.Optional.Method;
import net.minecraftforge.oredict.OreDictionary;
public final class OreDictManager
{
private static final List<String> minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium");
private static final List<String> minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium", "Platinum", "Iridium");
public static void init()
{
@@ -288,7 +287,7 @@ public final class OreDictManager
} catch(Exception e) {}
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public static void addIC2BronzeRecipe()
{
try {
@@ -12,7 +12,9 @@ import net.minecraftforge.fml.common.Optional.Method;
public class IC2Integration
{
@Method(modid = "IC2")
public static final String MODID = "ic2";
@Method(modid = IC2Integration.MODID)
public static boolean isOutputter(TileEntity tileEntity, EnumFacing side)
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
@@ -25,7 +27,7 @@ public class IC2Integration
return false;
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public static boolean isAcceptor(TileEntity orig, TileEntity tileEntity, EnumFacing side)
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
@@ -41,7 +43,7 @@ public class IC2Integration
return false;
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public static double emitEnergy(IEnergyWrapper from, TileEntity tileEntity, EnumFacing side, double currentSending)
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
@@ -24,6 +24,7 @@ import mekanism.common.base.ITierItem;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.ic2.IC2ItemManager;
import mekanism.common.integration.tesla.TeslaItemWrapper;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
@@ -56,7 +57,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import cofh.api.energy.IEnergyContainerItem;
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
})
public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem, ISecurityItem, ITierItem
{
@@ -324,7 +325,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -17,7 +17,6 @@ import mekanism.client.MekKeyHandler;
import mekanism.client.MekanismClient;
import mekanism.client.MekanismKeyHandler;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.FluidTankTier;
import mekanism.common.Upgrade;
@@ -37,10 +36,10 @@ import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.ic2.IC2ItemManager;
import mekanism.common.integration.tesla.TeslaItemWrapper;
import mekanism.common.inventory.InventoryPersonalChest;
import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.security.ISecurityItem;
import mekanism.common.security.ISecurityTile;
@@ -134,7 +133,7 @@ import cofh.api.energy.IEnergyContainerItem;
*
*/
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
})
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidItemWrapper, ITierItem, ISecurityItem, IItemNetwork
{
@@ -780,7 +779,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -11,6 +11,7 @@ import mekanism.common.Mekanism;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.ic2.IC2ItemManager;
import mekanism.common.integration.tesla.TeslaItemWrapper;
import mekanism.common.util.ItemDataUtils;
@@ -30,7 +31,7 @@ import net.minecraftforge.fml.common.Optional.Method;
import cofh.api.energy.IEnergyContainerItem;
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
})
public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem
{
@@ -171,7 +172,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -13,6 +13,7 @@ import mekanism.common.Mekanism;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.ic2.IC2ItemManager;
import mekanism.common.integration.tesla.TeslaItemWrapper;
import mekanism.common.util.ItemDataUtils;
@@ -44,7 +45,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import cofh.api.energy.IEnergyContainerItem;
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
})
public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem
{
@@ -206,7 +207,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -39,6 +39,11 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
{
EntityPlayer player = PacketHandler.getPlayer(context);
if(player == null)
{
return null;
}
PacketHandler.handlePacket(new Runnable() {
@Override
public void run()
@@ -8,6 +8,7 @@ import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.base.IAdvancedBoundingBlock;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.util.InventoryUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
@@ -25,7 +26,7 @@ import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2")
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID)
})
public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock implements ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData
{
@@ -243,7 +244,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
IAdvancedBoundingBlock inv = getInv();
@@ -334,7 +335,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getDemandedEnergy()
{
IAdvancedBoundingBlock inv = getInv();
@@ -342,7 +343,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double injectEnergy(EnumFacing directionFrom, double amount, double voltage)
{
IAdvancedBoundingBlock inv = getInv();
@@ -355,7 +356,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getSinkTier()
{
IAdvancedBoundingBlock inv = getInv();
@@ -170,13 +170,8 @@ public class TileEntityChargepad extends TileEntityNoisyBlock
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return EnumSet.of(EnumFacing.DOWN, facing.getOpposite());
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return side == EnumFacing.DOWN || side == facing.getOpposite();
}
@@ -1560,19 +1560,12 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing), EnumFacing.DOWN);
}
@Override
public boolean sideIsConsumer(EnumFacing side)
{
return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing) || side == EnumFacing.DOWN;
}
@Override
public TileComponentSecurity getSecurity()
{
@@ -415,12 +415,6 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return EnumSet.of(facing.getOpposite());
}
@Override
public boolean sideIsConsumer(EnumFacing side)
{
@@ -155,24 +155,12 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo
return true;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1);
}
@Override
public boolean sideIsConsumer(EnumFacing side)
{
return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side);
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
{
return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2);
}
@Override
public boolean sideIsOutput(EnumFacing side)
{
@@ -389,12 +389,6 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt
}
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1);
}
@Override
public boolean sideIsConsumer(EnumFacing side)
{
@@ -378,12 +378,6 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return EnumSet.of(facing.getOpposite());
}
@Override
public boolean sideIsConsumer(EnumFacing side)
{
@@ -267,11 +267,11 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im
{
if(!inventory.get(i).isEmpty())
{
ItemStack stack = inventory.get(i);
ItemStack stack = inventory.get(i).copy();
inventory.get(i).shrink(1);
if(stack.getCount() == 0 && stack.getItem().hasContainerItem(stack))
if(inventory.get(i).getCount() == 0 && stack.getItem().hasContainerItem(stack))
{
ItemStack container = stack.getItem().getContainerItem(stack);
@@ -10,7 +10,6 @@ import ic2.api.energy.tile.IEnergyTile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
@@ -23,6 +22,7 @@ import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.CapabilityWrapperManager;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.tesla.TeslaIntegration;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.CableUtils;
@@ -44,9 +44,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@InterfaceList({
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2")
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = IC2Integration.MODID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = IC2Integration.MODID)
})
public class TileEntityInductionPort extends TileEntityInductionCasing implements IEnergyWrapper, IConfigurable, IActiveState
{
@@ -80,54 +80,25 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
}
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
if(structure != null && mode)
{
EnumSet<EnumFacing> set = EnumSet.allOf(EnumFacing.class);
for(EnumFacing side : EnumFacing.VALUES)
{
if(structure.locations.contains(Coord4D.get(this).offset(side)))
{
set.remove(side);
}
}
return set;
}
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
if (structure != null && mode)
{
return !structure.locations.contains(Coord4D.get(this).offset(side));
}
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
if(structure != null && !mode)
{
return EnumSet.allOf(EnumFacing.class);
}
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return (structure != null && !mode);
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void register()
{
if(!world.isRemote)
@@ -149,7 +120,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void deregister()
{
if(!world.isRemote)
@@ -309,28 +280,28 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getSinkTier()
{
return 4;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getSourceTier()
{
return 4;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void setStored(int energy)
{
setEnergy(energy*general.FROM_IC2);
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int addEnergy(int amount)
{
double toUse = Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), amount*general.FROM_IC2);
@@ -340,7 +311,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean isTeleporterCompatible(EnumFacing side)
{
return canOutputEnergy(side);
@@ -353,49 +324,49 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
return sideIsConsumer(direction);
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction)
{
return sideIsOutput(direction) && receiver instanceof IEnergyConductor;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getStored()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getEnergy()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getCapacity()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxEnergy()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getOutput()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxOutput()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getDemandedEnergy()
{
return (getMaxEnergy() - getEnergy())*general.TO_IC2;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getOfferedEnergy()
{
return Math.min(getEnergy(), getMaxOutput())*general.TO_IC2;
@@ -408,14 +379,14 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getOutputEnergyUnitsPerTick()
{
return getMaxOutput()*general.TO_IC2;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
@@ -428,7 +399,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void drawEnergy(double amount)
{
if(structure != null)
@@ -119,13 +119,8 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return EnumSet.of(facing.getOpposite());
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return side == facing.getOpposite();
}
@@ -551,15 +551,10 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
{
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return false;
}
@@ -60,8 +60,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
public List<Frequency> publicCache = new ArrayList<Frequency>();
public List<Frequency> privateCache = new ArrayList<Frequency>();
public static final EnumSet<EnumFacing> nothing = EnumSet.noneOf(EnumFacing.class);
public TileComponentEjector ejectorComponent;
public TileComponentConfig configComponent;
@@ -367,32 +365,24 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
if (!hasFrequency())
if(!hasFrequency())
{
return false;
}
return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 2, side);
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
if (!hasFrequency())
if(!hasFrequency())
{
return false;
}
return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side);
}
@@ -123,15 +123,10 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I
}
}
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing));
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
public boolean sideIsConsumer(EnumFacing side)
{
return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing);
}
@@ -206,15 +206,10 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement
{
return controlType;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return EnumSet.of(facing.getOpposite());
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
public boolean sideIsConsumer(EnumFacing side)
{
return side == facing.getOpposite();
}
@@ -19,6 +19,7 @@ import mekanism.common.config.MekanismConfig.general;
import mekanism.common.frequency.Frequency;
import mekanism.common.frequency.FrequencyManager;
import mekanism.common.frequency.IFrequencyHandler;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.security.ISecurityTile;
@@ -34,7 +35,7 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Optional.Interface;
@Interface(iface = "ic2.api.tile.IWrenchable", modid = "IC2")
@Interface(iface = "ic2.api.tile.IWrenchable", modid = IC2Integration.MODID)
public abstract class TileEntityBasicBlock extends TileEntity implements ITileNetwork, IChunkLoadHandler, IFrequencyHandler, ITickable
{
/** The direction this block is facing. */
@@ -39,15 +39,10 @@ public abstract class TileEntityBasicMachine<INPUT extends MachineInput<INPUT>,
guiLocation = location;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
public boolean sideIsConsumer(EnumFacing side)
{
return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side);
}
@@ -10,13 +10,13 @@ import ic2.api.energy.tile.IEnergyTile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.EnumSet;
import mekanism.common.base.IEnergyWrapper;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.CapabilityWrapperManager;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.tesla.TeslaIntegration;
import mekanism.common.util.CapabilityUtils;
import mekanism.common.util.MekanismUtils;
@@ -56,7 +56,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
maxEnergy = BASE_MAX_ENERGY;
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void register()
{
if(!world.isRemote)
@@ -78,7 +78,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void deregister()
{
if(!world.isRemote)
@@ -102,24 +102,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return EnumSet.allOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return true;
}
@@ -261,28 +251,28 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getSinkTier()
{
return 4;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getSourceTier()
{
return 4;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void setStored(int energy)
{
setEnergy(energy*general.FROM_IC2);
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int addEnergy(int amount)
{
setEnergy(getEnergy() + amount*general.FROM_IC2);
@@ -290,7 +280,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean isTeleporterCompatible(EnumFacing side)
{
return sideIsOutput(side);
@@ -303,49 +293,49 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
return sideIsConsumer(direction);
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction)
{
return sideIsOutput(direction) && receiver instanceof IEnergyConductor;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getStored()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getEnergy()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getCapacity()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxEnergy()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getOutput()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxOutput()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getDemandedEnergy()
{
return (getMaxEnergy() - getEnergy())*general.TO_IC2;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getOfferedEnergy()
{
return Math.min(getEnergy(), getMaxOutput())*general.TO_IC2;
@@ -358,14 +348,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getOutputEnergyUnitsPerTick()
{
return getMaxOutput()*general.TO_IC2;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
@@ -379,7 +369,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void drawEnergy(double amount)
{
setEnergy(Math.max(getEnergy() - (amount*general.FROM_IC2), 0));
@@ -242,7 +242,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
if(didTransfer != prevTransfer || needsUpdate)
{
MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer));
MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer));
needsUpdate = false;
}
@@ -1,10 +1,13 @@
package mekanism.common.util;
import java.util.*;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.function.Function;
import mekanism.api.Coord4D;
import mekanism.api.energy.IStrictEnergyOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.energy.IStrictEnergyOutputter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.base.IEnergyWrapper;
import mekanism.common.capabilities.Capabilities;
@@ -39,17 +42,20 @@ public final class CableUtils
* @param sides - set of sides to check
* @return boolean[] of adjacent connections
*/
public static boolean[] getConnections(TileEntity tileEntity, Set<EnumFacing> sides)
public static boolean[] getConnections(TileEntity tileEntity, Function<EnumFacing, Boolean> sideFunction)
{
boolean[] connectable = new boolean[] {false, false, false, false, false, false};
Coord4D coord = Coord4D.get(tileEntity);
for(EnumFacing side : sides)
for(EnumFacing side : EnumFacing.values())
{
TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorld());
connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side);
connectable[side.ordinal()] |= isCable(tile);
if(sideFunction.apply(side))
{
TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorld());
connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side);
connectable[side.ordinal()] |= isCable(tile);
}
}
return connectable;
@@ -185,9 +191,9 @@ public final class CableUtils
if(energyToSend > 0)
{
List<EnumFacing> outputtingSides = new LinkedList<>();
boolean[] connectable = getConnections((TileEntity)emitter, emitter.getOutputtingSides());
boolean[] connectable = getConnections((TileEntity)emitter, side -> emitter.sideIsOutput(side));
for(EnumFacing side : emitter.getOutputtingSides())
for(EnumFacing side : EnumFacing.values())
{
if(connectable[side.ordinal()])
{
@@ -49,7 +49,7 @@ import net.minecraftforge.oredict.OreDictionary;
import buildcraft.api.fuels.BuildcraftFuelRegistry;
import buildcraft.api.fuels.IFuel;
@Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "9.3.3", dependencies = "required-after:mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
@Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "9.3.4", dependencies = "required-after:mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
public class MekanismGenerators implements IModule
{
@SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy")
@@ -59,7 +59,7 @@ public class MekanismGenerators implements IModule
public static MekanismGenerators instance;
/** MekanismGenerators version number */
public static Version versionNumber = new Version(9, 3, 3);
public static Version versionNumber = new Version(9, 3, 4);
public static MultiblockManager<SynchronizedTurbineData> turbineManager = new MultiblockManager<SynchronizedTurbineData>("industrialTurbine");
@@ -17,6 +17,7 @@ import mekanism.common.base.ISustainedTank;
import mekanism.common.capabilities.ItemCapabilityWrapper;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.ic2.IC2ItemManager;
import mekanism.common.integration.tesla.TeslaItemWrapper;
import mekanism.common.security.ISecurityItem;
@@ -70,7 +71,7 @@ import cofh.api.energy.IEnergyContainerItem;
*/
@InterfaceList({
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID)
})
public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, ISustainedTank, IEnergyContainerItem, ISecurityItem
{
@@ -411,7 +412,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public IElectricItemManager getManager(ItemStack itemStack)
{
return IC2ItemManager.getManager(this);
@@ -20,13 +20,8 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
return EnumSet.of(facing);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
return side == facing;
}
@@ -117,22 +117,11 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return false;
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
{
return EnumSet.of(facing);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
return side == facing;
@@ -189,13 +189,8 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
return EnumSet.of(EnumFacing.getFront(0));
}
@Override
public boolean sideIsOutput(EnumFacing side) {
return side == EnumFacing.DOWN;
}
@@ -77,24 +77,14 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return false;
}
@@ -284,23 +284,11 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
}
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
{
return EnumSet.allOf(EnumFacing.class);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
return true;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
{
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return false;
@@ -7,9 +7,6 @@ import ic2.api.energy.tile.IEnergyAcceptor;
import ic2.api.energy.tile.IEnergyConductor;
import ic2.api.energy.tile.IEnergyEmitter;
import ic2.api.energy.tile.IEnergyTile;
import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.common.base.FluidHandlerWrapper;
import mekanism.common.base.IEnergyWrapper;
@@ -20,6 +17,7 @@ import mekanism.common.config.MekanismConfig.general;
import mekanism.common.config.MekanismConfig.generators;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration;
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.tesla.TeslaIntegration;
import mekanism.common.tile.TileEntityGasTank.GasMode;
import mekanism.common.util.CableUtils;
@@ -73,47 +71,23 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
if(structure != null)
{
EnumSet<EnumFacing> set = EnumSet.allOf(EnumFacing.class);
for(EnumFacing side : EnumFacing.VALUES)
{
if(structure.locations.contains(Coord4D.get(this).offset(side)))
{
set.remove(side);
}
}
return set;
}
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
if (structure != null)
{
return !structure.locations.contains(Coord4D.get(this).offset(side));
}
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return false;
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void register()
{
if(!world.isRemote)
@@ -135,7 +109,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
}
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void deregister()
{
if(!world.isRemote)
@@ -231,35 +205,35 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getSinkTier()
{
return 4;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getSourceTier()
{
return 4;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void setStored(int energy)
{
setEnergy(energy*general.FROM_IC2);
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int addEnergy(int amount)
{
return 0;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean isTeleporterCompatible(EnumFacing side)
{
return canOutputEnergy(side);
@@ -272,49 +246,49 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction)
{
return false;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction)
{
return sideIsOutput(direction) && receiver instanceof IEnergyConductor;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getStored()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getEnergy()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getCapacity()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxEnergy()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public int getOutput()
{
return (int)Math.round(Math.min(Integer.MAX_VALUE, getMaxOutput()*general.TO_IC2));
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getDemandedEnergy()
{
return 0;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getOfferedEnergy()
{
return Math.min(getEnergy(), getMaxOutput())*general.TO_IC2;
@@ -327,21 +301,21 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double getOutputEnergyUnitsPerTick()
{
return getMaxOutput()*general.TO_IC2;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
return amount;
}
@Override
@Method(modid = "IC2")
@Method(modid = IC2Integration.MODID)
public void drawEnergy(double amount)
{
if(structure != null)
@@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.3.3", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
@Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.3.4", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
public class MekanismTools implements IModule
{
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
@@ -42,7 +42,7 @@ public class MekanismTools implements IModule
public static MekanismTools instance;
/** MekanismTools version number */
public static Version versionNumber = new Version(9, 3, 3);
public static Version versionNumber = new Version(9, 3, 4);
//Enums: Tools
public static ToolMaterial toolOBSIDIAN;