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

Fixed setting a Tunnel Type to "Forge Energy". Forgot to edit the part that actually sets the tunnel.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-07-15 01:19:29 +02:00
parent e20697a7d9
commit 16b5b5aea2
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/java/appeng/api/definitions/IParts.java
+2
View File
@@ -82,6 +82,8 @@ public interface IParts
IItemDefinition p2PTunnelRF(); IItemDefinition p2PTunnelRF();
IItemDefinition p2PTunnelFE();
IItemDefinition p2PTunnelLight(); IItemDefinition p2PTunnelLight();
// IItemDefinition p2PTunnelOpenComputers(); // IItemDefinition p2PTunnelOpenComputers();
src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
+5
View File
@@ -161,8 +161,13 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
*/ */
this.addNewAttunement( "thermaldynamics", TunnelType.RF_POWER ); this.addNewAttunement( "thermaldynamics", TunnelType.RF_POWER );
this.addNewAttunement( "thermalexpansion", TunnelType.RF_POWER );
this.addNewAttunement( "thermalfoundation", TunnelType.RF_POWER );
// TODO: Remove when confirmed that the official 1.12 version of EnderIO will support FE.
this.addNewAttunement( "enderio", TunnelType.RF_POWER ); this.addNewAttunement( "enderio", TunnelType.RF_POWER );
// TODO: Remove when confirmed that the official 1.12 version of Mekanism will support FE.
this.addNewAttunement( "mekanism", TunnelType.RF_POWER ); this.addNewAttunement( "mekanism", TunnelType.RF_POWER );
// TODO: Remove when support for RFTools' Powercells support is added
this.addNewAttunement( "rftools", TunnelType.RF_POWER ); this.addNewAttunement( "rftools", TunnelType.RF_POWER );
this.addNewAttunement( "ic2", TunnelType.IC2_POWER ); this.addNewAttunement( "ic2", TunnelType.IC2_POWER );
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+4
View File
@@ -226,6 +226,10 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
newType = parts.p2PTunnelRF().maybeStack( 1 ).orElse( ItemStack.EMPTY ); newType = parts.p2PTunnelRF().maybeStack( 1 ).orElse( ItemStack.EMPTY );
break; break;
case FE_POWER:
newType = parts.p2PTunnelFE().maybeStack( 1 ).orElse( ItemStack.EMPTY );
break;
case FLUID: case FLUID:
newType = parts.p2PTunnelFluids().maybeStack( 1 ).orElse( ItemStack.EMPTY ); newType = parts.p2PTunnelFluids().maybeStack( 1 ).orElse( ItemStack.EMPTY );
break; break;