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

All GUI compile errors fixed, switched to excludes over includes in gradle build and lots, LOTS of more fixes.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-06 21:16:05 +02:00
parent bb453b0d35
commit ff042a394b
209 changed files with 4527 additions and 4479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/misc/TileInterface.java
+7 -5
View File
@@ -25,10 +25,12 @@ import java.util.List;
import javax.annotation.Nullable;
import appeng.container.implementations.ContainerInterface;
import appeng.core.Api;
import com.google.common.collect.ImmutableSet;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
@@ -360,9 +362,9 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
return Api.INSTANCE.definitions().blocks().iface().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
// FIXME @Override
// FIXME public GuiBridge getGuiBridge()
// FIXME {
// FIXME return GuiBridge.GUI_INTERFACE;
// FIXME }
@Override
public ContainerType<?> getContainerType()
{
return ContainerInterface.TYPE;
}
}
src/main/java/appeng/tile/storage/TileChest.java
+20 -17
View File
@@ -26,8 +26,11 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.core.Api;
import appeng.fluids.container.ContainerFluidTerminal;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
@@ -943,22 +946,22 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
return Api.INSTANCE.definitions().blocks().chest().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
// FIXME @Override
// FIXME public GuiBridge getGuiBridge()
// FIXME {
// FIXME this.updateHandler();
// FIXME if( this.cellHandler != null )
// FIXME {
// FIXME if( this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) )
// FIXME {
// FIXME return GuiBridge.GUI_ME;
// FIXME }
// FIXME if( this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) )
// FIXME {
// FIXME return GuiBridge.GUI_FLUID_TERMINAL;
// FIXME }
// FIXME }
// FIXME return null;
// FIXME }
@Override
public ContainerType<?> getContainerType()
{
this.updateHandler();
if( this.cellHandler != null )
{
if( this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) )
{
return ContainerMEMonitorable.TYPE;
}
if( this.cellHandler.getChannel() == Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class ) )
{
return ContainerFluidTerminal.TYPE;
}
}
return null;
}
}
src/main/java/appeng/tile/storage/TileDrive.java
+7 -5
View File
@@ -29,7 +29,9 @@ import java.util.Map;
import appeng.block.AEBaseTileBlock;
import appeng.block.storage.DriveSlotsState;
import appeng.container.implementations.ContainerDrive;
import appeng.core.Api;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
@@ -426,9 +428,9 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
}
// FIXME @Override
// FIXME public GuiBridge getGuiBridge()
// FIXME {
// FIXME return GuiBridge.GUI_DRIVE;
// FIXME }
@Override
public ContainerType<?> getContainerType()
{
return ContainerDrive.TYPE;
}
}