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

Compiles again.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-04 19:58:58 +02:00
parent 237463dd94
commit c402390282
89 changed files with 1353 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+1 -1
View File
@@ -1091,7 +1091,7 @@ public abstract class AEBaseContainer extends Container
{
if( name.hasCustomInventoryName() )
{
this.setCustomName( name.getCustomInventoryName() );
this.setCustomName( name.getCustomInventoryName().getString() );
}
if( this.getCustomName() != null )
src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
+2 -2
View File
@@ -114,7 +114,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
}
else
{
this.setName( this.cpus.get( this.getSelectedCpu() ).getName() );
this.setName( this.cpus.get( this.getSelectedCpu() ).getName().getString() );
this.setCpuAvailableBytes( this.cpus.get( this.getSelectedCpu() ).getSize() );
this.setCpuCoProcessors( this.cpus.get( this.getSelectedCpu() ).getProcessors() );
}
@@ -306,7 +306,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
}
else if( this.getSelectedCpu() != -1 )
{
this.setName( this.cpus.get( this.getSelectedCpu() ).getName() );
this.setName( this.cpus.get( this.getSelectedCpu() ).getName().getString() );
this.setCpuAvailableBytes( this.cpus.get( this.getSelectedCpu() ).getSize() );
this.setCpuCoProcessors( this.cpus.get( this.getSelectedCpu() ).getProcessors() );
}
src/main/java/appeng/container/implementations/ContainerCraftingStatus.java
+2 -2
View File
@@ -121,7 +121,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU
}
else if( this.selectedCpu != -1 )
{
this.myName = this.cpus.get( this.selectedCpu ).getName();
this.myName = this.cpus.get( this.selectedCpu ).getName().getString();
}
if( this.selectedCpu == -1 && this.cpus.size() > 0 )
@@ -174,7 +174,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU
}
else
{
this.myName = this.cpus.get( this.selectedCpu ).getName();
this.myName = this.cpus.get( this.selectedCpu ).getName().getString();
this.setCPU( this.cpus.get( this.selectedCpu ).getCpu() );
}
}
src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java
+2 -2
View File
@@ -329,7 +329,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
final DualityInterface dual = ih.getInterfaceDuality();
if( gn.isActive() && dual.getConfigManager().getSetting( Settings.INTERFACE_TERMINAL ) == YesNo.YES )
{
this.diList.put( ih, new InvTracker( dual, dual.getPatterns(), dual.getTermName() ) );
this.diList.put( ih, new InvTracker( dual, dual.getPatterns(), dual.getTermName().getString() ) );
}
}
@@ -339,7 +339,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
final DualityInterface dual = ih.getInterfaceDuality();
if( gn.isActive() && dual.getConfigManager().getSetting( Settings.INTERFACE_TERMINAL ) == YesNo.YES )
{
this.diList.put( ih, new InvTracker( dual, dual.getPatterns(), dual.getTermName() ) );
this.diList.put( ih, new InvTracker( dual, dual.getPatterns(), dual.getTermName().getString() ) );
}
}
}