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

More Container / GUI fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-02 11:40:26 +02:00
parent fb4995da62
commit 7747804385
16 changed files with 272 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+17 -19
View File
@@ -27,6 +27,8 @@ import java.util.HashSet;
import java.util.List;
import appeng.core.Api;
import appeng.core.sync.packets.PacketInventoryAction;
import appeng.core.sync.packets.PacketValueConfig;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
@@ -58,8 +60,6 @@ import appeng.client.me.SlotME;
import appeng.container.guisync.GuiSync;
import appeng.container.guisync.SyncData;
import appeng.container.slot.AppEngSlot;
import appeng.container.slot.SlotCraftingMatrix;
import appeng.container.slot.SlotCraftingTerm;
import appeng.container.slot.SlotDisabled;
import appeng.container.slot.SlotFake;
import appeng.container.slot.SlotInaccessible;
@@ -67,9 +67,7 @@ import appeng.container.slot.SlotPlayerHotBar;
import appeng.container.slot.SlotPlayerInv;
import appeng.core.AELog;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketInventoryAction;
import appeng.core.sync.packets.PacketTargetItemStack;
import appeng.core.sync.packets.PacketValueConfig;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.InventoryAction;
import appeng.me.helpers.PlayerSource;
@@ -414,7 +412,7 @@ public abstract class AEBaseContainer extends Container
{
final AppEngSlot cs = (AppEngSlot) inventorySlot;
if( !( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) && !( cs instanceof SlotCraftingMatrix ) )
if( !( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) /* FIXME && !( cs instanceof SlotCraftingMatrix ) */ )
{
if( cs.isItemValid( tis ) )
{
@@ -433,7 +431,7 @@ public abstract class AEBaseContainer extends Container
{
final AppEngSlot cs = (AppEngSlot) inventorySlot;
if( ( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) && !( cs instanceof SlotCraftingMatrix ) )
if( ( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) /* FIXME && !( cs instanceof SlotCraftingMatrix ) */ )
{
if( cs.isItemValid( tis ) )
{
@@ -663,18 +661,18 @@ public abstract class AEBaseContainer extends Container
{
final Slot s = this.getSlot( slot );
if( s instanceof SlotCraftingTerm )
{
switch( action )
{
case CRAFT_SHIFT:
case CRAFT_ITEM:
case CRAFT_STACK:
( (SlotCraftingTerm) s ).doClick( action, player );
this.updateHeld( player );
default:
}
}
// FIXME if( s instanceof SlotCraftingTerm )
// FIXME {
// FIXME switch( action )
// FIXME {
// FIXME case CRAFT_SHIFT:
// FIXME case CRAFT_ITEM:
// FIXME case CRAFT_STACK:
// FIXME ( (SlotCraftingTerm) s ).doClick( action, player );
// FIXME this.updateHeld( player );
// FIXME default:
// FIXME }
// FIXME }
if( s instanceof SlotFake )
{
@@ -747,7 +745,7 @@ public abstract class AEBaseContainer extends Container
for( final Object j : this.inventorySlots )
{
if( j instanceof Slot && j.getClass() == s.getClass() && !( j instanceof SlotCraftingTerm ) )
if( j instanceof Slot && j.getClass() == s.getClass() /* FIXME && !( j instanceof SlotCraftingTerm ) */ )
{
from.add( (Slot) j );
}
src/main/java/appeng/container/guisync/SyncData.java
+1 -2
View File
@@ -27,7 +27,6 @@ import appeng.container.AEBaseContainer;
import appeng.core.AELog;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketProgressBar;
import appeng.core.sync.packets.PacketValueConfig;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.inventory.container.IContainerListener;
@@ -87,7 +86,7 @@ public class SyncData
{
if( o instanceof ServerPlayerEntity)
{
NetworkHandler.instance().sendTo( new PacketValueConfig( "SyncDat." + this.channel, (String) val ), (ServerPlayerEntity) o );
// FIXME NetworkHandler.instance().sendTo( new PacketValueConfig( "SyncDat." + this.channel, (String) val ), (ServerPlayerEntity) o );
}
}
else if( this.field.getType().isEnum() )
src/main/java/appeng/container/implementations/ContainerCraftAmount.java
+3 -3
View File
@@ -22,6 +22,7 @@ package appeng.container.implementations;
import javax.annotation.Nonnull;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.inventory.container.Slot;
import net.minecraft.world.World;
@@ -43,9 +44,8 @@ public class ContainerCraftAmount extends AEBaseContainer
private final Slot craftingItem;
private IAEItemStack itemToCreate;
public ContainerCraftAmount( final PlayerInventory ip, final ITerminalHost te )
{
super( ip, te );
public ContainerCraftAmount(ContainerType<?> containerType, int id, PlayerInventory ip, final ITerminalHost te) {
super(containerType, id, ip, te);
this.craftingItem = new SlotInaccessible( new AppEngInternalInventory( null, 1 ), 0, 34, 53 );
this.addSlot( this.getCraftingItem() );
src/main/java/appeng/container/slot/SlotCraftingTerm.java
+1
View File
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import appeng.core.Api;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.Item;