conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
>>>>>>>
import net.minecraft.block.Block; |
<<<<<<<
import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing;
=======
import net.minecraft.tileentity.TileEntity;
>>>>>>>
import net.minecraft.tileentity.TileEntity;
import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing;
<<<<<<<
private static final double offset = 0.001;
private Map<EnumFacing, HashMap<Gas, DisplayInteger>> cachedGasses = new HashMap<EnumFacing, HashMap<Gas, DisplayInteger>>();
=======
>>>>>>>
<<<<<<<
if(!glass)
{
model.render(0.0625F);
}
else {
model.renderGlass(0.0625F);
}
GL11.glPopMatrix();
}
@SuppressWarnings("incomplete-switch")
private DisplayInteger getListAndRender(EnumFacing side, Gas gas)
{
if(gas == null || gas.getIcon() == null)
{
return null;
}
if(cachedGasses.containsKey(side) && cachedGasses.get(side).containsKey(gas))
{
return cachedGasses.get(side).get(gas);
}
Model3D toReturn = new Model3D();
toReturn.baseBlock = Blocks.water;
toReturn.setTexture(gas.getIcon());
DisplayInteger display = DisplayInteger.createAndStart();
if(cachedGasses.containsKey(side))
{
cachedGasses.get(side).put(gas, display);
}
else {
HashMap<Gas, DisplayInteger> map = new HashMap<Gas, DisplayInteger>();
map.put(gas, display);
cachedGasses.put(side, map);
}
switch(side)
{
case NORTH:
{
toReturn.minX = 0.625 + offset;
toReturn.minY = 0.0625 + offset;
toReturn.minZ = 0.625 + offset;
toReturn.maxX = 0.8125 - offset;
toReturn.maxY = 0.9375 - offset;
toReturn.maxZ = 0.8125 - offset;
break;
}
case SOUTH:
{
toReturn.minX = 0.1875 + offset;
toReturn.minY = 0.0625 + offset;
toReturn.minZ = 0.1875 + offset;
toReturn.maxX = 0.375 - offset;
toReturn.maxY = 0.9375 - offset;
toReturn.maxZ = 0.375 - offset;
break;
}
case WEST:
{
toReturn.minX = 0.625 + offset;
toReturn.minY = 0.0625 + offset;
toReturn.minZ = 0.1875 + offset;
toReturn.maxX = 0.8125 - offset;
toReturn.maxY = 0.9375 - offset;
toReturn.maxZ = 0.375 - offset;
break;
}
case EAST:
{
toReturn.minX = 0.1875 + offset;
toReturn.minY = 0.0625 + offset;
toReturn.minZ = 0.625 + offset;
toReturn.maxX = 0.375 - offset;
toReturn.maxY = 0.9375 - offset;
toReturn.maxZ = 0.8125 - offset;
break;
}
}
MekanismRenderer.renderObject(toReturn);
display.endList();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
return display;
}
private void pop()
{
GL11.glPopAttrib();
=======
>>>>>>> |
<<<<<<<
double electricityStored = itemStack.getTagCompound().getDouble("electricity");
itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100))));
return electricityStored;
=======
return itemStack.stackTagCompound.getDouble("electricity");
>>>>>>>
return electricityStored = itemStack.getTagCompound().getDouble("electricity");
<<<<<<<
itemStack.getTagCompound().setDouble("electricity", electricityStored);
itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100))));
=======
itemStack.stackTagCompound.setDouble("electricity", electricityStored);
>>>>>>>
itemStack.getTagCompound().setDouble("electricity", electricityStored); |
<<<<<<<
import mekanism.common.tile.TileEntityThermoelectricBoiler;
import mekanism.common.tile.TileEntityThermoelectricValve;
import net.minecraft.block.state.IBlockState;
=======
import mekanism.common.tile.TileEntityBoilerCasing;
import mekanism.common.tile.TileEntityBoilerValve;
import mekanism.common.tile.TileEntityPressureDisperser;
import mekanism.common.tile.TileEntitySuperheatingElement;
>>>>>>>
import mekanism.common.tile.TileEntityBoilerCasing;
import mekanism.common.tile.TileEntityBoilerValve;
import mekanism.common.tile.TileEntityPressureDisperser;
import mekanism.common.tile.TileEntitySuperheatingElement;
<<<<<<<
import net.minecraft.util.BlockPos;
=======
import net.minecraft.tileentity.TileEntity;
>>>>>>>
import net.minecraft.util.BlockPos;
import net.minecraft.tileentity.TileEntity;
<<<<<<<
IBlockState state = pointer.getWorld().getBlockState(new BlockPos(x, y, z));
return state.getBlock() == MekanismBlocks.BasicBlock2 && state.getBlock().getMetaFromState(state) == 1;
=======
return BasicType.get(pointer.getWorldObj().getBlock(x, y, z), pointer.getWorldObj().getBlockMetadata(x, y, z)) == BasicType.BOILER_CASING;
}
@Override
protected boolean isValidInnerNode(int x, int y, int z)
{
if(super.isValidInnerNode(x, y, z))
{
return true;
}
TileEntity tile = pointer.getWorldObj().getTileEntity(x, y, z);
return tile instanceof TileEntityPressureDisperser || tile instanceof TileEntitySuperheatingElement;
}
@Override
protected boolean canForm(SynchronizedBoilerData structure)
{
if(structure.volHeight >= 3)
{
Set<Coord4D> dispersers = new HashSet<Coord4D>();
Set<Coord4D> elements = new HashSet<Coord4D>();
for(Coord4D coord : innerNodes)
{
TileEntity tile = coord.getTileEntity(pointer.getWorldObj());
if(tile instanceof TileEntityPressureDisperser)
{
dispersers.add(coord);
}
else if(tile instanceof TileEntitySuperheatingElement)
{
elements.add(coord);
}
}
int prevDispersers = dispersers.size();
//Ensure at least one disperser exists
if(dispersers.size() == 0)
{
return false;
}
//Find a single disperser contained within this multiblock
Coord4D initDisperser = dispersers.iterator().next();
//Ensure that a full horizontal plane of dispersers exist, surrounding the found disperser
for(int x = structure.renderLocation.xCoord+1; x < structure.renderLocation.xCoord+structure.volLength-1; x++)
{
for(int z = structure.renderLocation.zCoord+1; z < structure.renderLocation.zCoord+structure.volWidth-1; z++)
{
TileEntity tile = pointer.getWorldObj().getTileEntity(x, initDisperser.yCoord, z);
if(!(tile instanceof TileEntityPressureDisperser))
{
return false;
}
dispersers.remove(new Coord4D(x, initDisperser.yCoord, z, pointer.getWorldObj().provider.dimensionId));
}
}
//If there are more dispersers than those on the plane found, the structure is invalid
if(dispersers.size() > 0)
{
return false;
}
structure.superheatingElements = new NodeCounter(new NodeChecker() {
@Override
public boolean isValid(Coord4D coord)
{
return coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntitySuperheatingElement;
}
}).calculate(elements.iterator().next());
if(elements.size() > structure.superheatingElements)
{
return false;
}
Coord4D initAir = null;
int totalAir = 0;
//Find the first available block in the structure for water storage (including casings)
for(int x = structure.renderLocation.xCoord; x < structure.renderLocation.xCoord+structure.volLength; x++)
{
for(int y = structure.renderLocation.yCoord; y < initDisperser.yCoord; y++)
{
for(int z = structure.renderLocation.zCoord; z < structure.renderLocation.zCoord+structure.volWidth; z++)
{
if(pointer.getWorldObj().isAirBlock(x, y, z) || isViableNode(x, y, z))
{
initAir = new Coord4D(x, y, z, pointer.getWorldObj().provider.dimensionId);
totalAir++;
}
}
}
}
//Some air must exist for the structure to be valid
if(initAir == null)
{
return false;
}
structure.waterVolume = new NodeCounter(new NodeChecker() {
@Override
public boolean isValid(Coord4D coord)
{
return coord.yCoord < initDisperser.yCoord && (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord));
}
}).calculate(initAir);
//Make sure all air blocks are connected
if(totalAir > structure.waterVolume)
{
return false;
}
int steamHeight = (structure.renderLocation.yCoord+structure.volHeight)-initDisperser.yCoord;
structure.steamVolume = structure.volWidth*structure.volLength*steamHeight;
return true;
}
return false;
>>>>>>>
return BasicBlockType.get(pointer.getWorld().getBlockState(new BlockPos(x, y, z))) == BasicBlockType.BOILER_CASING;
}
@Override
protected boolean isValidInnerNode(int x, int y, int z)
{
if(super.isValidInnerNode(x, y, z))
{
return true;
}
TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(x, y, z));
return tile instanceof TileEntityPressureDisperser || tile instanceof TileEntitySuperheatingElement;
}
@Override
protected boolean canForm(SynchronizedBoilerData structure)
{
if(structure.volHeight >= 3)
{
Set<Coord4D> dispersers = new HashSet<Coord4D>();
Set<Coord4D> elements = new HashSet<Coord4D>();
for(Coord4D coord : innerNodes)
{
TileEntity tile = coord.getTileEntity(pointer.getWorld());
if(tile instanceof TileEntityPressureDisperser)
{
dispersers.add(coord);
}
else if(tile instanceof TileEntitySuperheatingElement)
{
elements.add(coord);
}
}
int prevDispersers = dispersers.size();
//Ensure at least one disperser exists
if(dispersers.size() == 0)
{
return false;
}
//Find a single disperser contained within this multiblock
Coord4D initDisperser = dispersers.iterator().next();
//Ensure that a full horizontal plane of dispersers exist, surrounding the found disperser
Coord4D pos = new Coord4D(structure.renderLocation.getX(), initDisperser.getY(), structure.renderLocation.getZ(), pointer.getWorld().provider.getDimensionId());
for(int x = 1; x < structure.volLength-1; x++)
{
for(int z = 1; z < structure.volWidth-1; z++)
{
Coord4D coord4D = pos.add(x, 0, z);
TileEntity tile = pointer.getWorld().getTileEntity(coord4D);
if(!(tile instanceof TileEntityPressureDisperser))
{
return false;
}
dispersers.remove(coord4D);
}
}
//If there are more dispersers than those on the plane found, the structure is invalid
if(dispersers.size() > 0)
{
return false;
}
structure.superheatingElements = new NodeCounter(new NodeChecker() {
@Override
public boolean isValid(Coord4D coord)
{
return coord.getTileEntity(pointer.getWorld()) instanceof TileEntitySuperheatingElement;
}
}).calculate(elements.iterator().next());
if(elements.size() > structure.superheatingElements)
{
return false;
}
Coord4D initAir = null;
int totalAir = 0;
pos = new Coord4D(structure.renderLocation, pointer.getWorld().provider.getDimensionId());
//Find the first available block in the structure for water storage (including casings)
for(int x = 0; x < structure.volLength; x++)
{
for(int y = 0; y < initDisperser.getY() - structure.renderLocation.getY(); y++)
{
for(int z = 0; z < structure.volWidth; z++)
{
if(pointer.getWorld().isAirBlock(pos.add(x, y, z)) || isViableNode(pos.add(x, y, z)))
{
initAir = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId());
totalAir++;
}
}
}
}
//Some air must exist for the structure to be valid
if(initAir == null)
{
return false;
}
structure.waterVolume = new NodeCounter(new NodeChecker() {
@Override
public boolean isValid(Coord4D coord)
{
return coord.getY() < initDisperser.getY() && (coord.isAirBlock(pointer.getWorld()) || isViableNode(coord));
}
}).calculate(initAir);
//Make sure all air blocks are connected
if(totalAir > structure.waterVolume)
{
return false;
}
int steamHeight = (structure.renderLocation.getY()+structure.volHeight)-initDisperser.getY();
structure.steamVolume = structure.volWidth*structure.volLength*steamHeight;
return true;
}
return false;
<<<<<<<
if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityThermoelectricValve)
=======
if(obj.getTileEntity(pointer.getWorldObj()) instanceof TileEntityBoilerValve)
>>>>>>>
if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityBoilerValve) |
<<<<<<<
import org.apache.accumulo.core.client.mapreduce.lib.util.DistributedCacheHelper;
=======
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.mapreduce.lib.impl.DistributedCacheHelper;
>>>>>>>
import org.apache.accumulo.core.client.mapreduce.lib.impl.DistributedCacheHelper; |
<<<<<<<
if(canReplace(below, false) && getEnergy() >= usage.fluidicPlenisherUsage && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME)
=======
if(canReplace(below, false, false) && getEnergy() >= Mekanism.fluidicPlenisherUsage && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME)
>>>>>>>
if(canReplace(below, false, false) && getEnergy() >= usage.fluidicPlenisherUsage && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME)
<<<<<<<
worldObj.setBlock(coord.xCoord, coord.yCoord, coord.zCoord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()), 0, 3);
setEnergy(getEnergy() - usage.fluidicPlenisherUsage);
fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true);
=======
if(canReplace(coord, true, false))
{
worldObj.setBlock(coord.xCoord, coord.yCoord, coord.zCoord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()), 0, 3);
setEnergy(getEnergy() - Mekanism.fluidicPlenisherUsage);
fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true);
}
>>>>>>>
if(canReplace(coord, true, false))
{
worldObj.setBlock(coord.xCoord, coord.yCoord, coord.zCoord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()), 0, 3);
setEnergy(getEnergy() - usage.fluidicPlenisherUsage);
fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true);
} |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
>>>>>>> |
<<<<<<<
import cofh.api.energy.IEnergyHandler;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
=======
>>>>>>>
<<<<<<<
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
=======
import net.minecraftforge.common.util.ForgeDirection;
import cofh.api.energy.IEnergyHandler;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.common.Optional.InterfaceList;
import cpw.mods.fml.common.Optional.Method;
>>>>>>>
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import cofh.api.energy.IEnergyHandler;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
<<<<<<<
@Method(modid = "CoFHCore")
public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate)
=======
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
>>>>>>>
public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate)
<<<<<<<
@Method(modid = "CoFHCore")
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate)
=======
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
>>>>>>>
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate)
<<<<<<<
@Method(modid = "CoFHCore")
public boolean canConnectEnergy(EnumFacing from)
=======
public boolean canConnectEnergy(ForgeDirection from)
>>>>>>>
public boolean canConnectEnergy(EnumFacing from)
<<<<<<<
@Method(modid = "CoFHCore")
public int getEnergyStored(EnumFacing from)
=======
public int getEnergyStored(ForgeDirection from)
>>>>>>>
public int getEnergyStored(EnumFacing from)
<<<<<<<
@Method(modid = "CoFHCore")
public int getMaxEnergyStored(EnumFacing from)
=======
public int getMaxEnergyStored(ForgeDirection from)
>>>>>>>
public int getMaxEnergyStored(EnumFacing from) |
<<<<<<<
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.SoundEvents;
=======
>>>>>>>
import net.minecraft.nbt.CompoundNBT; |
<<<<<<<
=======
import java.util.Collections;
>>>>>>>
import java.util.Collections;
<<<<<<<
import javax.annotation.Nullable;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
=======
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
>>>>>>>
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
<<<<<<<
import mekanism.common.util.HeatUtils;
=======
import mekanism.common.tile.base.SubstanceType;
import mekanism.common.util.HeatUtils;
>>>>>>>
import mekanism.common.tile.base.SubstanceType;
import mekanism.common.util.HeatUtils;
<<<<<<<
structure.lastMaxBoil = (int) Math.floor(heatAvailable / HeatUtils.getVaporizationEnthalpy());
=======
structure.lastMaxBoil = (int)(heatAvailable / HeatUtils.getVaporizationEnthalpy());
>>>>>>>
structure.lastMaxBoil = (int) Math.floor(heatAvailable / HeatUtils.getVaporizationEnthalpy());
<<<<<<<
structure.temperature -= (amountToBoil * HeatUtils.getVaporizationEnthalpy()) / structure.locations.size();
=======
structure.handleHeat(-amountToBoil * HeatUtils.getVaporizationEnthalpy());
>>>>>>>
structure.handleHeat(-amountToBoil * HeatUtils.getVaporizationEnthalpy()); |
<<<<<<<
Coord4D wrapper = Coord4D.get(this).offset(orientation);
=======
Coord4D wrapper = Coord4D.get(this).getFromSide(orientation);
FluidStack fluid = MekanismUtils.getFluid(worldObj, wrapper, hasFilter());
>>>>>>>
Coord4D wrapper = Coord4D.get(this).offset(orientation);
FluidStack fluid = MekanismUtils.getFluid(worldObj, wrapper, hasFilter());
<<<<<<<
setEnergy(getEnergy() - usage.electricPumpUsage);
activeType = fluid.getFluid();
recurringNodes.add(wrapper.clone());
fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper, hasFilter()), true);
worldObj.setBlockToAir(wrapper);
=======
worldObj.setBlock(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord, Blocks.air, 0, 3);
>>>>>>>
worldObj.setBlockToAir(wrapper);
<<<<<<<
setEnergy(getEnergy() - usage.electricPumpUsage);
activeType = fluid.getFluid();
fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper, hasFilter()), true);
worldObj.setBlockToAir(wrapper);
=======
worldObj.setBlock(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord, Blocks.air, 0, 3);
>>>>>>>
worldObj.setBlockToAir(wrapper);
}
}
return true;
}
}
//Finally, go over the recurring list of nodes and see if there is a fluid block available to suck - if not, will iterate around the recurring block, attempt to suck,
//and then add the adjacent block to the recurring list
for(Coord4D wrapper : tempPumpList)
{
FluidStack fluid = MekanismUtils.getFluid(worldObj, wrapper, hasFilter());
if(fluid != null && (activeType == null || fluid.getFluid() == activeType) && (fluidTank.getFluid() == null || fluidTank.getFluid().isFluidEqual(fluid)))
{
if(take)
{
activeType = fluid.getFluid();
fluidTank.fill(fluid, true);
if(shouldTake(fluid, wrapper))
{
worldObj.setBlockToAir(wrapper);
<<<<<<<
setEnergy(getEnergy() - usage.electricPumpUsage);
activeType = fluid.getFluid();
recurringNodes.add(side);
fluidTank.fill(MekanismUtils.getFluid(worldObj, side, hasFilter()), true);
worldObj.setBlockToAir(side);
=======
worldObj.setBlock(side.xCoord, side.yCoord, side.zCoord, Blocks.air, 0, 3);
>>>>>>>
worldObj.setBlockToAir(side); |
<<<<<<<
import net.minecraft.util.EnumFacing;
=======
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
>>>>>>>
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; |
<<<<<<<
=======
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
>>>>>>> |
<<<<<<<
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
@Interface(iface = "cofh.redstoneflux.api.IEnergyProvider", modid = "redstoneflux"),
@Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = "redstoneflux")
=======
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID),
>>>>>>>
@Interface(iface = "cofh.redstoneflux.api.IEnergyProvider", modid = "redstoneflux"),
@Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = "redstoneflux"),
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID), |
<<<<<<<
playerMP.openContainer = Mekanism.proxy.getServerGui(id, playerMP, world, obj);
=======
playerMP.openContainer = handlers.get(handler).getServerGui(id, playerMP, world, obj.xCoord, obj.yCoord, obj.zCoord);
>>>>>>>
playerMP.openContainer = handlers.get(handler).getServerGui(id, playerMP, world, obj);
<<<<<<<
return (GuiScreen)Mekanism.proxy.getClientGui(id, player, world, obj);
=======
return (GuiScreen)handlers.get(handler).getClientGui(id, player, world, obj.xCoord, obj.yCoord, obj.zCoord);
>>>>>>>
return (GuiScreen)handlers.get(handler).getClientGui(id, player, world, obj); |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
>>>>>>> |
<<<<<<<
import javax.annotation.Nullable;
import it.unimi.dsi.fastutil.ints.IntList;
=======
>>>>>>>
import it.unimi.dsi.fastutil.ints.IntList;
<<<<<<<
ejectorComponent.setOutputData(configComponent, TransmissionType.ITEM);
=======
ejectorComponent.setOutputData(TransmissionType.ITEM, itemConfig);
addCapabilityResolver(BasicCapabilityResolver.constant(Capabilities.CONFIG_CARD_CAPABILITY, this));
>>>>>>>
ejectorComponent.setOutputData(configComponent, TransmissionType.ITEM);
addCapabilityResolver(BasicCapabilityResolver.constant(Capabilities.CONFIG_CARD_CAPABILITY, this)); |
<<<<<<<
@Method(modid = "CoFHCore")
public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate)
=======
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
>>>>>>>
public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate)
<<<<<<<
@Method(modid = "CoFHCore")
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate)
=======
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
>>>>>>>
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate)
<<<<<<<
@Method(modid = "CoFHCore")
public boolean canConnectEnergy(EnumFacing from)
=======
public boolean canConnectEnergy(ForgeDirection from)
>>>>>>>
public boolean canConnectEnergy(EnumFacing from)
<<<<<<<
@Method(modid = "CoFHCore")
public int getEnergyStored(EnumFacing from)
=======
public int getEnergyStored(ForgeDirection from)
>>>>>>>
public int getEnergyStored(EnumFacing from)
<<<<<<<
@Method(modid = "CoFHCore")
public int getMaxEnergyStored(EnumFacing from)
=======
public int getMaxEnergyStored(ForgeDirection from)
>>>>>>>
public int getMaxEnergyStored(EnumFacing from) |
<<<<<<<
import net.minecraft.inventory.EquipmentSlotType;
=======
import mekanism.common.util.UnitDisplayUtils.TemperatureUnit;
import net.minecraft.inventory.EquipmentSlotType;
>>>>>>>
import net.minecraft.inventory.EquipmentSlotType;
import mekanism.common.util.UnitDisplayUtils.TemperatureUnit;
import net.minecraft.inventory.EquipmentSlotType;
<<<<<<<
/**
* Cached value of {@link RadiationScale#values()}. DO NOT MODIFY THIS LIST.
*/
public static final RadiationScale[] RADIATION_SCALES = RadiationScale.values();
/**
* Cached value of {@link SubstanceType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final SubstanceType[] SUBSTANCES = SubstanceType.values();
/**
* Cached value of {@link CacheSubstance#values()}. DO NOT MODIFY THIS LIST.
*/
public static final CacheSubstance[] CACHE_SUBSTANCES = CacheSubstance.values();
/**
* Cached value of {@link OreType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final OreType[] ORE_TYPES = OreType.values();
/**
* Cached value of {@link PrimaryResource#values()}. DO NOT MODIFY THIS LIST.
*/
public static final PrimaryResource[] PRIMARY_RESOURCES = PrimaryResource.values();
/**
* Cached value of {@link ResourceType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final ResourceType[] RESOURCE_TYPES = ResourceType.values();
/**
* Cached value of {@link EquipmentSlotType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final EquipmentSlotType[] EQUIPMENT_SLOT_TYPES = EquipmentSlotType.values();
=======
/**
* Cached collection of armor slot positions from EquipmentSlotType. DO NOT MODIFY THIS LIST.
*/
public static final EquipmentSlotType[] ARMOR_SLOTS = new EquipmentSlotType[] { EquipmentSlotType.HEAD, EquipmentSlotType.CHEST, EquipmentSlotType.LEGS, EquipmentSlotType.FEET };
>>>>>>>
/**
* Cached collection of armor slot positions from EquipmentSlotType. DO NOT MODIFY THIS LIST.
*/
public static final EquipmentSlotType[] ARMOR_SLOTS = new EquipmentSlotType[] { EquipmentSlotType.HEAD, EquipmentSlotType.CHEST, EquipmentSlotType.LEGS, EquipmentSlotType.FEET };
/**
* Cached value of {@link RadiationScale#values()}. DO NOT MODIFY THIS LIST.
*/
public static final RadiationScale[] RADIATION_SCALES = RadiationScale.values();
/**
* Cached value of {@link SubstanceType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final SubstanceType[] SUBSTANCES = SubstanceType.values();
/**
* Cached value of {@link CacheSubstance#values()}. DO NOT MODIFY THIS LIST.
*/
public static final CacheSubstance[] CACHE_SUBSTANCES = CacheSubstance.values();
/**
* Cached value of {@link OreType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final OreType[] ORE_TYPES = OreType.values();
/**
* Cached value of {@link PrimaryResource#values()}. DO NOT MODIFY THIS LIST.
*/
public static final PrimaryResource[] PRIMARY_RESOURCES = PrimaryResource.values();
/**
* Cached value of {@link ResourceType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final ResourceType[] RESOURCE_TYPES = ResourceType.values();
/**
* Cached value of {@link EquipmentSlotType#values()}. DO NOT MODIFY THIS LIST.
*/
public static final EquipmentSlotType[] EQUIPMENT_SLOT_TYPES = EquipmentSlotType.values(); |
<<<<<<<
import mekanism.common.block.states.BlockStateBasic;
import mekanism.common.block.states.BlockStateBasic.BasicBlock;
import mekanism.common.block.states.BlockStateBasic.BasicBlockType;
=======
import mekanism.common.content.boiler.SynchronizedBoilerData;
>>>>>>>
import mekanism.common.block.states.BlockStateBasic;
import mekanism.common.block.states.BlockStateBasic.BasicBlock;
import mekanism.common.block.states.BlockStateBasic.BasicBlockType;
import mekanism.common.content.boiler.SynchronizedBoilerData;
<<<<<<<
case 9:
=======
case 10:
return false;
case 9:
>>>>>>>
case 10:
return false;
case 9:
<<<<<<<
TileEntityInductionCasing tileEntity = (TileEntityInductionCasing)world.getTileEntity(pos);
=======
case 7:
case 8:
TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(x, y, z);
>>>>>>>
case 7:
case 8:
TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(pos);
<<<<<<<
entityplayer.openGui(Mekanism.instance, 33, world, pos.getX(), pos.getY(), pos.getZ());
=======
if(!world.isRemote)
{
entityplayer.openGui(Mekanism.instance, 33, world, x, y, z);
}
>>>>>>>
if(!world.isRemote)
{
entityplayer.openGui(Mekanism.instance, 33, world, , pos.getX(), pos.getY(), pos.getZ());
}
<<<<<<<
((EntityPlayerMP)entityplayer).sendContainerToPlayer(entityplayer.openContainer);
=======
>>>>>>>
<<<<<<<
return ((IMultiblock)world.getTileEntity(pos)).onActivate(entityplayer);
=======
if(world.isRemote)
{
return true;
}
return ((IMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer);
>>>>>>>
if(world.isRemote)
{
return true;
}
return ((IMultiblock)world.getTileEntity(pos)).onActivate(entityplayer);
<<<<<<<
return ((IStructuralMultiblock)world.getTileEntity(pos)).onActivate(entityplayer);
=======
if(world.isRemote)
{
return true;
}
return ((IStructuralMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer);
>>>>>>>
if(world.isRemote)
{
return true;
}
return ((IStructuralMultiblock)world.getTileEntity(pos)).onActivate(entityplayer);
<<<<<<<
tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0;
=======
tileEntity.redstone = world.isBlockIndirectlyGettingPowered(x, y, z);
if(tileEntity instanceof TileEntitySecurityDesk)
{
((TileEntitySecurityDesk)tileEntity).owner = entityliving.getCommandSenderName();
}
>>>>>>>
tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0;
if(tileEntity instanceof TileEntitySecurityDesk)
{
((TileEntitySecurityDesk)tileEntity).owner = entityliving.getCommandSenderName();
}
<<<<<<<
if(BasicBlockType.get(this, world.getBlockMetadata(x, y, z)) == BasicBlockType.STRUCTURAL_GLASS)
=======
if(BasicType.get(this, obj.getMetadata(world)) == BasicType.STRUCTURAL_GLASS)
>>>>>>>
if(BasicBlockType.get(this, world.getBlockMetadata(x, y, z)) == BasicBlockType.STRUCTURAL_GLASS)
<<<<<<<
*/
=======
@Override
public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta)
{
return BasicType.get(this, world.getBlockMetadata(x, y, z)) != BasicType.SECURITY_DESK;
}
public static enum BasicType
{
OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_1, 0, "OsmiumBlock", null, false),
BRONZE_BLOCK(BasicBlock.BASIC_BLOCK_1, 1, "BronzeBlock", null, false),
REFINED_OBSIDIAN(BasicBlock.BASIC_BLOCK_1, 2, "RefinedObsidian", null, false),
CHARCOAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false),
REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false),
STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false),
BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, true),
TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, true),
STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, true),
DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, true),
STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, true),
DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, true),
COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false),
TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false),
THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, true),
THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, true),
THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, true),
INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, true),
INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true),
INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true),
INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, true),
SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true),
PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser", TileEntityPressureDisperser.class, true),
BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true),
BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true),
SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true);
public BasicBlock typeBlock;
public int meta;
public String name;
public Class<? extends TileEntity> tileEntityClass;
public boolean hasDescription;
private BasicType(BasicBlock block, int i, String s, Class<? extends TileEntity> tileClass, boolean hasDesc)
{
typeBlock = block;
meta = i;
name = s;
tileEntityClass = tileClass;
hasDescription = hasDesc;
}
public static BasicType get(Block block, int meta)
{
if(block instanceof BlockBasic)
{
return get(((BlockBasic)block).blockType, meta);
}
return null;
}
public static BasicType get(BasicBlock block, int meta)
{
for(BasicType type : values())
{
if(type.meta == meta && type.typeBlock == block)
{
return type;
}
}
return null;
}
public TileEntity create()
{
try {
return tileEntityClass.newInstance();
} catch(Exception e) {
Mekanism.logger.error("Unable to indirectly create tile entity.");
e.printStackTrace();
return null;
}
}
public String getDescription()
{
return LangUtils.localize("tooltip." + name);
}
public ItemStack getStack()
{
return new ItemStack(typeBlock.getBlock(), 1, meta);
}
public static BasicType get(ItemStack stack)
{
return get(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage());
}
}
public static enum BasicBlock
{
BASIC_BLOCK_1,
BASIC_BLOCK_2;
public Block getBlock()
{
switch(this)
{
case BASIC_BLOCK_1:
return MekanismBlocks.BasicBlock;
case BASIC_BLOCK_2:
return MekanismBlocks.BasicBlock2;
default:
return null;
}
}
}
>>>>>>>
*/ |
<<<<<<<
=======
import mekanism.common.MekanismBlocks;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.FluidTankTier;
>>>>>>>
import mekanism.common.Tier.FluidTankTier;
<<<<<<<
=======
import mekanism.common.tile.TileEntityElectricPump;
import mekanism.common.tile.TileEntityElectrolyticSeparator;
import mekanism.common.tile.TileEntityEliteFactory;
import mekanism.common.tile.TileEntityEnergizedSmelter;
import mekanism.common.tile.TileEntityEnrichmentChamber;
>>>>>>>
<<<<<<<
=======
import mekanism.common.tile.TileEntityFluidTank;
import mekanism.common.tile.TileEntityFluidicPlenisher;
import mekanism.common.tile.TileEntityFormulaicAssemblicator;
import mekanism.common.tile.TileEntityLaser;
>>>>>>>
<<<<<<<
import mekanism.common.tile.TileEntityPortableTank;
=======
import mekanism.common.tile.TileEntityOredictionificator;
import mekanism.common.tile.TileEntityOsmiumCompressor;
import mekanism.common.tile.TileEntityPRC;
import mekanism.common.tile.TileEntityPrecisionSawmill;
import mekanism.common.tile.TileEntityPurificationChamber;
import mekanism.common.tile.TileEntityQuantumEntangloporter;
import mekanism.common.tile.TileEntityResistiveHeater;
import mekanism.common.tile.TileEntityRotaryCondensentrator;
import mekanism.common.tile.TileEntitySeismicVibrator;
import mekanism.common.tile.TileEntitySolarNeutronActivator;
>>>>>>>
import mekanism.common.tile.TileEntityFluidTank;
<<<<<<<
if(world.getTileEntity(pos) instanceof TileEntityChargepad)
=======
setBlockBoundsBasedOnState(world, x, y, z);
if(world.getTileEntity(x, y, z) instanceof TileEntityChargepad)
>>>>>>>
setBlockBoundsBasedOnState(world, x, y, z);
if(world.getTileEntity(pos) instanceof TileEntityChargepad)
<<<<<<<
case PORTABLE_TANK:
return side == EnumFacing.UP || side == EnumFacing.DOWN;
=======
case FLUID_TANK:
return side == ForgeDirection.UP || side == ForgeDirection.DOWN;
>>>>>>>
case FLUID_TANK:
return side == EnumFacing.UP || side == EnumFacing.DOWN;
<<<<<<<
=======
public static enum MachineBlock
{
MACHINE_BLOCK_1,
MACHINE_BLOCK_2,
MACHINE_BLOCK_3;
public Block getBlock()
{
switch(this)
{
case MACHINE_BLOCK_1:
return MekanismBlocks.MachineBlock;
case MACHINE_BLOCK_2:
return MekanismBlocks.MachineBlock2;
case MACHINE_BLOCK_3:
return MekanismBlocks.MachineBlock3;
default:
return null;
}
}
}
public static enum MachineType
{
ENRICHMENT_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 0, "EnrichmentChamber", 3, TileEntityEnrichmentChamber.class, true, false, true),
OSMIUM_COMPRESSOR(MachineBlock.MACHINE_BLOCK_1, 1, "OsmiumCompressor", 4, TileEntityOsmiumCompressor.class, true, false, true),
COMBINER(MachineBlock.MACHINE_BLOCK_1, 2, "Combiner", 5, TileEntityCombiner.class, true, false, true),
CRUSHER(MachineBlock.MACHINE_BLOCK_1, 3, "Crusher", 6, TileEntityCrusher.class, true, false, true),
DIGITAL_MINER(MachineBlock.MACHINE_BLOCK_1, 4, "DigitalMiner", 2, TileEntityDigitalMiner.class, true, true, true),
BASIC_FACTORY(MachineBlock.MACHINE_BLOCK_1, 5, "Factory", 11, TileEntityFactory.class, true, false, true),
ADVANCED_FACTORY(MachineBlock.MACHINE_BLOCK_1, 6, "Factory", 11, TileEntityAdvancedFactory.class, true, false, true),
ELITE_FACTORY(MachineBlock.MACHINE_BLOCK_1, 7, "Factory", 11, TileEntityEliteFactory.class, true, false, true),
METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 8, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser.class, true, true, true),
PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 9, "PurificationChamber", 15, TileEntityPurificationChamber.class, true, false, true),
ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 10, "EnergizedSmelter", 16, TileEntityEnergizedSmelter.class, true, false, true),
TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter.class, true, false, false),
ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_1, 12, "ElectricPump", 17, TileEntityElectricPump.class, true, true, false),
ELECTRIC_CHEST(MachineBlock.MACHINE_BLOCK_1, 13, "ElectricChest", -1, TileEntityElectricChest.class, true, true, false),
CHARGEPAD(MachineBlock.MACHINE_BLOCK_1, 14, "Chargepad", -1, TileEntityChargepad.class, true, true, false),
LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", -1, TileEntityLogisticalSorter.class, false, true, false),
ROTARY_CONDENSENTRATOR(MachineBlock.MACHINE_BLOCK_2, 0, "RotaryCondensentrator", 7, TileEntityRotaryCondensentrator.class, true, true, false),
CHEMICAL_OXIDIZER(MachineBlock.MACHINE_BLOCK_2, 1, "ChemicalOxidizer", 29, TileEntityChemicalOxidizer.class, true, true, true),
CHEMICAL_INFUSER(MachineBlock.MACHINE_BLOCK_2, 2, "ChemicalInfuser", 30, TileEntityChemicalInfuser.class, true, true, false),
CHEMICAL_INJECTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 3, "ChemicalInjectionChamber", 31, TileEntityChemicalInjectionChamber.class, true, false, true),
ELECTROLYTIC_SEPARATOR(MachineBlock.MACHINE_BLOCK_2, 4, "ElectrolyticSeparator", 32, TileEntityElectrolyticSeparator.class, true, true, false),
PRECISION_SAWMILL(MachineBlock.MACHINE_BLOCK_2, 5, "PrecisionSawmill", 34, TileEntityPrecisionSawmill.class, true, false, true),
CHEMICAL_DISSOLUTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 6, "ChemicalDissolutionChamber", 35, TileEntityChemicalDissolutionChamber.class, true, true, true),
CHEMICAL_WASHER(MachineBlock.MACHINE_BLOCK_2, 7, "ChemicalWasher", 36, TileEntityChemicalWasher.class, true, true, false),
CHEMICAL_CRYSTALLIZER(MachineBlock.MACHINE_BLOCK_2, 8, "ChemicalCrystallizer", 37, TileEntityChemicalCrystallizer.class, true, true, true),
SEISMIC_VIBRATOR(MachineBlock.MACHINE_BLOCK_2, 9, "SeismicVibrator", 39, TileEntitySeismicVibrator.class, true, true, false),
PRESSURIZED_REACTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 10, "PressurizedReactionChamber", 40, TileEntityPRC.class, true, true, false),
FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false),
FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false),
LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false),
LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false),
LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false),
QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, false, false),
SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false),
AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false),
OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false),
RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false),
FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true);
public MachineBlock typeBlock;
public int meta;
public String name;
public int guiId;
public double baseEnergy;
public Class<? extends TileEntity> tileEntityClass;
public boolean isElectric;
public boolean hasModel;
public boolean supportsUpgrades;
public Collection<ShapedMekanismRecipe> machineRecipes = new HashSet<ShapedMekanismRecipe>();
private MachineType(MachineBlock block, int i, String s, int j, Class<? extends TileEntity> tileClass, boolean electric, boolean model, boolean upgrades)
{
typeBlock = block;
meta = i;
name = s;
guiId = j;
tileEntityClass = tileClass;
isElectric = electric;
hasModel = model;
supportsUpgrades = upgrades;
}
public boolean isEnabled()
{
return machines.isEnabled(this.name);
}
public void addRecipes(Collection<ShapedMekanismRecipe> recipes)
{
machineRecipes.addAll(recipes);
}
public void addRecipe(ShapedMekanismRecipe recipe)
{
machineRecipes.add(recipe);
}
public Collection<ShapedMekanismRecipe> getRecipes()
{
return machineRecipes;
}
public static List<MachineType> getValidMachines()
{
List<MachineType> ret = new ArrayList<MachineType>();
for(MachineType type : MachineType.values())
{
if(type != AMBIENT_ACCUMULATOR)
{
ret.add(type);
}
}
return ret;
}
public static MachineType get(Block block, int meta)
{
if(block instanceof BlockMachine)
{
return get(((BlockMachine)block).blockType, meta);
}
return null;
}
public static MachineType get(MachineBlock block, int meta)
{
for(MachineType type : values())
{
if(type.meta == meta && type.typeBlock == block)
{
return type;
}
}
return null;
}
public TileEntity create()
{
try {
return tileEntityClass.newInstance();
} catch(Exception e) {
Mekanism.logger.error("Unable to indirectly create tile entity.");
e.printStackTrace();
return null;
}
}
/** Used for getting the base energy storage. */
public double getUsage()
{
switch(this)
{
case ENRICHMENT_CHAMBER:
return usage.enrichmentChamberUsage;
case OSMIUM_COMPRESSOR:
return usage.osmiumCompressorUsage;
case COMBINER:
return usage.combinerUsage;
case CRUSHER:
return usage.crusherUsage;
case DIGITAL_MINER:
return usage.digitalMinerUsage;
case BASIC_FACTORY:
return usage.factoryUsage * 3;
case ADVANCED_FACTORY:
return usage.factoryUsage * 5;
case ELITE_FACTORY:
return usage.factoryUsage * 7;
case METALLURGIC_INFUSER:
return usage.metallurgicInfuserUsage;
case PURIFICATION_CHAMBER:
return usage.purificationChamberUsage;
case ENERGIZED_SMELTER:
return usage.energizedSmelterUsage;
case TELEPORTER:
return 12500;
case ELECTRIC_PUMP:
return usage.electricPumpUsage;
case ELECTRIC_CHEST:
return 30;
case CHARGEPAD:
return 25;
case LOGISTICAL_SORTER:
return 0;
case ROTARY_CONDENSENTRATOR:
return usage.rotaryCondensentratorUsage;
case CHEMICAL_OXIDIZER:
return usage.oxidationChamberUsage;
case CHEMICAL_INFUSER:
return usage.chemicalInfuserUsage;
case CHEMICAL_INJECTION_CHAMBER:
return usage.chemicalInjectionChamberUsage;
case ELECTROLYTIC_SEPARATOR:
return general.FROM_H2 * 2;
case PRECISION_SAWMILL:
return usage.precisionSawmillUsage;
case CHEMICAL_DISSOLUTION_CHAMBER:
return usage.chemicalDissolutionChamberUsage;
case CHEMICAL_WASHER:
return usage.chemicalWasherUsage;
case CHEMICAL_CRYSTALLIZER:
return usage.chemicalCrystallizerUsage;
case SEISMIC_VIBRATOR:
return usage.seismicVibratorUsage;
case PRESSURIZED_REACTION_CHAMBER:
return usage.pressurizedReactionBaseUsage;
case FLUID_TANK:
return 0;
case FLUIDIC_PLENISHER:
return usage.fluidicPlenisherUsage;
case LASER:
return usage.laserUsage;
case LASER_AMPLIFIER:
return 0;
case LASER_TRACTOR_BEAM:
return 0;
case QUANTUM_ENTANGLOPORTER:
return 0;
case SOLAR_NEUTRON_ACTIVATOR:
return 0;
case AMBIENT_ACCUMULATOR:
return 0;
case RESISTIVE_HEATER:
return 100;
case FORMULAIC_ASSEMBLICATOR:
return usage.formulaicAssemblicatorUsage;
default:
return 0;
}
}
public static void updateAllUsages()
{
for(MachineType type : values())
{
type.updateUsage();
}
}
public void updateUsage()
{
baseEnergy = 400 * getUsage();
}
public String getDescription()
{
return LangUtils.localize("tooltip." + name);
}
public ItemStack getStack()
{
return new ItemStack(typeBlock.getBlock(), 1, meta);
}
public static MachineType get(ItemStack stack)
{
return get(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage());
}
}
>>>>>>> |
<<<<<<<
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
>>>>>>>
import org.lwjgl.opengl.GL11;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; |
<<<<<<<
import org.apache.accumulo.server.master.state.TServerInstance;
=======
import org.apache.accumulo.minicluster.impl.ProcessReference;
import org.apache.accumulo.server.replication.ReplicaSystemFactory;
>>>>>>>
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.replication.ReplicaSystemFactory; |
<<<<<<<
import net.minecraft.entity.ai.attributes.GlobalEntityTypeAttributes;
=======
import net.minecraft.nbt.CompoundNBT;
>>>>>>>
import net.minecraft.entity.ai.attributes.GlobalEntityTypeAttributes;
import net.minecraft.nbt.CompoundNBT; |
<<<<<<<
public float getBlockHardness(World world, BlockPos pos)
=======
public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z)
>>>>>>>
public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, BlockPos pos) |
<<<<<<<
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
=======
>>>>>>> |
<<<<<<<
EnumFacing dir = EnumFacing.getFront(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite();
toSend -= acceptor.fill(dir, new FluidStack(stack.getFluid(), currentSending), true);
=======
ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite();
toSend -= acceptor.fill(dir, copy(stack, currentSending), true);
>>>>>>>
EnumFacing dir = EnumFacing.getFront(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite();
toSend -= acceptor.fill(dir, copy(stack, currentSending), true); |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import codechicken.lib.vec.Rectangle4i;
=======
import codechicken.lib.vec.Rectangle4i;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
>>>>>>>
import codechicken.lib.vec.Rectangle4i;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
>>>>>>> |
<<<<<<<
innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorldObj().provider.getDimensionId()));
=======
if(!isAir(origX+x, origY+y, origZ+z))
{
innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorldObj().provider.dimensionId));
}
>>>>>>>
if(!isAir(origX+x, origY+y, origZ+z))
{
innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorldObj().provider.getDimensionId()));
}
<<<<<<<
TileEntity tileEntity = Coord4D.get(tile).offset(side).getTileEntity(tile.getWorldObj());
=======
Coord4D coord = Coord4D.get(tile).getFromSide(side);
TileEntity tileEntity = coord.getTileEntity(tile.getWorldObj());
>>>>>>>
Coord4D coord = Coord4D.get(tile).offset(side);
TileEntity tileEntity = coord.getTileEntity(tile.getWorldObj()); |
<<<<<<<
import net.minecraft.client.renderer.OpenGlHelper;
=======
import net.minecraft.client.renderer.RenderBlocks;
>>>>>>>
import net.minecraft.client.renderer.OpenGlHelper;
<<<<<<<
=======
import net.minecraft.client.renderer.texture.TextureManager;
>>>>>>>
<<<<<<<
import net.minecraft.util.EnumFacing;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
>>>>>>>
import net.minecraft.util.EnumFacing;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
<<<<<<<
private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
=======
private final RenderBlocks renderBlocks = new RenderBlocks();
private final RenderItem renderItem = new RenderItem();
>>>>>>>
private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
<<<<<<<
if(itemStack != null)
{
GL11.glPushMatrix();
switch(tileEntity.facing)
=======
MekanismRenderer.glowOn();
if(itemStack != null)
>>>>>>>
if(itemStack != null)
{
GL11.glPushMatrix();
switch(tileEntity.facing)
<<<<<<<
case NORTH:
GL11.glTranslated(x + 0.73, y + 0.83, z - 0.01);
break;
case SOUTH:
GL11.glTranslated(x + 0.27, y + 0.83, z + 1.01);
GL11.glRotatef(180, 0, 1, 0);
break;
case WEST:
GL11.glTranslated(x - 0.01, y + 0.83, z + 0.27);
GL11.glRotatef(90, 0, 1, 0);
break;
case EAST:
GL11.glTranslated(x + 1.01, y + 0.83, z + 0.73);
GL11.glRotatef(-90, 0, 1, 0);
break;
=======
GL11.glPushMatrix();
switch(ForgeDirection.getOrientation(tileEntity.facing))
{
case NORTH:
GL11.glTranslated(x + 0.73, y + 0.83, z - 0.01);
break;
case SOUTH:
GL11.glTranslated(x + 0.27, y + 0.83, z + 1.01);
GL11.glRotatef(180, 0, 1, 0);
break;
case WEST:
GL11.glTranslated(x - 0.01, y + 0.83, z + 0.27);
GL11.glRotatef(90, 0, 1, 0);
break;
case EAST:
GL11.glTranslated(x + 1.01, y + 0.83, z + 0.73);
GL11.glRotatef(-90, 0, 1, 0);
break;
}
float scale = 0.03125F;
float scaler = 0.9F;
GL11.glScalef(scale*scaler, scale*scaler, -0.0001F);
GL11.glRotatef(180, 0, 0, 1);
TextureManager renderEngine = Minecraft.getMinecraft().renderEngine;
renderItem.renderItemAndEffectIntoGUI(func_147498_b()/*getFontRenderer()*/, renderEngine, itemStack, 0, 0);
GL11.glPopMatrix();
>>>>>>>
case NORTH:
GL11.glTranslated(x + 0.73, y + 0.83, z - 0.01);
break;
case SOUTH:
GL11.glTranslated(x + 0.27, y + 0.83, z + 1.01);
GL11.glRotatef(180, 0, 1, 0);
break;
case WEST:
GL11.glTranslated(x - 0.01, y + 0.83, z + 0.27);
GL11.glRotatef(90, 0, 1, 0);
break;
case EAST:
GL11.glTranslated(x + 1.01, y + 0.83, z + 0.73);
GL11.glRotatef(-90, 0, 1, 0);
break;
<<<<<<<
float scale = 0.03125F;
float scaler = 0.9F;
GL11.glScalef(scale*scaler, scale*scaler, 0);
GL11.glRotatef(180, 0, 0, 1);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST);
renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
=======
if(amount != "")
{
renderText(amount, ForgeDirection.getOrientation(tileEntity.facing), 0.02F, x, y - 0.31F, z);
}
MekanismRenderer.glowOff();
>>>>>>>
float scale = 0.03125F;
float scaler = 0.9F;
GL11.glScalef(scale*scaler, scale*scaler, 0);
GL11.glRotatef(180, 0, 0, 1);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST);
renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
<<<<<<<
private void doLight(World world, Coord4D obj)
{
if(world.getBlockState(obj).getBlock().isOpaqueCube())
{
return;
}
int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj);
int lightX = brightness % 65536;
int lightY = brightness / 65536;
float scale = 0.6F;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightX * scale, lightY * scale);
}
=======
>>>>>>>
private void doLight(World world, Coord4D obj)
{
if(world.getBlockState(obj).getBlock().isOpaqueCube())
{
return;
}
int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj);
int lightX = brightness % 65536;
int lightY = brightness / 65536;
float scale = 0.6F;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightX * scale, lightY * scale);
} |
<<<<<<<
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
=======
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
>>>>>>>
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; |
<<<<<<<
LITHIUM("lithium", 0xFFEBA400, 453.65F, 512),
HYDROFLUORIC_ACID("hydrofluoric_acid", 0xFFC6C7BD, 189.6F, 1150F),
URANIUM_OXIDE("uranium_oxide", 0xFFE1F573, 3138.15F, 10970F),
URANIUM_HEXAFLUORIDE("uranium_hexafluoride", 0xFF809960, 337.2F, 5090F);
=======
LITHIUM("lithium", 0xFFEBA400, 0, 453.65F, 512);
>>>>>>>
LITHIUM("lithium", 0xFFEBA400, 0, 453.65F, 512),
HYDROFLUORIC_ACID("hydrofluoric_acid", 0xFFC6C7BD, 0, 189.6F, 1150F),
URANIUM_OXIDE("uranium_oxide", 0xFFE1F573, 0, 3138.15F, 10970F),
URANIUM_HEXAFLUORIDE("uranium_hexafluoride", 0xFF809960, 0, 337.2F, 5090F); |
<<<<<<<
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.SoundEvents;
=======
>>>>>>>
import net.minecraft.nbt.CompoundNBT; |
<<<<<<<
import mekanism.api.MekanismConfig.general;
=======
import mekanism.api.Range4D;
>>>>>>>
import mekanism.api.MekanismConfig.general;
import mekanism.api.Range4D; |
<<<<<<<
=======
import codechicken.lib.vec.Vector3;
>>>>>>>
<<<<<<<
public PartLogisticalTransporter()
{
transmitterDelegate = new MultipartTransporter(this);
}
=======
public Set<TransporterStack> needsSync = new HashSet<TransporterStack>();
public PartLogisticalTransporter(Tier.TransporterTier transporterTier)
{
tier = transporterTier;
}
protected PartLogisticalTransporter() {}
>>>>>>>
public PartLogisticalTransporter(TransporterTier transporterTier)
{
tier = transporterTier;
transmitterDelegate = new MultipartTransporter(this);
}
<<<<<<<
getTransmitter().update();
=======
if(world().isRemote)
{
for(TransporterStack stack : transit)
{
if(stack != null)
{
stack.progress = Math.min(100, stack.progress+tier.speed);
}
}
}
else {
Set<TransporterStack> remove = new HashSet<TransporterStack>();
pullItems();
for(TransporterStack stack : transit)
{
if(!stack.initiatedPath)
{
if(stack.itemStack == null || !recalculate(stack, null))
{
remove.add(stack);
continue;
}
}
stack.progress += tier.speed;
if(stack.progress > 100)
{
Coord4D prevSet = null;
if(stack.hasPath())
{
int currentIndex = stack.pathToTarget.indexOf(Coord4D.get(tile()));
Coord4D next = stack.pathToTarget.get(currentIndex-1);
if(!stack.isFinal(this))
{
if(next != null && stack.canInsertToTransporter(stack.getNext(this).getTileEntity(world()), ForgeDirection.getOrientation(stack.getSide(this))))
{
ILogisticalTransporter nextTile = (ILogisticalTransporter)next.getTileEntity(world());
nextTile.entityEntering(stack, stack.progress%100);
remove.add(stack);
continue;
}
else if(next != null)
{
prevSet = next;
}
}
else {
if(stack.pathType != Path.NONE)
{
if(next != null && next.getTileEntity(world()) instanceof IInventory)
{
needsSync.add(stack);
IInventory inventory = (IInventory)next.getTileEntity(world());
if(inventory != null)
{
ItemStack rejected = InventoryUtils.putStackInInventory(inventory, stack.itemStack, stack.getSide(this), stack.pathType == Path.HOME);
if(rejected == null)
{
TransporterManager.remove(stack);
remove.add(stack);
continue;
}
else {
needsSync.add(stack);
stack.itemStack = rejected;
prevSet = next;
}
}
}
}
}
}
if(!recalculate(stack, prevSet))
{
remove.add(stack);
continue;
}
else {
if(prevSet != null)
{
stack.progress = 0;
}
else {
stack.progress = 50;
}
}
}
else if(stack.progress == 50)
{
if(stack.isFinal(this))
{
if(stack.pathType == Path.DEST && (!checkSideForInsert(stack) || !InventoryUtils.canInsert(stack.getDest().getTileEntity(world()), stack.color, stack.itemStack, stack.getSide(this), false)))
{
if(!recalculate(stack, null))
{
remove.add(stack);
continue;
}
}
else if(stack.pathType == Path.HOME && (!checkSideForInsert(stack) || !InventoryUtils.canInsert(stack.getDest().getTileEntity(world()), stack.color, stack.itemStack, stack.getSide(this), true)))
{
if(!recalculate(stack, null))
{
remove.add(stack);
continue;
}
}
else if(stack.pathType == Path.NONE)
{
if(!recalculate(stack, null))
{
remove.add(stack);
continue;
}
}
}
else {
TileEntity next = stack.getNext(this).getTileEntity(world());
boolean recalculate = false;
if(!stack.canInsertToTransporter(next, ForgeDirection.getOrientation(stack.getSide(this))))
{
recalculate = true;
}
if(recalculate)
{
if(!recalculate(stack, null))
{
remove.add(stack);
continue;
}
}
}
}
}
for(TransporterStack stack : remove)
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tile()), getSyncPacket(stack, true)), new Range4D(Coord4D.get(tile())));
transit.remove(stack);
MekanismUtils.saveChunk(tile());
}
for(TransporterStack stack : needsSync)
{
if(transit.contains(stack))
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tile()), getSyncPacket(stack, false)), new Range4D(Coord4D.get(tile())));
}
}
needsSync.clear();
}
}
private boolean checkSideForInsert(TransporterStack stack)
{
ForgeDirection side = ForgeDirection.getOrientation(stack.getSide(this));
return getConnectionType(side) == ConnectionType.NORMAL || getConnectionType(side) == ConnectionType.PUSH;
>>>>>>>
getTransmitter().update();
<<<<<<<
=======
private boolean recalculate(TransporterStack stack, Coord4D from)
{
needsSync.add(stack);
if(stack.pathType != Path.NONE)
{
if(!TransporterManager.didEmit(stack.itemStack, stack.recalculatePath(this, 0)))
{
if(!stack.calculateIdle(this))
{
TransporterUtils.drop(this, stack);
return false;
}
}
}
else {
if(!stack.calculateIdle(this))
{
TransporterUtils.drop(this, stack);
return false;
}
}
if(from != null)
{
stack.originalLocation = from;
}
return true;
}
@Override
public ItemStack insert(Coord4D original, ItemStack itemStack, EnumColor color, boolean doEmit, int min)
{
return insert_do(original, itemStack, color, doEmit, min, false);
}
private ItemStack insert_do(Coord4D original, ItemStack itemStack, EnumColor color, boolean doEmit, int min, boolean force)
{
ForgeDirection from = Coord4D.get(tile()).sideDifference(original).getOpposite();
TransporterStack stack = new TransporterStack();
stack.itemStack = itemStack;
stack.originalLocation = original;
stack.homeLocation = original;
stack.color = color;
if((force && !canReceiveFrom(original.getTileEntity(world()), from)) || !stack.canInsertToTransporter(tile(), from))
{
return itemStack;
}
ItemStack rejected = stack.recalculatePath(this, min);
if(TransporterManager.didEmit(stack.itemStack, rejected))
{
stack.itemStack = TransporterManager.getToUse(stack.itemStack, rejected);
if(doEmit)
{
transit.add(stack);
TransporterManager.add(stack);
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tile()), getSyncPacket(stack, false)), new Range4D(Coord4D.get(tile())));
MekanismUtils.saveChunk(tile());
}
return rejected;
}
return itemStack;
}
>>>>>>> |
<<<<<<<
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.3", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
=======
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
>>>>>>>
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
<<<<<<<
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 0),
=======
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 0), new Object[] {
>>>>>>>
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 0), new Object[] {
<<<<<<<
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 1),
=======
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 1), new Object[] {
>>>>>>>
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 1), new Object[] {
<<<<<<<
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 2),
=======
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 2), new Object[] {
>>>>>>>
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 2), new Object[] {
<<<<<<<
));
BlockStateMachine.MachineType.OREDICTIONIFICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 3),
"SGS", "CBC", "SWS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "paneGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), MekanismItems.Dictionary, Character.valueOf('W'), Blocks.CHEST
));
BlockStateMachine.MachineType.LASER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 13),
=======
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 3), new Object[] {
"RCR", "dWd", "RCR", Character.valueOf('R'), "alloyUltimate", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('d'), "gemDiamond", Character.valueOf('W'), "plankWood"
}));
MachineType.OREDICTIONIFICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 3), new Object[] {
"SGS", "CBC", "SWS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "paneGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), MekanismItems.Dictionary, Character.valueOf('W'), Blocks.chest
}));
MachineType.LASER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 13), new Object[] {
>>>>>>>
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 3), new Object[] {
"RCR", "dWd", "RCR", Character.valueOf('R'), "alloyUltimate", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('d'), "gemDiamond", Character.valueOf('W'), "plankWood"
}));
BlockStateMachine.MachineType.OREDICTIONIFICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 3),
"SGS", "CBC", "SWS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "paneGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), MekanismItems.Dictionary, Character.valueOf('W'), Blocks.CHEST
));
BlockStateMachine.MachineType.LASER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 13), |
<<<<<<<
GasStack stored = GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored"));
if(stored == null)
{
itemstack.setItemDamage(100);
}
else {
itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100))));
}
return stored;
=======
return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored"));
>>>>>>>
return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored"));
<<<<<<<
itemstack.setItemDamage(100);
itemstack.getTagCompound().removeTag("stored");
=======
itemstack.stackTagCompound.removeTag("stored");
>>>>>>>
itemstack.getTagCompound().removeTag("stored");
<<<<<<<
itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100))));
itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound()));
=======
itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound()));
>>>>>>>
itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); |
<<<<<<<
import net.minecraftforge.fml.common.Optional.Interface;
=======
>>>>>>> |
<<<<<<<
fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
=======
fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040);
>>>>>>>
fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); |
<<<<<<<
=======
import mekanism.client.MekKeyHandler;
import mekanism.client.MekanismKeyHandler;
import mekanism.common.IEnergyCube;
import mekanism.common.ISustainedInventory;
>>>>>>> |
<<<<<<<
public HashMap<Coord4D, A> possibleAcceptors = new HashMap<Coord4D, A>();
public HashMap<Coord4D, EnumSet<ForgeDirection>> acceptorDirections = new HashMap<Coord4D, EnumSet<ForgeDirection>>();
=======
public ConcurrentHashMap<Coord4D, A> possibleAcceptors = new ConcurrentHashMap<Coord4D, A>();
public ConcurrentHashMap<A, ForgeDirection> acceptorDirections = new ConcurrentHashMap<A, ForgeDirection>();
>>>>>>>
public ConcurrentHashMap<Coord4D, A> possibleAcceptors = new ConcurrentHashMap<Coord4D, A>();
public ConcurrentHashMap<Coord4D, EnumSet<ForgeDirection>> acceptorDirections = new ConcurrentHashMap<Coord4D, EnumSet<ForgeDirection>>();
<<<<<<<
acceptorDirections.get(acceptor).remove(side.getOpposite());
if(acceptorDirections.get(acceptor).isEmpty())
{
possibleAcceptors.remove(acceptor);
}
=======
possibleAcceptors.remove(acceptor);
if(acceptor.getTileEntity(getWorld()) != null)
{
acceptorDirections.remove(acceptor.getTileEntity(getWorld()));
}
>>>>>>>
acceptorDirections.get(acceptor).remove(side.getOpposite());
if(acceptorDirections.get(acceptor).isEmpty())
{
possibleAcceptors.remove(acceptor);
} |
<<<<<<<
readers.add(new RFile.Reader(new CachableBlockFile.Reader(inputStream, sources[i].getLength(), opts.in.getConf(), dataCache, indexCache,
DefaultConfiguration.getInstance())));
=======
readers.add(new RFile.Reader(new CachableBlockFile.Reader("source-" + i, inputStream, sources[i].getLength(), opts.in.getConf(), dataCache, indexCache,
AccumuloConfiguration.getDefaultConfiguration())));
>>>>>>>
readers.add(new RFile.Reader(new CachableBlockFile.Reader("source-" + i, inputStream, sources[i].getLength(), opts.in.getConf(), dataCache, indexCache,
DefaultConfiguration.getInstance()))); |
<<<<<<<
public static int MAX_LENGTH = 16;
public EnumHand currentHand;
=======
>>>>>>>
public EnumHand currentHand; |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
>>>>>>> |
<<<<<<<
@Interface(iface = "cofh.redstoneflux.api.IEnergyProvider", modid = "redstoneflux"),
@Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = "redstoneflux"),
@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)
=======
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = MekanismHooks.IC2_MOD_ID)
>>>>>>>
@Interface(iface = "cofh.redstoneflux.api.IEnergyProvider", modid = "redstoneflux"),
@Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = "redstoneflux"),
@Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = MekanismHooks.IC2_MOD_ID),
@Interface(iface = "ic2.api.tile.IEnergyStorage", modid = MekanismHooks.IC2_MOD_ID) |
<<<<<<<
import mekanism.common.registries.MekanismTileEntityTypes;
import mekanism.common.tile.prefab.TileEntityMultiblock;
=======
>>>>>>>
import mekanism.common.tile.prefab.TileEntityMultiblock; |
<<<<<<<
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.client.CPacketCustomPayload;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
import net.minecraft.network.play.client.C17PacketCustomPayload;
import net.minecraft.util.StatCollector;
>>>>>>>
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.client.CPacketCustomPayload;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
<<<<<<<
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 0, entityId, null));
mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0);
=======
SoundHandler.playSound("gui.button.press");
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 0, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0);
>>>>>>>
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 0, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0);
<<<<<<<
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 1, entityId, null));
mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, entityId, 0, 0);
=======
SoundHandler.playSound("gui.button.press");
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 1, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0);
>>>>>>>
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 1, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0);
<<<<<<<
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 2, entityId, null));
mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0);
=======
SoundHandler.playSound("gui.button.press");
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 2, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0);
>>>>>>>
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 2, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0);
<<<<<<<
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 3, entityId, null));
mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0);
=======
SoundHandler.playSound("gui.button.press");
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 3, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0);
>>>>>>>
SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK);
Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.GUI, 3, robit.getEntityId(), null));
mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); |
<<<<<<<
import net.minecraft.block.state.IBlockState;
=======
import net.minecraft.block.BlockLiquid;
>>>>>>>
import net.minecraft.block.BlockLiquid;
import net.minecraft.block.state.IBlockState;
<<<<<<<
import net.minecraft.util.BlockPos;
=======
import net.minecraftforge.fluids.IFluidBlock;
>>>>>>>
import net.minecraftforge.fluids.IFluidBlock;
import net.minecraft.util.BlockPos;
<<<<<<<
if(info.block != null && !tileEntity.getWorld().isAirBlock(new BlockPos(x, y, z)) && info.block.getBlockHardness(tileEntity.getWorld(), new BlockPos(x, y, z)) >= 0)
=======
info.block = tileEntity.getWorldObj().getBlock(x, y, z);
info.meta = tileEntity.getWorldObj().getBlockMetadata(x, y, z);
if(info.block instanceof BlockLiquid || info.block instanceof IFluidBlock)
{
continue;
}
if(info.block != null && !tileEntity.getWorldObj().isAirBlock(x, y, z) && info.block.getBlockHardness(tileEntity.getWorldObj(), x, y, z) >= 0)
>>>>>>>
if(info.block instanceof BlockLiquid || info.block instanceof IFluidBlock)
{
continue;
}
if(info.block != null && !tileEntity.getWorld().isAirBlock(new BlockPos(x, y, z)) && info.block.getBlockHardness(tileEntity.getWorld(), new BlockPos(x, y, z)) >= 0) |
<<<<<<<
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.n52.iceland.ds.ConnectionProvider;
import org.n52.iceland.ogc.ows.OwsExceptionReport;
=======
import org.n52.iceland.exception.ows.OwsExceptionReport;
>>>>>>>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.n52.iceland.ds.ConnectionProvider;
import org.n52.iceland.exception.ows.OwsExceptionReport; |
<<<<<<<
=======
import javax.annotation.Nonnull;
>>>>>>>
import javax.annotation.Nonnull;
<<<<<<<
@Nullable
@Override
public List<String> getTooltipStrings(int mouseX, int mouseY)
{
List<String> currenttip = new ArrayList<>();
if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12)
{
currenttip.add(gasType.getLocalizedName());
}
return currenttip;
}
=======
>>>>>>> |
<<<<<<<
@CapabilityInject(IRadiationShielding.class)
public static Capability<IRadiationShielding> RADIATION_SHIELDING_CAPABILITY = null;
@CapabilityInject(IHeatTransfer.class)
public static Capability<IHeatTransfer> HEAT_TRANSFER_CAPABILITY = null;
=======
@CapabilityInject(IHeatHandler.class)
public static Capability<IHeatHandler> HEAT_HANDLER_CAPABILITY = null;
>>>>>>>
@CapabilityInject(IRadiationShielding.class)
public static Capability<IRadiationShielding> RADIATION_SHIELDING_CAPABILITY = null;
@CapabilityInject(IHeatHandler.class)
public static Capability<IHeatHandler> HEAT_HANDLER_CAPABILITY = null; |
<<<<<<<
=======
import mekanism.common.integration.ic2.IC2Integration;
import mekanism.common.integration.storagedrawer.StorageDrawerRecipeHandler;
>>>>>>>
import mekanism.common.integration.ic2.IC2Integration; |
<<<<<<<
import mekanism.common.PacketHandler;
=======
import mekanism.common.Tier.BaseTier;
>>>>>>>
import mekanism.common.PacketHandler;
import mekanism.common.Tier.BaseTier;
<<<<<<<
import mekanism.common.capabilities.Capabilities;
=======
import mekanism.common.base.ITierUpgradeable;
>>>>>>>
import mekanism.common.base.ITierUpgradeable;
import mekanism.common.capabilities.Capabilities;
<<<<<<<
public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandlerWrapper, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile
=======
public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile, ITierUpgradeable
>>>>>>>
public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandlerWrapper, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile, ITierUpgradeable |
<<<<<<<
general.allowChunkloading = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowChunkloading", true).getBoolean();
=======
general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean();
>>>>>>>
general.allowChunkloading = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowChunkloading", true).getBoolean();
general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean(); |
<<<<<<<
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
=======
>>>>>>>
import net.minecraft.util.math.BlockPos;
<<<<<<<
super(inventory, world, BlockPos.ORIGIN, inventory.player);
=======
super(inventory, entity.worldObj, 0, 0, 0, inventory.player);
robit = entity;
>>>>>>>
super(inventory, entity.worldObj, BlockPos.ORIGIN, inventory.player);
robit = entity; |
<<<<<<<
import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
=======
>>>>>>> |
<<<<<<<
@Method(modid = "CoFHCore")
public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate)
=======
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
>>>>>>>
public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate)
<<<<<<<
@Method(modid = "CoFHCore")
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate)
=======
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
>>>>>>>
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate)
<<<<<<<
@Method(modid = "CoFHCore")
public boolean canConnectEnergy(EnumFacing from)
=======
public boolean canConnectEnergy(ForgeDirection from)
>>>>>>>
public boolean canConnectEnergy(EnumFacing from)
<<<<<<<
@Method(modid = "CoFHCore")
public int getEnergyStored(EnumFacing from)
=======
public int getEnergyStored(ForgeDirection from)
>>>>>>>
public int getEnergyStored(EnumFacing from)
<<<<<<<
@Method(modid = "CoFHCore")
public int getMaxEnergyStored(EnumFacing from)
=======
public int getMaxEnergyStored(ForgeDirection from)
>>>>>>>
public int getMaxEnergyStored(EnumFacing from) |
<<<<<<<
colors[color.ordinal()] = event.map.registerSprite(new ResourceLocation("mekanism:blocks/overlay/overlay_" + color.unlocalizedName));
}
for(TransmissionType type : TransmissionType.values())
{
overlays.put(type, event.map.registerSprite(new ResourceLocation("mekanism:blocks/overlay/" + type.getTransmission() + "Overlay")));
}
energyIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/LiquidEnergy"));
heatIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/LiquidHeat"));
GasRegistry.getGas("hydrogen").setIcon(event.map, "mekanism:blocks/LiquidHydrogen");
GasRegistry.getGas("oxygen").setIcon(event.map,"mekanism:blocks/LiquidOxygen");
GasRegistry.getGas("water").setIcon(event.map,"mekanism:blocks/LiquidSteam");
GasRegistry.getGas("chlorine").setIcon(event.map,"mekanism:blocks/LiquidChlorine");
GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map,"mekanism:blocks/LiquidSulfurDioxide");
GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map,"mekanism:blocks/LiquidSulfurTrioxide");
GasRegistry.getGas("sulfuricAcid").setIcon(event.map,"mekanism:blocks/LiquidSulfuricAcid");
GasRegistry.getGas("hydrogenChloride").setIcon(event.map,"mekanism:blocks/LiquidHydrogenChloride");
GasRegistry.getGas("liquidOsmium").setIcon(event.map,"mekanism:blocks/LiquidOsmium");
GasRegistry.getGas("liquidStone").setIcon(event.map,"mekanism:blocks/LiquidStone");
GasRegistry.getGas("ethene").setIcon(event.map,"mekanism:blocks/LiquidEthene");
GasRegistry.getGas("brine").setIcon(event.map,"mekanism:blocks/LiquidBrine");
GasRegistry.getGas("sodium").setIcon(event.map,"mekanism:blocks/LiquidSodium");
GasRegistry.getGas("deuterium").setIcon(event.map,"mekanism:blocks/LiquidDeuterium");
GasRegistry.getGas("tritium").setIcon(event.map,"mekanism:blocks/LiquidTritium");
GasRegistry.getGas("fusionFuelDT").setIcon(event.map,"mekanism:blocks/LiquidDT");
GasRegistry.getGas("lithium").setIcon(event.map,"mekanism:blocks/LiquidLithium");
for(Gas gas : GasRegistry.getRegisteredGasses())
{
if(gas instanceof OreGas)
=======
for(EnumColor color : EnumColor.values())
{
colors[color.ordinal()] = event.map.registerIcon("mekanism:overlay/overlay_" + color.unlocalizedName);
}
for(TransmissionType type : TransmissionType.values())
{
overlays.put(type, event.map.registerIcon("mekanism:overlay/" + type.getTransmission() + "Overlay"));
}
energyIcon = event.map.registerIcon("mekanism:liquid/LiquidEnergy");
heatIcon = event.map.registerIcon("mekanism:liquid/LiquidHeat");
GasRegistry.getGas("hydrogen").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogen"));
GasRegistry.getGas("oxygen").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOxygen"));
GasRegistry.getGas("water").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSteam"));
GasRegistry.getGas("chlorine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidChlorine"));
GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurDioxide"));
GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurTrioxide"));
GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfuricAcid"));
GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogenChloride"));
GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium"));
GasRegistry.getGas("liquidStone").setIcon(event.map.registerIcon("mekanism:liquid/LiquidStone"));
GasRegistry.getGas("ethene").setIcon(event.map.registerIcon("mekanism:liquid/LiquidEthene"));
GasRegistry.getGas("brine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidBrine"));
GasRegistry.getGas("sodium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSodium"));
GasRegistry.getGas("deuterium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDeuterium"));
GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidTritium"));
GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDT"));
GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidLithium"));
for(Gas gas : GasRegistry.getRegisteredGasses())
>>>>>>>
colors[color.ordinal()] = event.map.registerSprite(new ResourceLocation("mekanism:blocks/overlay/overlay_" + color.unlocalizedName));
}
for(TransmissionType type : TransmissionType.values())
{
overlays.put(type, event.map.registerSprite(new ResourceLocation("mekanism:blocks/overlay/" + type.getTransmission() + "Overlay")));
}
energyIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/LiquidEnergy"));
heatIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/LiquidHeat"));
GasRegistry.getGas("hydrogen").setIcon(event.map, "mekanism:blocks/LiquidHydrogen");
GasRegistry.getGas("oxygen").setIcon(event.map,"mekanism:blocks/LiquidOxygen");
GasRegistry.getGas("water").setIcon(event.map,"mekanism:blocks/LiquidSteam");
GasRegistry.getGas("chlorine").setIcon(event.map,"mekanism:blocks/LiquidChlorine");
GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map,"mekanism:blocks/LiquidSulfurDioxide");
GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map,"mekanism:blocks/LiquidSulfurTrioxide");
GasRegistry.getGas("sulfuricAcid").setIcon(event.map,"mekanism:blocks/LiquidSulfuricAcid");
GasRegistry.getGas("hydrogenChloride").setIcon(event.map,"mekanism:blocks/LiquidHydrogenChloride");
GasRegistry.getGas("liquidOsmium").setIcon(event.map,"mekanism:blocks/LiquidOsmium");
GasRegistry.getGas("liquidStone").setIcon(event.map,"mekanism:blocks/LiquidStone");
GasRegistry.getGas("ethene").setIcon(event.map,"mekanism:blocks/LiquidEthene");
GasRegistry.getGas("brine").setIcon(event.map,"mekanism:blocks/LiquidBrine");
GasRegistry.getGas("sodium").setIcon(event.map,"mekanism:blocks/LiquidSodium");
GasRegistry.getGas("deuterium").setIcon(event.map,"mekanism:blocks/LiquidDeuterium");
GasRegistry.getGas("tritium").setIcon(event.map,"mekanism:blocks/LiquidTritium");
GasRegistry.getGas("fusionFuelDT").setIcon(event.map,"mekanism:blocks/LiquidDT");
GasRegistry.getGas("lithium").setIcon(event.map,"mekanism:blocks/LiquidLithium");
for(Gas gas : GasRegistry.getRegisteredGasses())
{
if(gas instanceof OreGas)
<<<<<<<
gas.setIcon(event.map,"mekanism:blocks/LiquidCleanOre");
}
else {
gas.setIcon(event.map,"mekanism:blocks/LiquidOre");
=======
if(gas.getUnlocalizedName().contains("clean"))
{
gas.setIcon(event.map.registerIcon("mekanism:liquid/LiquidCleanOre"));
}
else {
gas.setIcon(event.map.registerIcon("mekanism:liquid/LiquidOre"));
}
>>>>>>>
gas.setIcon(event.map,"mekanism:liquid/LiquidCleanOre");
}
else {
gas.setIcon(event.map,"mekanism:liquid/LiquidOre");
<<<<<<<
/*
if(RenderPartTransmitter.getInstance() != null)
{
RenderPartTransmitter.getInstance().resetDisplayInts();
}
*/
RenderDynamicTank.resetDisplayInts();
RenderThermalEvaporationController.resetDisplayInts();
RenderFluidTank.resetDisplayInts();
}
public static void initFluidTextures(TextureMap map) {
missingIcon = map.getMissingSprite();
textureMap.clear();
for (FluidType type : FluidType.values()) {
textureMap.put(type, new HashMap<Fluid, TextureAtlasSprite>());
}
for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) {
// TextureAtlasSprite toUse = null;
if (fluid.getFlowing() != null) {
String flow = fluid.getFlowing().toString();
TextureAtlasSprite sprite;
if (map.getTextureExtry(flow) != null) {
sprite = map.getTextureExtry(flow);
} else {
sprite = map.registerSprite(fluid.getStill());
}
// toUse = sprite;
textureMap.get(FluidType.FLOWING).put(fluid, sprite);
=======
FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:liquid/LiquidBrine"));
FluidRegistry.getFluid("heavywater").setIcons(event.map.registerIcon("mekanism:liquid/LiquidHeavyWater"));
FluidRegistry.getFluid("steam").setIcons(event.map.registerIcon("mekanism:liquid/LiquidSteam"));
for(InfuseType type : InfuseRegistry.getInfuseMap().values())
{
type.setIcon(event.map.registerIcon(type.textureLocation));
>>>>>>>
/*
if(RenderPartTransmitter.getInstance() != null)
{
RenderPartTransmitter.getInstance().resetDisplayInts();
}
*/
RenderDynamicTank.resetDisplayInts();
RenderThermalEvaporationController.resetDisplayInts();
RenderFluidTank.resetDisplayInts();
}
public static void initFluidTextures(TextureMap map) {
missingIcon = map.getMissingSprite();
textureMap.clear();
for (FluidType type : FluidType.values()) {
textureMap.put(type, new HashMap<Fluid, TextureAtlasSprite>());
}
for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) {
// TextureAtlasSprite toUse = null;
if (fluid.getFlowing() != null) {
String flow = fluid.getFlowing().toString();
TextureAtlasSprite sprite;
if (map.getTextureExtry(flow) != null) {
sprite = map.getTextureExtry(flow);
} else {
sprite = map.registerSprite(fluid.getStill());
}
// toUse = sprite;
textureMap.get(FluidType.FLOWING).put(fluid, sprite);
<<<<<<<
public DefIcon(TextureAtlasSprite icon, int... is)
=======
/** If this DefIcon should be prioritized over a machine's side-specific off texture
* if no on texture is present. */
public boolean overridesInactive = true;
public DefIcon(IIcon icon, int... is)
>>>>>>>
/** If this DefIcon should be prioritized over a machine's side-specific off texture
* if no on texture is present. */
public boolean overridesInactive = true;
public DefIcon(TextureAtlasSprite icon, int... is)
<<<<<<<
public static DefIcon getAll(TextureAtlasSprite icon)
=======
public DefIcon setOverrides(boolean b)
{
overridesInactive = b;
return this;
}
public static DefIcon getAll(IIcon icon)
>>>>>>>
public DefIcon setOverrides(boolean b)
{
overridesInactive = b;
return this;
}
public static DefIcon getAll(TextureAtlasSprite icon) |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
>>>>>>> |
<<<<<<<
dataStream.writeBoolean(general.allowChunkloading);
=======
dataStream.writeBoolean(general.allowProtection);
>>>>>>>
dataStream.writeBoolean(general.allowChunkloading);
dataStream.writeBoolean(general.allowProtection);
<<<<<<<
general.allowChunkloading = dataStream.readBoolean();
=======
general.allowProtection = dataStream.readBoolean();
>>>>>>>
general.allowChunkloading = dataStream.readBoolean();
general.allowProtection = dataStream.readBoolean(); |
<<<<<<<
import java.util.Map.Entry;
=======
>>>>>>>
import java.util.Map.Entry;
<<<<<<<
=======
import mekanism.api.transmitters.ITransmitterNetwork;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.ListUtils;
>>>>>>>
<<<<<<<
buffer = net.buffer.copy();
} else
{
if(buffer.getGas() == net.buffer.getGas())
{
buffer.amount += net.buffer.amount;
}
else if(net.buffer.amount > buffer.amount)
{
buffer = net.buffer.copy();
}
=======
gasStored = net.gasStored;
}
else {
if(gasStored.isGasEqual(net.gasStored))
{
gasStored.amount += net.gasStored.amount;
}
>>>>>>>
buffer = net.buffer.copy();
} else
{
if(buffer.isGasEqual(net.buffer))
{
buffer.amount += net.buffer.amount;
}
else if(net.buffer.amount > buffer.amount)
{
buffer = net.buffer.copy();
}
<<<<<<<
=======
@Override
public synchronized void refresh()
{
Set<IGridTransmitter<GasNetwork>> iterTubes = (Set<IGridTransmitter<GasNetwork>>)transmitters.clone();
Iterator<IGridTransmitter<GasNetwork>> it = iterTubes.iterator();
while(it.hasNext())
{
IGridTransmitter<GasNetwork> conductor = it.next();
if(conductor == null || conductor.getTile().isInvalid())
{
removeTransmitter(conductor);
}
else {
conductor.setTransmitterNetwork(this);
}
}
needsUpdate = true;
}
@Override
public synchronized void refresh(IGridTransmitter<GasNetwork> transmitter)
{
IGasHandler[] acceptors = GasTransmission.getConnectedAcceptors(transmitter.getTile());
clearAround(transmitter);
for(IGasHandler acceptor : acceptors)
{
ForgeDirection side = ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor));
if(side != null && acceptor != null && !(acceptor instanceof IGridTransmitter) && transmitter.canConnectToAcceptor(side, true))
{
possibleAcceptors.put(Coord4D.get((TileEntity)acceptor), acceptor);
addSide(Coord4D.get((TileEntity)acceptor), ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor)));
}
}
}
>>>>>>>
<<<<<<<
=======
public boolean canMerge(List<ITransmitterNetwork<?, ?>> networks)
{
Gas found = null;
for(ITransmitterNetwork<?, ?> network : networks)
{
if(network instanceof GasNetwork)
{
GasNetwork net = (GasNetwork)network;
if(net.gasStored != null)
{
if(found != null && found != net.gasStored.getGas())
{
return false;
}
found = net.gasStored.getGas();
}
}
}
return true;
}
@Override
protected GasNetwork create(Collection<IGridTransmitter<GasNetwork>> collection)
{
GasNetwork network = new GasNetwork(collection);
network.refGas = refGas;
if(gasStored != null)
{
if(network.gasStored == null)
{
network.gasStored = gasStored;
}
else {
if(network.gasStored.isGasEqual(gasStored))
{
network.gasStored.amount += gasStored.amount;
}
}
}
network.gasScale = network.getScale();
network.updateCapacity();
return network;
}
@Override
public TransmissionType getTransmissionType()
{
return TransmissionType.GAS;
}
@Override
>>>>>>> |
<<<<<<<
GasStack stored = GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored"));
if(stored == null)
{
itemstack.setItemDamage(100);
}
else {
itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100))));
}
return stored;
=======
return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored"));
>>>>>>>
return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored"));
<<<<<<<
itemstack.setItemDamage(100);
itemstack.getTagCompound().removeTag("stored");
=======
itemstack.stackTagCompound.removeTag("stored");
>>>>>>>
itemstack.getTagCompound().removeTag("stored");
<<<<<<<
itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100))));
itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound()));
=======
itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound()));
>>>>>>>
itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); |
<<<<<<<
public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork> implements ILogisticalTransporter, IPipeTile
=======
public class PartLogisticalTransporter extends PartSidedPipe implements ILogisticalTransporter
>>>>>>>
public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork> implements ILogisticalTransporter
<<<<<<<
@Override
@Method(modid = "BuildCraftAPI|transport")
public PipeType getPipeType()
{
return PipeType.ITEM;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, buildcraft.api.core.EnumColor color) {
return 0;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from)
{
if(doAdd)
{
TileEntity tile = Coord4D.get(tile()).getFromSide(from).getTileEntity(world());
ItemStack rejects = TransporterUtils.insert(tile, this, stack, null, true, 0);
return TransporterManager.getToUse(stack, rejects).stackSize;
}
return 0;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isPipeConnected(ForgeDirection with)
{
return connectionMapContainsSide(getAllCurrentConnections(), with);
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public TileEntity getAdjacentTile(ForgeDirection dir)
{
return Coord4D.get(tile()).getFromSide(dir).getTileEntity(world());
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public IPipe getPipe()
{
return pipe;
}
@Interface(iface = "buildcraft.api.transport.IPipe", modid = "BuildCraftAPI|transport")
public class TransporterPipeProxy implements IPipe
{
@Override
@Method(modid = "BuildCraftAPI|transport")
public int x()
{
return PartLogisticalTransporter.this.x();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public int y()
{
return PartLogisticalTransporter.this.y();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public int z()
{
return PartLogisticalTransporter.this.y();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public IPipeTile getTile()
{
return (IPipeTile)tile();
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public IGate getGate(ForgeDirection side)
{
return null;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean hasGate(ForgeDirection side)
{
return false;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isWired(PipeWire wire)
{
return false;
}
@Override
@Method(modid = "BuildCraftAPI|transport")
public boolean isWireActive(PipeWire wire)
{
return false;
}
}
@Override
public int getTransmitterNetworkSize()
{
return getTransmitterNetwork().getSize();
}
@Override
public int getTransmitterNetworkAcceptorSize()
{
return getTransmitterNetwork().getAcceptorSize();
}
@Override
public String getTransmitterNetworkNeeded()
{
return getTransmitterNetwork().getNeededInfo();
}
@Override
public String getTransmitterNetworkFlow()
{
return getTransmitterNetwork().getFlowInfo();
}
@Override
public int getCapacity()
{
return 0;
}
@Override
public InventoryNetwork createNetworkFromSingleTransmitter(IGridTransmitter<InventoryNetwork> transmitter)
{
return new InventoryNetwork(transmitter);
}
@Override
public InventoryNetwork createNetworkByMergingSet(Set<InventoryNetwork> networks)
{
return new InventoryNetwork(networks);
}
=======
>>>>>>>
@Override
public int getTransmitterNetworkSize()
{
return getTransmitterNetwork().getSize();
}
@Override
public int getTransmitterNetworkAcceptorSize()
{
return getTransmitterNetwork().getAcceptorSize();
}
@Override
public String getTransmitterNetworkNeeded()
{
return getTransmitterNetwork().getNeededInfo();
}
@Override
public String getTransmitterNetworkFlow()
{
return getTransmitterNetwork().getFlowInfo();
}
@Override
public int getCapacity()
{
return 0;
}
@Override
public InventoryNetwork createNetworkFromSingleTransmitter(IGridTransmitter<InventoryNetwork> transmitter)
{
return new InventoryNetwork(transmitter);
}
@Override
public InventoryNetwork createNetworkByMergingSet(Set<InventoryNetwork> networks)
{
return new InventoryNetwork(networks);
} |
<<<<<<<
import mekanism.common.capabilities.Capabilities;
=======
import mekanism.common.base.IUpgradeTile;
>>>>>>>
import mekanism.common.base.IUpgradeTile;
import mekanism.common.capabilities.Capabilities;
<<<<<<<
import mekanism.common.util.ItemDataUtils;
=======
import mekanism.common.tile.component.TileComponentUpgrade;
>>>>>>>
import mekanism.common.tile.component.TileComponentUpgrade;
import mekanism.common.util.ItemDataUtils; |
<<<<<<<
func_230480_a_(new GuiDownArrow(this, 150, 39));
func_230480_a_(new GuiContainerEditMode<>(this, tile));
func_230480_a_(new GuiMergedTankGauge<>(() -> tile.getMultiblock().mergedTank, tile::getMultiblock, GaugeType.MEDIUM, this, 7, 16, 34, 56));
=======
addButton(new GuiDownArrow(this, 150, 39));
addButton(new GuiContainerEditModeTab<>(this, tile));
addButton(new GuiMergedTankGauge<>(() -> tile.getMultiblock().mergedTank, tile::getMultiblock, GaugeType.MEDIUM, this, 7, 16, 34, 56));
>>>>>>>
func_230480_a_(new GuiDownArrow(this, 150, 39));
func_230480_a_(new GuiContainerEditModeTab<>(this, tile));
func_230480_a_(new GuiMergedTankGauge<>(() -> tile.getMultiblock().mergedTank, tile::getMultiblock, GaugeType.MEDIUM, this, 7, 16, 34, 56)); |
<<<<<<<
import net.minecraft.util.EnumFacing;
import net.minecraftforge.client.model.obj.OBJModel;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import java.util.ArrayList;
=======
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.IFluidHandler;
>>>>>>>
import net.minecraft.util.EnumFacing;
import net.minecraftforge.client.model.obj.OBJModel;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import java.util.ArrayList;
<<<<<<<
return slotID == 0 && FluidContainerRegistry.isContainer(itemstack);
=======
if(slotID == 0)
{
if(itemstack.getItem() instanceof IFluidContainerItem)
{
return true;
}
else if(FluidContainerRegistry.isFilledContainer(itemstack))
{
FluidStack stack = FluidContainerRegistry.getFluidForFilledItem(itemstack);
if(fluidTank.getFluid() == null || fluidTank.getFluid().isFluidEqual(stack))
{
return editMode == ContainerEditMode.EMPTY || editMode == ContainerEditMode.BOTH;
}
}
else if(FluidContainerRegistry.isEmptyContainer(itemstack))
{
return editMode == ContainerEditMode.FILL || editMode == ContainerEditMode.BOTH;
}
}
>>>>>>>
if(slotID == 0)
{
if(itemstack.getItem() instanceof IFluidContainerItem)
{
return true;
}
else if(FluidContainerRegistry.isFilledContainer(itemstack))
{
FluidStack stack = FluidContainerRegistry.getFluidForFilledItem(itemstack);
if(fluidTank.getFluid() == null || fluidTank.getFluid().isFluidEqual(stack))
{
return editMode == ContainerEditMode.EMPTY || editMode == ContainerEditMode.BOTH;
}
}
else if(FluidContainerRegistry.isEmptyContainer(itemstack))
{
return editMode == ContainerEditMode.FILL || editMode == ContainerEditMode.BOTH;
}
}
return false; |
<<<<<<<
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import cofh.api.energy.IEnergyContainerItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
=======
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.common.Optional.InterfaceList;
import cpw.mods.fml.common.Optional.Method;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
>>>>>>>
import cofh.api.energy.IEnergyContainerItem;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
<<<<<<<
double electricityStored = itemStack.getTagCompound().getDouble("electricity");
itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100))));
return electricityStored;
=======
return itemStack.stackTagCompound.getDouble("electricity");
>>>>>>>
return itemStack.getTagCompound().getDouble("electricity");
<<<<<<<
itemStack.getTagCompound().setDouble("electricity", electricityStored);
itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100))));
=======
itemStack.stackTagCompound.setDouble("electricity", electricityStored);
>>>>>>>
itemStack.getTagCompound().setDouble("electricity", electricityStored); |
<<<<<<<
return canAccess(security.getSecurity(stack), player.getName(), security.getOwner(stack));
=======
if(MekanismUtils.isOp((EntityPlayerMP)player))
{
return true;
}
return canAccess(security.getSecurity(stack), player.getCommandSenderName(), security.getOwner(stack));
>>>>>>>
if(MekanismUtils.isOp((EntityPlayerMP)player))
{
return true;
}
return canAccess(security.getSecurity(stack), player.getName(), security.getOwner(stack));
<<<<<<<
return canAccess(security.getSecurity().getMode(), player.getName(), security.getSecurity().getOwner());
=======
if(MekanismUtils.isOp((EntityPlayerMP)player))
{
return true;
}
return canAccess(security.getSecurity().getMode(), player.getCommandSenderName(), security.getSecurity().getOwner());
>>>>>>>
if(MekanismUtils.isOp((EntityPlayerMP)player))
{
return true;
}
return canAccess(security.getSecurity().getMode(), player.getName(), security.getSecurity().getOwner()); |
<<<<<<<
private Map<BooleanArray, DisplayInteger> displayLists = new HashMap<BooleanArray, DisplayInteger>();
=======
private Map<BooleanArray, Integer> displayLists = new HashMap<BooleanArray, Integer>();
>>>>>>>
private Map<BooleanArray, DisplayInteger> displayLists = new HashMap<BooleanArray, DisplayInteger>();
<<<<<<<
DisplayInteger currentDisplayList = displayLists.get(new BooleanArray(dontRender));
if (currentDisplayList == null)
=======
Integer currentDisplayList = displayLists.get(new BooleanArray(dontRender));
if(currentDisplayList == null)
>>>>>>>
DisplayInteger currentDisplayList = displayLists.get(new BooleanArray(dontRender));
if(currentDisplayList == null)
<<<<<<<
=======
private class BooleanArray
{
private final boolean[] boolArray;
public BooleanArray(boolean[] array)
{
boolArray = array.clone();
}
@Override
public boolean equals(Object o)
{
if(o instanceof BooleanArray)
{
return Arrays.equals(boolArray, ((BooleanArray)o).boolArray);
}
else if(o instanceof boolean[])
{
return Arrays.equals(boolArray, (boolean[])o);
}
else {
return false;
}
}
@Override
public int hashCode()
{
return Arrays.hashCode(boolArray);
}
}
>>>>>>> |
<<<<<<<
import mekanism.client.render.MekanismRenderer.FluidType;
=======
import mekanism.client.sound.SoundHandler;
import mekanism.common.Mekanism;
>>>>>>>
import mekanism.client.render.MekanismRenderer.FluidType;
import mekanism.client.sound.SoundHandler;
import mekanism.common.Mekanism; |
<<<<<<<
import net.minecraftforge.fml.common.Optional;
=======
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.Optional;
>>>>>>>
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
<<<<<<<
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
=======
>>>>>>>
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; |
<<<<<<<
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade),
=======
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade), new Object[] {
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron"
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), new Object[] {
>>>>>>>
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade),
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade),
<<<<<<<
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade),
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(),
=======
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.MufflingUpgrade), new Object[] {
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustSteel"
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] {
>>>>>>>
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.MufflingUpgrade),
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustSteel"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(),
<<<<<<<
));
*/
=======
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 18), new Object[] {
"SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "ingotCopper"
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 19), new Object[] {
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 18)
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 20), new Object[] {
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 19)
}));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 21), new Object[] {
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 20)
}));
>>>>>>>
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 18),
"SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "ingotCopper"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 19),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 18)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 20),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 19)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 21),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 20)
));
*/ |
<<<<<<<
import mekanism.client.render.tileentity.RenderPortableTank;
=======
import mekanism.client.render.tileentity.RenderMetallurgicInfuser;
import mekanism.client.render.tileentity.RenderObsidianTNT;
>>>>>>>
import mekanism.client.render.tileentity.RenderMetallurgicInfuser;
import mekanism.client.render.tileentity.RenderObsidianTNT;
import mekanism.client.render.tileentity.RenderPortableTank;
<<<<<<<
import mekanism.client.render.tileentity.RenderThermalEvaporationController;
=======
import mekanism.client.render.tileentity.RenderRotaryCondensentrator;
>>>>>>>
import mekanism.client.render.tileentity.RenderRotaryCondensentrator;
import mekanism.client.render.tileentity.RenderThermalEvaporationController;
<<<<<<<
=======
import mekanism.common.tile.TileEntityThermalEvaporationController;
>>>>>>>
import mekanism.common.tile.TileEntityThermalEvaporationController; |
<<<<<<<
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
list.add(EnumColor.GREY + LangUtils.localize("tooltip.mode") + ": " + EnumColor.GREY + getMode(itemstack).getName());
=======
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack)));
>>>>>>>
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack)));
list.add(EnumColor.GREY + LangUtils.localize("tooltip.mode") + ": " + EnumColor.GREY + getMode(itemstack).getName()); |
<<<<<<<
tier = InductionProviderTier.values()[dataStream.readInt()];
super.handlePacketData(dataStream);
MekanismUtils.updateBlock(worldObj, getPos());
=======
if(worldObj.isRemote)
{
tier = InductionProviderTier.values()[dataStream.readInt()];
super.handlePacketData(dataStream);
MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord);
}
>>>>>>>
if(worldObj.isRemote)
{
tier = InductionProviderTier.values()[dataStream.readInt()];
super.handlePacketData(dataStream);
MekanismUtils.updateBlock(worldObj, getPos());
} |
<<<<<<<
public String getUnlocalizedName(ItemStack itemstack)
=======
public IIcon getIconFromDamage(int i)
{
return metaBlock.getIcon(2, i);
}
@Override
public String getItemStackDisplayName(ItemStack itemstack)
>>>>>>>
public String getUnlocalizedName(ItemStack itemstack)
<<<<<<<
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos);
=======
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z);
tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()];
tileEntity.gasTank.setMaxGas(tileEntity.tier.storage);
>>>>>>>
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos);
tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()];
tileEntity.gasTank.setMaxGas(tileEntity.tier.storage);
<<<<<<<
GasStack stored = GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored"));
if(stored == null)
{
itemstack.setItemDamage(100);
}
else {
itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100))));
}
return stored;
=======
return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored"));
>>>>>>>
return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored"));
<<<<<<<
itemstack.setItemDamage(100);
itemstack.getTagCompound().removeTag("stored");
=======
itemstack.stackTagCompound.removeTag("stored");
>>>>>>>
itemstack.getTagCompound().removeTag("stored");
<<<<<<<
itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100))));
itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound()));
=======
itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound()));
>>>>>>>
itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); |
<<<<<<<
import mekanism.api.MekanismConfig.usage;
=======
import mekanism.api.Range4D;
>>>>>>>
import mekanism.api.Range4D;
import mekanism.api.MekanismConfig.usage; |
<<<<<<<
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
=======
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.2", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
>>>>>>>
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.2", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + |
<<<<<<<
import mekanism.common.base.*;
import mekanism.common.block.states.BlockStateMachine;
=======
import mekanism.common.base.IEjector;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.ISustainedData;
import mekanism.common.base.ITankManager;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.BlockMachine.MachineType;
>>>>>>>
import mekanism.common.base.IEjector;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.ISustainedData;
import mekanism.common.base.ITankManager;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.states.BlockStateMachine;
<<<<<<<
import java.util.ArrayList;
=======
>>>>>>> |
<<<<<<<
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fluids.FluidRegistry;
=======
import net.minecraftforge.common.util.ForgeDirection;
>>>>>>>
import net.minecraft.util.EnumFacing;
<<<<<<<
public static class ValveData
{
public EnumFacing side;
public Coord4D location;
public boolean serverFluid;
@Override
public int hashCode()
{
int code = 1;
code = 31 * code + side.ordinal();
code = 31 * code + location.hashCode();
return code;
}
@Override
public boolean equals(Object obj)
{
return obj instanceof ValveData && ((ValveData)obj).side == side && ((ValveData)obj).location.equals(location);
}
}
=======
>>>>>>> |
<<<<<<<
func_230480_a_(new GuiFluidGauge(() -> tile.lavaTank, () -> tile.getFluidTanks(null), GaugeType.WIDE, this, 55, 18));
func_230480_a_(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15));
func_230480_a_(new GuiHeatTab(() -> {
ITextComponent temp = MekanismUtils.getTemperatureDisplay(tile.getTotalTemperature(), TemperatureUnit.KELVIN, false);
=======
addButton(new GuiFluidGauge(() -> tile.lavaTank, () -> tile.getFluidTanks(null), GaugeType.WIDE, this, 55, 18));
addButton(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15));
addButton(new GuiHeatTab(() -> {
ITextComponent temp = MekanismUtils.getTemperatureDisplay(tile.getTotalTemperature(), TemperatureUnit.KELVIN, true);
>>>>>>>
func_230480_a_(new GuiFluidGauge(() -> tile.lavaTank, () -> tile.getFluidTanks(null), GaugeType.WIDE, this, 55, 18));
func_230480_a_(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15));
func_230480_a_(new GuiHeatTab(() -> {
ITextComponent temp = MekanismUtils.getTemperatureDisplay(tile.getTotalTemperature(), TemperatureUnit.KELVIN, true); |
<<<<<<<
updateCapacity();
=======
>>>>>>>
updateCapacity();
<<<<<<<
boolean networkChanged = false;
=======
>>>>>>>
boolean networkChanged = false; |
<<<<<<<
import mekanism.induction.common.item.ItemBlockWire;
import mekanism.induction.common.item.ItemLinker;
=======
>>>>>>>
import mekanism.induction.common.item.ItemBlockWire;
<<<<<<<
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.common.Configuration;
=======
>>>>>>>
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.common.Configuration;
<<<<<<<
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
=======
>>>>>>>
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
<<<<<<<
import cpw.mods.fml.common.Loader;
=======
>>>>>>>
import cpw.mods.fml.common.Loader;
<<<<<<<
// Items
public static Item Linker;
/** With Forge Multipart; Use EnumWireMaterial reference. **/
private static Item itemPartWire;
// Blocks
=======
//Blocks
>>>>>>>
/** With Forge Multipart; Use EnumWireMaterial reference. **/
private static Item itemPartWire;
// Blocks
<<<<<<<
// Config
FURNACE_WATTAGE = (float) Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Furnace Wattage", FURNACE_WATTAGE).getDouble(FURNACE_WATTAGE);
SOUND_FXS = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Tesla Sound FXs", SOUND_FXS).getBoolean(SOUND_FXS);
LO_FI_INSULATION = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Use lo-fi insulation texture", LO_FI_INSULATION).getBoolean(LO_FI_INSULATION);
SHINY_SILVER = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Shiny silver wires", SHINY_SILVER).getBoolean(SHINY_SILVER);
MAX_CONTRACTOR_DISTANCE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Max EM Contractor Path", MAX_CONTRACTOR_DISTANCE).getInt(MAX_CONTRACTOR_DISTANCE);
// Enable advanced vanilla furnace with Mekanism Generators is NOT installed.
ENABLE_ADVANCED_FURNACE = Loader.isModLoaded("MekanismGenerators");
ENABLE_ADVANCED_FURNACE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Enable Vanilla Electric Furnace", ENABLE_ADVANCED_FURNACE).getBoolean(ENABLE_ADVANCED_FURNACE);
TileEntityEMContractor.ACCELERATION = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Item Acceleration", TileEntityEMContractor.ACCELERATION).getDouble(TileEntityEMContractor.ACCELERATION);
TileEntityEMContractor.MAX_REACH = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Reach", TileEntityEMContractor.MAX_REACH).getInt(TileEntityEMContractor.MAX_REACH);
TileEntityEMContractor.MAX_SPEED = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Speed", TileEntityEMContractor.MAX_SPEED).getDouble(TileEntityEMContractor.MAX_SPEED);
TileEntityEMContractor.PUSH_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Item Push Delay", TileEntityEMContractor.PUSH_DELAY).getInt(TileEntityEMContractor.PUSH_DELAY);
// Items
Linker = new ItemLinker(Mekanism.configuration.get(Mekanism.configuration.CATEGORY_ITEM, "Linker", getNextItemID()).getInt()).setUnlocalizedName("Linker");
if (Loader.isModLoaded("ForgeMultipart"))
{
try
{
// itemPartWire = (Item) Class.forName("mekanism.induction.common.wire.ItemPartWire").getDeclaredConstructor(Integer.TYPE).newInstance(getNextItemID());
Mekanism.logger.fine("Mekanism Induction multipart loaded.");
}
catch (Exception e)
{
Mekanism.logger.severe("Failed to load multipart wire.");
e.printStackTrace();
}
}
else
{
Mekanism.logger.fine("Mekanism Induction Multipart disabled due to Forge Multipart not found.");
}
// Blocks
=======
//Blocks
>>>>>>>
// Config
FURNACE_WATTAGE = (float) Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Furnace Wattage", FURNACE_WATTAGE).getDouble(FURNACE_WATTAGE);
SOUND_FXS = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Tesla Sound FXs", SOUND_FXS).getBoolean(SOUND_FXS);
LO_FI_INSULATION = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Use lo-fi insulation texture", LO_FI_INSULATION).getBoolean(LO_FI_INSULATION);
SHINY_SILVER = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Shiny silver wires", SHINY_SILVER).getBoolean(SHINY_SILVER);
MAX_CONTRACTOR_DISTANCE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Max EM Contractor Path", MAX_CONTRACTOR_DISTANCE).getInt(MAX_CONTRACTOR_DISTANCE);
// Enable advanced vanilla furnace with Mekanism Generators is NOT installed.
ENABLE_ADVANCED_FURNACE = Loader.isModLoaded("MekanismGenerators");
ENABLE_ADVANCED_FURNACE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Enable Vanilla Electric Furnace", ENABLE_ADVANCED_FURNACE).getBoolean(ENABLE_ADVANCED_FURNACE);
TileEntityEMContractor.ACCELERATION = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Item Acceleration", TileEntityEMContractor.ACCELERATION).getDouble(TileEntityEMContractor.ACCELERATION);
TileEntityEMContractor.MAX_REACH = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Reach", TileEntityEMContractor.MAX_REACH).getInt(TileEntityEMContractor.MAX_REACH);
TileEntityEMContractor.MAX_SPEED = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Speed", TileEntityEMContractor.MAX_SPEED).getDouble(TileEntityEMContractor.MAX_SPEED);
TileEntityEMContractor.PUSH_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Item Push Delay", TileEntityEMContractor.PUSH_DELAY).getInt(TileEntityEMContractor.PUSH_DELAY);
//Register Items
if (Loader.isModLoaded("ForgeMultipart"))
{
try
{
// itemPartWire = (Item) Class.forName("mekanism.induction.common.wire.ItemPartWire").getDeclaredConstructor(Integer.TYPE).newInstance(getNextItemID());
Mekanism.logger.fine("Mekanism Induction multipart loaded.");
}
catch (Exception e)
{
Mekanism.logger.severe("Failed to load multipart wire.");
e.printStackTrace();
}
}
else
{
Mekanism.logger.fine("Mekanism Induction Multipart disabled due to Forge Multipart not found.");
}
// Blocks
<<<<<<<
/**
* Recipes
*/
final ItemStack defaultWire = EnumWireMaterial.IRON.getWire();
/** Linker **/
GameRegistry.addRecipe(new MekanismRecipe(new ItemStack(Linker), new Object[] { " E ", "GCG", " E ", 'E', Item.eyeOfEnder, 'C', Mekanism.EnergyTablet.getUnchargedItem(), 'G', "ingotOsmium" }));
=======
>>>>>>>
/**
* Recipes
*/
final ItemStack defaultWire = EnumWireMaterial.IRON.getWire(); |
<<<<<<<
/**
* The tiers used by the Energy Cube and their corresponding values.
* @author aidancbrady
*
*/
public static enum EnergyCubeTier implements IStringSerializable
=======
public static enum EnergyCubeTier implements ITier
>>>>>>>
public static enum EnergyCubeTier implements ITier, IStringSerializable
<<<<<<<
private EnergyCubeTier(double max, double out)
{
baseMaxEnergy = maxEnergy = max;
baseOutput = output = out;
}
@Override
public String getName()
{
return name().toLowerCase();
}
=======
>>>>>>>
@Override
public String getName()
{
return name().toLowerCase();
}
<<<<<<<
*/
/**
* The tiers used by Mechanical Pipes and their corresponding values.
* @author unpairedbracket
*
*//*
public static enum PipeTier
=======
public static enum PipeTier implements ITier
>>>>>>>
public static enum PipeTier implements ITier
<<<<<<<
*/
/**
* The tiers used by Pressurized Tubes and their corresponding values.
* @author AidanBrady
*
*//*
public static enum TubeTier
=======
public static enum TubeTier implements ITier
>>>>>>>
public static enum TubeTier implements ITier
<<<<<<<
*/
/**
* The tiers used by Logistical Transporters and their corresponding values.
* @author AidanBrady
*
*//*
public static enum TransporterTier
=======
public static enum TransporterTier implements ITier
>>>>>>>
public static enum TransporterTier implements ITier
<<<<<<<
*/
for(InductionCellTier tier : InductionCellTier.values())
=======
for(Class c : Tier.class.getDeclaredClasses())
>>>>>>>
*/
for(Class c : Tier.class.getDeclaredClasses())
<<<<<<<
/*
for(PipeTier tier : PipeTier.values())
=======
}
public static void writeConfig(ByteBuf dataStream)
{
for(ITier tier : tierTypes)
>>>>>>>
}
public static void writeConfig(ByteBuf dataStream)
{
for(ITier tier : tierTypes)
<<<<<<<
for(ConductorTier tier : ConductorTier.values())
{
tier.writeConfig(dataStream);
}
*/
=======
public void writeConfig(ByteBuf dataStream);
>>>>>>>
public void writeConfig(ByteBuf dataStream);
*/ |
<<<<<<<
import mekanism.common.Tier.EnergyCubeTier;
=======
import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_1;
import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_2;
import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1;
import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2;
import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_3;
>>>>>>>
import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_1;
import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_2;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3;
<<<<<<<
import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_1;
import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_2;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3;
=======
>>>>>>> |
<<<<<<<
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
import mekanism.api.EnumColor;
import mekanism.api.energy.IEnergizedItem;
import mekanism.client.ClientProxy;
import mekanism.client.MekanismClient;
import mekanism.client.model.ModelArmoredJetpack;
import mekanism.client.model.ModelAtomicDisassembler;
import mekanism.client.model.ModelEnergyCube;
import mekanism.client.model.ModelEnergyCube.ModelEnergyCore;
import mekanism.client.model.ModelFlamethrower;
import mekanism.client.model.ModelFreeRunners;
import mekanism.client.model.ModelGasMask;
import mekanism.client.model.ModelGasTank;
import mekanism.client.model.ModelJetpack;
import mekanism.client.model.ModelObsidianTNT;
import mekanism.client.model.ModelRobit;
import mekanism.client.model.ModelScubaTank;
import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.RenderGlowPanel;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.client.render.entity.RenderBalloon;
import mekanism.client.render.tileentity.RenderBin;
import mekanism.client.render.tileentity.RenderFluidTank;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.Tier.FluidTankTier;
import mekanism.common.base.IEnergyCube;
import mekanism.common.block.BlockBasic.BasicType;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.inventory.InventoryBin;
import mekanism.common.item.ItemAtomicDisassembler;
import mekanism.common.item.ItemBalloon;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemFlamethrower;
import mekanism.common.item.ItemFreeRunners;
import mekanism.common.item.ItemGasMask;
import mekanism.common.item.ItemRobit;
import mekanism.common.item.ItemScubaTank;
import mekanism.common.item.ItemWalkieTalkie;
import mekanism.common.multipart.ItemGlowPanel;
import mekanism.common.multipart.ItemPartTransmitter;
import mekanism.common.multipart.TransmitterType;
import mekanism.common.tile.TileEntityBin;
import mekanism.common.tile.TileEntityFluidTank;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.model.ModelChest;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
>>>>>>>
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
<<<<<<<
}
else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.BasicBlock && item.getItemDamage() == 6)
{
RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], MekanismBlocks.BasicBlock, item.getItemDamage(), ClientProxy.BASIC_RENDER_ID);
if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()* / == null)
=======
GL11.glRotatef(-270, 0.0F, 1.0F, 0.0F);
if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()*/ == null)
>>>>>>>
GL11.glRotatef(-270, 0.0F, 1.0F, 0.0F);
if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()* / == null) |
<<<<<<<
import com.mojang.blaze3d.matrix.MatrixStack;
import javax.annotation.Nonnull;
import mekanism.api.text.EnumColor;
=======
import mekanism.client.SpecialColors;
>>>>>>>
import com.mojang.blaze3d.matrix.MatrixStack;
import javax.annotation.Nonnull;
import mekanism.api.text.EnumColor;
import mekanism.client.SpecialColors; |
<<<<<<<
import net.minecraft.util.EnumFacing;
=======
import cpw.mods.fml.relauncher.Side;
>>>>>>>
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
<<<<<<<
if(side == EnumFacing.DOWN || SecurityUtils.getSecurity(this) != SecurityMode.PUBLIC)
=======
if(side == 0 || SecurityUtils.getSecurity(this, Side.SERVER) != SecurityMode.PUBLIC)
>>>>>>>
if(side == EnumFacing.DOWN || SecurityUtils.getSecurity(this, Side.SERVER) != SecurityMode.PUBLIC) |
<<<<<<<
import com.marklogic.quickstart.model.entity_services.EntityModel;
import com.marklogic.quickstart.service.JobManager;
=======
>>>>>>>
import com.marklogic.quickstart.EnvironmentAware;
import com.marklogic.quickstart.model.entity_services.EntityModel;
import com.marklogic.quickstart.service.JobManager;
<<<<<<<
import com.marklogic.quickstart.exception.NotFoundException;
=======
import com.marklogic.quickstart.EnvironmentAware;
import com.marklogic.quickstart.model.EntityModel;
>>>>>>>
import com.marklogic.quickstart.exception.NotFoundException;
<<<<<<<
public Collection<EntityModel> getEntities(@PathVariable int projectId,
@PathVariable String environment) throws ClassNotFoundException, IOException {
requireAuth();
Project project = projectManagerService.getProject(projectId);
if (!project.getEnvironments().contains(environment)) {
throw new NotFoundException();
}
return entityManagerService.getEntities();
=======
public Collection<EntityModel> getEntities() throws ClassNotFoundException, IOException {
return entityManagerService.getEntities(envConfig().getProjectDir());
>>>>>>>
public Collection<EntityModel> getEntities() throws ClassNotFoundException, IOException {
return entityManagerService.getEntities();
<<<<<<<
public ResponseEntity<?> saveEntities(@PathVariable int projectId,
@PathVariable String environment,
@RequestBody List<EntityModel> entities) throws ClassNotFoundException, IOException {
requireAuth();
// ensure project exists
projectManagerService.getProject(projectId);
for (EntityModel entity : entities) {
entityManagerService.saveEntity(entity);
}
entityManagerService.saveAllUiData(entities);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@RequestMapping(value = "/entities/ui/", method = RequestMethod.POST)
@ResponseBody
public ResponseEntity<?> saveEntitiesUiState(@PathVariable int projectId,
@PathVariable String environment,
@RequestBody List<EntityModel> entities) throws ClassNotFoundException, IOException {
requireAuth();
// ensure project exists
projectManagerService.getProject(projectId);
entityManagerService.saveAllUiData(entities);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@RequestMapping(value = "/entities/{entityName}", method = RequestMethod.PUT)
@ResponseBody
public EntityModel saveEntity(@PathVariable int projectId,
@PathVariable String environment,
@RequestBody EntityModel entity) throws ClassNotFoundException, IOException {
requireAuth();
// ensure project exists
projectManagerService.getProject(projectId);
entityManagerService.saveEntityUiData(entity);
return entityManagerService.saveEntity(entity);
=======
public EntityModel createEntity(@RequestBody EntityModel newEntity) throws ClassNotFoundException, IOException {
return entityManagerService.createEntity(envConfig().getProjectDir(), newEntity);
>>>>>>>
public ResponseEntity<?> saveEntities(@RequestBody List<EntityModel> entities) throws ClassNotFoundException, IOException {
for (EntityModel entity : entities) {
entityManagerService.saveEntity(entity);
}
entityManagerService.saveAllUiData(entities);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@RequestMapping(value = "/entities/ui/", method = RequestMethod.POST)
@ResponseBody
public ResponseEntity<?> saveEntitiesUiState(@RequestBody List<EntityModel> entities) throws ClassNotFoundException, IOException {
entityManagerService.saveAllUiData(entities);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@RequestMapping(value = "/entities/{entityName}", method = RequestMethod.PUT)
@ResponseBody
public EntityModel saveEntity(@RequestBody EntityModel entity) throws ClassNotFoundException, IOException {
entityManagerService.saveEntityUiData(entity);
return entityManagerService.saveEntity(entity);
<<<<<<<
requireAuth();
// ensure project exists
projectManagerService.getProject(projectId);
return entityManagerService.createFlow(envConfig.getProjectDir(), entityName, flowType, newFlow);
=======
EntityModel entity = entityManagerService.getEntity(envConfig().getProjectDir(), entityName);
return entityManagerService.createFlow(envConfig().getProjectDir(), entity, flowType, newFlow);
>>>>>>>
return entityManagerService.createFlow(envConfig().getProjectDir(), entityName, flowType, newFlow);
<<<<<<<
ResponseEntity<JobExecution> resp = null;
// ensure project exists
projectManagerService.getProject(projectId);
=======
ResponseEntity<JobExecution> resp;
>>>>>>>
ResponseEntity<JobExecution> resp;
<<<<<<<
requireAuth();
// ensure project exists
projectManagerService.getProject(projectId);
=======
>>>>>>>
<<<<<<<
requireAuth();
ResponseEntity<BigInteger> resp = null;
// ensure project exists
projectManagerService.getProject(projectId);
=======
>>>>>>>
<<<<<<<
requireAuth();
// ensure project exists
projectManagerService.getProject(projectId);
JobManager jm = new JobManager(envConfig.getMlSettings(), envConfig.getJobClient());
=======
JobManager jm = new JobManager(envConfig().getMlSettings(), envConfig().getJobClient());
>>>>>>>
JobManager jm = new JobManager(envConfig().getMlSettings(), envConfig().getJobClient()); |
<<<<<<<
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.marklogic.client.helper.LoggingObject;
=======
>>>>>>>
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.marklogic.client.helper.LoggingObject;
<<<<<<<
import com.marklogic.hub.scaffold.Scaffolding;
=======
import com.marklogic.hub.scaffold.Scaffolding;
import com.marklogic.quickstart.auth.ConnectionAuthenticationToken;
import com.marklogic.quickstart.exception.NotFoundException;
import com.marklogic.quickstart.model.EntityModel;
>>>>>>>
import com.marklogic.hub.scaffold.Scaffolding;
import com.marklogic.quickstart.auth.ConnectionAuthenticationToken; |
<<<<<<<
* @param cryptoModule
* the module to use to obtain cryptographic streams
* @param cryptoParams
* @throws IOException
=======
>>>>>>>
* @param cryptoModule
* the module to use to obtain cryptographic streams
<<<<<<<
=======
@Override
>>>>>>>
@Override
<<<<<<<
=======
@Override
>>>>>>>
@Override |
<<<<<<<
private void installEntity() {
Scaffolding scaffolding = Scaffolding.create(projectDir.toString(), finalClient);
=======
private void installEntities() {
Scaffolding scaffolding = new Scaffolding(projectDir.toString(), finalClient);
>>>>>>>
private void installEntities() {
Scaffolding scaffolding = Scaffolding.create(projectDir.toString(), finalClient);
<<<<<<<
// private void removeEntity() throws IOException {
// Scaffolding scaffolding = Scaffolding.create(projectDir.toString(), finalClient);
// Path employeeDir = scaffolding.getEntityDir("employee");
// FileUtils.deleteDirectory(employeeDir.toFile());
// }
=======
private void updateManagerEntity() {
Scaffolding scaffolding = new Scaffolding(projectDir.toString(), finalClient);
Path managerDir = scaffolding.getEntityDir("manager");
assertTrue(managerDir.toFile().exists());
File targetFile = managerDir.resolve("manager.entity.json").toFile();
FileUtil.copy(getResourceStream("scaffolding-test/manager2.entity.json"), targetFile);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
targetFile.setLastModified(System.currentTimeMillis());
}
>>>>>>>
private void updateManagerEntity() {
Scaffolding scaffolding = Scaffolding.create(projectDir.toString(), finalClient);
Path managerDir = scaffolding.getEntityDir("manager");
assertTrue(managerDir.toFile().exists());
File targetFile = managerDir.resolve("manager.entity.json").toFile();
FileUtil.copy(getResourceStream("scaffolding-test/manager2.entity.json"), targetFile);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
targetFile.setLastModified(System.currentTimeMillis());
} |
<<<<<<<
import com.marklogic.client.modulesloader.ModulesManager;
import com.marklogic.client.modulesloader.impl.DefaultModulesLoader;
import com.marklogic.hub.util.GsonUtil;
=======
import com.marklogic.hub.commands.LoadModulesCommand;
>>>>>>>
import com.marklogic.client.modulesloader.ModulesManager;
import com.marklogic.client.modulesloader.impl.DefaultModulesLoader;
import com.marklogic.hub.commands.LoadModulesCommand;
import com.marklogic.hub.util.GsonUtil;
<<<<<<<
LoadModulesCommand lmc = new LoadModulesCommand();
DefaultModulesLoader dml = new DefaultModulesLoader(config.newXccAssetLoader());
lmc.setModulesLoader(dml);
commands.add(lmc);
=======
commands.add(new LoadModulesCommand());
>>>>>>>
commands.add(new LoadModulesCommand()); |
<<<<<<<
public void testFlow(HttpServletRequest request) {
final String entityName = request.getParameter("entityName");
final String flowName = request.getParameter("flowName");
final Flow flow = flowManagerService.getFlow(entityName, flowName);
flowManagerService.testFlow(flow);
=======
public BigInteger testFlow(HttpServletRequest request) {
CancellableTask task = new CancellableTask() {
private JobExecution jobExecution;
@Override
public void cancel(BasicFuture<?> resultFuture) {
if (jobExecution != null) {
jobExecution.stop();
}
}
@Override
public void run(BasicFuture<?> resultFuture) {
final String domainName = request.getParameter("domainName");
final String flowName = request.getParameter("flowName");
final Flow flow = flowManagerService.getFlow(domainName, flowName);
this.jobExecution = flowManagerService.testFlow(flow);
}
};
return taskManagerService.addTask(task);
>>>>>>>
public BigInteger testFlow(HttpServletRequest request) {
CancellableTask task = new CancellableTask() {
private JobExecution jobExecution;
@Override
public void cancel(BasicFuture<?> resultFuture) {
if (jobExecution != null) {
jobExecution.stop();
}
}
@Override
public void run(BasicFuture<?> resultFuture) {
final String entityName = request.getParameter("entityName");
final String flowName = request.getParameter("flowName");
final Flow flow = flowManagerService.getFlow(entityName, flowName);
this.jobExecution = flowManagerService.testFlow(flow);
}
};
return taskManagerService.addTask(task);
<<<<<<<
public void runFlow(@RequestBody RunFlowModel runFlow) {
final Flow flow = flowManagerService.getFlow(runFlow.getEntityName(),
runFlow.getFlowName());
// TODO update and move BATCH SIZE TO a constant or config - confirm
// desired behavior
flowManagerService.runFlow(flow, 100);
=======
public BigInteger runFlow(@RequestBody RunFlowModel runFlow) {
CancellableTask task = new CancellableTask() {
private JobExecution jobExecution;
@Override
public void cancel(BasicFuture<?> resultFuture) {
if (jobExecution != null) {
jobExecution.stop();
}
}
@Override
public void run(BasicFuture<?> resultFuture) {
final Flow flow = flowManagerService.getFlow(runFlow.getDomainName(), runFlow.getFlowName());
// TODO update and move BATCH SIZE TO a constant or config - confirm
// desired behavior
this.jobExecution = flowManagerService.runFlow(flow, 100, new JobExecutionListener() {
@Override
public void beforeJob(JobExecution jobExecution) {
}
@Override
public void afterJob(JobExecution jobExecution) {
resultFuture.completed(null);
}
});
}
};
return taskManagerService.addTask(task);
>>>>>>>
public BigInteger runFlow(@RequestBody RunFlowModel runFlow) {
CancellableTask task = new CancellableTask() {
private JobExecution jobExecution;
@Override
public void cancel(BasicFuture<?> resultFuture) {
if (jobExecution != null) {
jobExecution.stop();
}
}
@Override
public void run(BasicFuture<?> resultFuture) {
final Flow flow = flowManagerService.getFlow(runFlow.getEntityName(),
runFlow.getFlowName());
// TODO update and move BATCH SIZE TO a constant or config - confirm
// desired behavior
this.jobExecution = flowManagerService.runFlow(flow, 100, new JobExecutionListener() {
@Override
public void beforeJob(JobExecution jobExecution) {
}
@Override
public void afterJob(JobExecution jobExecution) {
resultFuture.completed(null);
}
});
}
};
return taskManagerService.addTask(task); |
<<<<<<<
private String colorTestContrastRatio;
@Override
public void setColorTestContrastRatio(String colorTestContrastRatio) {
this.colorTestContrastRatio = colorTestContrastRatio;
}
@Override
public String getColorTestContrastRatio() {
return colorTestContrastRatio;
}
=======
private String colorTestContrastRatio;
@Override
public void setColorTestContrastRatio(String colorTestContrastRatio) {
this.colorTestContrastRatio = colorTestContrastRatio;
}
@Override
public String getColorTestContrastRatio() {
return colorTestContrastRatio;
}
>>>>>>>
private String colorTestContrastRatio;
@Override
public void setColorTestContrastRatio(String colorTestContrastRatio) {
this.colorTestContrastRatio = colorTestContrastRatio;
}
@Override
public String getColorTestContrastRatio() {
return colorTestContrastRatio;
}
<<<<<<<
=======
private List<DefiniteResult> history;
@Override
public List<DefiniteResult> getHistory() {
return history;
}
@Override
public void setHistory(List<DefiniteResult> history) {
this.history = history;
}
@Override
public List<ProcessResult> getHistory(ProcessResult processResult) {
//TODO :YNE: afficher l'historique pour chaque processResult
//TODO :YNE: essayer de déporter ce code sur un service et/ou module dédier à hibernate-envers
// AuditReader auditReader = AuditReaderFactory.get(ProcessResultImpl);
return null;
}
>>>>>>>
private List<DefiniteResult> history;
@Override
public List<DefiniteResult> getHistory() {
return history;
}
@Override
public void setHistory(List<DefiniteResult> history) {
this.history = history;
}
@Override
public List<ProcessResult> getHistory(ProcessResult processResult) {
//TODO :YNE: afficher l'historique pour chaque processResult
//TODO :YNE: essayer de déporter ce code sur un service et/ou module dédier à hibernate-envers
// AuditReader auditReader = AuditReaderFactory.get(ProcessResultImpl);
return null;
} |
<<<<<<<
import static com.google.common.base.Preconditions.checkArgument;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
=======
>>>>>>>
<<<<<<<
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
=======
>>>>>>>
<<<<<<<
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
=======
>>>>>>>
<<<<<<<
checkArgument(tableName != null, "tableName is null");
conf.set(enumToConfKey(implementingClass, ScanOpts.TABLE_NAME), tableName);
=======
org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.setInputTableName(implementingClass, conf, tableName);
>>>>>>>
<<<<<<<
String authString = conf.get(enumToConfKey(implementingClass, ScanOpts.AUTHORIZATIONS));
return authString == null ? Authorizations.EMPTY : new Authorizations(authString.getBytes(StandardCharsets.UTF_8));
=======
return org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.getScanAuthorizations(implementingClass, conf);
>>>>>>>
<<<<<<<
checkArgument(ranges != null, "ranges is null");
ArrayList<String> rangeStrings = new ArrayList<String>(ranges.size());
try {
for (Range r : ranges) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
r.write(new DataOutputStream(baos));
rangeStrings.add(new String(Base64.encodeBase64(baos.toByteArray())));
}
conf.setStrings(enumToConfKey(implementingClass, ScanOpts.RANGES), rangeStrings.toArray(new String[0]));
} catch (IOException ex) {
throw new IllegalArgumentException("Unable to encode ranges to Base64", ex);
}
=======
org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.setRanges(implementingClass, conf, ranges);
>>>>>>>
<<<<<<<
checkArgument(columnFamilyColumnQualifierPairs != null, "columnFamilyColumnQualifierPairs is null");
String[] columnStrings = serializeColumns(columnFamilyColumnQualifierPairs);
conf.setStrings(enumToConfKey(implementingClass, ScanOpts.COLUMNS), columnStrings);
=======
org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.fetchColumns(implementingClass, conf, columnFamilyColumnQualifierPairs);
>>>>>>>
<<<<<<<
checkArgument(columnFamilyColumnQualifierPairs != null, "columnFamilyColumnQualifierPairs is null");
ArrayList<String> columnStrings = new ArrayList<String>(columnFamilyColumnQualifierPairs.size());
for (Pair<Text,Text> column : columnFamilyColumnQualifierPairs) {
if (column.getFirst() == null)
throw new IllegalArgumentException("Column family can not be null");
String col = new String(Base64.encodeBase64(TextUtil.getBytes(column.getFirst())), StandardCharsets.UTF_8);
if (column.getSecond() != null)
col += ":" + new String(Base64.encodeBase64(TextUtil.getBytes(column.getSecond())), StandardCharsets.UTF_8);
columnStrings.add(col);
}
return columnStrings.toArray(new String[0]);
=======
return org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.serializeColumns(columnFamilyColumnQualifierPairs);
>>>>>>>
<<<<<<<
checkArgument(conf != null, "conf is null");
String confValue = conf.get(enumToConfKey(implementingClass, ScanOpts.COLUMNS));
List<String> serialized = new ArrayList<String>();
if (confValue != null) {
// Split and include any trailing empty strings to allow empty column families
for (String val : confValue.split(",", -1)) {
serialized.add(val);
}
}
return deserializeFetchedColumns(serialized);
=======
return org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.getFetchedColumns(implementingClass, conf);
>>>>>>>
<<<<<<<
Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
if (null == serialized) {
return columns;
}
for (String col : serialized) {
int idx = col.indexOf(":");
Text cf = new Text(idx < 0 ? Base64.decodeBase64(col.getBytes(StandardCharsets.UTF_8)) : Base64.decodeBase64(col.substring(0, idx).getBytes(StandardCharsets.UTF_8)));
Text cq = idx < 0 ? null : new Text(Base64.decodeBase64(col.substring(idx + 1).getBytes(StandardCharsets.UTF_8)));
columns.add(new Pair<Text,Text>(cf, cq));
}
return columns;
=======
return org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.deserializeFetchedColumns(serialized);
>>>>>>>
<<<<<<<
ByteArrayOutputStream baos = new ByteArrayOutputStream();
String newIter;
try {
cfg.write(new DataOutputStream(baos));
newIter = new String(Base64.encodeBase64(baos.toByteArray()), StandardCharsets.UTF_8);
baos.close();
} catch (IOException e) {
throw new IllegalArgumentException("unable to serialize IteratorSetting");
}
=======
org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator.addIterator(implementingClass, conf, cfg);
}
>>>>>>> |
<<<<<<<
/**
* Calculate the lineprotocol entry for a single point, using a specific {@link TimeUnit} for the timestamp.
* @param precision the time precision unit for this point
* @return the String without newLine
*/
public String lineProtocol(final TimeUnit precision) {
final StringBuilder sb = new StringBuilder();
sb.append(KEY_ESCAPER.escape(this.measurement));
sb.append(concatenatedTags());
sb.append(concatenateFields());
sb.append(formatedTime(precision));
return sb.toString();
}
private StringBuilder concatenatedTags() {
final StringBuilder sb = new StringBuilder();
=======
private void concatenatedTags(final StringBuilder sb) {
>>>>>>>
/**
* Calculate the lineprotocol entry for a single point, using a specific {@link TimeUnit} for the timestamp.
* @param precision the time precision unit for this point
* @return the String without newLine
*/
public String lineProtocol(final TimeUnit precision) {
final StringBuilder sb = new StringBuilder();
sb.append(KEY_ESCAPER.escape(this.measurement));
sb.append(concatenatedTags());
sb.append(concatenateFields());
sb.append(formatedTime(precision));
return sb.toString();
}
private void concatenatedTags(final StringBuilder sb) {
<<<<<<<
private StringBuilder formatedTime(final TimeUnit precision) {
final StringBuilder sb = new StringBuilder();
sb.append(" ").append(precision.convert(this.time, this.precision));
return sb;
}
=======
private static class MeasurementStringBuilder {
private final StringBuilder sb = new StringBuilder(128);
private final int length;
MeasurementStringBuilder(final String measurement) {
this.sb.append(KEY_ESCAPER.escape(measurement));
this.length = sb.length();
}
StringBuilder resetForUse() {
sb.setLength(length);
return sb;
}
}
>>>>>>>
private StringBuilder formatedTime(final TimeUnit precision) {
final StringBuilder sb = new StringBuilder();
sb.append(" ").append(precision.convert(this.time, this.precision));
return sb;
}
private static class MeasurementStringBuilder {
private final StringBuilder sb = new StringBuilder(128);
private final int length;
MeasurementStringBuilder(final String measurement) {
this.sb.append(KEY_ESCAPER.escape(measurement));
this.length = sb.length();
}
StringBuilder resetForUse() {
sb.setLength(length);
return sb;
}
} |
<<<<<<<
=======
import org.n52.sos.ogc.swe.SweConstants.SweDataComponentType;
import org.n52.sos.ogc.swe.SweDataComponentVisitor;
import org.n52.sos.ogc.swe.VoidSweDataComponentVisitor;
>>>>>>>
import org.n52.sos.ogc.swe.SweDataComponentVisitor;
import org.n52.sos.ogc.swe.VoidSweDataComponentVisitor;
<<<<<<<
/**
* swe:values<br />
* Each list entry represents one block, a list of tokens.<br />
* Atm, this implementation using java.lang.String to represent each token.
*/
private StreamingValue values;
/**
* swe:elementType
*/
private SweAbstractDataComponent elementType;
/**
*
*/
private SweAbstractEncoding encoding;
private SweCount elementCount;
/**
* @return the values
*/
public StreamingValue getValues() {
return values;
}
/**
*
* @param values
* the values to set
* @return This SweDataArray
*/
public StreamingSweDataArray setValues(final StreamingValue values) {
this.values = values;
return this;
}
/**
* @return the elementType
*/
public SweAbstractDataComponent getElementType() {
return elementType;
}
/**
* @param elementType
* the elementType to set
* @return This SweDataArray
*/
public StreamingSweDataArray setElementType(final SweAbstractDataComponent elementType) {
this.elementType = elementType;
return this;
}
public SweCount getElementCount() {
return new SweCount();
}
public SweAbstractEncoding getEncoding() {
return encoding;
}
public StreamingSweDataArray setEncoding(final SweAbstractEncoding encoding) {
this.encoding = encoding;
return this;
}
/**
* @return <tt>true</tt>, if the values field is set properly
*/
public boolean isSetValues() {
try {
return getValues() != null && getValues().hasNextValue();
} catch (OwsExceptionReport e) {
e.printStackTrace();
}
return false;
}
public boolean isSetElementTyp() {
return elementType != null;
}
public boolean isSetEncoding() {
return encoding != null;
}
public StreamingSweDataArray setElementCount(final SweCount elementCount) {
this.elementCount = elementCount;
return this;
}
public boolean isSetElementCount() {
return elementCount != null || isSetValues();
}
public boolean isEmpty() {
return isSetElementTyp() && isSetEncoding() && isSetValues();
}
@Override
public SweDataComponentType getDataComponentType() {
return SweDataComponentType.DataArray;
=======
/**
* swe:values<br />
* Each list entry represents one block, a list of tokens.<br />
* Atm, this implementation using java.lang.String to represent each token.
*/
private StreamingValue values;
/**
* swe:elementType
*/
private SweAbstractDataComponent elementType;
/**
*
*/
private SweAbstractEncoding encoding;
private SweCount elementCount;
/**
* @return the values
*/
public StreamingValue getValues() {
return values;
}
/**
*
* @param values
* the values to set
*
* @return This SweDataArray
*/
public StreamingSweDataArray setValues(final StreamingValue values) {
this.values = values;
return this;
}
/**
* @return the elementType
*/
public SweAbstractDataComponent getElementType() {
return elementType;
}
/**
* @param elementType
* the elementType to set
*
* @return This SweDataArray
*/
public StreamingSweDataArray setElementType(
final SweAbstractDataComponent elementType) {
this.elementType = elementType;
return this;
}
public SweCount getElementCount() {
return new SweCount();
}
public SweAbstractEncoding getEncoding() {
return encoding;
}
public StreamingSweDataArray setEncoding(final SweAbstractEncoding encoding) {
this.encoding = encoding;
return this;
}
/**
* @return <tt>true</tt>, if the values field is set properly
*/
public boolean isSetValues() {
try {
return getValues() != null && getValues().hasNextValue();
} catch (OwsExceptionReport e) {
e.printStackTrace();
>>>>>>>
/**
* swe:values<br />
* Each list entry represents one block, a list of tokens.<br />
* Atm, this implementation using java.lang.String to represent each token.
*/
private StreamingValue values;
/**
* swe:elementType
*/
private SweAbstractDataComponent elementType;
/**
*
*/
private SweAbstractEncoding encoding;
private SweCount elementCount;
/**
* @return the values
*/
public StreamingValue getValues() {
return values;
}
/**
*
* @param values
* the values to set
* @return This SweDataArray
*/
public StreamingSweDataArray setValues(final StreamingValue values) {
this.values = values;
return this;
}
/**
* @return the elementType
*/
public SweAbstractDataComponent getElementType() {
return elementType;
}
/**
* @param elementType
* the elementType to set
*
* @return This SweDataArray
*/
public StreamingSweDataArray setElementType(
final SweAbstractDataComponent elementType) {
this.elementType = elementType;
return this;
}
public SweCount getElementCount() {
return new SweCount();
}
public SweAbstractEncoding getEncoding() {
return encoding;
}
public StreamingSweDataArray setEncoding(final SweAbstractEncoding encoding) {
this.encoding = encoding;
return this;
}
/**
* @return <tt>true</tt>, if the values field is set properly
*/
public boolean isSetValues() {
try {
return getValues() != null && getValues().hasNextValue();
} catch (OwsExceptionReport e) {
e.printStackTrace(); |
<<<<<<<
write(database, retentionPolicy, consistency, TimeUnit.NANOSECONDS, records);
}
@Override
public void write(final String database, final String retentionPolicy, final ConsistencyLevel consistency,
final TimeUnit precision, final List<String> records) {
final String joinedRecords = Joiner.on("\n").join(records);
write(database, retentionPolicy, consistency, precision, joinedRecords);
=======
write(database, retentionPolicy, consistency, String.join("\n", records));
>>>>>>>
write(database, retentionPolicy, consistency, TimeUnit.NANOSECONDS, records);
}
@Override
public void write(final String database, final String retentionPolicy, final ConsistencyLevel consistency,
final TimeUnit precision, final List<String> records) {
write(database, retentionPolicy, consistency, precision, String.join("\n", records)); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.