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/parts/automation/PartExportBus.java
+5 -1
View File
@@ -19,6 +19,10 @@
package appeng.parts.automation;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerUpgradeable;
import appeng.fluids.container.ContainerFluidInterface;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -220,7 +224,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
{
if( Platform.isServer() )
{
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_BUS );
ContainerOpener.openContainer(ContainerUpgradeable.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
src/main/java/appeng/parts/automation/PartFormationPlane.java
+11 -6
View File
@@ -23,9 +23,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerFormationPlane;
import appeng.fluids.container.ContainerFluidInterface;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.*;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
@@ -195,7 +200,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
{
if( Platform.isServer() )
{
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_FORMATION_PLANE );
ContainerOpener.openContainer(ContainerFormationPlane.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
@@ -378,11 +383,11 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
return Api.INSTANCE.definitions().parts().formationPlane().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
// FIXME @Override
// FIXME public GuiBridge getGuiBridge()
// FIXME {
// FIXME return GuiBridge.GUI_FORMATION_PLANE;
// FIXME }
@Override
public ContainerType<?> getContainerType()
{
return ContainerFormationPlane.TYPE;
}
private int countEntitesAround( World world, BlockPos pos )
{
src/main/java/appeng/parts/automation/PartImportBus.java
+5 -1
View File
@@ -19,6 +19,10 @@
package appeng.parts.automation;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerUpgradeable;
import appeng.fluids.container.ContainerFluidInterface;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Items;
import net.minecraft.item.ItemStack;
@@ -131,7 +135,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
{
if( Platform.isServer() )
{
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_BUS );
ContainerOpener.openContainer(ContainerUpgradeable.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
src/main/java/appeng/parts/automation/PartLevelEmitter.java
+4 -1
View File
@@ -22,6 +22,9 @@ package appeng.parts.automation;
import java.util.Collection;
import java.util.Random;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerLevelEmitter;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
@@ -461,7 +464,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
{
if( Platform.isServer() )
{
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_LEVEL_EMITTER );
ContainerOpener.openContainer(ContainerLevelEmitter.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
src/main/java/appeng/parts/misc/PartInterface.java
+10 -6
View File
@@ -22,10 +22,14 @@ package appeng.parts.misc;
import java.util.EnumSet;
import java.util.List;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerInterface;
import com.google.common.collect.ImmutableSet;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
@@ -177,7 +181,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
{
if( Platform.isServer() )
{
// FIXME Platform.openGUI( p, this.getTileEntity(), this.getSide(), GuiBridge.GUI_INTERFACE );
ContainerOpener.openContainer(ContainerInterface.TYPE, p, ContainerLocator.forPart(this));
}
return true;
}
@@ -307,9 +311,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
return Api.INSTANCE.definitions().parts().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/parts/misc/PartStorageBus.java
+11 -6
View File
@@ -23,7 +23,12 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerStorageBus;
import appeng.fluids.container.ContainerFluidInterface;
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.tileentity.TileEntity;
@@ -316,7 +321,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
{
if( Platform.isServer() )
{
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_STORAGEBUS );
ContainerOpener.openContainer(ContainerStorageBus.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
@@ -646,9 +651,9 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
return Api.INSTANCE.definitions().parts().storageBus().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
// FIXME @Override
// FIXME public GuiBridge getGuiBridge()
// FIXME {
// FIXME return GuiBridge.GUI_STORAGEBUS;
// FIXME }
@Override
public ContainerType<?> getContainerType()
{
return ContainerStorageBus.TYPE;
}
}
src/main/java/appeng/parts/p2p/PartP2PItems.java
+10 -2
View File
@@ -49,6 +49,8 @@ import appeng.me.cache.helpers.TunnelCollection;
import appeng.util.Platform;
import appeng.util.inv.WrapperChainedItemHandler;
import javax.annotation.Nonnull;
public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHandler, IGridTickable
{
@@ -133,9 +135,10 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
final Direction facing = this.getSide().getFacing();
final TileEntity te = this.getTile().getWorld().getTileEntity( this.getTile().getPos().offset( facing ) );
if( te != null && te.hasCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite() ) )
if( te != null )
{
ret = te.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite() );
ret = te.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite() )
.orElse(ret);
}
}
this.partVisited = false;
@@ -249,6 +252,11 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
return this.getDestination().getSlots();
}
@Override
public boolean isItemValid(int slot, @Nonnull ItemStack stack) {
return this.getDestination().isItemValid(slot, stack);
}
@Override
public ItemStack getStackInSlot( final int i )
{
src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java
+5 -1
View File
@@ -19,6 +19,10 @@
package appeng.parts.reporting;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerInscriber;
import appeng.container.implementations.ContainerInterfaceTerminal;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Hand;
@@ -57,7 +61,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
{
if( Platform.isServer() )
{
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_INTERFACE_TERMINAL );
ContainerOpener.openContainer(ContainerInterfaceTerminal.TYPE, player, ContainerLocator.forPart(this));
}
}
return true;