Merge remote-tracking branch 'origin/master' into Telepad

Conflicts:
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/enderface/BlockEnderIO.java
	src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/gui/IGuiScreen.java
This commit is contained in:
tterrag1098 committed 2015-02-26 11:33:42 -05:00
commit 96273cede4
223 files changed
+7920 -1655

No files matched your search

@@ -8,7 +8,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
@@ -22,6 +21,8 @@ import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.conduit.BlockConduitBundle;
import crazypants.enderio.conduit.IConduit;
import crazypants.enderio.conduit.TileConduitBundle;
@@ -132,6 +133,7 @@ import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer;
import crazypants.enderio.teleport.telepad.TeleportEntityRenderHandler;
import crazypants.render.IconUtil;
@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy {
// @formatter:off
@@ -225,7 +227,7 @@ public class ClientProxy extends CommonProxy {
BlockSolarPanel.renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(new SolarPanelRenderer());
EnchanterModelRenderer emr = new EnchanterModelRenderer();
ClientRegistry.bindTileEntitySpecialRenderer(TileEnchanter.class, emr);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnchanter), emr);
@@ -260,7 +262,7 @@ public class ClientProxy extends CommonProxy {
BlockWeatherObelisk.renderId = BlockAttractor.renderId;
ClientRegistry.bindTileEntitySpecialRenderer(TileWeatherObelisk.class, twr);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr);
if(Config.useCombustionGenModel) {
CombustionGeneratorModelRenderer cgmr = new CombustionGeneratorModelRenderer();
ClientRegistry.bindTileEntitySpecialRenderer(TileCombustionGenerator.class, cgmr);
+9 -10
View File
@@ -1,9 +1,5 @@
package crazypants.enderio;
import static crazypants.enderio.EnderIO.MODID;
import static crazypants.enderio.EnderIO.MOD_NAME;
import static crazypants.enderio.EnderIO.VERSION;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -155,9 +151,12 @@ import crazypants.enderio.teleport.TravelController;
import crazypants.enderio.teleport.anchor.BlockTravelAnchor;
import crazypants.enderio.teleport.telepad.BlockTelePad;
import crazypants.enderio.teleport.telepad.ItemCoordSelector;
import crazypants.enderio.thaumcraft.ThaumcraftCompat;
import crazypants.util.EntityUtil;
@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:[email protected],);after:MineFactoryReloaded;after:Waila@[1.5.8,)", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
import static crazypants.enderio.EnderIO.*;
@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:[email protected],);after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
public class EnderIO {
public static final String MODID = "EnderIO";
@@ -478,7 +477,7 @@ public class EnderIO {
public void load(FMLInitializationEvent event) {
Config.init();
instance = this;
PacketHandler.INSTANCE.registerMessage(MessageTileNBT.class, MessageTileNBT.class, PacketHandler.nextID(), Side.SERVER);
@@ -559,14 +558,13 @@ public class EnderIO {
TeleportRecipes.addRecipes();
proxy.load();
}
@EventHandler
public void postInit(FMLPostInitializationEvent event) {
Config.postInit();
//Regsiter the enchants
Enchantments.getInstance();
@@ -627,7 +625,7 @@ public class EnderIO {
try {
Field getField = Class.forName("openblocks.Config").getField("xpFluidId");
openBlocksXPJuiceName = (String) getField.get(null);
}catch(Exception e) {
} catch (Exception e) {
}
if(openBlocksXPJuiceName != null && !Config.xpJuiceName.equals(openBlocksXPJuiceName)) {
@@ -657,7 +655,8 @@ public class EnderIO {
Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades");
}
}
ThaumcraftCompat.load();
}
@EventHandler
@@ -1,10 +1,10 @@
package crazypants.enderio;
import static crazypants.enderio.EnderIO.MODID;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import static crazypants.enderio.EnderIO.*;
public class EnderIOTab extends CreativeTabs {
@@ -27,6 +27,7 @@ public class EnderIOTab extends CreativeTabs {
}
@Override
@SideOnly(Side.CLIENT)
public Item getTabIconItem() {
return EnderIO.itemEnderface;
}
@@ -56,6 +56,7 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements I
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iIconRegister) {
blockIcon = iIconRegister.registerIcon("enderio:" + ModObject.blockDarkSteelPressurePlate.unlocalisedName);
}
@@ -69,6 +70,7 @@ public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements I
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileEntityPaintedBlock) {
@@ -437,9 +437,6 @@ public abstract class AbstractConduit implements IConduit {
bundle.getEntity().getBlockType());
}
}
if(getNetwork() != null) {
getNetwork().onUpdateEntity(this);
}
}
@Override
@@ -12,10 +12,12 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
protected final List<I> conduits = new ArrayList<I>();
protected Class<I> implClass;
protected final Class<I> implClass;
protected final Class<T> baseConduitClass;
protected AbstractConduitNetwork(Class<I> implClass) {
protected AbstractConduitNetwork(Class<I> implClass, Class<T> baseConduitClass) {
this.implClass = implClass;
this.baseConduitClass = baseConduitClass;
}
public void init(IConduitBundle tile, Collection<I> connections, World world) {
@@ -35,7 +37,9 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
notifyNetworkOfUpdate();
}
public abstract Class<T> getBaseConduitType();
public final Class<T> getBaseConduitType() {
return baseConduitClass;
}
protected void setNetwork(World world, IConduitBundle tile) {
@@ -58,6 +62,9 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
public void addConduit(I con) {
if(!conduits.contains(con)) {
if(conduits.isEmpty()) {
ConduitNetworkTickHandler.instance.registerNetwork(this);
}
conduits.add(con);
}
}
@@ -67,6 +74,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
con.setNetwork(null);
}
conduits.clear();
ConduitNetworkTickHandler.instance.unregisterNetwork(this);
}
public List<I> getConduits() {
@@ -90,7 +98,6 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
return "AbstractConduitNetwork [conduits=" + sb.toString() + "]";
}
public void onUpdateEntity(IConduit conduit) {
public void doNetworkTick() {
}
}
@@ -14,6 +14,8 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
@@ -43,6 +45,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
int index = 0;
for (ItemConduitSubtype subtype : subtypes) {
@@ -108,6 +111,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
damage = MathHelper.clamp_int(damage, 0, subtypes.length - 1);
return icons[damage];
@@ -122,6 +126,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int j = 0; j < subtypes.length; ++j) {
par3List.add(new ItemStack(this, 1, j));
@@ -337,14 +337,15 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
}
}
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderBlockPass() {
return 1;
}
public static volatile int theRenderPass;
@Override
public boolean canRenderInPass(int pass) {
theRenderPass = pass;
@@ -760,6 +761,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
}
@Override
@SideOnly(Side.CLIENT)
public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int
y, int z) {
@@ -851,7 +853,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
}
IConduitBundle bundle = (IConduitBundle) te;
List<RaytraceResult> hits = new ArrayList<RaytraceResult>();
if (player == null) {
player = EnderIO.proxy.getClientPlayer();
}
@@ -1,6 +1,7 @@
package crazypants.enderio.conduit;
import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.List;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -19,6 +20,9 @@ public class ConduitNetworkTickHandler {
private final List<TickListener> listeners = new ArrayList<TickListener>();
private final IdentityHashMap<AbstractConduitNetwork<?,?>, Boolean> networks =
new IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean>();
public void addListener(TickListener listener) {
listeners.add(listener);
}
@@ -27,6 +31,14 @@ public class ConduitNetworkTickHandler {
listeners.remove(listener);
}
public void registerNetwork(AbstractConduitNetwork<?,?> cn) {
networks.put(cn, Boolean.TRUE);
}
public void unregisterNetwork(AbstractConduitNetwork<?,?> cn) {
networks.remove(cn);
}
@SubscribeEvent
public void onServerTick(TickEvent.ServerTickEvent event) {
if(event.phase == Phase.START) {
@@ -47,6 +59,9 @@ public class ConduitNetworkTickHandler {
h.tickEnd(event);
}
listeners.clear();
for(AbstractConduitNetwork<?,?> cn : networks.keySet()) {
cn.doNetworkTick();
}
}
}
@@ -2,6 +2,7 @@ package crazypants.enderio.conduit;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -33,7 +34,6 @@ import crazypants.enderio.conduit.geom.ConduitConnectorType;
import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
import crazypants.enderio.conduit.geom.Offset;
import crazypants.enderio.conduit.geom.Offsets;
import crazypants.enderio.conduit.geom.Offsets.Axis;
import crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.liquid.ILiquidConduit;
import crazypants.enderio.conduit.me.IMEConduit;
@@ -224,7 +224,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
@Override
public void updateEntity() {
if(worldObj == null) {
return;
}
@@ -234,62 +233,74 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
}
if(conduitsDirty) {
if(!worldObj.isRemote) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
markDirty();
}
conduitsDirty = false;
doConduitsDirty();
}
if(facadeChanged) {
//force re-calc of lighting for both client and server
ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord);
//worldObj.updateAllLightTypes(xCoord, yCoord, zCoord);
worldObj.func_147451_t(xCoord, yCoord, zCoord);
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
facadeChanged = false;
doFacadeChanged();
}
//client side only, check for changes in rendering of the bundle
if(worldObj.isRemote) {
updateEntityClient();
}
}
boolean markForUpdate = false;
if(clientUpdated) {
//TODO: This is not the correct solution here but just marking the block for a render update server side
//seems to get out of sync with the client sometimes so connections are not rendered correctly
private void doConduitsDirty() {
if(!worldObj.isRemote) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
markDirty();
}
conduitsDirty = false;
}
private void doFacadeChanged() {
//force re-calc of lighting for both client and server
ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord);
//worldObj.updateAllLightTypes(xCoord, yCoord, zCoord);
worldObj.func_147451_t(xCoord, yCoord, zCoord);
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, EnderIO.blockConduitBundle);
facadeChanged = false;
}
private void updateEntityClient() {
boolean markForUpdate = false;
if(clientUpdated) {
//TODO: This is not the correct solution here but just marking the block for a render update server side
//seems to get out of sync with the client sometimes so connections are not rendered correctly
markForUpdate = true;
clientUpdated = false;
}
FacadeRenderState curRS = getFacadeRenderedAs();
FacadeRenderState rs = ConduitUtil.getRequiredFacadeRenderState(this, EnderIO.proxy.getClientPlayer());
if(Config.updateLightingWhenHidingFacades) {
int curLO = getLightOpacity();
int shouldBeLO = rs == FacadeRenderState.FULL ? 255 : 0;
if(curLO != shouldBeLO) {
setLightOpacity(shouldBeLO);
//worldObj.updateAllLightTypes(xCoord, yCoord, zCoord);
worldObj.func_147451_t(xCoord, yCoord, zCoord);
}
}
if(curRS != rs) {
setFacadeRenderAs(rs);
if(!ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord)) {
markForUpdate = true;
clientUpdated = false;
}
} else { //can do the else as only need to update once
ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(EnderIO.proxy.getClientPlayer().getCurrentEquippedItem());
if(curMode != lastMode) {
markForUpdate = true;
lastMode = curMode;
}
FacadeRenderState curRS = getFacadeRenderedAs();
FacadeRenderState rs = ConduitUtil.getRequiredFacadeRenderState(this, EnderIO.proxy.getClientPlayer());
if(Config.updateLightingWhenHidingFacades) {
int curLO = getLightOpacity();
int shouldBeLO = rs == FacadeRenderState.FULL ? 255 : 0;
if(curLO != shouldBeLO) {
setLightOpacity(shouldBeLO);
//worldObj.updateAllLightTypes(xCoord, yCoord, zCoord);
worldObj.func_147451_t(xCoord, yCoord, zCoord);
}
}
if(curRS != rs) {
setFacadeRenderAs(rs);
if(!ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord)) {
markForUpdate = true;
}
} else { //can do the else as only need to update once
ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(EnderIO.proxy.getClientPlayer().getCurrentEquippedItem());
if(curMode != lastMode) {
markForUpdate = true;
lastMode = curMode;
}
}
if(markForUpdate) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
}
if(markForUpdate) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
}
@@ -421,7 +432,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
@Override
public Set<ForgeDirection> getAllConnections() {
Set<ForgeDirection> result = new HashSet<ForgeDirection>();
EnumSet<ForgeDirection> result = EnumSet.noneOf(ForgeDirection.class);
for (IConduit con : conduits) {
result.addAll(con.getConduitConnections());
}
@@ -582,7 +593,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
}
// External Connectors
Set<ForgeDirection> externalDirs = new HashSet<ForgeDirection>();
EnumSet<ForgeDirection> externalDirs = EnumSet.noneOf(ForgeDirection.class);
for (IConduit con : conduits) {
Set<ForgeDirection> extCons = con.getExternalConnections();
if(extCons != null) {
@@ -603,20 +614,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
connectorsDirty = false;
}
private boolean axisOfConnectionsEqual(Set<ForgeDirection> cons) {
Axis axis = null;
for (ForgeDirection dir : cons) {
if(axis == null) {
axis = Offsets.getAxisForDir(dir);
} else {
if(axis != Offsets.getAxisForDir(dir)) {
return false;
}
}
}
return true;
}
private void addConduitCores(List<CollidableComponent> result, IConduit con) {
CollidableCache cc = CollidableCache.instance;
Class<? extends IConduit> type = con.getCollidableType();
@@ -632,43 +629,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
}
}
// private boolean containsOnlySingleVerticalConnections() {
// return getConnectionCount(ForgeDirection.UP) < 2 && getConnectionCount(ForgeDirection.DOWN) < 2;
// }
//
// private boolean containsOnlySingleHorizontalConnections() {
// return getConnectionCount(ForgeDirection.WEST) < 2 && getConnectionCount(ForgeDirection.EAST) < 2 &&
// getConnectionCount(ForgeDirection.NORTH) < 2 && getConnectionCount(ForgeDirection.SOUTH) < 2;
// }
//
// private boolean allDirectionsHaveSameConnectionCount() {
// for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
// boolean hasCon = conduits.get(0).isConnectedTo(dir);
// for (int i = 1; i < conduits.size(); i++) {
// if(hasCon != conduits.get(i).isConnectedTo(dir)) {
// return false;
// }
// }
// }
// return true;
// }
// private boolean containsOnlyHorizontalConnections() {
// for (IConduit con : conduits) {
// for (ForgeDirection dir : con.getConduitConnections()) {
// if(dir == ForgeDirection.UP || dir == ForgeDirection.DOWN) {
// return false;
// }
// }
// for (ForgeDirection dir : con.getExternalConnections()) {
// if(dir == ForgeDirection.UP || dir == ForgeDirection.DOWN) {
// return false;
// }
// }
// }
// return true;
// }
private int getConnectionCount(ForgeDirection dir) {
if(dir == ForgeDirection.UNKNOWN) {
return conduits.size();
@@ -916,7 +876,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
@Override
@Method(modid = "appliedenergistics2")
public void securityBreak() {
;
}
@Override
@@ -32,6 +32,7 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock {
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister IIconRegister) {
blockIcon = IIconRegister.registerIcon("enderio:conduitFacade");
}
@@ -27,8 +27,8 @@ import crazypants.enderio.machine.painter.BasicPainterTemplate;
import crazypants.enderio.machine.painter.IPaintedBlock;
import crazypants.enderio.machine.painter.PaintSourceValidator;
import crazypants.enderio.machine.painter.PainterUtil;
import crazypants.util.Util;
import crazypants.util.Lang;
import crazypants.util.Util;
public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, IResourceTooltipProvider {
@@ -63,6 +63,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) {
for (FacadeType t : FacadeType.values()) {
list.add(new ItemStack(item, 1, t.ordinal()));
@@ -80,6 +81,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
icons = new IIcon[FacadeType.values().length];
icons[0] = itemIcon = IIconRegister.registerIcon("enderio:conduitFacade");
@@ -92,6 +94,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider,
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
return icons[damage % icons.length];
}
@@ -8,18 +8,13 @@ public class AbstractGasTankConduitNetwork<T extends AbstractGasTankConduit> ext
protected GasStack gasType;
protected AbstractGasTankConduitNetwork(Class<T> cl) {
super(cl);
super(cl, IGasConduit.class);
}
public GasStack getGasType() {
return gasType;
}
@Override
public Class<IGasConduit> getBaseConduitType() {
return IGasConduit.class;
}
@Override
public void addConduit(T con) {
super.addConduit(con);
@@ -9,9 +9,6 @@ import mekanism.api.gas.IGasHandler;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import crazypants.enderio.conduit.ConduitNetworkTickHandler;
import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
import crazypants.enderio.conduit.IConduit;
import crazypants.util.BlockCoord;
@@ -29,19 +26,10 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit>
private int lastSyncedVolume = -1;
private long timeAtLastApply;
private final InnerTickHandler tickHandler = new InnerTickHandler();
public GasConduitNetwork() {
super(GasConduit.class);
}
@Override
public Class<IGasConduit> getBaseConduitType() {
return IGasConduit.class;
}
@Override
public void addConduit(GasConduit con) {
tank.setCapacity(tank.getMaxGas() + GasConduit.CONDUIT_VOLUME);
@@ -97,24 +85,7 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit>
}
@Override
public void onUpdateEntity(IConduit conduit) {
World world = conduit.getBundle().getEntity().getWorldObj();
if(world == null) {
return;
}
if(world.isRemote) {
return;
}
long curTime = world.getTotalWorldTime();
if(curTime > 0 && curTime != timeAtLastApply) {
timeAtLastApply = curTime;
ConduitNetworkTickHandler.instance.addListener(tickHandler);
}
}
private void doTick() {
public void doNetworkTick() {
if(gasType == null || outputs.isEmpty() || !tank.containsValidGas() || tank.isEmpty()) {
updateActiveState();
return;
@@ -294,16 +265,4 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit>
lastSyncedVolume = tank.getStored();
}
private class InnerTickHandler implements TickListener {
@Override
public void tickStart(ServerTickEvent evt) {
}
@Override
public void tickEnd(ServerTickEvent evt) {
doTick();
}
}
}
@@ -17,33 +17,22 @@ import crazypants.enderio.conduit.gui.item.InventoryFilterUpgrade;
import crazypants.enderio.conduit.gui.item.InventorySpeedUpgrades;
import crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.item.SpeedUpgrade;
import crazypants.enderio.conduit.item.filter.IItemFilter;
public class ExternalConnectionContainer extends Container {
private InventoryPlayer playerInv;
private IConduitBundle bundle;
private ForgeDirection dir;
private IItemConduit itemConduit;
private final IItemConduit itemConduit;
private int speedUpgradeSlotLimit = 15;
private IItemFilter inputFilter;
private IItemFilter outputFilter;
private int outputFilterUpgradeSlot = 36;
private int inputFilterUpgradeSlot = 37;
private int speedUpgradeSlot = 38;
private int startFilterSlot = 39;
private List<Point> slotLocations = new ArrayList<Point>();
List<FilterChangeListener> filterListeners = new ArrayList<FilterChangeListener>();
public ExternalConnectionContainer(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) {
this.playerInv = playerInv;
this.bundle = bundle;
this.dir = dir;
int x;
int y;
@@ -67,7 +56,6 @@ public class ExternalConnectionContainer extends Container {
itemConduit = bundle.getConduit(IItemConduit.class);
if(itemConduit != null) {
x = 10;
y = 47;
InventoryFilterUpgrade fi = new InventoryFilterUpgrade(itemConduit, dir, false);
@@ -96,48 +84,14 @@ public class ExternalConnectionContainer extends Container {
}
});
slotLocations.add(new Point(x, y));
addFilterSlots(dir);
}
}
public void addFilterListener(FilterChangeListener list) {
filterListeners.add(list);
}
private void addFilterSlots(ForgeDirection dir) {
List<Slot> slots;
inputFilter = itemConduit.getInputFilter(dir);
if(inputFilter != null && inputFilter.getSlotCount() > 0) {
slots = inputFilter.getSlots(33, 69);
for (Slot slot : slots) {
addSlotToContainer(slot);
slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition));
}
}
outputFilter = itemConduit.getOutputFilter(dir);
if(outputFilter != null && outputFilter.getSlotCount() > 0) {
slots = outputFilter.getSlots(33, 69);
for (Slot slot : slots) {
addSlotToContainer(slot);
slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition));
}
}
}
protected void filterChanged() {
int slotsToRemove = inventorySlots.size() - startFilterSlot;
for (int i = 0; i < slotsToRemove; i++) {
int removeIndex = inventorySlots.size() - 1;
inventorySlots.remove(removeIndex);
inventoryItemStacks.remove(removeIndex);
slotLocations.remove(removeIndex);
}
addFilterSlots(dir);
for (FilterChangeListener list : filterListeners) {
list.onFilterChanged();
}
@@ -149,31 +103,14 @@ public class ExternalConnectionContainer extends Container {
}
setSlotsVisible(visible, inputFilterUpgradeSlot, inputFilterUpgradeSlot + 1);
setSlotsVisible(visible, speedUpgradeSlot, speedUpgradeSlot + 1);
if(inputFilter == null || inputFilter.getSlotCount() == 0) {
return;
}
int startIndex = startFilterSlot;
int endIndex = inputFilter.getSlotCount() + startIndex;
setSlotsVisible(visible, startIndex, endIndex);
}
public void setOutputSlotsVisible(boolean visible) {
if(itemConduit == null) {
return;
}
setSlotsVisible(visible, outputFilterUpgradeSlot, outputFilterUpgradeSlot + 1);
if(outputFilter == null || outputFilter.getSlotCount() == 0) {
return;
}
int startIndex = startFilterSlot + (inputFilter == null ? 0 : inputFilter.getSlotCount());
int endIndex = startIndex + outputFilter.getSlotCount();
setSlotsVisible(visible, startIndex, endIndex);
}
public void setInventorySlotsVisible(boolean visible) {
@@ -205,12 +142,6 @@ public class ExternalConnectionContainer extends Container {
SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(st);
speedUpgradeSlotLimit = speedUpgrade.maxStackSize;
}
if(par4EntityPlayer.worldObj != null) {
if(par1 >= startFilterSlot && itemConduit != null) {
itemConduit.setInputFilter(dir, inputFilter);
itemConduit.setOutputFilter(dir, outputFilter);
}
}
try {
return super.slotClick(par1, par2, par3, par4EntityPlayer);
} catch (Exception e) {
@@ -226,9 +157,8 @@ public class ExternalConnectionContainer extends Container {
}
private class FilterSlot extends Slot {
final boolean isInput;
boolean isInput;
public FilterSlot(IInventory par1iInventory, int par2, int par3, int par4, boolean isInput) {
super(par1iInventory, par2, par3, par4);
this.isInput = isInput;
@@ -199,6 +199,7 @@ public class GuiExternalConnection extends GuiContainerBase {
tes.draw();
}
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
}
public ForgeDirection getDir() {
@@ -21,19 +21,19 @@ public class BasicItemFilterGui implements IItemFilterGui {
private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId();
private static final int ID_STICKY = GuiExternalConnection.nextButtonId();
private GuiContainerBase gui;
private final GuiContainerBase gui;
private ToggleButtonEIO useMetaB;
private ToggleButtonEIO useNbtB;
private IconButtonEIO whiteListB;
private ToggleButtonEIO useOreDictB;
private ToggleButtonEIO stickyB;
private final ToggleButtonEIO useMetaB;
private final ToggleButtonEIO useNbtB;
private final IconButtonEIO whiteListB;
private final ToggleButtonEIO useOreDictB;
private final ToggleButtonEIO stickyB;
boolean isAdvanced;
boolean isStickyModeAvailable;
final boolean isAdvanced;
final boolean isStickyModeAvailable;
private IItemFilterContainer filterContainer;
private ItemFilter filter;
private final IItemFilterContainer filterContainer;
private final ItemFilter filter;
private int buttonIdOffset;
private int xOffset;
@@ -58,8 +58,8 @@ public class BasicItemFilterGui implements IItemFilterGui {
isAdvanced = filter.isAdvanced();
int butLeft = xOffset + 92;
int x = butLeft ;
int y = yOffset;
int x = butLeft;
int y = yOffset + 1;
whiteListB = new IconButtonEIO(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
whiteListB.setToolTip(Lang.localize("gui.conduit.item.whitelist"));
@@ -91,6 +91,15 @@ public class BasicItemFilterGui implements IItemFilterGui {
useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled"));
useOreDictB.setPaintSelectedBorder(false);
}
public void createFilterSlots() {
filter.createGhostSlots(gui.getGhostSlots(), xOffset+1, yOffset+1, new Runnable() {
@Override
public void run() {
sendFilterChange();
}
});
}
@Override
public void mouseClicked(int x, int y, int par3) {
@@ -98,9 +107,8 @@ public class BasicItemFilterGui implements IItemFilterGui {
@Override
public void updateButtons() {
ItemFilter activeFilter = filter;
if(isAdvanced) {
useNbtB.onGuiInit();
useNbtB.setSelected(activeFilter.isMatchNBT());
@@ -54,16 +54,16 @@ public class ItemSettings extends BaseSettingsPanel {
private String inputHeading;
private String outputHeading;
private IconButtonEIO nextFilterB;
private final IconButtonEIO nextFilterB;
private ToggleButtonEIO loopB;
private ToggleButtonEIO roundRobinB;
private final ToggleButtonEIO loopB;
private final ToggleButtonEIO roundRobinB;
private IconButtonEIO priUpB;
private IconButtonEIO priDownB;
private final IconButtonEIO priUpB;
private final IconButtonEIO priDownB;
private RedstoneModeButton rsB;
private ColorButton colorB;
private final RedstoneModeButton rsB;
private final ColorButton colorB;
private ColorButton channelB;
@@ -74,9 +74,9 @@ public class ItemSettings extends BaseSettingsPanel {
private int priLeft;
private int priWidth = 32;
private GuiToolTip priorityTooltip;
private GuiToolTip speedUpgradeTooltip;
private GuiToolTip filterUpgradeTooltip;
private final GuiToolTip priorityTooltip;
private final GuiToolTip speedUpgradeTooltip;
private final GuiToolTip filterUpgradeTooltip;
private IItemFilterGui filterGui;
@@ -150,12 +150,10 @@ public class ItemSettings extends BaseSettingsPanel {
priDownB.setSize(8, 8);
gui.getContainer().addFilterListener(new FilterChangeListener() {
@Override
public void onFilterChanged() {
filtersChanged();
}
});
}
@@ -180,9 +178,12 @@ public class ItemSettings extends BaseSettingsPanel {
}
private void updateGuiVisibility() {
deactivate();
createFilterGUI();
updateButtons();
}
private void createFilterGUI() {
boolean showInput = false;
boolean showOutput = false;
@@ -191,15 +192,10 @@ public class ItemSettings extends BaseSettingsPanel {
showInput = true;
} else if(mode == ConnectionMode.OUTPUT) {
showOutput = true;
} else if(mode == ConnectionMode.IN_OUT) {
if(nextFilterB != null) {
nextFilterB.onGuiInit();
}
nextFilterB.onGuiInit();
showInput = inOutShowIn;
showOutput = !inOutShowIn;
}
if(!showInput && !showOutput) {
@@ -212,7 +208,6 @@ public class ItemSettings extends BaseSettingsPanel {
gui.getContainer().setOutputSlotsVisible(false);
if(activeFilter != null) {
filterGui = getFilterGui(activeFilter, true);
}
} else if(showOutput) {
activeFilter = itemConduit.getOutputFilter(gui.getDir());
@@ -223,54 +218,24 @@ public class ItemSettings extends BaseSettingsPanel {
filterGui = getFilterGui(activeFilter, false);
}
}
updateButtons();
}
private void filtersChanged() {
if(filterGui != null) {
filterGui.deactivate();
filterGui = null;
}
deactiveFilterGUI();
createFilterGUI();
ConnectionMode mode = con.getConnectionMode(gui.getDir());
if(mode == ConnectionMode.DISABLED) {
return;
}
boolean showInput = mode == ConnectionMode.INPUT || (mode == ConnectionMode.IN_OUT && inOutShowIn);
if(showInput) {
gui.getContainer().setInventorySlotsVisible(true);
gui.getContainer().setInputSlotsVisible(true);
gui.getContainer().setOutputSlotsVisible(false);
activeFilter = itemConduit.getInputFilter(gui.getDir());
if(activeFilter != null) {
filterGui = getFilterGui(activeFilter, true);
}
} else {
gui.getContainer().setInventorySlotsVisible(true);
gui.getContainer().setInputSlotsVisible(false);
gui.getContainer().setOutputSlotsVisible(true);
activeFilter = itemConduit.getOutputFilter(gui.getDir());
if(activeFilter != null) {
filterGui = getFilterGui(activeFilter, false);
}
}
if(filterGui != null) {
filterGui.updateButtons();
}
}
private IItemFilterGui getFilterGui(IItemFilter filter, boolean isInput) {
//TODO: move to a factory
if(filter instanceof ItemFilter) {
ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput);
return new BasicItemFilterGui(gui, cont, !isInput);
BasicItemFilterGui basicItemFilterGui = new BasicItemFilterGui(gui, cont, !isInput);
basicItemFilterGui.createFilterSlots();
return basicItemFilterGui;
} else if(filter instanceof ExistingItemFilter) {
return new ExistingItemFilterGui(gui, itemConduit, isInput);
} else if(filter instanceof ModItemFilter) {
@@ -329,7 +294,6 @@ public class ItemSettings extends BaseSettingsPanel {
if(filterGui != null) {
filterGui.updateButtons();
}
}
@Override
@@ -343,37 +307,35 @@ public class ItemSettings extends BaseSettingsPanel {
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir()));
} else if(guiButton.id == ID_LOOP) {
itemConduit.setSelfFeedEnabled(gui.getDir(), !itemConduit.isSelfFeedEnabled(gui.getDir()));
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
sendFilterChange();
} else if(guiButton.id == ID_ROUND_ROBIN) {
itemConduit.setRoundRobinEnabled(gui.getDir(), !itemConduit.isRoundRobinEnabled(gui.getDir()));
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
sendFilterChange();
} else if(guiButton.id == ID_PRIORITY_UP) {
itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) + 1);
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
sendFilterChange();
} else if(guiButton.id == ID_PRIORITY_DOWN) {
itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) - 1);
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
sendFilterChange();
} else if(guiButton.id == ID_CHANNEL) {
DyeColor col = DyeColor.values()[channelB.getColorIndex()];
boolean input;
if(isInputVisible()) {
col = DyeColor.values()[channelB.getColorIndex()];
itemConduit.setInputColor(gui.getDir(), col);
input = true;
} else {
itemConduit.setOutputColor(gui.getDir(), DyeColor.values()[channelB.getColorIndex()]);
input = false;
itemConduit.setOutputColor(gui.getDir(), col);
}
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
sendFilterChange();
}
if(filterGui != null) {
filterGui.actionPerformed(guiButton);
}
}
private void sendFilterChange() {
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
}
@Override
public void mouseClicked(int x, int y, int par3) {
@@ -406,7 +368,6 @@ public class ItemSettings extends BaseSettingsPanel {
FontRenderer fr = gui.getFontRenderer();
String heading = getHeading();
int headingWidth = fr.getStringWidth(heading);
int x = 0;
int rgb = ColorUtil.getRGB(Color.darkGray);
fr.drawString(heading, left + x, top, rgb);
@@ -433,7 +394,6 @@ public class ItemSettings extends BaseSettingsPanel {
if(filterGui != null) {
filterGui.renderCustomOptions(top, par1, par2, par3);
}
}
@Override
@@ -452,11 +412,15 @@ public class ItemSettings extends BaseSettingsPanel {
gui.removeToolTip(speedUpgradeTooltip);
gui.removeToolTip(filterUpgradeTooltip);
channelB.detach();
deactiveFilterGUI();
}
private void deactiveFilterGUI() {
if(filterGui != null) {
filterGui.deactivate();
filterGui = null;
}
gui.getGhostSlots().clear();
}
}
@@ -8,13 +8,8 @@ import java.util.Map;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import crazypants.enderio.conduit.AbstractConduitNetwork;
import crazypants.enderio.conduit.ConduitNetworkTickHandler;
import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
import crazypants.enderio.conduit.IConduit;
import crazypants.enderio.conduit.item.NetworkedInventory.Target;
import crazypants.enderio.conduit.item.filter.IItemFilter;
import crazypants.util.BlockCoord;
@@ -22,8 +17,6 @@ import crazypants.util.Lang;
public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IItemConduit> {
private long timeAtLastApply;
final List<NetworkedInventory> inventories = new ArrayList<NetworkedInventory>();
private final Map<BlockCoord, List<NetworkedInventory>> invMap = new HashMap<BlockCoord, List<NetworkedInventory>>();
@@ -33,15 +26,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
private boolean doingSend = false;
private final InnerTickHandler tickHandler = new InnerTickHandler();
public ItemConduitNetwork() {
super(IItemConduit.class);
}
@Override
public Class<IItemConduit> getBaseConduitType() {
return IItemConduit.class;
super(IItemConduit.class, IItemConduit.class);
}
@Override
@@ -146,7 +132,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
for (NetworkedInventory source : invs) {
if(source.con.getLocation().equals(con.getLocation())) {
if(source != null && source.sendPriority != null) {
if(source.sendPriority != null) {
for (Target t : source.sendPriority) {
IItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir);
if(input == null || f == null || f.doesItemPassFilter(t.inv, input)) {
@@ -174,38 +160,13 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
return result;
}
private boolean isRemote(ItemConduit itemConduit) {
World world = itemConduit.getBundle().getEntity().getWorldObj();
if(world != null && world.isRemote) {
return true;
}
return false;
}
@Override
public void onUpdateEntity(IConduit conduit) {
World world = conduit.getBundle().getEntity().getWorldObj();
if(world == null) {
return;
}
if(world.isRemote) {
return;
}
long curTime = world.getTotalWorldTime();
if(curTime != timeAtLastApply) {
timeAtLastApply = curTime;
tickHandler.tick = world.getTotalWorldTime();
ConduitNetworkTickHandler.instance.addListener(tickHandler);
}
}
private void doTick(long tick) {
public void doNetworkTick() {
for (NetworkedInventory ni : inventories) {
if(requiresSort) {
ni.updateInsertOrder();
}
ni.onTick(tick);
ni.onTick();
}
requiresSort = false;
@@ -217,18 +178,4 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
static int MAX_SLOT_CHECK_PER_TICK = 64;
private class InnerTickHandler implements TickListener {
long tick;
@Override
public void tickStart(ServerTickEvent evt) {
}
@Override
public void tickEnd(ServerTickEvent evt) {
doTick(tick);
}
}
}
@@ -62,10 +62,9 @@ public class ItemConduitRenderer extends DefaultConduitRenderer {
Tessellator.instance.setColorOpaque_I(outChannel.getColor());
ConnectionModeGeometry.renderModeConnector(dir, offset, outTex, false);
}
Tessellator.instance.setColorOpaque_F(1f, 1f, 1f);
}
}
}
}
@@ -21,7 +21,7 @@ public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipPro
private final IIcon[] icons;
public static ItemExtractSpeedUpgrade create() {
public static ItemExtractSpeedUpgrade create() {
ItemExtractSpeedUpgrade result = new ItemExtractSpeedUpgrade();
result.init();
return result;
@@ -42,6 +42,7 @@ public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipPro
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
damage = MathHelper.clamp_int(damage, 0, icons.length - 1);
return icons[damage];
@@ -62,6 +63,7 @@ public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipPro
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int j = 0; j < UPGRADES.length; ++j) {
par3List.add(new ItemStack(par1, 1, j));
@@ -91,7 +91,7 @@ public class NetworkedInventory {
return con.getOutputPriority(conDir);
}
public void onTick(long tick) {
public void onTick() {
if(tickDeficit > 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) {
//do nothing
} else {
@@ -3,10 +3,8 @@ package crazypants.enderio.conduit.item.filter;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -14,6 +12,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.oredict.OreDictionary;
import crazypants.enderio.conduit.item.NetworkedInventory;
import crazypants.enderio.network.NetworkUtil;
import crazypants.gui.GhostSlot;
import net.minecraft.inventory.IInventory;
public class ExistingItemFilter implements IItemFilter {
@@ -88,8 +87,7 @@ public class ExistingItemFilter implements IItemFilter {
}
@Override
public List<Slot> getSlots(int xOffset, int yOffset) {
return Collections.emptyList();
public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
}
@Override
@@ -4,10 +4,10 @@ import io.netty.buffer.ByteBuf;
import java.util.List;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import crazypants.enderio.conduit.item.NetworkedInventory;
import crazypants.gui.GhostSlot;
public interface IItemFilter {
@@ -27,7 +27,7 @@ public interface IItemFilter {
boolean isSticky();
List<Slot> getSlots(int xOffset, int yOffset);
void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb);
int getSlotCount();
@@ -53,23 +53,25 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
filter = new ItemFilter(true);
}
if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
}
return filter;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
damage = MathHelper.clamp_int(damage, 0, 1);
return icons[damage];
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBasic");
icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeAdvanced");
}
@Override
@@ -80,6 +82,7 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int j = 0; j < 2; ++j) {
par3List.add(new ItemStack(this, 1, j));
@@ -88,18 +91,18 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
if(FilterRegister.isFilterSet(par1ItemStack)) {
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
if(FilterRegister.isFilterSet(par1ItemStack)) {
if(!TooltipAddera.instance.showAdvancedTooltips()) {
par3List.add(Lang.localize("itemConduitFilterUpgrade"));
TooltipAddera.instance.addShowDetailsTooltip(par3List);
} else {
par3List.add(EnumChatFormatting.ITALIC + Lang.localize("itemConduitFilterUpgrade.configured"));
par3List.add(EnumChatFormatting.ITALIC + Lang.localize("itemConduitFilterUpgrade.clearConfigMethod"));
}
}
} else {
par3List.add(Lang.localize("itemConduitFilterUpgrade"));
}
}
}
@@ -4,9 +4,13 @@ import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -17,10 +21,6 @@ import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.gui.TooltipAddera;
import crazypants.util.ItemUtil;
import crazypants.util.Lang;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.world.World;
public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
@@ -76,6 +76,7 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade,
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
itemIcon = IIconRegister.registerIcon("enderio:existingItemFilter");
}
@@ -84,7 +85,7 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade,
public String getUnlocalizedNameForTooltip(ItemStack stack) {
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
@@ -8,7 +8,6 @@ import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
@@ -16,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import crazypants.enderio.conduit.item.NetworkedInventory;
import crazypants.enderio.network.NetworkUtil;
import crazypants.gui.TemplateSlot;
import crazypants.gui.GhostSlot;
public class ItemFilter implements IInventory, IItemFilter {
@@ -340,9 +339,7 @@ public class ItemFilter implements IInventory, IItemFilter {
}
@Override
public List<Slot> getSlots(int xOffset, int yOffset) {
List<Slot> result = new ArrayList<Slot>();
public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
int topY = yOffset;
int leftX = xOffset;
int index = 0;
@@ -351,13 +348,12 @@ public class ItemFilter implements IInventory, IItemFilter {
for (int col = 0; col < 5; ++col) {
int x = leftX + col * 18;
int y = topY + row * 20;
result.add(new TemplateSlot(this, index, x, y));
slots.add(new ItemFilterGhostSlot(index, x, y, cb));
index++;
}
}
return result;
}
}
@Override
public int getSlotCount() {
return getSizeInventory();
@@ -381,7 +377,31 @@ public class ItemFilter implements IInventory, IItemFilter {
// + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", isAdvanced=" + isAdvanced + "]";
return "ItemFilter [isAdvanced=" + isAdvanced + ", items=" + Arrays.toString(items) + "]";
}
class ItemFilterGhostSlot extends GhostSlot {
private final int slot;
private final Runnable cb;
ItemFilterGhostSlot(int slot, int x, int y, Runnable cb) {
this.x = x;
this.y = y;
this.slot = slot;
this.cb = cb;
}
@Override
public void putStack(ItemStack stack) {
if(stack != null) {
stack = stack.copy();
stack.stackSize = 1;
}
items[slot] = stack;
cb.run();
}
@Override
public ItemStack getStack() {
return items[slot];
}
}
}
@@ -27,7 +27,7 @@ public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IReso
protected ItemModItemFilter() {
setCreativeTab(EnderIOTab.tabEnderIO);
setUnlocalizedName(ModObject.itemModItemFilter.unlocalisedName);
setUnlocalizedName(ModObject.itemModItemFilter.unlocalisedName);
setMaxDamage(0);
setMaxStackSize(64);
}
@@ -46,6 +46,7 @@ public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IReso
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
itemIcon = IIconRegister.registerIcon("enderio:modItemFilter");
}
@@ -54,15 +55,15 @@ public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IReso
public String getUnlocalizedNameForTooltip(ItemStack stack) {
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
if(FilterRegister.isFilterSet(par1ItemStack)) {
if(TooltipAddera.instance.showAdvancedTooltips()) {
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
if(FilterRegister.isFilterSet(par1ItemStack)) {
if(TooltipAddera.instance.showAdvancedTooltips()) {
par3List.add(EnumChatFormatting.ITALIC + Lang.localize("itemConduitFilterUpgrade.configured"));
par3List.add(EnumChatFormatting.ITALIC + Lang.localize("itemConduitFilterUpgrade.clearConfigMethod"));
}
}
}
}
@@ -1,24 +1,14 @@
package crazypants.enderio.conduit.item.filter;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.conduit.item.FilterRegister;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.gui.TooltipAddera;
import crazypants.util.Lang;
/**
*
@@ -54,6 +44,7 @@ public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade, IRe
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
itemIcon = IIconRegister.registerIcon("enderio:filterUpgradePower");
}
@@ -2,16 +2,15 @@ package crazypants.enderio.conduit.item.filter;
import io.netty.buffer.ByteBuf;
import java.util.Collections;
import java.util.List;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
import crazypants.enderio.conduit.item.NetworkedInventory;
import crazypants.enderio.network.NetworkUtil;
import crazypants.gui.GhostSlot;
public class ModItemFilter implements IItemFilter {
@@ -91,8 +90,7 @@ public class ModItemFilter implements IItemFilter {
}
@Override
public List<Slot> getSlots(int xOffset, int yOffset) {
return Collections.emptyList();
public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
}
@Override
@@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import crazypants.enderio.conduit.item.NetworkedInventory;
import crazypants.enderio.network.NetworkUtil;
import crazypants.gui.GhostSlot;
/**
*
@@ -80,8 +81,7 @@ public class PowerItemFilter implements IItemFilter {
}
@Override
public List<Slot> getSlots(int xOffset, int yOffset) {
return Collections.emptyList();
public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
}
@Override
@@ -9,18 +9,13 @@ public class AbstractTankConduitNetwork<T extends AbstractTankConduit> extends A
protected boolean fluidTypeLocked = false;
protected AbstractTankConduitNetwork(Class<T> cl) {
super(cl);
super(cl, ILiquidConduit.class);
}
public FluidStack getFluidType() {
return liquidType;
}
@Override
public Class<ILiquidConduit> getBaseConduitType() {
return ILiquidConduit.class;
}
@Override
public void addConduit(T con) {
super.addConduit(con);
@@ -9,9 +9,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import crazypants.enderio.conduit.ConduitNetworkTickHandler;
import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
import crazypants.enderio.conduit.IConduit;
import crazypants.util.BlockCoord;
import crazypants.util.FluidUtil;
@@ -24,27 +21,16 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork<Adv
private Iterator<LiquidOutput> outputIterator;
private int ticksActiveUnsynced;
private boolean lastSyncedActive = false;
private int lastSyncedVolume = -1;
private long timeAtLastApply;
private final InnerTickHandler tickHandler = new InnerTickHandler();
private int ticksEmpty;
public AdvancedLiquidConduitNetwork() {
super(AdvancedLiquidConduit.class);
}
@Override
public Class<ILiquidConduit> getBaseConduitType() {
return ILiquidConduit.class;
}
@Override
public void addConduit(AdvancedLiquidConduit con) {
tank.setCapacity(tank.getCapacity() + AdvancedLiquidConduit.CONDUIT_VOLUME);
@@ -108,24 +94,7 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork<Adv
}
@Override
public void onUpdateEntity(IConduit conduit) {
World world = conduit.getBundle().getEntity().getWorldObj();
if(world == null) {
return;
}
if(world.isRemote) {
return;
}
long curTime = world.getTotalWorldTime();
if(curTime > 0 && curTime != timeAtLastApply) {
timeAtLastApply = curTime;
ConduitNetworkTickHandler.instance.addListener(tickHandler);
}
}
private void doTick() {
public void doNetworkTick() {
if(liquidType == null || outputs.isEmpty() || !tank.containsValidLiquid() || tank.isEmpty()) {
updateActiveState();
return;
@@ -172,7 +141,6 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork<Adv
con.setActive(false);
}
lastSyncedActive = false;
ticksActiveUnsynced = 0;
}
}
return;
@@ -325,17 +293,4 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork<Adv
setConduitVolumes();
lastSyncedVolume = tank.getFluidAmount();
}
private class InnerTickHandler implements TickListener {
@Override
public void tickStart(ServerTickEvent evt) {
}
@Override
public void tickEnd(ServerTickEvent evt) {
doTick();
}
}
}
@@ -29,12 +29,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork<ILiquidCon
boolean filling;
public EnderLiquidConduitNetwork() {
super(EnderLiquidConduit.class);
}
@Override
public Class<ILiquidConduit> getBaseConduitType() {
return ILiquidConduit.class;
super(EnderLiquidConduit.class, ILiquidConduit.class);
}
public void connectionChanged(EnderLiquidConduit con, ForgeDirection conDir) {
@@ -5,15 +5,10 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import crazypants.enderio.conduit.ConduitNetworkTickHandler;
import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
import crazypants.enderio.conduit.ConduitUtil;
import crazypants.enderio.conduit.IConduit;
import crazypants.util.BlockCoord;
public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidConduit> {
@@ -22,8 +17,6 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
super(LiquidConduit.class);
}
private long timeAtLastApply;
private int ticksEmpty = 0;
private int maxFlowsPerTick = 10;
@@ -31,7 +24,7 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
private boolean printFlowTiming = false;
private int pushToken = 0;
private int lastPushToken = 0;
private int inputVolume;
@@ -39,8 +32,6 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
private boolean inputLocked = false;
private final InnerTickHandler tickHandler = new InnerTickHandler();
public boolean lockNetworkForFill() {
if(inputLocked) {
return false;
@@ -54,24 +45,7 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
}
@Override
public void onUpdateEntity(IConduit conduit) {
World world = conduit.getBundle().getEntity().getWorldObj();
if(world == null) {
return;
}
if(world.isRemote || liquidType == null) {
return;
}
long curTime = world.getTotalWorldTime();
if(curTime > 0 && curTime != timeAtLastApply) {
timeAtLastApply = curTime;
ConduitNetworkTickHandler.instance.addListener(tickHandler);
}
}
private void doTick() {
public void doNetworkTick() {
List<LiquidConduit> cons = getConduits();
if(cons == null || cons.isEmpty()) {
return;
@@ -114,7 +88,7 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
}
int getNextPushToken() {
return ++pushToken;
return ++lastPushToken;
}
private boolean doFlow() {
@@ -386,19 +360,6 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork<LiquidCondu
this.bc = bc;
this.dir = dir;
}
}
private class InnerTickHandler implements TickListener {
@Override
public void tickStart(ServerTickEvent evt) {
}
@Override
public void tickEnd(ServerTickEvent evt) {
doTick();
}
}
}
@@ -13,4 +13,6 @@ public interface IMEConduit extends IConduit {
boolean isDense();
int getChannelsInUse();
}
@@ -12,11 +12,11 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.util.AECableType;
import cpw.mods.fml.common.Optional.Method;
import crazypants.enderio.EnderIO;
import crazypants.enderio.conduit.AbstractConduit;
@@ -121,6 +121,18 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
this.playerID = playerID;
}
@Override
public int getChannelsInUse() {
int channelsInUse = 0;
IGridNode node = getNode();
if(node != null) {
for (IGridConnection gc : node.getConnections()) {
channelsInUse = Math.max(channelsInUse, gc.getUsedChannels());
}
}
return channelsInUse;
}
@Override
@Method(modid = "appliedenergistics2")
public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreDisabled) {
@@ -128,15 +140,31 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
BlockCoord pos = getLocation();
TileEntity te = world.getTileEntity(pos.x + dir.offsetX, pos.y + dir.offsetY, pos.z + dir.offsetZ);
if(te instanceof TileConduitBundle) {
return false;
}
// because the AE2 API doesn't allow an easy query like "which side can connect to an ME cable" it needs this mess
if(te instanceof IPartHost) {
IPart part = ((IPartHost) te).getPart(dir.getOpposite());
if(part == null) {
part = ((IPartHost) te).getPart(ForgeDirection.UNKNOWN);
return part != null;
}
return part.getExternalFacingNode() != null;
if(part.getExternalFacingNode() != null) {
return true;
}
String name = part.getClass().getSimpleName();
return "PartP2PTunnelME".equals(name) || "PartQuartzFiber".endsWith(name) ||
"PartToggleBus".equals(name) || "PartInvertedToggleBus".equals(name);
} else if(te instanceof IGridHost) {
return !(te instanceof TileConduitBundle) && ((IGridHost) te).getCableConnectionType(dir.getOpposite()) != AECableType.NONE;
IGridNode node = ((IGridHost) te).getGridNode(dir.getOpposite());
if(node == null) {
node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN);
}
if(node != null) {
return node.getGridBlock().getConnectableSides().contains(dir.getOpposite());
}
}
return false;
}
@@ -14,7 +14,7 @@ import appeng.api.util.DimensionalCoord;
public class MEConduitGrid implements IGridBlock {
private IMEConduit conduit;
private final IMEConduit conduit;
public MEConduitGrid(IMEConduit conduit) {
this.conduit = conduit;
@@ -5,17 +5,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
public class MEConduitNetwork extends AbstractConduitNetwork<IMEConduit, IMEConduit> {
public MEConduitNetwork() {
super(IMEConduit.class);
super(IMEConduit.class, IMEConduit.class);
}
@Override
public Class<IMEConduit> getBaseConduitType() {
return IMEConduit.class;
}
@Override
public void addConduit(IMEConduit con) {
// TODO Auto-generated method stub
super.addConduit(con);
}
}
@@ -11,10 +11,7 @@ import java.util.Set;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import crazypants.enderio.Log;
import crazypants.enderio.conduit.ConduitNetworkTickHandler;
import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
import crazypants.enderio.conduit.ConnectionMode;
import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry;
import crazypants.enderio.config.Config;
@@ -23,11 +20,10 @@ import crazypants.enderio.power.IPowerStorage;
public class NetworkPowerManager {
private PowerConduitNetwork network;
private final PowerConduitNetwork network;
int maxEnergyStored;
int energyStored;
private int reserved;
private int updateRenderTicks = 10;
private int inactiveTicks = 100;
@@ -41,12 +37,10 @@ public class NetworkPowerManager {
private final Map<IPowerConduit, PowerTracker> powerTrackers = new HashMap<IPowerConduit, PowerTracker>();
private PowerTracker networkPowerTracker = new PowerTracker();
private final PowerTracker networkPowerTracker = new PowerTracker();
private final CapBankSupply capSupply = new CapBankSupply();
private InnerTickHandler applyPowerCallback = new InnerTickHandler();
public NetworkPowerManager(PowerConduitNetwork netowrk, World world) {
network = netowrk;
maxEnergyStored = 64;
@@ -113,8 +107,11 @@ public class NetworkPowerManager {
}
public void applyRecievedPower() {
//want to do this after all conduits have updated so all connections have been checked etc
ConduitNetworkTickHandler.instance.addListener(applyPowerCallback);
try {
doApplyRecievedPower();
} catch (Exception e) {
Log.warn("NetworkPowerManager: Exception thrown when updating power network " + e);
}
}
public void doApplyRecievedPower() {
@@ -458,9 +455,7 @@ public class NetworkPowerManager {
long use = (int) Math.ceil(ratio * entry.canExtract);
use = Math.min(use, amount);
use = Math.min(use, entry.canExtract);
if(!entry.capBank.isCreative()) {
entry.capBank.addEnergy((int) -use);
}
entry.capBank.addEnergy((int) -use);
trackerRecieve(entry.emmiter, (int) use, true);
amount -= use;
if(amount == 0) {
@@ -479,9 +474,7 @@ public class NetworkPowerManager {
long add = (int) Math.ceil(ratio * entry.canFill);
add = Math.min(add, entry.canFill);
add = Math.min(add, amount);
if(!entry.capBank.isCreative()) {
entry.capBank.addEnergy((int) add);
}
entry.capBank.addEnergy((int) add);
trackerSend(entry.emmiter, (int) add, true);
amount -= add;
if(amount == 0) {
@@ -527,20 +520,4 @@ public class NetworkPowerManager {
}
private class InnerTickHandler implements TickListener {
@Override
public void tickStart(ServerTickEvent evt) {
}
@Override
public void tickEnd(ServerTickEvent evt) {
try {
doApplyRecievedPower();
} catch (Exception e) {
Log.warn("NetworkPowerManager: Exception thrown when updating power network " + e);
}
}
}
}
@@ -11,7 +11,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.conduit.AbstractConduitNetwork;
import crazypants.enderio.conduit.IConduit;
import crazypants.enderio.conduit.IConduitBundle;
import crazypants.enderio.power.IPowerInterface;
import crazypants.util.BlockCoord;
@@ -22,12 +21,10 @@ public class PowerConduitNetwork extends AbstractConduitNetwork<IPowerConduit, I
NetworkPowerManager powerManager;
private Map<ReceptorKey, ReceptorEntry> powerReceptors = new HashMap<ReceptorKey, ReceptorEntry>();
private long timeAtLastApply = -1;
private final Map<ReceptorKey, ReceptorEntry> powerReceptors = new HashMap<ReceptorKey, ReceptorEntry>();
public PowerConduitNetwork() {
super(IPowerConduit.class);
super(IPowerConduit.class, IPowerConduit.class);
}
@Override
@@ -68,11 +65,6 @@ public class PowerConduitNetwork extends AbstractConduitNetwork<IPowerConduit, I
}
}
@Override
public Class<IPowerConduit> getBaseConduitType() {
return IPowerConduit.class;
}
public void powerReceptorAdded(IPowerConduit powerConduit, ForgeDirection direction, int x, int y, int z, IPowerInterface powerReceptor) {
if(powerReceptor == null) {
return;
@@ -108,19 +100,8 @@ public class PowerConduitNetwork extends AbstractConduitNetwork<IPowerConduit, I
}
@Override
public void onUpdateEntity(IConduit conduit) {
World world = conduit.getBundle().getEntity().getWorldObj();
if(world == null) {
return;
}
if(world.isRemote) {
return;
}
long curTime = world.getTotalWorldTime();
if(curTime != timeAtLastApply) {
timeAtLastApply = curTime;
powerManager.applyRecievedPower();
}
public void doNetworkTick() {
powerManager.applyRecievedPower();
}
public static class ReceptorEntry {
@@ -22,12 +22,7 @@ public class RedstoneConduitNetwork extends AbstractConduitNetwork<IRedstoneCond
private boolean networkEnabled = true;
public RedstoneConduitNetwork() {
super(IRedstoneConduit.class);
}
@Override
public Class<IRedstoneConduit> getBaseConduitType() {
return IRedstoneConduit.class;
super(IRedstoneConduit.class, IRedstoneConduit.class);
}
@Override
@@ -144,9 +139,7 @@ public class RedstoneConduitNetwork extends AbstractConduitNetwork<IRedstoneCond
StringBuilder sb = new StringBuilder();
for (IRedstoneConduit con : conduits) {
TileEntity te = con.getBundle().getEntity();
sb.append("<");
sb.append(te.xCoord + "," + te.yCoord + "," + te.zCoord);
sb.append(">");
sb.append("<").append(te.xCoord).append(",").append(te.yCoord).append(",").append(te.zCoord).append(">");
}
return sb.toString();
}
@@ -10,6 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.conduit.RaytraceResult;
import crazypants.enderio.conduit.geom.CollidableComponent;
@@ -29,6 +31,7 @@ public class RedstoneSwitch extends RedstoneConduit {
private boolean isOn;
@SideOnly(Side.CLIENT)
public static void initIcons() {
IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@@ -34,8 +34,8 @@ import crazypants.enderio.conduit.ConduitUtil;
import crazypants.enderio.conduit.ConnectionMode;
import crazypants.enderio.conduit.IConduit;
import crazypants.enderio.conduit.IConduitBundle;
import crazypants.enderio.conduit.RaytraceResult;
import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState;
import crazypants.enderio.conduit.RaytraceResult;
import crazypants.enderio.conduit.TileConduitBundle;
import crazypants.enderio.conduit.facade.BlockConduitFacade;
import crazypants.enderio.conduit.geom.CollidableComponent;
@@ -49,6 +49,7 @@ import crazypants.render.RenderUtil;
import crazypants.util.BlockCoord;
import crazypants.util.IBlockAccessWrapper;
@SideOnly(Side.CLIENT)
public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
public ConduitBundleRenderer(float conduitScale) {
@@ -105,7 +106,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
@Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rb) {
//If the MC renderer is told that an alpha pass is required ( see BlockConduitBundle.getRenderBlockPass() ) put
//If the MC renderer is told that an alpha pass is required ( see BlockConduitBundle.getRenderBlockPass() ) put
//nothing is actually added to the tessellator in this pass then the renderer will crash. We cant selectively
//enable the alpha pass based on state so the only work around is to ensure we always render something in this
//pass. Throwing in a polygon with a 0 area does the job
@@ -121,9 +122,9 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
boolean renderedFacade = renderFacade(x, y, z, rb, bundle, player);
boolean renderConduit = !renderedFacade;
boolean renderConduit = !renderedFacade || ConduitUtil.isFacadeHidden(bundle, player);
if(renderConduit) {
if(renderConduit && BlockConduitBundle.theRenderPass == 0) {
BlockCoord loc = bundle.getLocation();
float brightness;
if(!Config.updateLightingWhenHidingFacades && bundle.hasFacade() && ConduitUtil.isFacadeHidden(bundle, player)) {
@@ -141,7 +142,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
private boolean renderFacade(int x, int y, int z, RenderBlocks rb, IConduitBundle bundle, EntityClientPlayerMP player) {
boolean res = false;
if(bundle.hasFacade()) {
res = true;
Block facadeId = bundle.getFacadeId();
if(ConduitUtil.isFacadeHidden(bundle, player)) {
Tessellator.instance.setColorOpaque_F(1, 1, 1);
@@ -156,12 +157,10 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
rb.renderStandardBlock(facb, x, y, z);
}
facb.setBlockOverride(null);
bundle.setFacadeId(facadeId, false);
} else if(facadeId != null) {
bundle.setFacadeRenderAs(FacadeRenderState.FULL);
boolean isFacadeOpaque = facadeId.isOpaqueCube();
res = isFacadeOpaque;
if((isFacadeOpaque && BlockConduitBundle.theRenderPass == 0) ||
(rb.hasOverrideBlockTexture() || (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1))) {
@@ -316,6 +316,7 @@ public final class Config {
public static int poweredSpawnerLevelTwoPowerPerTickRF = 500;
public static int poweredSpawnerLevelThreePowerPerTickRF = 1500;
public static int poweredSpawnerMaxPlayerDistance = 0;
public static int poweredSpawnerDespawnTimeSeconds = 120;
public static boolean poweredSpawnerUseVanillaSpawChecks = false;
public static double brokenSpawnerDropChance = 1;
public static String[] brokenSpawnerToolBlacklist = new String[] {
@@ -1000,6 +1001,8 @@ public final class Config {
"RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelThreePowerPerTickRF);
poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner.name, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance,
"Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance);
poweredSpawnerDespawnTimeSeconds = config.get(sectionSpawner.name, "poweredSpawnerDespawnTimeSeconds" , poweredSpawnerDespawnTimeSeconds,
"Number of seconds in which spawned entities are protected from despawning").getInt(poweredSpawnerDespawnTimeSeconds);
poweredSpawnerUseVanillaSpawChecks = config.get(sectionSpawner.name, "poweredSpawnerUseVanillaSpawChecks", poweredSpawnerUseVanillaSpawChecks,
"If true, regular spawn checks such as lighting level and dimension will be made before spawning mobs").getBoolean(poweredSpawnerUseVanillaSpawChecks);
brokenSpawnerDropChance = (float) config.get(sectionSpawner.name, "brokenSpawnerDropChance", brokenSpawnerDropChance,
@@ -125,6 +125,7 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider {
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iIconRegister) {
super.registerBlockIcons(iIconRegister);
frameIcon = iIconRegister.registerIcon("enderio:enderIOFrame");
@@ -12,6 +12,8 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer;
import crazypants.render.BoundingBox;
@@ -21,6 +23,7 @@ import crazypants.vecmath.Matrix4d;
import crazypants.vecmath.VecmathUtil;
import crazypants.vecmath.Vector3d;
@SideOnly(Side.CLIENT)
public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
private TravelEntitySpecialRenderer selectionRenderer = new TravelEntitySpecialRenderer() {
@@ -42,7 +45,7 @@ public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemR
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) {
EntityLivingBase entityPlayer = Minecraft.getMinecraft().thePlayer;
Matrix4d lookMat = RenderUtil.createBillboardMatrix(te, entityPlayer);
@@ -8,6 +8,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
@@ -38,11 +40,13 @@ public class ItemEnderface extends Item implements IGuiHandler {
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
itemIcon = IIconRegister.registerIcon("enderio:enderface");
}
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack par1ItemStack, int pass) {
return true;
}
@@ -26,7 +26,7 @@ public class BlockFluidEio extends BlockFluidClassic {
public static BlockFluidEio create(Fluid fluid, Material material) {
BlockFluidEio res = new BlockFluidEio(fluid, material);
res.init();
fluid.setBlock(res);
fluid.setBlock(res);
return res;
}
@@ -46,6 +46,7 @@ public class BlockFluidEio extends BlockFluidClassic {
protected IIcon[] icons;
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) {
return side != 0 && side != 1 ? this.icons[1] : this.icons[0];
}
@@ -23,9 +23,9 @@ import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.util.ItemUtil;
public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipProvider {
private static final String ACTIVE_KEY = "magnetActive";
public static void setActive(ItemStack item, boolean active) {
if(item == null) {
return;
@@ -33,7 +33,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
NBTTagCompound nbt = ItemUtil.getOrCreateNBT(item);
nbt.setBoolean(ACTIVE_KEY, active);
}
public static boolean isActive(ItemStack item) {
if(item == null) {
return false;
@@ -44,29 +44,29 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
if(!item.stackTagCompound.hasKey(ACTIVE_KEY)) {
return false;
}
return item.stackTagCompound.getBoolean(ACTIVE_KEY);
return item.stackTagCompound.getBoolean(ACTIVE_KEY);
}
public static boolean hasPower(ItemStack itemStack) {
public static boolean hasPower(ItemStack itemStack) {
return EnderIO.itemMagnet.getEnergyStored(itemStack) > 0;
}
public static void drainPerSecondPower(ItemStack itemStack) {
EnderIO.itemMagnet.extractEnergy(itemStack, Config.magnetPowerUsePerSecondRF, false);
EnderIO.itemMagnet.extractEnergy(itemStack, Config.magnetPowerUsePerSecondRF, false);
}
public static ItemMagnet create() {
public static ItemMagnet create() {
ItemMagnet result = new ItemMagnet();
result.init();
FMLCommonHandler.instance().bus().register(new MagnetController());
result.init();
FMLCommonHandler.instance().bus().register(new MagnetController());
return result;
}
protected ItemMagnet() {
super(Config.magnetPowerCapacityRF, Config.magnetPowerCapacityRF/100);
setCreativeTab(EnderIOTab.tabEnderIO);
setUnlocalizedName(ModObject.itemMagnet.unlocalisedName);
setUnlocalizedName(ModObject.itemMagnet.unlocalisedName);
setMaxDamage(16);
setMaxStackSize(1);
setHasSubtypes(true);
@@ -81,7 +81,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
public void registerIcons(IIconRegister IIconRegister) {
itemIcon = IIconRegister.registerIcon("enderio:magnet");
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
@@ -93,7 +93,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
setEnergy(is, 0);
par3List.add(is);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
@@ -102,17 +102,18 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
+ PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation();
list.add(str);
}
@Override
public boolean hasEffect(ItemStack item, int pass) {
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack item, int pass) {
return isActive(item);
}
@Override
public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) {
setEnergy(itemStack, 0);
}
@Override
public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
int res = super.receiveEnergy(container, maxReceive, simulate);
@@ -151,10 +152,10 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP
@Override
public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) {
if(player.isSneaking()) {
public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) {
if(player.isSneaking()) {
setActive(equipped, !isActive(equipped));
}
}
return equipped;
}
@@ -47,7 +47,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
}
private IIcon filledIcon;
private List<String> blackList;
protected ItemSoulVessel() {
@@ -79,21 +79,22 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
public IIcon getIcon(ItemStack item, int arg1, EntityPlayer arg2, ItemStack arg3, int arg4) {
if(containsSoul(item)) {
return filledIcon;
}
return itemIcon;
}
}
return itemIcon;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconIndex(ItemStack item) {
if(containsSoul(item)) {
return filledIcon;
}
}
return itemIcon;
}
@Override
public boolean hasEffect(ItemStack item, int pass) {
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack item, int pass) {
return containsSoul(item);
}
@@ -114,7 +115,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
}
Entity mob;
NBTTagCompound root = itemstack.stackTagCompound;
NBTTagCompound root = itemstack.stackTagCompound;
if(root.hasKey("isStub")) {
String entityId = root.getString("id");
mob = EntityList.createEntityByName(entityId, world);
@@ -122,18 +123,18 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
mob = EntityList.createEntityFromNBT(root, world);
}
if (mob == null) {
return true;
return true;
}
mob.readFromNBT(root);
Block blk = world.getBlock(x,y,z);
Block blk = world.getBlock(x,y,z);
double spawnX = x + Facing.offsetsXForSide[side] + 0.5;
double spawnY = y + Facing.offsetsYForSide[side];
double spawnZ = z + Facing.offsetsZForSide[side] + 0.5;
if(side == ForgeDirection.UP.ordinal() && (blk instanceof BlockFence || blk instanceof BlockWall)) {
spawnY += 0.5;
}
mob.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0);
}
mob.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0);
boolean spaceClear = world.checkNoEntityCollision(mob.boundingBox)
&& world.getCollidingBoundingBoxes(mob, mob.boundingBox).isEmpty();
@@ -145,26 +146,26 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
((EntityLiving)mob).setCustomNameTag(itemstack.getDisplayName());
}
world.spawnEntityInWorld(mob);
world.spawnEntityInWorld(mob);
if(mob instanceof EntityLiving) {
((EntityLiving)mob).playLivingSound();
}
Entity riddenByEntity = mob.riddenByEntity;
while(riddenByEntity != null) {
riddenByEntity.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0.0F);
while(riddenByEntity != null) {
riddenByEntity.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0.0F);
world.spawnEntityInWorld(riddenByEntity);
if(riddenByEntity instanceof EntityLiving) {
((EntityLiving)riddenByEntity).playLivingSound();
}
}
riddenByEntity = riddenByEntity.riddenByEntity;
}
if(player == null || !player.capabilities.isCreativeMode) {
itemstack.setTagCompound(null);
}
return true;
}
@@ -181,20 +182,20 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
if(entity instanceof EntityPlayer) {
return false;
}
String entityId = EntityList.getEntityString(entity);
if(isBlackListed(entityId)) {
return false;
}
if(!Config.soulVesselCapturesBosses && entity instanceof IBossDisplayData) {
return false;
}
NBTTagCompound root = new NBTTagCompound();
root.setString("id", entityId);
root.setString("id", entityId);
entity.writeToNBT(root);
ItemStack capturedMobVessel = new ItemStack(EnderIO.itemSoulVessel);
capturedMobVessel.setTagCompound(root);
setDisplayNameFromEntityNameTag(capturedMobVessel, entity);
@@ -222,7 +223,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
}
return false;
}
public ItemStack createVesselWithEntityStub(String entityId) {
NBTTagCompound root = new NBTTagCompound();
root.setString("id", entityId);
@@ -265,10 +266,10 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
}
if(item.getItem() != this) {
return false;
}
return item.stackTagCompound != null && item.stackTagCompound.hasKey("id");
}
return item.stackTagCompound != null && item.stackTagCompound.hasKey("id");
}
public String getMobTypeFromStack(ItemStack item) {
if(!containsSoul(item)) {
return null;
@@ -355,7 +356,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
public String getUnlocalizedNameForTooltip(ItemStack itemStack) {
return getUnlocalizedName(itemStack);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
@@ -393,6 +394,6 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider {
}
}
}
@@ -23,7 +23,6 @@ import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.api.tool.IConduitControl;
import crazypants.enderio.api.tool.ITool;
import crazypants.enderio.conduit.BlockConduitBundle;
import crazypants.enderio.conduit.ConduitDisplayMode;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
@@ -105,6 +104,7 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv
}
@Override
@SideOnly(Side.CLIENT)
public boolean isFull3D() {
return true;
}
@@ -122,30 +122,30 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv
@Override
public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) {
}
@Override
public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) {
ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack);
return curMode != ConduitDisplayMode.NONE;
}
@Override
public boolean showOverlay(ItemStack stack, EntityPlayer player) {
return true;
}
/* IAdvancedTooltipProvider */
@SuppressWarnings("rawtypes")
@Override
public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
}
@SuppressWarnings("rawtypes")
@Override
public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
@@ -158,7 +158,7 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv
}
/* InvocationHandler */
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
System.out.println("ItemYetaWrench.invoke: method = " + method.getName());
@@ -14,17 +14,17 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
import crazypants.enderio.EnderIO;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.api.tool.IConduitControl;
import crazypants.enderio.conduit.ConduitDisplayMode;
import crazypants.enderio.item.darksteel.DarkSteelController;
import crazypants.enderio.item.darksteel.GogglesOfRevealingUpgrade;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.darksteel.JumpUpgrade;
import crazypants.enderio.item.darksteel.PacketUpgradeState;
import crazypants.enderio.item.darksteel.SoundDetector;
import crazypants.enderio.item.darksteel.SoundDetectorUpgrade;
import crazypants.enderio.item.darksteel.SpeedUpgrade;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
import crazypants.util.Lang;
public class KeyTracker {
@@ -19,6 +19,8 @@ import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import crazypants.enderio.EnderIO;
import crazypants.enderio.material.Alloy;
import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
import crazypants.enderio.thaumcraft.ThaumcraftCompat;
import crazypants.util.Lang;
public class DarkSteelRecipeManager {
@@ -47,7 +49,7 @@ public class DarkSteelRecipeManager {
upgrades.add(SolarUpgrade.SOLAR_ONE);
upgrades.add(SolarUpgrade.SOLAR_TWO);
if(Loader.isModLoaded("Thaumcraft")) {
upgrades.add(GogglesOfRevealingUpgrade.INSTANCE);
ThaumcraftCompat.loadUpgrades(upgrades);
}
if(Loader.isModLoaded("Forestry")) {
upgrades.add(NaturalistEyeUpgrade.INSTANCE);
@@ -30,6 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
import crazypants.util.ItemUtil;
import crazypants.util.Lang;
import forestry.api.apiculture.IArmorApiarist;
@@ -2,24 +2,20 @@ package crazypants.enderio.item.darksteel;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.material.ItemCapacitor;
import crazypants.enderio.power.BasicCapacitor;
import crazypants.enderio.power.Capacitors;
import crazypants.enderio.power.ICapacitor;
import crazypants.util.Lang;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
public class ItemGliderWing extends Item implements IResourceTooltipProvider {
@@ -46,6 +42,7 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider {
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
damage = MathHelper.clamp_int(damage, 0, 1);
if(damage == 0) {
@@ -55,6 +52,7 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider {
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = register.registerIcon("enderio:itemGliderWing");
wingsIcon = register.registerIcon("enderio:itemGliderWings");
@@ -71,6 +69,7 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider {
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int j = 0; j < 2; ++j) {
par3List.add(new ItemStack(par1, 1, j));
@@ -82,7 +81,7 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider {
return getUnlocalizedName(itemStack);
}
// @Override
// @SideOnly(Side.CLIENT)
// public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
@@ -91,5 +90,5 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider {
// }
//
// }
}
@@ -8,25 +8,28 @@ import net.minecraft.entity.Entity;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.gui.IconEIO;
@SideOnly(Side.CLIENT)
public class SoundRenderer extends RenderEntity {
@Override
public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
SoundEntity se = ((SoundEntity) entity);
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
float alpha = 0.5f;
GL11.glColor4f(1, 1, 1, alpha);
float scale = se.lifeSpan / 20f;
@@ -36,9 +39,9 @@ public class SoundRenderer extends RenderEntity {
GL11.glTranslatef((float) x, (float) y, (float) z);
GL11.glRotatef(-player.rotationYaw, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(player.rotationPitch, 1.0F, 0.0F, 0.0F);
double size = 0.5 * se.lifeSpan / 20f;
IconEIO.SOUND.renderIcon(-size/2, -size/2, size,size,0,true,true);
GL11.glPopAttrib();
@@ -1,6 +1,5 @@
package crazypants.enderio.item.skull;
import cpw.mods.fml.common.Optional;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
@@ -9,12 +8,13 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import thaumcraft.api.crafting.IInfusionStabiliser;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.BlockEio;
import crazypants.enderio.ModObject;
import thaumcraft.api.crafting.IInfusionStabiliser;
@Optional.Interface(iface = "thaumcraft.api.crafting.IInfusionStabiliser", modid = "Thaumcraft")
public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser {
@@ -22,22 +22,22 @@ public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser
public static int renderId = -1;
public enum SkullType {
BASE("base",false),
REANIMATED("reanimated",true),
TORMENTED("tormented",false),
REANIMATED_TORMENTED("reanimatedTormented",true);
final String name;
final boolean showEyes;
SkullType(String name, boolean showEyes) {
this.name = name;
this.showEyes = showEyes;
}
}
public static BlockEndermanSkull create() {
BlockEndermanSkull res = new BlockEndermanSkull();
res.init();
@@ -53,18 +53,19 @@ public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser
super(ModObject.blockEndermanSkull.unlocalisedName, TileEndermanSkull.class, Material.circuits);
setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F);
}
@Override
protected void init() {
GameRegistry.registerBlock(this, ItemEndermanSkull.class, name);
GameRegistry.registerTileEntity(teClass, name + "TileEntity");
GameRegistry.registerBlock(this, ItemEndermanSkull.class, name);
GameRegistry.registerTileEntity(teClass, name + "TileEntity");
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iIconRegister) {
frontIcon = iIconRegister.registerIcon("enderio:endermanSkullFront");
frontIconEyes = iIconRegister.registerIcon("enderio:endermanSkullFrontEyes");
@@ -86,18 +87,22 @@ public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser
return sideIcon;
}
@Override
public int getRenderType() {
return renderId;
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock() {
return false;
}
@Override
@SideOnly(Side.CLIENT)
public String getItemIconName() {
return "enderio:endermanSkull";
@@ -105,9 +110,9 @@ public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
int inc = MathHelper.floor_double((double)(player.rotationYaw * 16.0F / 360.0F) + 0.5D) & 15;
float facingYaw = -22.5f * inc;
int inc = MathHelper.floor_double(player.rotationYaw * 16.0F / 360.0F + 0.5D) & 15;
float facingYaw = -22.5f * inc;
TileEndermanSkull te = (TileEndermanSkull) world.getTileEntity(x, y, z);
te.setYaw(facingYaw);
if(world.isRemote) {
@@ -2,16 +2,16 @@ package crazypants.enderio.item.skull;
import java.util.List;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType;
import crazypants.enderio.material.BlockFusedQuartz;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType;
public class ItemEndermanSkull extends ItemBlockWithMetadata {
@@ -19,7 +19,7 @@ public class ItemEndermanSkull extends ItemBlockWithMetadata {
super(block, block);
setCreativeTab(EnderIOTab.tabEnderIO);
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
int meta = par1ItemStack.getItemDamage();
@@ -29,6 +29,7 @@ public class ItemEndermanSkull extends ItemBlockWithMetadata {
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int j = 0; j < SkullType.values().length; ++j) {
if(!SkullType.values()[j].showEyes) {
@@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
@@ -31,6 +32,7 @@ public class BlockAlloySmelter extends AbstractMachineBlock<TileAlloySmelter> {
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iIconRegister) {
super.registerBlockIcons(iIconRegister);
vanillaSmeltingOn = iIconRegister.registerIcon("enderio:furnaceSmeltingOn");
@@ -12,7 +12,6 @@ import crazypants.enderio.machine.IMachineRecipe.ResultStack;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.MachineRecipeRegistry;
import crazypants.enderio.machine.SlotDefinition;
import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator;
import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe;
public class TileAlloySmelter extends AbstractPoweredTaskEntity {
@@ -186,15 +185,19 @@ public class TileAlloySmelter extends AbstractPoweredTaskEntity {
}
@Override
public void readCustomNBT(NBTTagCompound nbtRoot) {
super.readCustomNBT(nbtRoot);
public void readCommon(NBTTagCompound nbtRoot) {
super.readCommon(nbtRoot);
short mb = nbtRoot.getShort("mode");
mode = Mode.values()[mb];
Mode[] modes = Mode.values();
if(mb < 0 || mb >= modes.length) {
mb = 0;
}
mode = modes[mb];
}
@Override
public void writeCustomNBT(NBTTagCompound nbtRoot) {
super.writeCustomNBT(nbtRoot);
public void writeCommon(NBTTagCompound nbtRoot) {
super.writeCommon(nbtRoot);
nbtRoot.setShort("mode", (short) mode.ordinal());
}
@@ -22,6 +22,8 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.render.BoundingBox;
import crazypants.render.CubeRenderer;
@@ -32,12 +34,13 @@ import crazypants.vecmath.Vector3f;
import crazypants.vecmath.Vertex;
import static org.lwjgl.opengl.GL11.*;
@SideOnly(Side.CLIENT)
public class ObeliskRenderer<T extends TileEntity> extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
private VertXForm xform = new VertXForm();
private VertXForm2 xform2 = new VertXForm2();
private ItemStack floatingStack;
private Random rand = new Random();
public ObeliskRenderer(ItemStack itemStack) {
@@ -80,7 +83,7 @@ public class ObeliskRenderer<T extends TileEntity> extends TileEntitySpecialRend
default:
break;
}
renderInventoryBlock(EnderIO.blockAttractor, item.getItemDamage(), 0, (RenderBlocks) data[0]);
Timer t = RenderUtil.getTimer();
renderItemStack(null, Minecraft.getMinecraft().theWorld, 0, 0, 0, t.renderPartialTicks);
@@ -99,18 +102,19 @@ public class ObeliskRenderer<T extends TileEntity> extends TileEntitySpecialRend
int l1 = l % 65536;
int l2 = l / 65536;
Tessellator.instance.setColorOpaque_F(f, f, f);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) l1, (float) l2);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2);
renderItemStack((T) te, world, x, y, z, tick);
}
private void renderItemStack(T te, World world, double x, double y, double z, float tick) {
if(ei == null) {
ei = new EntityItem(world, 0, 0, 0, getFloatingItem((T) te));
ei = new EntityItem(world, 0, 0, 0, getFloatingItem(te));
}
ei.setEntityItemStack(getFloatingItem(te));
ei.hoverStart = (float) world.getTotalWorldTime() * 0.05f + (tick * 0.05f);
ei.hoverStart = world.getTotalWorldTime() * 0.05f + (tick * 0.05f);
ei.age = 0;
glPushMatrix();
glPushAttrib(GL_ALL_ATTRIB_BITS);
@@ -132,7 +136,7 @@ public class ObeliskRenderer<T extends TileEntity> extends TileEntitySpecialRend
glPopAttrib();
glPopMatrix();
}
/**
* @param te CAN BE NULL
*/
@@ -156,7 +160,7 @@ public class ObeliskRenderer<T extends TileEntity> extends TileEntitySpecialRend
BoundingBox bb = BoundingBox.UNIT_CUBE;
Tessellator.instance.addTranslation(x, y, z);
IIcon icon = EnderIO.blockAttractor.getOnIcon();
if(world != null) {
icon = block.getIcon(world, x, y, z, 0);
@@ -1,7 +1,5 @@
package crazypants.enderio.machine.buffer;
import java.util.ArrayList;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
@@ -13,9 +11,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.google.common.collect.Lists;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -94,11 +89,13 @@ public class BlockBuffer extends AbstractMachineBlock<TileBuffer> implements IFa
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int blockSide, int blockMeta) {
return blockSide > 1 ? textures[blockMeta] : super.getIcon(blockSide, blockMeta);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileBuffer) {
@@ -161,8 +158,11 @@ public class BlockBuffer extends AbstractMachineBlock<TileBuffer> implements IFa
if(paintSource == null) {
return new ResultStack[0];
}
return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(MachineRecipeInput.getInputForSlot(0, inputs).copy(),
Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) };
ItemStack target = MachineRecipeInput.getInputForSlot(0, inputs);
target = target.copy();
target.stackSize = 1;
return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(target, Block.getBlockFromItem(paintSource.getItem()),
paintSource.getItemDamage())) };
}
}
@@ -10,6 +10,8 @@ import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.ModObject;
@@ -20,11 +22,11 @@ public class BlockItemBuffer extends ItemBlockWithMetadata {
POWER(false, true, false),
OMNI(true, true, false),
CREATIVE(true, true, true);
final boolean hasInventory;
final boolean hasPower;
final boolean isCreative;
private Type(boolean hasInventory, boolean hasPower, boolean isCreative) {
this.hasInventory = hasInventory;
this.hasPower = hasPower;
@@ -34,7 +36,7 @@ public class BlockItemBuffer extends ItemBlockWithMetadata {
public static Type get(TileBuffer buffer) {
return !buffer.hasPower() ? ITEM : !buffer.hasInventory() ? POWER : !buffer.isCreative() ? OMNI : CREATIVE;
}
public String getUnlocalizedName() {
return "tile." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase();
}
@@ -43,24 +45,25 @@ public class BlockItemBuffer extends ItemBlockWithMetadata {
return new ItemStack(EnderIO.blockBuffer, 1, type.ordinal());
}
}
public BlockItemBuffer(Block block) {
super(block, block);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (Type type : Type.values()) {
list.add(new ItemStack(item, 1, type.ordinal()));
}
}
@Override
public String getUnlocalizedName(ItemStack stack) {
return Type.values()[stack.getItemDamage()].getUnlocalizedName();
}
@Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata);
@@ -63,7 +63,7 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl
if (!isCreative()) {
setEnergyStored(getEnergyStored() - transmitted);
}
return transmitted > 0;
return false;
}
@Override
@@ -106,7 +106,7 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
return hasPower() && getIoMode(from).canRecieveInput() ? super.receiveEnergy(from, maxReceive, isCreative() || simulate) : 0;
}
@Override
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
return 0;
@@ -272,6 +272,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool
}
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) {
Block i1 = par1IBlockAccess.getBlock(par2, par3, par4);
return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5);
@@ -20,7 +20,6 @@ import crazypants.enderio.machine.IRedstoneModeControlable;
import crazypants.enderio.machine.IoMode;
import crazypants.enderio.machine.RedstoneControlMode;
import crazypants.enderio.machine.capbank.network.CapBankClientNetwork;
import crazypants.enderio.machine.capbank.network.NetworkState;
import crazypants.enderio.machine.capbank.packet.PacketGuiChange;
import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest;
import crazypants.enderio.machine.gui.GuiButtonIoConfig;
@@ -37,8 +36,6 @@ import crazypants.vecmath.VecmathUtil;
public class GuiCapBank extends GuiContainerBase {
private static final NetworkState EMPTY_STATE = new NetworkState();
private static final CapBankClientNetwork NULL_NETWORK = new CapBankClientNetwork(-1);
protected static final int INPUT_BUTTON_ID = 18;
@@ -369,4 +366,4 @@ public class GuiCapBank extends GuiContainerBase {
}
}
}
@@ -2,7 +2,6 @@ package crazypants.enderio.machine.capbank;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -360,7 +359,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerHandler,
}
if(faceDisplayTypes == null) {
faceDisplayTypes = new HashMap<ForgeDirection, InfoDisplayType>();
faceDisplayTypes = new EnumMap<ForgeDirection, InfoDisplayType>(ForgeDirection.class);
}
if(type == InfoDisplayType.NONE) {
@@ -678,7 +677,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerHandler,
if(mode == IoMode.DISABLED || mode == IoMode.PUSH) {
return 0;
}
return network.recieveEnergy(maxReceive, simulate);
return network.receiveEnergy(maxReceive, simulate);
}
@Override
@@ -36,7 +36,8 @@ public class CapBankClientNetwork implements ICapBankNetwork {
private final InventoryImpl inventory = new InventoryImpl();
private float aveChange;
private float avgInput;
private float avgOutput;
private long lastPowerRequestTick = -1;
@@ -56,8 +57,10 @@ public class CapBankClientNetwork implements ICapBankNetwork {
if(lastPowerRequestTick == -1 || curTick - lastPowerRequestTick >= interval) {
if(stateUpdateCount == 0) {
PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank));
// the network state also contains the energy data
} else {
PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(capBank));
}
PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(capBank));
lastPowerRequestTick = curTick;
}
}
@@ -80,8 +83,9 @@ public class CapBankClientNetwork implements ICapBankNetwork {
inventory.setCapBank((TileCapBank) te);
}
}
aveChange = state.getAverageChange();
avgInput = state.getAverageInput();
avgOutput = state.getAverageOutput();
stateUpdateCount++;
}
@@ -190,11 +194,22 @@ public class CapBankClientNetwork implements ICapBankNetwork {
@Override
public float getAverageChangePerTick() {
return aveChange;
return avgInput - avgOutput;
}
public void setAverageChangePerTick(float aveChange) {
this.aveChange = aveChange;
@Override
public float getAverageInputPerTick() {
return avgInput;
}
@Override
public float getAverageOutputPerTick() {
return avgOutput;
}
public void setAverageIOPerTick(float input, float output) {
this.avgInput = input;
this.avgOutput = output;
}
@Override
@@ -211,7 +226,7 @@ public class CapBankClientNetwork implements ICapBankNetwork {
}
@Override
public int recieveEnergy(int maxReceive, boolean simulate) {
public int receiveEnergy(int maxReceive, boolean simulate) {
return 0;
}
@@ -50,12 +50,14 @@ public class CapBankNetwork implements ICapBankNetwork {
private long energyStored;
private long prevEnergyStored = -1;
private long energyReceived;
private long energySend;
private long maxEnergyStored;
private CapBankType type;
private Set<BlockCoord> redstoneRecievers = new HashSet<BlockCoord>();
private final Set<BlockCoord> redstoneRecievers = new HashSet<BlockCoord>();
private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE;
private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE;
@@ -63,9 +65,10 @@ public class CapBankNetwork implements ICapBankNetwork {
private boolean inputRedstoneConditionMet = true;
private boolean outputRedstoneConditionMet = true;
private TickListener tickListener;
private final TickListener tickListener = new TickReciever();
private PerTickIntAverageCalculator powerTracker = new PerTickIntAverageCalculator(2);
private final PerTickIntAverageCalculator powerTrackerIn = new PerTickIntAverageCalculator(2);
private final PerTickIntAverageCalculator powerTrackerOut = new PerTickIntAverageCalculator(2);
private final InventoryImpl inventory = new InventoryImpl();
@@ -82,8 +85,6 @@ public class CapBankNetwork implements ICapBankNetwork {
throw new UnsupportedOperationException();
}
tickListener = new TickReciever();
type = cap.getType();
inputControlMode = cap.getInputControlMode();
outputControlMode = cap.getOutputControlMode();
@@ -223,10 +224,11 @@ public class CapBankNetwork implements ICapBankNetwork {
if(energyStored != prevEnergyStored) {
distributeEnergyToBanks();
}
if(prevEnergyStored != -1) {
powerTracker.tick((int) (energyStored - prevEnergyStored));
}
powerTrackerIn.tick(energyReceived);
powerTrackerOut.tick(energySend);
prevEnergyStored = energyStored;
energyReceived = 0;
energySend = 0;
if(firstUpate) {
if(!capBanks.isEmpty()) {
@@ -265,9 +267,7 @@ public class CapBankNetwork implements ICapBankNetwork {
totalSent += sent;
available -= sent;
}
if(!type.isCreative()) {
addEnergy(-totalSent);
}
addEnergy(-totalSent);
}
protected int getEnergyAvailableForTick(int limit) {
@@ -316,9 +316,7 @@ public class CapBankNetwork implements ICapBankNetwork {
}
if(used > 0) {
if(!type.isCreative()) {
addEnergy(-used);
}
addEnergy(-used);
chargedItem = true;
available -= used;
}
@@ -344,11 +342,21 @@ public class CapBankNetwork implements ICapBankNetwork {
@Override
public float getAverageChangePerTick() {
return powerTracker.getAverage();
return powerTrackerIn.getAverage() - powerTrackerOut.getAverage();
}
@Override
public int recieveEnergy(int maxReceive, boolean simulate) {
public float getAverageInputPerTick() {
return powerTrackerIn.getAverage();
}
@Override
public float getAverageOutputPerTick() {
return powerTrackerOut.getAverage();
}
@Override
public int receiveEnergy(int maxReceive, boolean simulate) {
if(maxReceive <= 0 || !inputRedstoneConditionMet) {
return 0;
}
@@ -360,20 +368,25 @@ public class CapBankNetwork implements ICapBankNetwork {
int res = Math.min(maxReceive, (int) spaceAvailable);
res = Math.min(res, getMaxInput());
if(!simulate) {
if(!type.isCreative()) {
addEnergy(res);
}
addEnergy(res);
}
return res;
}
@Override
public void addEnergy(int energy) {
energyStored += energy;
if(energyStored > maxEnergyStored) {
energyStored = maxEnergyStored;
} else if(energyStored < 0) {
energyStored = 0;
if(energy > 0) {
energyReceived += energy;
} else {
energySend -= energy;
}
if(!type.isCreative()) {
energyStored += energy;
if(energyStored > maxEnergyStored) {
energyStored = maxEnergyStored;
} else if(energyStored < 0) {
energyStored = 0;
}
}
}
@@ -14,16 +14,15 @@ public class ClientNetworkManager {
return instance;
}
private Map<Integer, CapBankClientNetwork> networks = new HashMap<Integer, CapBankClientNetwork>();
private final Map<Integer, CapBankClientNetwork> networks = new HashMap<Integer, CapBankClientNetwork>();
ClientNetworkManager() {
}
public void destroyNetwork(int id) {
CapBankClientNetwork res = networks.get(id);
CapBankClientNetwork res = networks.remove(id);
if(res != null) {
res.destroyNetwork();
networks.remove(res);
}
}
@@ -32,13 +31,13 @@ public class ClientNetworkManager {
network.setState(world, state);
}
public void updateEnergy(int id, long energyStored, float avChange) {
public void updateEnergy(int id, long energyStored, float avgInput, float avgOutput) {
CapBankClientNetwork res = networks.get(id);
if(res == null) {
return;
}
res.setEnergyStored(energyStored);
res.setAverageChangePerTick(avChange);
res.setAverageIOPerTick(avgInput, avgOutput);
}
public CapBankClientNetwork getOrCreateNetwork(int id) {
@@ -31,7 +31,7 @@ public interface ICapBankNetwork extends IPowerStorage {
@Override
void addEnergy(int energy);
int recieveEnergy(int maxReceive, boolean simulate);
int receiveEnergy(int maxReceive, boolean simulate);
@Override
long getMaxEnergyStoredL();
@@ -50,6 +50,10 @@ public interface ICapBankNetwork extends IPowerStorage {
float getAverageChangePerTick();
float getAverageInputPerTick();
float getAverageOutputPerTick();
void removeReceptors(Collection<EnergyReceptor> receptors);
void addReceptors(Collection<EnergyReceptor> receptors);
@@ -15,14 +15,11 @@ public class NetworkState {
private final RedstoneControlMode inputMode;
private final RedstoneControlMode outputMode;
private final BlockCoord invImplLoc;
private final float averageChange;
public NetworkState() {
this(0, 0, 0, 0, 0, RedstoneControlMode.IGNORE, RedstoneControlMode.IGNORE, null, 0);
}
private final float averageInput;
private final float averageOutput;
public NetworkState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode,
RedstoneControlMode outputMode, BlockCoord invImplLoc, float averageChange) {
RedstoneControlMode outputMode, BlockCoord invImplLoc, float averageInput, float averageOutput) {
this.energyStored = energyStored;
this.maxEnergyStored = maxEnergyStored;
this.maxIO = maxIO;
@@ -31,7 +28,8 @@ public class NetworkState {
this.inputMode = inputMode;
this.outputMode = outputMode;
this.invImplLoc = invImplLoc;
this.averageChange = averageChange;
this.averageInput = averageInput;
this.averageOutput = averageOutput;
}
public NetworkState(ICapBankNetwork network) {
@@ -48,7 +46,8 @@ public class NetworkState {
} else {
invImplLoc = null;
}
averageChange = network.getAverageChangePerTick();
averageInput = network.getAverageInputPerTick();
averageOutput = network.getAverageOutputPerTick();
}
public long getEnergyStored() {
@@ -83,8 +82,12 @@ public class NetworkState {
return invImplLoc;
}
public float getAverageChange() {
return averageChange;
public float getAverageInput() {
return averageInput;
}
public float getAverageOutput() {
return averageOutput;
}
public void writeToBuf(ByteBuf buf) {
@@ -99,13 +102,14 @@ public class NetworkState {
if(invImplLoc != null) {
invImplLoc.writeToBuf(buf);
}
buf.writeFloat(averageChange);
buf.writeFloat(averageInput);
buf.writeFloat(averageOutput);
}
public static NetworkState readFromBuf(ByteBuf buf) {
return new NetworkState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(),
RedstoneControlMode.values()[buf.readShort()], RedstoneControlMode.values()[buf.readShort()],
buf.readBoolean() ? BlockCoord.readFromBuf(buf) : null, buf.readFloat());
buf.readBoolean() ? BlockCoord.readFromBuf(buf) : null, buf.readFloat(), buf.readFloat());
}
@Override
@@ -11,7 +11,8 @@ public class PacketNetworkEnergyResponse implements IMessage, IMessageHandler<Pa
private int id;
private long energyStored;
private float avChange;
private float avgInput;
private float avgOutput;
public PacketNetworkEnergyResponse() {
}
@@ -19,26 +20,29 @@ public class PacketNetworkEnergyResponse implements IMessage, IMessageHandler<Pa
public PacketNetworkEnergyResponse(ICapBankNetwork network) {
id = network.getId();
energyStored = network.getEnergyStoredL();
avChange = network.getAverageChangePerTick();
avgInput = network.getAverageInputPerTick();
avgOutput = network.getAverageOutputPerTick();
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeInt(id);
buf.writeLong(energyStored);
buf.writeFloat(avChange);
buf.writeFloat(avgInput);
buf.writeFloat(avgOutput);
}
@Override
public void fromBytes(ByteBuf buf) {
id = buf.readInt();
energyStored = buf.readLong();
avChange = buf.readFloat();
avgInput = buf.readFloat();
avgOutput = buf.readFloat();
}
@Override
public IMessage onMessage(PacketNetworkEnergyResponse message, MessageContext ctx) {
ClientNetworkManager.getInstance().updateEnergy(message.id, message.energyStored, message.avChange);
ClientNetworkManager.getInstance().updateEnergy(message.id, message.energyStored, message.avgInput, message.avgOutput);
return null;
}
@@ -18,6 +18,8 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.machine.capbank.BlockCapBank;
import crazypants.enderio.machine.capbank.CapBankType;
@@ -32,6 +34,7 @@ import crazypants.render.CubeRenderer;
import crazypants.render.CustomCubeRenderer;
import crazypants.render.RenderUtil;
@SideOnly(Side.CLIENT)
public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
private ConnectedTextureRenderer connectedTexRenderer;
@@ -86,7 +89,7 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl
return BlockCapBank.renderId;
}
//------- Item
//------- Item
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return true;
@@ -6,16 +6,12 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import crazypants.enderio.EnderIO;
import crazypants.enderio.machine.capbank.CapBankType;
import crazypants.enderio.machine.capbank.InfoDisplayType;
import crazypants.enderio.machine.capbank.TileCapBank;
import crazypants.enderio.machine.capbank.network.CapBankClientNetwork;
import crazypants.enderio.machine.power.PowerDisplayUtil;
@@ -137,19 +133,32 @@ public class IoDisplay implements IInfoRenderer {
nw.requestPowerUpdate(cb, 20);
int change = Math.round(nw.getAverageChangePerTick());
HeadingText heading = HeadingText.STABLE;
if(change > 0) {
heading = HeadingText.GAIN;
} else if(change < 0) {
heading = HeadingText.LOSS;
}
HeadingText heading1 = HeadingText.STABLE;
HeadingText heading2 = null;
String text1;
String text2 = "";
FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
String changeText = getChangeText(change, fr);
float size = 0.15f * Math.min(info.width, info.height);
float scale = size / fr.FONT_HEIGHT;
float offset;
if(info.height*3 >= info.width*4) {
heading1 = HeadingText.INPUT;
heading2 = HeadingText.OUTPUT;
text1 = getChangeText(nw.getAverageInputPerTick(), fr);
text2 = getChangeText(nw.getAverageOutputPerTick(), fr);
offset = -size*2.5f;
} else {
int change = Math.round(nw.getAverageChangePerTick());
if(change > 0) {
heading1 = HeadingText.GAIN;
} else if(change < 0) {
heading1 = HeadingText.LOSS;
}
text1 = getChangeText(change, fr);
offset = -size;
}
ForgeDirection right = dir.getRotation(ForgeDirection.UP);
@@ -167,24 +176,40 @@ public class IoDisplay implements IInfoRenderer {
GL11.glRotatef(90, 0, 1, 0);
}
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_LIGHTING);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
offset = drawText(heading1, text1, offset, scale, size, fr);
if(heading2 != null) {
drawText(heading2, text2, offset, scale, size, fr);
}
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_BLEND);
GL11.glPopMatrix();
}
private float drawText(HeadingText heading, String text, float offset, float scale, float size, FontRenderer fr) {
GL11.glPushMatrix();
GL11.glTranslatef(0, -size, 0);
GL11.glTranslatef(0, offset, 0);
GL11.glScalef(scale, scale, scale);
fr.drawString(heading.text, -fr.getStringWidth(heading.text) / 2, 0, 0);
GL11.glPopMatrix();
offset += size * 1.5f;
GL11.glPushMatrix();
GL11.glTranslatef(0, size / 2, 0);
GL11.glTranslatef(0, offset, 0);
GL11.glScalef(scale, scale, scale);
fr.drawString(changeText, -fr.getStringWidth(changeText) / 2, 0, heading.color);
GL11.glPopMatrix();
fr.drawString(text, -fr.getStringWidth(text) / 2, 0, heading.color);
GL11.glPopMatrix();
offset += size * 1.5f;
return offset;
}
protected String getChangeText(int change, FontRenderer fr) {
change = Math.abs(change);
protected String getChangeText(float average, FontRenderer fr) {
int change = Math.round(Math.abs(average));
String txt = PowerDisplayUtil.INT_NF.format(change);
int width = fr.getStringWidth(txt);
if(width > 38 && change > 1000) {
@@ -197,7 +222,9 @@ public class IoDisplay implements IInfoRenderer {
static enum HeadingText {
STABLE(ColorUtil.getRGB(0, 0, 0)),
GAIN(ColorUtil.getRGB(0, 0.25f, 0)),
LOSS(ColorUtil.getRGB(0.25f, 0, 0));
LOSS(ColorUtil.getRGB(0.25f, 0, 0)),
INPUT(ColorUtil.getRGB(0, 0.25f, 0)),
OUTPUT(ColorUtil.getRGB(0.25f, 0, 0));
final String text;
final int color;
@@ -1,15 +1,18 @@
package crazypants.enderio.machine.crafter;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.network.PacketHandler;
public class BlockCrafter extends AbstractMachineBlock<TileCrafter> {
public static BlockCrafter create() {
PacketHandler.INSTANCE.registerMessage(PacketCrafter.class,PacketCrafter.class,PacketHandler.nextID(), Side.SERVER);
BlockCrafter res = new BlockCrafter();
res.init();
return res;
@@ -1,29 +1,26 @@
package crazypants.enderio.machine.crafter;
import java.awt.Point;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import crazypants.enderio.machine.gui.AbstractMachineContainer;
import crazypants.gui.TemplateSlot;
import crazypants.enderio.network.PacketHandler;
import crazypants.gui.GhostSlot;
public class ContainerCrafter extends AbstractMachineContainer {
private TileCrafter crafter;
private DummyCraftingGrid craftingGrid;
private final TileCrafter crafter;
public ContainerCrafter(InventoryPlayer playerInv, TileCrafter te) {
super(playerInv, te);
addCrafterSlots();
crafter = (TileCrafter) tileEntity;
}
private void addCrafterSlots() {
crafter = (TileCrafter) tileEntity;
craftingGrid = crafter.craftingGrid;
public void addCrafterSlots(List<GhostSlot> ghostSlots) {
int topY = 16;
int leftX = 31;
int index = 0;
@@ -32,12 +29,12 @@ public class ContainerCrafter extends AbstractMachineContainer {
for (int col = 0; col < 3; ++col) {
int x = leftX + col * 18;
int y = topY + row * 18;
addSlotToContainer(new DummySlot(craftingGrid, index, x, y));
ghostSlots.add(new DummySlot(index, x, y));
index++;
}
}
addSlotToContainer(new DummySlot(craftingGrid, 9, 90, 34));
ghostSlots.add(new DummySlot(9, 90, 34));
}
@Override
@@ -45,19 +42,17 @@ public class ContainerCrafter extends AbstractMachineContainer {
return new Point(30, 84);
}
@Override
public Point getUpgradeOffset() {
return new Point(6, 60);
}
@Override
protected void addMachineSlots(InventoryPlayer playerInv) {
int topY = 16;
int leftX = 31;
int leftX = 113;
int index = 0;
leftX = 113;
index = 0;
for (int row = 0; row < 3; ++row) {
for (int col = 0; col < 3; ++col) {
int x = leftX + col * 18;
@@ -73,18 +68,6 @@ public class ContainerCrafter extends AbstractMachineContainer {
}
});
}
@Override
public ItemStack slotClick(int par1, int par2, int par3,
EntityPlayer par4EntityPlayer) {
if(par1 >= 0 && par1 < inventorySlots.size()) {
Slot slot = getSlot(par1);
if(slot.getHasStack() && slot instanceof DummySlot) {
slot.putStack(null);
}
}
return super.slotClick(par1, par2, par3, par4EntityPlayer);
}
private class InputSlot extends Slot {
@@ -103,35 +86,30 @@ public class ContainerCrafter extends AbstractMachineContainer {
}
}
private class DummySlot extends TemplateSlot {
private class DummySlot extends GhostSlot {
private final int slotIndex;
public DummySlot(IInventory inventory, int slotIndex, int x, int y) {
super(inventory, slotIndex, x, y);
public DummySlot(int slotIndex, int x, int y) {
this.slotIndex = slotIndex;
this.x = x;
this.y = y;
}
@Override
public boolean isItemValid(ItemStack itemStack) {
return true;
public ItemStack getStack() {
return crafter.craftingGrid.getStackInSlot(slotIndex);
}
@Override
public void putStack(ItemStack par1ItemStack) {
if(par1ItemStack != null) {
par1ItemStack.stackSize = 0;
public void putStack(ItemStack stack) {
if(slotIndex >= 9) {
return;
}
inventory.setInventorySlotContents(slotIndex, par1ItemStack);
onSlotChanged();
}
@Override
public void onSlotChanged() {
super.onSlotChanged();
crafter.updateCraftingOutput();
}
@Override
public boolean canTakeStack(EntityPlayer player) {
return false;
if(stack != null) {
stack = stack.copy();
stack.stackSize = 1;
}
PacketHandler.INSTANCE.sendToServer(PacketCrafter.setSlot(crafter, slotIndex, stack));
}
}
}
@@ -10,17 +10,19 @@ import org.lwjgl.opengl.GL11;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.gui.ToggleButtonEIO;
import crazypants.enderio.machine.IItemBuffer;
import crazypants.enderio.machine.PacketItemBuffer;
import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.enderio.network.PacketHandler;
import crazypants.gui.GhostSlot;
import crazypants.render.RenderUtil;
import crazypants.util.Lang;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
private ToggleButtonEIO bufferSizeB;
private final ToggleButtonEIO bufferSizeB;
public GuiCrafter(InventoryPlayer par1InventoryPlayer, TileCrafter te) {
super(te, new ContainerCrafter(par1InventoryPlayer, te));
@@ -38,6 +40,22 @@ public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
public void initGui() {
super.initGui();
bufferSizeB.onGuiInit();
((ContainerCrafter) inventorySlots).addCrafterSlots(ghostSlots);
}
@Override
protected void mouseClickMove(int mouseX, int mouseY, int button, long par4) {
if(!ghostSlots.isEmpty()) {
GhostSlot slot = getGhostSlot(mouseX, mouseY);
if(slot != null) {
ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack();
// don't replace already set slots while dragging an item
if(st == null || slot.getStack() == null) {
slot.putStack(st);
}
}
}
super.mouseClickMove(mouseX, mouseY, button, par4);
}
@Override
@@ -55,7 +73,7 @@ public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
}
@Override
public int getXSize() {
public final int getXSize() {
return 219;
}
@@ -0,0 +1,59 @@
package crazypants.enderio.machine.crafter;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import crazypants.enderio.network.MessageTileEntity;
import io.netty.buffer.ByteBuf;
import net.minecraft.item.ItemStack;
public class PacketCrafter extends MessageTileEntity<TileCrafter> implements IMessageHandler<PacketCrafter, IMessage> {
private int slot;
private ItemStack stack;
public PacketCrafter() {
}
private PacketCrafter(TileCrafter tile) {
super(tile);
}
public static PacketCrafter setSlot(TileCrafter te, int slot, ItemStack stack) {
PacketCrafter msg = new PacketCrafter(te);
msg.slot = slot;
msg.stack = stack;
msg.execute(te);
return msg;
}
@Override
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
slot = buf.readShort();
stack = ByteBufUtils.readItemStack(buf);
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeShort(slot);
ByteBufUtils.writeItemStack(buf, stack);
}
@Override
public IMessage onMessage(PacketCrafter msg, MessageContext ctx) {
TileCrafter te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj);
if(te != null) {
msg.execute(te);
}
return null;
}
private void execute(TileCrafter te) {
te.craftingGrid.setInventorySlotContents(slot, stack);
te.updateCraftingOutput();
}
}
@@ -7,17 +7,17 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator;
import crazypants.enderio.network.PacketHandler;
public class BlockCrusher extends AbstractMachineBlock {
public static BlockCrusher create() {
PacketHandler.INSTANCE.registerMessage(PacketGrindingBall.class, PacketGrindingBall.class, PacketHandler.nextID(), Side.CLIENT);
BlockCrusher res = new BlockCrusher();
res.init();
return res;
@@ -59,8 +59,9 @@ public class BlockCrusher extends AbstractMachineBlock {
}
return "enderio:crusherFront";
}
@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
TileCrusher te = (TileCrusher) world.getTileEntity(x, y, z);
if(te != null && te.isActive()) {
@@ -73,7 +74,7 @@ public class BlockCrusher extends AbstractMachineBlock {
double v = 0.05;
double vx = 0;
double vz = 0;
if(front == ForgeDirection.NORTH || front == ForgeDirection.SOUTH) {
px += world.rand.nextFloat() * 0.8 - 0.4;
vz += front == ForgeDirection.NORTH ? -v : v;
@@ -12,8 +12,11 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.render.RenderUtil;
@SideOnly(Side.CLIENT)
public class EnchanterModelRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
private static final String TEXTURE = "enderio:models/BookStand.png";
@@ -31,11 +34,11 @@ public class EnchanterModelRenderer extends TileEntitySpecialRenderer implements
int l1 = l % 65536;
int l2 = l / 65536;
Tessellator.instance.setColorOpaque_F(f, f, f);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) l1, (float) l2);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2);
GL11.glPushMatrix();
GL11.glTranslatef((float) x, (float) y, (float) z);
renderModel(gen.getFacing());
renderModel(gen.getFacing());
GL11.glPopMatrix();
}
@@ -76,7 +76,7 @@ public class BlockFarmStation extends AbstractMachineBlock<TileFarmStation> {
public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
return true;
}
@Override
public int getLightOpacity() {
return 7;
@@ -107,6 +107,7 @@ public class BlockFarmStation extends AbstractMachineBlock<TileFarmStation> {
}
@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
}
@@ -5,10 +5,13 @@ import static org.lwjgl.opengl.GL11.glDisable;
import static org.lwjgl.opengl.GL11.glEnable;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.config.Config;
import crazypants.render.RenderUtil;
import crazypants.vecmath.Vector3f;
@SideOnly(Side.CLIENT)
public class FarmingStationSpecialRenderer extends TileEntitySpecialRenderer{
private void renderFarmStationAt(TileFarmStation tile, double x, double y, double z, float partialTickTime) {
@@ -17,13 +20,13 @@ public class FarmingStationSpecialRenderer extends TileEntitySpecialRenderer{
if ("".equals(toRender) || Config.disableFarmNotification) {
return;
}
glDisable(GL_LIGHTING);
RenderUtil.drawBillboardedText(new Vector3f(x + 0.5, y + 1.5, z + 0.5), toRender, 0.25f);
glEnable(GL_LIGHTING);
}
}
@Override
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTickTime) {
if (tile instanceof TileFarmStation) {
@@ -14,10 +14,13 @@ import crazypants.enderio.gui.ToggleButtonEIO;
import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
import crazypants.render.ColorUtil;
import crazypants.render.RenderUtil;
import crazypants.util.Lang;
import crazypants.vecmath.Vector4f;
public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
private static final int LOCK_ID = 1234;
public GuiFarmStation(InventoryPlayer par1InventoryPlayer, TileFarmStation machine) {
super(machine, new FarmStationContainer(par1InventoryPlayer, machine));
}
@@ -30,25 +33,23 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
int x = getGuiLeft() + 36;
int y = getGuiTop() + 36;
buttonList.add(createButton(x, y));
buttonList.add(createButton(x + 52, y));
buttonList.add(createButton(x, y + 20));
buttonList.add(createButton(x + 52, y + 20));
id = 0;
buttonList.add(createLockButton(TileFarmStation.minSupSlot + 0, x, y));
buttonList.add(createLockButton(TileFarmStation.minSupSlot + 1, x + 52, y));
buttonList.add(createLockButton(TileFarmStation.minSupSlot + 2, x, y + 20));
buttonList.add(createLockButton(TileFarmStation.minSupSlot + 3, x + 52, y + 20));
}
private int id = 0;
private IconButtonEIO createButton(int x, int y) {
return new ToggleButtonEIO(this, id, x, y, IconEIO.FARM_UNLOCK, IconEIO.FARM_LOCK).setSelected(getTileEntity().lockedSlots.contains(id++ + getTileEntity().minSupSlot));
private IconButtonEIO createLockButton(int slot, int x, int y) {
return new ToggleButtonEIO(this, LOCK_ID+slot, x, y, IconEIO.FARM_UNLOCK, IconEIO.FARM_LOCK).setSelected(getTileEntity().isSlotLocked(slot));
}
@Override
protected void drawForegroundImpl(int mouseX, int mouseY) {
super.drawForegroundImpl(mouseX, mouseY);
if(inventorySlots.inventorySlots.size() >= getTileEntity().maxSupSlot && !isConfigOverlayEnabled()) {
for (int i : getTileEntity().lockedSlots) {
if (i < inventorySlots.inventorySlots.size()) { // hack to allow old broken farms to be opened
if(!isConfigOverlayEnabled()) {
for(int i=TileFarmStation.minSupSlot ; i<=TileFarmStation.maxSupSlot ; i++) {
if(getTileEntity().isSlotLocked(i)) {
Slot slot = inventorySlots.getSlot(i);
GL11.glEnable(GL11.GL_BLEND);
RenderUtil.renderQuad2D(slot.xDisplayPosition, slot.yDisplayPosition, 0, 16, 16, new Vector4f(0, 0, 0, 0.5));
@@ -81,8 +82,8 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
@Override
protected void actionPerformed(GuiButton b) {
if (b instanceof ToggleButtonEIO) {
getTileEntity().toggleLockedState(b.id);
if (b.id >= LOCK_ID+TileFarmStation.minSupSlot && b.id <= LOCK_ID+TileFarmStation.maxSupSlot) {
getTileEntity().toggleLockedState(b.id - LOCK_ID);
}
super.actionPerformed(b);
}
@@ -92,7 +93,8 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
return false;
}
@Override
protected String getPowerOutputLabel() {
return "Base Use: ";
return Lang.localize("farm.gui.baseUse");
}
}
@@ -1,7 +1,6 @@
package crazypants.enderio.machine.farm;
import java.util.ArrayList;
import java.util.List;
import java.util.BitSet;
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
@@ -10,8 +9,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer;
@@ -39,6 +36,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
public enum ToolType {
HOE {
@Override
boolean match(ItemStack item) {
for (ItemStack stack : Config.farmHoes) {
if (stack.getItem() == item.getItem()) {
@@ -83,15 +81,13 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
private BlockCoord lastScanned;
private EntityPlayerMP farmerJoe;
private int farmSize = Config.farmDefaultSize;
private static final int minToolSlot = 0;
private static final int maxToolSlot = 1;
private int minToolSlot = 0;
private int maxToolSlot = 1;
int minSupSlot = maxToolSlot + 1;
int maxSupSlot = minSupSlot + 4;
public static final int minSupSlot = maxToolSlot + 1;
public static final int maxSupSlot = minSupSlot + 4;
List<Integer> lockedSlots = new ArrayList<Integer>();
private final BitSet lockedSlots = new BitSet();
private final int upgradeBonusSize = 2;
@@ -108,7 +104,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
}
public int getFarmSize() {
return farmSize + getUpgradeDist();
return Config.farmDefaultSize + getUpgradeDist();
}
public void actionPerformed(boolean isAxe) {
@@ -408,7 +404,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
}
}
}
return;
}
private boolean isOutputFull() {
@@ -424,10 +419,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
public boolean hasSeed(ItemStack seeds, BlockCoord bc) {
int slot = getSupplySlotForCoord(bc);
ItemStack inv = inventory[slot];
if(inv != null && (inv.stackSize > 1 || !isSlotLocked(slot)) && inv.isItemEqual(seeds)) {
return true;
}
return false;
return inv != null && (inv.stackSize > 1 || !isSlotLocked(slot)) && inv.isItemEqual(seeds);
}
public ItemStack takeSeedFromSupplies(ItemStack stack, BlockCoord forBlock) {
@@ -555,19 +547,15 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
return new BlockCoord(nextX, lastScanned.y, nextZ);
}
public void toggleLockedState(int buttonID) {
public void toggleLockedState(int slot) {
if (worldObj.isRemote) {
PacketHandler.INSTANCE.sendToServer(new PacketFarmLockedSlot(this, buttonID));
}
buttonID += minSupSlot;
if (lockedSlots.contains(buttonID)) {
lockedSlots.remove((Integer) buttonID); // hard cast otherwise it removes by index
} else {
lockedSlots.add(buttonID);
PacketHandler.INSTANCE.sendToServer(new PacketFarmLockedSlot(this, slot));
}
lockedSlots.flip(slot);
}
public boolean isSlotLocked(int slot) {
return lockedSlots.contains(slot);
return lockedSlots.get(slot);
}
@Override
@@ -627,11 +615,17 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
public void readCustomNBT(NBTTagCompound nbtRoot) {
super.readCustomNBT(nbtRoot);
currentTask = createTask();
}
@Override
public void readCommon(NBTTagCompound nbtRoot) {
super.readCommon(nbtRoot);
lockedSlots.clear();
for (int i : nbtRoot.getIntArray("lockedSlots")) {
lockedSlots.add(i);
lockedSlots.set(i);
}
}
IPoweredTask createTask() {
return new ContinuousTask(getPowerUsePerTick());
}
@@ -640,11 +634,18 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
public void writeCustomNBT(NBTTagCompound nbtRoot) {
super.writeCustomNBT(nbtRoot);
nbtRoot.setBoolean("isActive", isActive());
int[] locked = new int[lockedSlots.size()];
for (int i = 0; i < lockedSlots.size(); i++) {
locked[i] = lockedSlots.get(i);
}
@Override
public void writeCommon(NBTTagCompound nbtRoot) {
super.writeCommon(nbtRoot);
if(!lockedSlots.isEmpty()) {
int[] locked = new int[lockedSlots.cardinality()];
for (int i=0,bit=-1; (bit=lockedSlots.nextSetBit(bit+1)) >= 0; i++) {
locked[i] = bit;
}
nbtRoot.setIntArray("lockedSlots", locked);
}
nbtRoot.setIntArray("lockedSlots", locked);
}
}
@@ -10,6 +10,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
@@ -24,7 +25,7 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
public static BlockCombustionGenerator create() {
PacketHandler.INSTANCE.registerMessage(PacketCombustionTank.class, PacketCombustionTank.class, PacketHandler.nextID(), Side.CLIENT);
BlockCombustionGenerator gen = new BlockCombustionGenerator();
gen.init();
return gen;
@@ -125,6 +126,7 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
}
@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
// If active, randomly throw some smoke around
if(isActive(world, x, y, z)) {
@@ -12,65 +12,68 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.render.RenderUtil;
@SideOnly(Side.CLIENT)
public class CombustionGeneratorModelRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
private static final String TEXTURE = "enderio:models/combustionGenerator.png";
private CombustionGeneratorModel model = new CombustionGeneratorModel();
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) {
World world = te.getWorldObj();
TileCombustionGenerator gen = (TileCombustionGenerator)te;
// GL11.glEnable(GL11.GL_LIGHTING);
// GL11.glEnable(GL12.GL_RESCALE_NORMAL);
// GL11.glDisable(GL11.GL_CULL_FACE);
float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord);
int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0);
int l1 = l % 65536;
int l2 = l / 65536;
Tessellator.instance.setColorOpaque_F(f, f, f);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)l1, (float)l2);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2);
GL11.glPushMatrix();
GL11.glTranslatef((float)x, (float)y, (float)z);
renderModel(gen.facing);
renderModel(gen.facing);
GL11.glPopMatrix();
}
private void renderModel(int facing) {
GL11.glPushMatrix();
GL11.glTranslatef(0.5F, 1, 0.5F);
GL11.glTranslatef(0.5F, 1, 0.5F);
GL11.glRotatef(180F, 1F, 0F, 0F);
GL11.glScalef(1, 0.667f, 1);
ForgeDirection dir = ForgeDirection.getOrientation(facing);
if(dir == ForgeDirection.SOUTH) {
facing = 0;
} else if(dir == ForgeDirection.WEST) {
facing = -1;
}
}
GL11.glRotatef(facing * -90F, 0F, 1F, 0F);
RenderUtil.bindTexture(TEXTURE);
model.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
GL11.glTranslatef(-0.5F, -1, -0.5F);
GL11.glTranslatef(-0.5F, -1, -0.5F);
GL11.glPopMatrix();
}
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return true;
@@ -106,10 +109,10 @@ public class CombustionGeneratorModelRenderer extends TileEntitySpecialRenderer
private void renderItem(float x, float y, float z) {
GL11.glPushMatrix();
GL11.glTranslatef(x, y, z);
GL11.glTranslatef(x, y, z);
renderModel(ForgeDirection.NORTH.ordinal());
GL11.glPopMatrix();
}
}
@@ -16,6 +16,8 @@ import net.minecraftforge.fluids.FluidTank;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.machine.AbstractMachineBlock;
@@ -30,6 +32,7 @@ import crazypants.util.ForgeDirectionOffsets;
import crazypants.vecmath.Vector3d;
import crazypants.vecmath.Vertex;
@SideOnly(Side.CLIENT)
public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
private CustomCubeRenderer ccr = new CustomCubeRenderer();
@@ -60,7 +63,7 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple
boolean scaleX = facing != 4 && facing != 5;
float scx;
float scz;
IIcon override = renderer.overrideBlockTexture;
//middle chunk
@@ -106,12 +109,12 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple
tex = EnderIO.blockCombustionGenerator.getIcon(4,0);
} else {
tex = EnderIO.blockFusedQuartz.getDefaultFrameIcon(0);
}
}
if (override != null) {
tex = override;
}
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, vt, tex, world != null);
bb = bb.translate(-tx * 2, 0, -tz * 2);
@@ -1,7 +1,6 @@
package crazypants.enderio.machine.generator.stirling;
import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -61,7 +60,7 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
@Override
public boolean canExtractItem(int i, ItemStack itemstack, int j) {
return itemstack.getItem() == Items.bucket; // is there a more general way to do this? I've never found one
return !TileEntityFurnace.isItemFuel(itemstack);
}
@Override
@@ -141,8 +140,8 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
} else {
decrStackSize(0, 1);
}
needsUpdate = true;
}
needsUpdate = true;
}
}
}
@@ -2,7 +2,10 @@ package crazypants.enderio.machine.generator.zombie;
import net.minecraft.client.particle.EntityBubbleFX;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class BubbleFX extends EntityBubbleFX {
private final double yLimit;
@@ -14,12 +14,15 @@ import net.minecraftforge.fluids.FluidTank;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.render.BoundingBox;
import crazypants.render.CubeRenderer;
import crazypants.render.RenderUtil;
import crazypants.util.ForgeDirectionOffsets;
import crazypants.vecmath.Vector3d;
@SideOnly(Side.CLIENT)
public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
private static final String TEXTURE = "enderio:models/ZombieJar.png";
@@ -70,13 +73,13 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
double scaleX = absFac.x == 0 ? 0.95 : 1 - facingOffset / 2;
double scaleY = 0.85 * fullness;
double scaleZ = absFac.z == 0 ? 0.95 : 1 - facingOffset / 2;
bb = bb.scale(scaleX, 0.85 * fullness, scaleZ);
float ty = -(0.85f - (bb.maxY - bb.minY)) / 2;
Vector3d transOffset = ForgeDirectionOffsets.offsetScaled(facingDir, -facingOffset);
bb = bb.translate((float) transOffset.x, ty, (float) transOffset.z);
int brightness;
if(gen.getWorldObj() == null) {
brightness = 15 << 20 | 15 << 4;
@@ -84,13 +87,13 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
brightness = gen.getWorldObj().getLightBrightnessForSkyBlocks(gen.xCoord, gen.yCoord, gen.zCoord, 0);
}
tes.setBrightness(brightness);
CubeRenderer.render(bb, icon);
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glDepthMask(false);
tes.draw();
@@ -98,6 +98,8 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
}
renderSlotHighlights();
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
}
public void renderSlotHighlights() {
@@ -153,7 +155,7 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
addToolTip(tt);
}
private void updateProgressTooltips(int scaledProgress, float progress) {
protected final void updateProgressTooltips(int scaledProgress, float progress) {
if(lastProgressTooltipValue == scaledProgress || progressTooltips == null) {
return;
}
@@ -46,7 +46,7 @@ public abstract class GuiPoweredMachineBase<T extends AbstractPoweredMachineEnti
}
protected void updatePowerBarTooltip(List<String> text) {
text.add(getPowerOutputLabel() + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + PowerDisplayUtil.abrevation()
text.add(getPowerOutputLabel() + " " + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + PowerDisplayUtil.abrevation()
+ PowerDisplayUtil.perTickStr());
text.add(PowerDisplayUtil.formatStoredPower(getTileEntity().getEnergyStored(), getTileEntity().getCapacitor().getMaxEnergyStored()));
}
@@ -5,7 +5,6 @@ import java.util.ArrayList;
import java.util.Random;
import java.util.UUID;
import crazypants.util.PlayerUtil;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
@@ -23,6 +22,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.BlockEio;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
@@ -32,7 +32,7 @@ import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode;
import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.power.PowerHandlerUtil;
import crazypants.enderio.tool.ToolUtil;
import crazypants.util.PlayerUtil;
import crazypants.util.Util;
public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTooltipProvider {
@@ -79,6 +79,7 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister IIconRegister) {
blockIcon = IIconRegister.registerIcon("enderio:tesseractPortal");
}
@@ -11,12 +11,15 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.render.BoundingBox;
import crazypants.render.CubeRenderer;
import crazypants.render.RenderUtil;
@SideOnly(Side.CLIENT)
public class HyperCubeRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
private IModel model;
@@ -1,10 +1,8 @@
package crazypants.enderio.machine.killera;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.init.Items;
@@ -14,12 +12,13 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidTank;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.machine.generator.zombie.ModelZombieJar;
import crazypants.render.BoundingBox;
import crazypants.render.CubeRenderer;
@@ -27,6 +26,7 @@ import crazypants.render.RenderUtil;
import crazypants.util.ForgeDirectionOffsets;
import crazypants.vecmath.Vector3d;
@SideOnly(Side.CLIENT)
public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
private static final String TEXTURE = "enderio:models/KillerJoe.png";
@@ -47,7 +47,7 @@ public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IIte
int l1 = l % 65536;
int l2 = l / 65536;
Tessellator.instance.setColorOpaque_F(f, f, f);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) l1, (float) l2);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2);
GL11.glPushMatrix();
GL11.glTranslatef((float) x, (float) y, (float) z);
@@ -140,10 +140,10 @@ public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IIte
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDepthMask(false);
GL11.glColor3f(1, 1, 1);
GL11.glColor3f(1, 1, 1);
tes.draw();
GL11.glDepthMask(true);
GL11.glPopAttrib();
@@ -1,12 +1,7 @@
package crazypants.enderio.machine.light;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
@@ -22,8 +17,6 @@ import crazypants.enderio.BlockEio;
import crazypants.enderio.ModObject;
import crazypants.enderio.TileEntityEio;
import crazypants.enderio.api.redstone.IRedstoneConnectable;
import crazypants.enderio.api.tool.ITool;
import crazypants.enderio.tool.ToolUtil;
import crazypants.vecmath.Vector3f;
public class BlockElectricLight extends BlockEio implements IRedstoneConnectable {
@@ -63,6 +56,7 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iIconRegister) {
blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace");
blockIconOff = iIconRegister.registerIcon("enderio:blockElectricLightFaceOff");
@@ -215,7 +209,7 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable
}
/* IRedstoneConnectable */
@Override
public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) {
return true;
@@ -12,6 +12,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.gui.IResourceTooltipProvider;
@@ -24,21 +26,21 @@ public class BlockItemElectricLight extends ItemBlockWithMetadata implements IRe
BASIC_INV("item.itemLightInverted", true, false, false),
WIRELESS("item.itemWirelessLight", false, true, true),
WIRELESS_INV("item.itemWirelessLightInverted", true, true, true);
final String unlocName;
final boolean isInverted;
final boolean isPowered;
final boolean isWireless;
private Type(String unlocName, boolean isInverted, boolean isPowered, boolean isWireless) {
this.unlocName = unlocName;
this.isInverted = isInverted;
this.isPowered = isPowered;
this.isWireless = isWireless;
}
}
public BlockItemElectricLight(Block block) {
super(block, block);
setCreativeTab(EnderIOTab.tabEnderIO);
@@ -53,6 +55,7 @@ public class BlockItemElectricLight extends ItemBlockWithMetadata implements IRe
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for(Type type : Type.values()) {
par3List.add(new ItemStack(this,1,type.ordinal()));
@@ -68,7 +71,7 @@ public class BlockItemElectricLight extends ItemBlockWithMetadata implements IRe
ForgeDirection onFace = ForgeDirection.values()[side].getOpposite();
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileElectricLight) {
TileElectricLight el = ((TileElectricLight) te);
TileElectricLight el = ((TileElectricLight) te);
el.setFace(onFace);
Type t= Type.values()[metadata];
el.setInverted(t.isInverted);
@@ -80,7 +83,7 @@ public class BlockItemElectricLight extends ItemBlockWithMetadata implements IRe
}
@Override
public String getUnlocalizedNameForTooltip(ItemStack itemStack) {
public String getUnlocalizedNameForTooltip(ItemStack itemStack) {
return getUnlocalizedName(itemStack);
}
}
@@ -8,6 +8,8 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.BlockEio;
import crazypants.enderio.ModObject;
@@ -21,7 +23,7 @@ public class BlockLightNode extends BlockEio {
public BlockLightNode() {
super(ModObject.blockLightNode.unlocalisedName, TileLightNode.class, Material.air);
setCreativeTab(null);
setCreativeTab(null);
setBlockBounds(0, 0, 0, 0, 0, 0);
}
@@ -88,12 +90,13 @@ public class BlockLightNode extends BlockEio {
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iIconRegister) {
blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace");
}
@Override
public int quantityDropped(Random p_149745_1_) {
public int quantityDropped(Random p_149745_1_) {
return 0;
}
Loaded 100 of 223 files, more files were not shown because too many files have changed in this diff. Show more