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

Part models

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-09 00:53:40 +02:00
parent 4b11b8857b
commit 97e065ea1f
154 changed files with 578 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/reporting/AbstractPartTerminal.java
+10 -6
View File
@@ -21,7 +21,11 @@ package appeng.parts.reporting;
import java.util.List;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerMEMonitorable;
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.util.Hand;
@@ -115,18 +119,18 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
{
if( !super.onPartActivate( player, hand, pos ) )
{
if( Platform.isServer() )
if( !player.world.isRemote )
{
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), this.getGui( player ) );
ContainerOpener.openContainer(getContainerType(player), player, ContainerLocator.forPart(this));
}
}
return true;
}
// FIXME public GuiBridge getGui( final PlayerEntity player )
// FIXME {
// FIXME return GuiBridge.GUI_ME;
// FIXME }
public ContainerType<?> getContainerType(final PlayerEntity player )
{
return ContainerMEMonitorable.TYPE;
}
@Override
public <T extends IAEStack<T>> IMEMonitor<T> getInventory( IStorageChannel<T> channel )
src/main/java/appeng/parts/reporting/PartCraftingTerminal.java
+15 -19
View File
@@ -21,7 +21,13 @@ package appeng.parts.reporting;
import java.util.List;
import appeng.api.config.SecurityPermissions;
import appeng.api.networking.security.IActionHost;
import appeng.container.implementations.ContainerCraftingTerm;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.util.Platform;
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.util.ResourceLocation;
@@ -84,25 +90,15 @@ public class PartCraftingTerminal extends AbstractPartTerminal
this.craftingGrid.writeToNBT( data, "craftingGrid" );
}
// FIXME @Override
// FIXME public GuiBridge getGui( final PlayerEntity p )
// FIXME {
// FIXME int x = (int) p.getPosX();
// FIXME int y = (int) p.getPosY();
// FIXME int z = (int) p.getPosZ();
// FIXME if( this.getHost().getTile() != null )
// FIXME {
// FIXME x = this.getTile().getPos().getX();
// FIXME y = this.getTile().getPos().getY();
// FIXME z = this.getTile().getPos().getZ();
// FIXME }
// FIXME
// FIXME if( GuiBridge.GUI_CRAFTING_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.getSide(), p ) )
// FIXME {
// FIXME return GuiBridge.GUI_CRAFTING_TERMINAL;
// FIXME }
// FIXME return GuiBridge.GUI_ME;
// FIXME }
@Override
public ContainerType<?> getContainerType(final PlayerEntity p )
{
if( Platform.checkPermissions( p, this, SecurityPermissions.CRAFT, false) )
{
return ContainerCraftingTerm.TYPE;
}
return ContainerMEMonitorable.TYPE;
}
@Override
public IItemHandler getInventoryByName( final String name )
src/main/java/appeng/parts/reporting/PartPatternTerminal.java
+14 -19
View File
@@ -21,7 +21,12 @@ package appeng.parts.reporting;
import java.util.List;
import appeng.api.config.SecurityPermissions;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.container.implementations.ContainerPatternTerm;
import appeng.util.Platform;
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.util.ResourceLocation;
@@ -99,25 +104,15 @@ public class PartPatternTerminal extends AbstractPartTerminal
this.crafting.writeToNBT( data, "craftingGrid" );
}
// FIXME @Override
// FIXME public GuiBridge getGui( final PlayerEntity p )
// FIXME {
// FIXME int x = (int) p.getPosX();
// FIXME int y = (int) p.getPosY();
// FIXME int z = (int) p.getPosZ();
// FIXME if( this.getHost().getTile() != null )
// FIXME {
// FIXME x = this.getTile().getPos().getX();
// FIXME y = this.getTile().getPos().getY();
// FIXME z = this.getTile().getPos().getZ();
// FIXME }
// FIXME
// FIXME if( GuiBridge.GUI_PATTERN_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.getSide(), p ) )
// FIXME {
// FIXME return GuiBridge.GUI_PATTERN_TERMINAL;
// FIXME }
// FIXME return GuiBridge.GUI_ME;
// FIXME }
@Override
public ContainerType<?> getContainerType(final PlayerEntity p )
{
if(Platform.checkPermissions(p, this, SecurityPermissions.CRAFT, false) )
{
return ContainerPatternTerm.TYPE;
}
return ContainerMEMonitorable.TYPE;
}
@Override
public void onChangeInventory( final IItemHandler inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack )