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

Custom Model Loader

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-01 04:02:37 +02:00
parent 077ff17078
commit 5cdeff01be
202 changed files with 942 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
+1 -1
View File
@@ -190,7 +190,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
@Override
protected ItemStack getItemFromTile( final Object obj )
{
final Optional<ItemStack> is = AEApi.instance().definitions().blocks().craftingMonitor().maybeStack( 1 );
final Optional<ItemStack> is = Api.INSTANCE.definitions().blocks().craftingMonitor().maybeStack( 1 );
return is.orElseGet( () -> super.getItemFromTile( obj ) );
}
src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class TileCraftingStorageTile extends TileCraftingTile
@Override
protected ItemStack getItemFromTile( final Object obj )
{
final IBlocks blocks = AEApi.instance().definitions().blocks();
final IBlocks blocks = Api.INSTANCE.definitions().blocks();
final int storage = ( (TileCraftingTile) obj ).getStorageBytes() / KILO_SCALAR;
Optional<ItemStack> is;
src/main/java/appeng/tile/crafting/TileCraftingTile.java
+3 -3
View File
@@ -83,11 +83,11 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
if( ( (TileCraftingTile) obj ).isAccelerator() )
{
is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack( 1 );
is = Api.INSTANCE.definitions().blocks().craftingAccelerator().maybeStack( 1 );
}
else
{
is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 );
is = Api.INSTANCE.definitions().blocks().craftingUnit().maybeStack( 1 );
}
return is.orElseGet( () -> super.getItemFromTile( obj ) );
@@ -319,7 +319,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
throw new IllegalStateException( this.cluster + " does not contain any kind of blocks, which were destroyed." );
}
for( IAEItemStack ais : inv.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) )
for( IAEItemStack ais : inv.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ) )
{
ais = ais.copy();
ais.setStackSize( ais.getDefinition().getMaxStackSize() );
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
public TileMolecularAssembler()
{
final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler();
final ITileDefinition assembler = Api.INSTANCE.definitions().blocks().molecularAssembler();
this.settings = new ConfigManager( this );
this.settings.registerSetting( Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE );