fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on GUIs (specifically to get SkyChest GUI)

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-02 02:14:09 +02:00
parent 271e8889a1
commit 9f63859769
109 changed files with 1133 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/AEBaseTile.java
-5
View File
@@ -492,11 +492,6 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
return null;
}
public boolean requiresTESR()
{
return false;
}
public void setName( final String name )
{
this.customName = name;
src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
-6
View File
@@ -141,12 +141,6 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
return this.dspPlay; // AEItemStack.create( new ItemStack( Items.DIAMOND, 64 ) );
}
@Override
public boolean requiresTESR()
{
return this.dspPlay != null;
}
@Override
public AEColor getColor()
{
src/main/java/appeng/tile/grindstone/TileCrank.java
-6
View File
@@ -113,12 +113,6 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable
this.getBlockType().neighborChanged( state, this.world, this.pos, state.getBlock(), this.pos );
}
@Override
public boolean requiresTESR()
{
return true;
}
/**
* return true if this should count towards stats.
*/
src/main/java/appeng/tile/misc/TileCharger.java
-6
View File
@@ -115,12 +115,6 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
this.setPowerSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) );
}
@Override
public boolean requiresTESR()
{
return true;
}
@Override
public boolean canTurn()
{
src/main/java/appeng/tile/misc/TileCondenser.java
+1 -1
View File
@@ -296,7 +296,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
}
}
private static final IFluidTankProperties[] EMPTY = { new FluidTankProperties( null, Fluid.BUCKET_VOLUME, true, false ) };
private static final IFluidTankProperties[] EMPTY = { new FluidTankProperties( null, FluidAttributes.BUCKET_VOLUME, true, false ) };
/**
* A fluid handler that exposes a 1 bucket tank that can only be filled, and - when filled - will add power
src/main/java/appeng/tile/misc/TileInscriber.java
-6
View File
@@ -227,12 +227,6 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
}
@Override
public boolean requiresTESR()
{
return true;
}
@Override
public IItemHandler getInternalInventory()
{
src/main/java/appeng/tile/misc/TileSkyCompass.java
-6
View File
@@ -25,12 +25,6 @@ import appeng.tile.AEBaseTile;
public class TileSkyCompass extends AEBaseTile
{
@Override
public boolean requiresTESR()
{
return true;
}
@Override
public boolean hasFastRenderer()
{
src/main/java/appeng/tile/networking/TileCableBus.java
-6
View File
@@ -231,12 +231,6 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
}
}
@Override
public boolean requiresTESR()
{
return this.getCableBus().isRequiresDynamicRender();
}
@Override
public IFacadeContainer getFacadeContainer()
{
src/main/java/appeng/tile/storage/TileChest.java
+1 -1
View File
@@ -837,7 +837,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
private class FluidHandler implements IFluidHandler
{
private final IFluidTankProperties[] TANK_PROPS = new IFluidTankProperties[] { new FluidTankProperties( null, Fluid.BUCKET_VOLUME ) };
private final IFluidTankProperties[] TANK_PROPS = new IFluidTankProperties[] { new FluidTankProperties( null, FluidAttributes.BUCKET_VOLUME ) };
@Override
public int fill( final FluidStack resource, final boolean doFill )
src/main/java/appeng/tile/storage/TileSkyChest.java
+3 -45
View File
@@ -33,6 +33,7 @@ import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.MathHelper;
import net.minecraftforge.items.IItemHandler;
import appeng.tile.AEBaseInvTile;
@@ -43,6 +44,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity,
{
private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 9 * 4 );
// server
private int numPlayersUsing;
// client..
@@ -76,12 +78,6 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity,
return c; // TESR yo!
}
@Override
public boolean requiresTESR()
{
return true;
}
@Override
public boolean canRenderBreaking()
{
@@ -147,17 +143,9 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity,
@Override
public void tick()
{
int i = this.pos.getX();
int j = this.pos.getY();
int k = this.pos.getZ();
this.prevLidAngle = this.lidAngle;
float f1 = 0.1F;
if( this.numPlayersUsing == 0 && this.lidAngle > 0.0F || this.numPlayersUsing > 0 && this.lidAngle < 1.0F )
{
float f2 = this.lidAngle;
if( this.numPlayersUsing > 0 )
{
this.lidAngle += 0.1F;
@@ -167,17 +155,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity,
this.lidAngle -= 0.1F;
}
if( this.lidAngle > 1.0F )
{
this.lidAngle = 1.0F;
}
float f3 = 0.5F;
if( this.lidAngle < 0.0F )
{
this.lidAngle = 0.0F;
}
this.lidAngle = MathHelper.clamp(this.lidAngle, 0, 1);
}
}
@@ -187,26 +165,6 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity,
}
public float getLidAngle()
{
return this.lidAngle;
}
public void setLidAngle( final float lidAngle )
{
this.lidAngle = lidAngle;
}
public float getPrevLidAngle()
{
return this.prevLidAngle;
}
public void setPrevLidAngle( float prevLidAngle )
{
this.prevLidAngle = prevLidAngle;
}
public int getPlayerOpen()
{
return this.numPlayersUsing;