Merge branch '1.11' into feature-3808

This commit is contained in:
Aidan authored and GitHub committed 2017-07-22 20:53:20 -07:00
commit 8d3f9a2297
287 files changed
+222 -9394

No files matched your search

@@ -90,7 +90,7 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
@@ -106,7 +106,7 @@ public class GuiChemicalInfuser extends GuiMekanism
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
@@ -83,7 +83,7 @@ public class GuiChemicalOxidizer extends GuiMekanism
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
@@ -102,7 +102,7 @@ public class GuiChemicalWasher extends GuiMekanism
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
@@ -205,7 +205,7 @@ public class GuiDigitalMiner extends GuiMekanism
if(xAxis >= 164 && xAxis <= 168 && yAxis >= 25 && yAxis <= 77)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61)
@@ -69,7 +69,7 @@ public class GuiElectricPump extends GuiMekanism
{
fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00);
String text = tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid");
renderScaledText(text, 51, 35, 0x00CD00, 74);
@@ -53,7 +53,7 @@ public class GuiEnergyCube extends GuiMekanism
public List<String> getInfo()
{
return ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png")));
@@ -76,7 +76,7 @@ public class GuiFactory extends GuiMekanism
if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
if(xAxis >= 8 && xAxis <= 168 && yAxis >= 78 && yAxis <= 83)
@@ -69,7 +69,7 @@ public class GuiFluidicPlenisher extends GuiMekanism
{
fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00);
fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid"), 51, 44, 0x00CD00);
@@ -35,7 +35,7 @@ public class GuiInductionMatrix extends GuiMekanism
public List<String> getInfo()
{
return ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t",
LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t");
}
@@ -57,7 +57,7 @@ public class GuiInductionMatrix extends GuiMekanism
if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
@@ -64,7 +64,7 @@ public class GuiLaserAmplifier extends GuiMekanism
@Override
public String getText(double level)
{
return LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level);
return LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level, tileEntity.getMaxEnergy());
}
}, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 10));
guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
@@ -75,7 +75,7 @@ public class GuiMatrixStats extends GuiMekanism
public List<String> getInfo()
{
return ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t",
LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t");
}
@@ -111,7 +111,7 @@ public class GuiRobitMain extends GuiMekanism
{
CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName();
fontRendererObj.drawString(LangUtils.localize("gui.robit.greeting") + " " + robit.getName() + "!", 29, 18, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy(), robit.MAX_ELECTRICITY), 29, 36-4, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.robit.owner") + ": " + owner, 29, 63-4, 0x00CD00);
@@ -122,7 +122,7 @@ public class GuiRobitMain extends GuiMekanism
if(xAxis >= 28 && xAxis <= 148 && yAxis >= 75 && yAxis <= 79)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(robit.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(robit.getEnergy(), robit.MAX_ELECTRICITY), xAxis, yAxis);
}
else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72)
{
@@ -124,7 +124,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), xAxis, yAxis);
}
if(xAxis >= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22)
@@ -92,7 +92,7 @@ public class GuiTeleporter extends GuiMekanism
@Override
public String getTooltip()
{
return MekanismUtils.getEnergyDisplay(getEnergy());
return MekanismUtils.getEnergyDisplay(getEnergy(), getMaxEnergy());
}
@Override
@@ -124,7 +124,7 @@ public class GuiTeleporter extends GuiMekanism
@Override
public String getTooltip()
{
return MekanismUtils.getEnergyDisplay(getEnergy());
return MekanismUtils.getEnergyDisplay(getEnergy(), getMaxEnergy());
}
@Override
@@ -52,7 +52,7 @@ public class GuiEnergyGauge extends GuiGauge
@Override
public String getTooltipText()
{
return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy()) : LangUtils.localize("gui.empty");
return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy(), infoHandler.getEnergyStorage().getMaxEnergy()) : LangUtils.localize("gui.empty");
}
public static interface IEnergyInfoHandler
@@ -31,7 +31,7 @@ public class GuiPowerBar extends GuiElement
@Override
public String getTooltip()
{
return MekanismUtils.getEnergyDisplay(tileEntity.getEnergy());
return MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy());
}
@Override
@@ -2,10 +2,12 @@ package mekanism.common;
import java.util.HashMap;
import buildcraft.api.mj.MjAPI;
import mekanism.api.gas.Gas;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.util.MekanismUtils;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.ModAPIManager;
import buildcraft.api.fuels.BuildcraftFuelRegistry;
import buildcraft.api.fuels.IFuel;
@@ -28,7 +30,7 @@ public class FuelHandler
if(BCPresent() && gas.hasFluid() && BuildcraftFuelRegistry.fuel != null)
{
IFuel bcFuel = BuildcraftFuelRegistry.fuel.getFuel(gas.getFluid());
IFuel bcFuel = BuildcraftFuelRegistry.fuel.getFuel(new FluidStack(gas.getFluid(), 1));
if(bcFuel != null)
{
@@ -56,7 +58,10 @@ public class FuelHandler
public FuelGas(IFuel bcFuel)
{
burnTicks = bcFuel.getTotalBurningTime() / Fluid.BUCKET_VOLUME;
energyPerTick = bcFuel.getPowerPerCycle() * general.FROM_RF;
// getPowerPerCycle returns value in 1 BuildCraft micro MJ
// 1 BuildCraft MJ equals 20 RF
energyPerTick = bcFuel.getPowerPerCycle() / (double) MjAPI.MJ * 20 * general.FROM_RF;
}
}
@@ -1428,11 +1428,21 @@ public class Mekanism
public void onBlacklistUpdate(BoxBlacklistEvent event)
{
MekanismAPI.addBoxBlacklist(MekanismBlocks.CardboardBox, OreDictionary.WILDCARD_VALUE);
// Mekanism multiblock structures
MekanismAPI.addBoxBlacklist(MekanismBlocks.BoundingBlock, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(MekanismBlocks.BasicBlock2, 9); // Security Desk
MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock, 4); // Digital Miner
MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock2, 9); // Seismic Vibrator
MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock3, 1); // Solar Neutron Activator
// Minecraft unobtainable
MekanismAPI.addBoxBlacklist(Blocks.BEDROCK, 0);
MekanismAPI.addBoxBlacklist(Blocks.PORTAL, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL_FRAME, OreDictionary.WILDCARD_VALUE);
// Minecraft multiblock structures
MekanismAPI.addBoxBlacklist(Blocks.BED, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.OAK_DOOR, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.SPRUCE_DOOR, OreDictionary.WILDCARD_VALUE);
@@ -51,6 +51,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -59,6 +60,7 @@ import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
@@ -158,8 +160,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null)
{
state = state.withProperty(BlockStateFacing.facingProperty, ((TileEntityBasicBlock)tile).facing);
@@ -344,7 +346,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
return false;
case 9:
case 11:
TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(pos);
TileEntityDynamicTank tileEntity = (TileEntityDynamicTank) MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity != null)
{
@@ -372,7 +374,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
case 2:
case 7:
case 8:
TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(pos);
TileEntityMultiblock tileEntity = (TileEntityMultiblock) MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity != null)
{
@@ -412,12 +414,27 @@ public abstract class BlockBasic extends Block implements ICTMBlock
{
if(!bin.bottomStack.isEmpty())
{
if(!player.isSneaking())
ItemStack stack;
if(player.isSneaking())
{
world.spawnEntity(new EntityItem(world, player.posX, player.posY, player.posZ, bin.removeStack().copy()));
stack = bin.remove(1).copy();
}
else {
world.spawnEntity(new EntityItem(world, player.posX, player.posY, player.posZ, bin.remove(1).copy()));
else
{
stack = bin.removeStack().copy();
}
if(!player.inventory.addItemStackToInventory(stack))
{
BlockPos dropPos = pos.offset(bin.facing);
Entity item = new EntityItem(world, dropPos.getX() + .5f, dropPos.getY() + .3f, dropPos.getZ() + .5f, stack);
item.addVelocity(-item.motionX, -item.motionY, -item.motionZ);
world.spawnEntity(item);
}
else
{
world.playSound(null, pos.getX() + .5f, pos.getY() + .5f, pos.getZ() + .5f,
SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
}
}
}
@@ -716,7 +733,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
@Override
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntity tileEntity = world.getTileEntity(pos);
TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos);
int metadata = state.getBlock().getMetaFromState(state);
if(tileEntity instanceof IActiveState)
@@ -1044,4 +1061,4 @@ public abstract class BlockBasic extends Block implements ICTMBlock
{
return BasicBlockType.get(world.getBlockState(pos)).isBeaconBase;
}
}
}
@@ -87,7 +87,7 @@ public class BlockEnergyCube extends BlockContainer
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityEnergyCube)
{
@@ -74,7 +74,7 @@ public class BlockGasTank extends BlockContainer
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityGasTank)
{
@@ -9,6 +9,7 @@ import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.block.states.BlockStateGlowPanel;
import mekanism.common.tile.TileEntityGlowPanel;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MultipartUtils;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
@@ -71,7 +72,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos);
return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state;
}
@@ -79,8 +80,8 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity != null)
{
state = state.withProperty(BlockStateFacing.facingProperty, tileEntity.side);
@@ -117,7 +118,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos);
if(!tileEntity.getWorld().isRemote && !canStay(tileEntity))
{
@@ -137,7 +138,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile != null && tile instanceof TileEntityGlowPanel)
{
@@ -206,7 +206,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null)
{
@@ -383,7 +383,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
{
if(client.enableAmbientLighting)
{
TileEntity tileEntity = world.getTileEntity(pos);
TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity instanceof IActiveState)
{
@@ -992,7 +992,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
MachineType type = MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state));
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(type == null)
{
@@ -1025,12 +1025,6 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
{
return false;
}
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
return super.getCollisionBoundingBox(state, world, pos);
}
@Override
public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
@@ -1111,7 +1105,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
@Override
public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile instanceof TileEntityLaserAmplifier)
{
@@ -14,9 +14,7 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
@@ -95,7 +95,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntitySidedPipe)
{
@@ -129,7 +129,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)w.getTileEntity(pos);
TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(w, pos);
if(tile != null)
{
@@ -147,7 +147,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile instanceof TileEntitySidedPipe && ((TileEntitySidedPipe)tile).getTransmitterType().getSize() == Size.SMALL)
{
@@ -301,7 +301,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(world, pos);
EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ());
tile.onNeighborTileChange(side);
}
@@ -9,6 +9,7 @@ import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.common.Mekanism;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.content.transporter.TransitRequest.TransitResponse;
import mekanism.common.content.transporter.TransporterStack.Path;
@@ -113,6 +114,11 @@ public class TransporterManager
{
int slotID = slots[get];
if (slotID >= ret.size()){
Mekanism.logger.error("Inventory {} gave slot number >= the number of slots it reported! {} >= {} ", inv.getClass().getName(), slotID, ret.size());
continue;
}
ret.set(slotID, !sidedInventory.getStackInSlot(slotID).isEmpty() ? sidedInventory.getStackInSlot(slotID).copy() : ItemStack.EMPTY);
}
@@ -578,7 +578,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
public void setOwnerUUID(UUID uuid)
{
dataManager.set(OWNER_UUID, uuid.toString());
dataManager.set(OWNER_NAME, UsernameCache.getLastKnownUsername(uuid));
dataManager.set(OWNER_NAME, MekanismUtils.getLastKnownUsername(uuid));
}
public boolean getFollowing()
@@ -9,6 +9,7 @@ import java.util.UUID;
import mekanism.api.Coord4D;
import mekanism.common.PacketHandler;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.UsernameCache;
@@ -118,7 +119,7 @@ public class Frequency
{
data.add(name);
data.add(ownerUUID.toString());
data.add(UsernameCache.getLastKnownUsername(ownerUUID));
data.add(MekanismUtils.getLastKnownUsername(ownerUUID));
data.add(publicFreq);
}
@@ -38,7 +38,7 @@ public class ItemBlockCardboardBox extends ItemBlock
public ItemBlockCardboardBox(Block block)
{
super(block);
setMaxStackSize(1);
setMaxStackSize(16);
metaBlock = block;
MinecraftForge.EVENT_BUS.register(this);
@@ -168,4 +168,15 @@ public class ItemBlockCardboardBox extends ItemBlock
event.setCanceled(true);
}
}
@Override
public int getItemStackLimit(ItemStack stack)
{
BlockData blockData = getBlockData(stack);
if(blockData != null)
{
return 1;
}
return super.getItemStackLimit(stack);
}
}
@@ -61,7 +61,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
super(block);
metaBlock = block;
setHasSubtypes(true);
setMaxStackSize(1);
setMaxStackSize(16);
setCreativeTab(Mekanism.tabMekanism);
}
@@ -333,7 +333,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
@Override
public boolean showDurabilityBar(ItemStack stack)
{
return true;
return getGas(stack) != null; // No bar for empty containers as bars are drawn on top of stack count number
}
@Override
@@ -399,4 +399,15 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
{
return hasSecurity(stack);
}
@Override
public int getItemStackLimit(ItemStack stack)
{
GasStack gasStack = getGas(stack);
if(gasStack != null)
{
return 1;
}
return super.getItemStackLimit(stack);
}
}
@@ -244,7 +244,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
if(type.isElectric)
{
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack)));
}
if(hasTank(itemstack) && type != MachineType.FLUID_TANK)
@@ -971,4 +971,18 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
}
}
}
@Override
public int getItemStackLimit(ItemStack stack)
{
if(MachineType.get(stack) == MachineType.FLUID_TANK)
{
if(getFluidStack(stack) != null)
{
return 1;
}
return 16;
}
return super.getItemStackLimit(stack);
}
}
@@ -66,7 +66,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
@Override
public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag)
{
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack)));
}
public ItemStack getUnchargedItem()
@@ -82,7 +82,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci
@Override
public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag)
{
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(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());
}
@@ -13,6 +13,7 @@ import mekanism.common.frequency.Frequency;
import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage;
import mekanism.common.security.SecurityData;
import mekanism.common.security.SecurityFrequency;
import mekanism.common.util.MekanismUtils;
import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -51,7 +52,7 @@ public class PacketSecurityUpdate implements IMessageHandler<SecurityUpdateMessa
if(packetType == SecurityPacket.UPDATE)
{
playerUUID = uuid;
playerUsername = UsernameCache.getLastKnownUsername(uuid);
playerUsername = MekanismUtils.getLastKnownUsername(uuid);
securityData = data;
}
}
@@ -92,7 +93,7 @@ public class PacketSecurityUpdate implements IMessageHandler<SecurityUpdateMessa
for(SecurityFrequency frequency : frequencies)
{
PacketHandler.writeString(dataStream, frequency.ownerUUID.toString());
PacketHandler.writeString(dataStream, UsernameCache.getLastKnownUsername(frequency.ownerUUID));
PacketHandler.writeString(dataStream, MekanismUtils.getLastKnownUsername(frequency.ownerUUID));
new SecurityData(frequency).write(dataStream);
}
}
@@ -262,7 +262,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements
if(ownerUUID != null)
{
data.add(true);
data.add(UsernameCache.getLastKnownUsername(ownerUUID));
data.add(MekanismUtils.getLastKnownUsername(ownerUUID));
}
else {
data.add(false);
@@ -214,7 +214,7 @@ public class TileComponentSecurity implements ITileComponent
{
data.add(true);
data.add(ownerUUID.toString());
data.add(UsernameCache.getLastKnownUsername(ownerUUID));
data.add(MekanismUtils.getLastKnownUsername(ownerUUID));
}
else {
data.add(false);
@@ -1,5 +1,6 @@
package mekanism.common.util;
import com.mojang.authlib.GameProfile;
import ic2.api.energy.EnergyNet;
import java.io.BufferedReader;
@@ -12,6 +13,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mekanism.api.Chunk3D;
import mekanism.api.Coord4D;
@@ -82,20 +84,26 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.ChunkCache;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.UsernameCache;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.fluids.BlockFluidBase;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import cofh.api.item.IToolHammer;
import javax.annotation.Nonnull;
/**
* Utilities used by Mekanism. All miscellaneous methods are located here.
* @author AidanBrady
@@ -107,6 +115,8 @@ public final class MekanismUtils
public static final Map<String, Class<?>> classesFound = new HashMap<String, Class<?>>();
private static final List<UUID> warnedFails = new ArrayList<>();
/**
* Checks for a new version of Mekanism.
*/
@@ -1098,6 +1108,19 @@ public final class MekanismUtils
return "error";
}
public static String getEnergyDisplay(double energy, double max)
{
if(energy == Double.MAX_VALUE)
{
return LangUtils.localize("gui.infinite");
}
String energyString = getEnergyDisplay(energy);
String maxString = getEnergyDisplay(max);
return energyString + "/" + maxString;
}
/**
* Convert from the unit defined in the configuration to joules.
@@ -1503,6 +1526,30 @@ public final class MekanismUtils
return false;
}
@Nonnull
public static String getLastKnownUsername(UUID uuid)
{
String ret = UsernameCache.getLastKnownUsername(uuid);
if(ret == null && !warnedFails.contains(uuid) && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER)
{ // see if MC/Yggdrasil knows about it?!
GameProfile gp = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerProfileCache().getProfileByUUID(uuid);
if(gp != null)
{
ret = gp.getName();
}
}
if(ret == null && !warnedFails.contains(uuid))
{
Mekanism.logger.warn("Failed to retrieve username for UUID {}, you might want to add it to the JSON cache", uuid);
warnedFails.add(uuid);
}
return ret != null ? ret : "<???>";
}
public static enum ResourceType
{
GUI("gui"),
@@ -1526,4 +1573,9 @@ public final class MekanismUtils
return prefix + "/";
}
}
public static TileEntity getTileEntitySafe(IBlockAccess worldIn, BlockPos pos)
{
return worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos);
}
}
@@ -77,7 +77,7 @@ public class GuiIndustrialTurbine extends GuiMekanism
double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil);
return ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png")));
@@ -41,7 +41,7 @@ public class GuiReactorController extends GuiMekanism
public List<String> getInfo()
{
return tileEntity.isFormed() ? ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
@@ -53,7 +53,7 @@ public class GuiReactorFuel extends GuiMekanism
public List<String> getInfo()
{
return tileEntity.isFormed() ? ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
@@ -58,7 +58,7 @@ public class GuiReactorHeat extends GuiMekanism
public List<String> getInfo()
{
return tileEntity.isFormed() ? ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
@@ -45,7 +45,7 @@ public class GuiReactorStats extends GuiMekanism
public List<String> getInfo()
{
return tileEntity.isFormed() ? ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList();
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png")));
@@ -56,7 +56,7 @@ public class GuiSolarGenerator extends GuiMekanism
fontRendererObj.drawString(tileEntity.getName(), !tileEntity.fullName.contains("Advanced") ? 45 : 30, 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
@@ -41,7 +41,7 @@ public class GuiTurbineStats extends GuiMekanism
double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil);
return ListUtils.asList(
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()),
LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png")));
@@ -58,7 +58,7 @@ public class GuiWindGenerator extends GuiMekanism
{
fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.currentMultiplier)), 51, 35, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
@@ -1,6 +1,7 @@
package mekanism.generators.common;
import mekanism.common.item.ItemMekanism;
import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.item.ItemHohlraum;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor;
import net.minecraft.entity.player.EntityPlayer;
@@ -20,7 +21,7 @@ public class GeneratorsItems
@Override
public boolean doesSneakBypassUse(ItemStack stack, IBlockAccess world, BlockPos pos, EntityPlayer player)
{
return world.getTileEntity(pos) instanceof TileEntityTurbineRotor;
return MekanismUtils.getTileEntitySafe(world, pos) instanceof TileEntityTurbineRotor;
}
};
@@ -1,9 +1,11 @@
package mekanism.generators.common;
import buildcraft.api.mj.MjAPI;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
import mekanism.api.MekanismAPI;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasRegistry;
import mekanism.api.infuse.InfuseRegistry;
@@ -101,13 +103,13 @@ public class MekanismGenerators implements IModule
{
for(IFuel s : BuildcraftFuelRegistry.fuel.getFuels())
{
if(!(s.getFluid() == null || GasRegistry.containsGas(s.getFluid().getName())))
if(s.getFluid() != null && !GasRegistry.containsGas(s.getFluid().getFluid().getName()))
{
GasRegistry.register(new Gas(s.getFluid()));
GasRegistry.register(new Gas(s.getFluid().getFluid()));
}
}
BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (int)(240 * general.TO_RF), 40 * Fluid.BUCKET_VOLUME);
BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (long)(240 * general.TO_RF / 20 * MjAPI.MJ), 40 * Fluid.BUCKET_VOLUME);
}
//Update the config-dependent recipes after the recipes have actually been added in the first place
@@ -275,4 +277,12 @@ public class MekanismGenerators implements IModule
TypeConfigManager.updateConfigRecipes(GeneratorType.getGeneratorsForConfig(), generators.generatorsManager);
}
}
@SubscribeEvent
public void onBlacklistUpdate(MekanismAPI.BoxBlacklistEvent event)
{
// Mekanism Generators multiblock structures
MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 5); // Advanced Solar Generator
MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 6); // Wind Generator
}
}
@@ -169,7 +169,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null)
{
@@ -254,7 +254,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock
{
if(client.enableAmbientLighting)
{
TileEntity tileEntity = world.getTileEntity(pos);
TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity instanceof IActiveState && !(tileEntity instanceof TileEntitySolarGenerator))
{
@@ -75,7 +75,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityReactorController)
{
@@ -293,7 +293,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti
@Override
public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile instanceof TileEntityReactorLogicAdapter)
{
@@ -140,7 +140,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
}
}
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack)));
if(hasTank(itemstack))
{