Removed Pneumaticraft References since there is no 1.10 port and it has been inactive since March.
This commit is contained in:
parent
f598fb3cc4
commit
c23f11d8a1
7 changed files with 2 additions and 198 deletions
|
@ -34,6 +34,5 @@ public enum TunnelType
|
||||||
ITEM, // Item Tunnel
|
ITEM, // Item Tunnel
|
||||||
LIGHT, // Light Tunnel
|
LIGHT, // Light Tunnel
|
||||||
BUNDLED_REDSTONE, // Bundled Redstone Tunnel
|
BUNDLED_REDSTONE, // Bundled Redstone Tunnel
|
||||||
COMPUTER_MESSAGE, // Computer Message Tunnel
|
COMPUTER_MESSAGE // Computer Message Tunnel
|
||||||
PRESSURE // PneumaticCraft Tunnel
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,8 +86,6 @@ public interface IParts
|
||||||
|
|
||||||
// IItemDefinition p2PTunnelOpenComputers();
|
// IItemDefinition p2PTunnelOpenComputers();
|
||||||
|
|
||||||
// IItemDefinition p2PTunnelPneumaticCraft();
|
|
||||||
|
|
||||||
IItemDefinition cableAnchor();
|
IItemDefinition cableAnchor();
|
||||||
|
|
||||||
IItemDefinition monitor();
|
IItemDefinition monitor();
|
||||||
|
|
|
@ -66,7 +66,6 @@ public final class ApiParts implements IParts
|
||||||
// private final IItemDefinition p2PTunnelRF;
|
// private final IItemDefinition p2PTunnelRF;
|
||||||
private final IItemDefinition p2PTunnelLight;
|
private final IItemDefinition p2PTunnelLight;
|
||||||
// private final IItemDefinition p2PTunnelOpenComputers;
|
// private final IItemDefinition p2PTunnelOpenComputers;
|
||||||
// private final IItemDefinition p2PTunnelPneumaticCraft;
|
|
||||||
private final IItemDefinition cableAnchor;
|
private final IItemDefinition cableAnchor;
|
||||||
private final IItemDefinition monitor;
|
private final IItemDefinition monitor;
|
||||||
private final IItemDefinition semiDarkMonitor;
|
private final IItemDefinition semiDarkMonitor;
|
||||||
|
@ -119,8 +118,6 @@ public final class ApiParts implements IParts
|
||||||
this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2PTunnelLight ) );
|
this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2PTunnelLight ) );
|
||||||
// this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart(
|
// this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart(
|
||||||
// PartType.P2PTunnelOpenComputers ) );
|
// PartType.P2PTunnelOpenComputers ) );
|
||||||
// this.p2PTunnelPneumaticCraft = new DamagedItemDefinition( itemMultiPart.createPart(
|
|
||||||
// PartType.P2PTunnelPressure ) );
|
|
||||||
this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemPart.createPart( PartType.CableAnchor ) );
|
this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemPart.createPart( PartType.CableAnchor ) );
|
||||||
this.monitor = new DamagedItemDefinition( "part.monitor", itemPart.createPart( PartType.Monitor ) );
|
this.monitor = new DamagedItemDefinition( "part.monitor", itemPart.createPart( PartType.Monitor ) );
|
||||||
this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemPart.createPart( PartType.SemiDarkMonitor ) );
|
this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemPart.createPart( PartType.SemiDarkMonitor ) );
|
||||||
|
@ -314,11 +311,6 @@ public final class ApiParts implements IParts
|
||||||
* {
|
* {
|
||||||
* return this.p2PTunnelOpenComputers;
|
* return this.p2PTunnelOpenComputers;
|
||||||
* }
|
* }
|
||||||
* @Override
|
|
||||||
* public IItemDefinition p2PTunnelPneumaticCraft()
|
|
||||||
* {
|
|
||||||
* return this.p2PTunnelPneumaticCraft;
|
|
||||||
* }
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -63,9 +63,7 @@ public enum IntegrationType
|
||||||
|
|
||||||
BetterStorage( IntegrationSide.BOTH, "BetterStorage", "betterstorage" ),
|
BetterStorage( IntegrationSide.BOTH, "BetterStorage", "betterstorage" ),
|
||||||
|
|
||||||
OpenComputers( IntegrationSide.BOTH, "OpenComputers", "OpenComputers" ),
|
OpenComputers( IntegrationSide.BOTH, "OpenComputers", "OpenComputers" );
|
||||||
|
|
||||||
PneumaticCraft( IntegrationSide.BOTH, "PneumaticCraft", "PneumaticCraft" );
|
|
||||||
|
|
||||||
public final IntegrationSide side;
|
public final IntegrationSide side;
|
||||||
public final String dspName;
|
public final String dspName;
|
||||||
|
|
|
@ -239,9 +239,6 @@ public enum PartType
|
||||||
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of(
|
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of(
|
||||||
// IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
|
// IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
|
||||||
|
|
||||||
// P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of(
|
|
||||||
// IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ),
|
|
||||||
|
|
||||||
InterfaceTerminal( 480, "interface_terminal" , EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class );
|
InterfaceTerminal( 480, "interface_terminal" , EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class );
|
||||||
|
|
||||||
private final int baseDamage;
|
private final int baseDamage;
|
||||||
|
|
|
@ -1,174 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of Applied Energistics 2.
|
|
||||||
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
|
|
||||||
*
|
|
||||||
* Applied Energistics 2 is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Applied Energistics 2 is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package appeng.parts.p2p;
|
|
||||||
|
|
||||||
|
|
||||||
//import javax.annotation.Nonnull;
|
|
||||||
//import javax.annotation.Nullable;
|
|
||||||
//
|
|
||||||
//import net.minecraft.item.ItemStack;
|
|
||||||
//import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
//import net.minecraft.tileentity.TileEntity;
|
|
||||||
//import net.minecraft.util.IIcon;
|
|
||||||
//import net.minecraftforge.common.util.ForgeDirection;
|
|
||||||
//
|
|
||||||
//import pneumaticCraft.api.block.BlockSupplier;
|
|
||||||
//import pneumaticCraft.api.tileentity.AirHandlerSupplier;
|
|
||||||
//import pneumaticCraft.api.tileentity.IAirHandler;
|
|
||||||
//import pneumaticCraft.api.tileentity.ISidedPneumaticMachine;
|
|
||||||
//
|
|
||||||
//import appeng.api.networking.IGridNode;
|
|
||||||
//import appeng.api.networking.ticking.IGridTickable;
|
|
||||||
//import appeng.api.networking.ticking.TickRateModulation;
|
|
||||||
//import appeng.api.networking.ticking.TickingRequest;
|
|
||||||
//import appeng.core.settings.TickRates;
|
|
||||||
//import appeng.integration.IntegrationType;
|
|
||||||
//import appeng.transformer.annotations.Integration.Interface;
|
|
||||||
//import appeng.util.Platform;
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//@Interface( iface = "pneumaticCraft.api.tileentity.ISidedPneumaticMachine", iname = IntegrationType.PneumaticCraft )
|
|
||||||
//public final class PartP2PPressure extends PartP2PTunnel<PartP2PPressure> implements ISidedPneumaticMachine, IGridTickable
|
|
||||||
//{
|
|
||||||
// private static final String PRESSURE_NBT_TAG = "pneumaticCraft";
|
|
||||||
// private static final String PRESSURE_TYPE_ICON_NAME = "compressedIronBlock";
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * The pressure should never exceed 30f, thus preventing the tunnel from exploding.
|
|
||||||
// */
|
|
||||||
// private static final float MAX_PRESSURE = 30f;
|
|
||||||
// private static final int VOLUME = 1000;
|
|
||||||
//
|
|
||||||
// @Nonnull
|
|
||||||
// private final IAirHandler handler;
|
|
||||||
// private boolean isConnected = false;
|
|
||||||
//
|
|
||||||
// public PartP2PPressure( ItemStack is )
|
|
||||||
// {
|
|
||||||
// super( is );
|
|
||||||
// this.handler = AirHandlerSupplier.getAirHandler( MAX_PRESSURE, MAX_PRESSURE, VOLUME );
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// protected IIcon getTypeTexture()
|
|
||||||
// {
|
|
||||||
// return BlockSupplier.getBlock( PRESSURE_TYPE_ICON_NAME ).getIcon( 0, 0 );
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Nullable
|
|
||||||
// @Override
|
|
||||||
// public IAirHandler getAirHandler( ForgeDirection side )
|
|
||||||
// {
|
|
||||||
// if( side == this.side )
|
|
||||||
// {
|
|
||||||
// return this.getInternalHandler();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onNeighborChanged()
|
|
||||||
// {
|
|
||||||
// super.onNeighborChanged();
|
|
||||||
// this.getInternalHandler().onNeighborChange();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void addToWorld()
|
|
||||||
// {
|
|
||||||
// super.addToWorld();
|
|
||||||
// this.getInternalHandler().validateI( this.getTile() );
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void removeFromWorld()
|
|
||||||
// {
|
|
||||||
// super.removeFromWorld();
|
|
||||||
//
|
|
||||||
// if( this.output && this.getInput() != null )
|
|
||||||
// {
|
|
||||||
// this.getInternalHandler().removeConnection( this.getInput().getInternalHandler() );
|
|
||||||
// this.isConnected = false;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public TickingRequest getTickingRequest( IGridNode node )
|
|
||||||
// {
|
|
||||||
// return new TickingRequest( TickRates.PressureTunnel.min, TickRates.PressureTunnel.max, false, false );
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
|
|
||||||
// {
|
|
||||||
// if( this.proxy.isPowered() && this.proxy.isActive() )
|
|
||||||
// {
|
|
||||||
// if( !this.isConnected )
|
|
||||||
// {
|
|
||||||
// this.updateHandler();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// this.getInternalHandler().updateEntityI();
|
|
||||||
// return TickRateModulation.URGENT;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// return TickRateModulation.IDLE;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void writeToNBT( NBTTagCompound data )
|
|
||||||
// {
|
|
||||||
// super.writeToNBT( data );
|
|
||||||
// final NBTTagCompound pneumaticNBT = new NBTTagCompound();
|
|
||||||
//
|
|
||||||
// this.getInternalHandler().writeToNBTI( pneumaticNBT );
|
|
||||||
// data.setTag( PRESSURE_NBT_TAG, pneumaticNBT );
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void readFromNBT( NBTTagCompound data )
|
|
||||||
// {
|
|
||||||
// super.readFromNBT( data );
|
|
||||||
// this.getInternalHandler().readFromNBTI( data.getCompoundTag( PRESSURE_NBT_TAG ) );
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Nonnull
|
|
||||||
// private IAirHandler getInternalHandler()
|
|
||||||
// {
|
|
||||||
// return this.handler;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// private void updateHandler()
|
|
||||||
// {
|
|
||||||
// if( this.proxy.isPowered() && this.proxy.isActive() )
|
|
||||||
// {
|
|
||||||
//
|
|
||||||
// if( this.output && this.getInput() != null )
|
|
||||||
// {
|
|
||||||
// this.getInternalHandler().createConnection( this.getInput().getInternalHandler() );
|
|
||||||
// this.isConnected = true;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// final TileEntity te = this.getTile();
|
|
||||||
// Platform.notifyBlocksOfNeighbors( te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord );
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// }
|
|
|
@ -263,12 +263,6 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
|
||||||
* newType = stack;
|
* newType = stack;
|
||||||
* }
|
* }
|
||||||
* break;
|
* break;
|
||||||
* case PRESSURE:
|
|
||||||
* for( ItemStack stack : parts.p2PTunnelPneumaticCraft().maybeStack( 1 ).asSet() )
|
|
||||||
* {
|
|
||||||
* newType = stack;
|
|
||||||
* }
|
|
||||||
* break;
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in a new issue