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

Compiles again.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-04 19:58:58 +02:00
parent 237463dd94
commit c402390282
89 changed files with 1353 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/misc/CondenserItemInventory.java
+1
View File
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
import appeng.core.Api;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
src/main/java/appeng/tile/misc/TilePaint.java
+17
View File
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import appeng.block.paint.PaintSplotches;
import io.netty.buffer.Unpooled;
import net.minecraft.block.BlockState;
@@ -42,11 +43,18 @@ import appeng.api.util.AEColor;
import appeng.helpers.Splotch;
import appeng.items.misc.ItemPaintBall;
import appeng.tile.AEBaseTile;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
import javax.annotation.Nonnull;
public class TilePaint extends AEBaseTile
{
public static final ModelProperty<PaintSplotches> SPLOTCHES = new ModelProperty<>();
private static final int LIGHT_PER_DOT = 12;
private int isLit = 0;
@@ -283,4 +291,13 @@ public class TilePaint extends AEBaseTile
return this.dots;
}
@Nonnull
@Override
public IModelData getModelData() {
// FIXME update trigger
return new ModelDataMap.Builder()
.withInitial(SPLOTCHES, new PaintSplotches(getDots()))
.build();
}
}
src/main/java/appeng/tile/networking/TileCableBus.java
+23
View File
@@ -29,6 +29,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.block.networking.BlockCableBus;
import appeng.client.render.cablebus.CableBusRenderState;
import appeng.helpers.AEMultiTile;
import appeng.hooks.TickHandler;
import appeng.parts.CableBusContainer;
@@ -44,6 +45,10 @@ import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
@@ -57,6 +62,8 @@ import java.util.Set;
public class TileCableBus extends AEBaseTile implements AEMultiTile
{
public static final ModelProperty<CableBusRenderState> RENDER_STATE_PROPERTY = new ModelProperty<>();
private CableBusContainer cb = new CableBusContainer( this );
private int oldLV = -1; // on re-calculate light when it changes
@@ -382,4 +389,20 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile
return super.getCapability( capabilityClass, fromSide );
}
@Nonnull
@Override
public IModelData getModelData() {
World world = getWorld();
if (world == null) {
return EmptyModelData.INSTANCE;
}
CableBusRenderState renderState = this.cb.getRenderState();
renderState.setWorld(world);
renderState.setPos(pos);
return new ModelDataMap.Builder()
.withInitial(RENDER_STATE_PROPERTY, renderState)
.build();
}
}
src/main/java/appeng/tile/qnb/TileQuantumBridge.java
+21
View File
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.EnumSet;
import java.util.Optional;
import appeng.block.qnb.QnbFormedState;
import appeng.core.Api;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
@@ -32,6 +33,9 @@ import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.EmptyHandler;
@@ -52,9 +56,14 @@ import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
import appeng.util.inv.InvOperation;
import javax.annotation.Nonnull;
public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock, ITickableTileEntity
{
public static final ModelProperty<QnbFormedState> FORMED_STATE = new ModelProperty<>();
private final byte corner = 16;
private final AppEngInternalInventory internalInventory = new AppEngInternalInventory( this, 1, 1 );
private final byte hasSingularity = 32;
@@ -348,4 +357,16 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
{
return this.corner;
}
@Nonnull
@Override
public IModelData getModelData() {
// FIXME must trigger model data updates
return new ModelDataMap.Builder()
.withInitial(FORMED_STATE, new QnbFormedState( getAdjacentQuantumBridges(), isCorner(), isPowered() ))
.build();
}
}
src/main/java/appeng/tile/spatial/TileSpatialPylon.java
+20
View File
@@ -37,11 +37,21 @@ import appeng.me.cluster.implementations.SpatialPylonCluster;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.AENetworkProxyMultiblock;
import appeng.tile.grid.AENetworkTile;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
import javax.annotation.Nonnull;
public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock
{
public static final ModelProperty<Integer> STATE = new ModelProperty<>(value -> {
// The lower 6 bits are used
return ( value & ~0x3F ) == 0;
});
public static final int DISPLAY_END_MIN = 0x01;
public static final int DISPLAY_END_MAX = 0x02;
public static final int DISPLAY_MIDDLE = 0x01 + 0x02;
@@ -247,4 +257,14 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock
{
return this.displayBits;
}
@Nonnull
@Override
public IModelData getModelData() {
// FIXME: Must force model data update on changes, should potentially be moved to block state (?)
return new ModelDataMap.Builder()
.withInitial(STATE, getDisplayBits())
.build();
}
}
src/main/java/appeng/tile/storage/TileDrive.java
+22 -1
View File
@@ -27,11 +27,16 @@ import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import appeng.block.AEBaseTileBlock;
import appeng.block.storage.DriveSlotsState;
import appeng.core.Api;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.items.IItemHandler;
import appeng.api.implementations.tiles.IChestOrDrive;
@@ -63,10 +68,14 @@ import appeng.util.Platform;
import appeng.util.inv.InvOperation;
import appeng.util.inv.filter.IAEItemFilter;
import javax.annotation.Nonnull;
public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPriorityHost
{
public static final ModelProperty<DriveSlotsState> SLOTS_STATE = new ModelProperty<>();
private static final int BIT_POWER_MASK = 0x80000000;
private static final int BIT_BLINK_MASK = 0x24924924;
private static final int BIT_STATE_MASK = 0xDB6DB6DB;
@@ -405,7 +414,19 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
return Api.INSTANCE.definitions().blocks().drive().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
// FIXME @Override
@Nonnull
@Override
public IModelData getModelData() {
return new ModelDataMap.Builder()
.withInitial(AEBaseTileBlock.UP, getUp())
.withInitial(AEBaseTileBlock.FORWARD, getForward())
.withInitial(SLOTS_STATE, DriveSlotsState.fromChestOrDrive( this ))
.build();
}
// FIXME @Override
// FIXME public GuiBridge getGuiBridge()
// FIXME {
// FIXME return GuiBridge.GUI_DRIVE;