tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

fix: remove metadata hack for legacy controller

Browse source
This commit is contained in:
LordMZTE 2023-01-10 17:48:36 +01:00
parent 1e7b8c759f
commit 44655d2596
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
2 changed files with 63 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/appeng/block/legacy/BlockLegacyController.java
View file

@ -10,7 +10,9 @@ import appeng.tile.legacy.TileLegacyController;
import appeng.util.Platform;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@ -43,9 +45,19 @@ public class BlockLegacyController extends AEBaseTileBlock {
}
@Override
public IIcon getIcon(int direction, int metadata) {
if (direction == 3) {
switch (metadata) {
public IIcon getIcon(IBlockAccess w, int x, int y, int z, int s) {
TileEntity te = w.getTileEntity(x, y, z);
if (!(te instanceof TileLegacyController)) {
return super.getIcon(w, x, y, z, s);
}
TileLegacyController tlc = (TileLegacyController) te;
ForgeDirection direction
= this.mapRotation(tlc, ForgeDirection.getOrientation(s));
if (direction == ForgeDirection.SOUTH) {
switch (tlc.powerLevel) {
case 0:
return ExtraBlockTextures.Controller0.getIcon();
case 1:
@ -62,6 +74,6 @@ public class BlockLegacyController extends AEBaseTileBlock {
return ExtraBlockTextures.ControllerLinked.getIcon();
}
}
return super.getIcon(direction, metadata);
return super.getIcon(direction.ordinal(), w.getBlockMetadata(x, y, z));
}
}

83
src/main/java/appeng/tile/legacy/TileLegacyController.java
View file

@ -11,6 +11,7 @@ import appeng.tile.grid.AENetworkPowerTile;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.InvOperation;
import appeng.util.Platform;
import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -18,12 +19,14 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
public class TileLegacyController extends AENetworkPowerTile implements ILocatable {
private static final IInventory NULL_INVENTORY = new AppEngInternalInventory(null, 0);
private static final int[] ACCESSIBLE_SLOTS_BY_SIDE = {};
private static int difference = 0;
private int ticksSinceRefresh = 0;
private long controllerKey;
public static final IInventory NULL_INVENTORY = new AppEngInternalInventory(null, 0);
public static final int[] ACCESSIBLE_SLOTS_BY_SIDE = {};
public static int difference = 0;
public int ticksSinceRefresh = 0;
public long controllerKey;
public int powerLevel;
public int lastPowerLevel;
public TileLegacyController() { //TODO Fix power storage
this.setInternalMaxPower(10000);
this.setInternalPublicPowerStorage(true);
@ -41,7 +44,7 @@ public class TileLegacyController extends AENetworkPowerTile implements ILocatab
ticksSinceRefresh++;
if (ticksSinceRefresh % 20 == 0) {
ticksSinceRefresh = 0;
updateMeta();
updatePowerLevel();
}
}
}
@ -62,27 +65,20 @@ public class TileLegacyController extends AENetworkPowerTile implements ILocatab
}
@Override
protected double getFunnelPowerDemand( final double maxReceived )
{
try
{
return this.getProxy().getEnergy().getEnergyDemand( 10000 );
}
catch( final GridAccessException e )
{
protected double getFunnelPowerDemand(final double maxReceived) {
try {
return this.getProxy().getEnergy().getEnergyDemand(10000);
} catch (final GridAccessException e) {
// no grid? use local...
return super.getFunnelPowerDemand(maxReceived);
}
}
@Override
protected double funnelPowerIntoStorage( final double power, final Actionable mode )
{
try
{
final double ret = this.getProxy().getEnergy().injectPower( power, mode );
if( mode == Actionable.SIMULATE )
{
protected double funnelPowerIntoStorage(final double power, final Actionable mode) {
try {
final double ret = this.getProxy().getEnergy().injectPower(power, mode);
if (mode == Actionable.SIMULATE) {
return ret;
}
return 0;
@ -92,22 +88,24 @@ public class TileLegacyController extends AENetworkPowerTile implements ILocatab
}
}
public void updateMeta() {
int meta = (int
public void updatePowerLevel() {
this.powerLevel = (int
) Math.ceil((5.0 * this.getInternalCurrentPower() / this.getInternalMaxPower()));
if (meta < 0) {
meta = 0;
} else if (meta > 5) {
meta = 5;
if (this.powerLevel < 0) {
this.powerLevel = 0;
} else if (this.powerLevel > 5) {
this.powerLevel = 5;
}
if (getProxy().isActive() && meta == 0) {
meta = 6;
if (getProxy().isActive() && this.powerLevel == 0) {
this.powerLevel = 6;
} else if (!getProxy().isActive()) {
meta = 0;
this.powerLevel = 0;
}
if (this.powerLevel != this.lastPowerLevel) {
this.markForUpdate();
this.lastPowerLevel = this.powerLevel;
}
this.worldObj.setBlockMetadataWithNotify(
this.xCoord, this.yCoord, this.zCoord, meta, 2
);
}
@Override
@ -116,12 +114,12 @@ public class TileLegacyController extends AENetworkPowerTile implements ILocatab
}
@TileEvent(TileEventType.WORLD_NBT_WRITE)
public void writeNBT(final NBTTagCompound data) {
public void writeNBTTileLegacyController(final NBTTagCompound data) {
data.setLong("controllerKey", this.controllerKey);
}
@TileEvent(TileEventType.WORLD_NBT_READ)
public void readNBT(final NBTTagCompound data) {
public void readNBTTileLegacyController(final NBTTagCompound data) {
if (data.hasKey("controllerKey")) {
this.controllerKey = data.getLong("controllerKey");
}
@ -152,4 +150,17 @@ public class TileLegacyController extends AENetworkPowerTile implements ILocatab
new LocatableEventAnnounce(this, LocatableEvent.Unregister)
);
}
@TileEvent(TileEventType.NETWORK_WRITE)
public void writeToStreamTileLegacyController(ByteBuf buf) {
buf.writeByte(this.powerLevel);
}
@TileEvent(TileEventType.NETWORK_READ)
public void readFromStreamTileLegacyController(ByteBuf buf) {
this.powerLevel = buf.readByte();
this.worldObj.markBlockRangeForRenderUpdate(
this.xCoord, this.yCoord, this.zCoord, this.xCoord, this.yCoord, this.zCoord
);
}
}