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/container/AEBaseContainer.java
+4 -4
View File
@@ -803,7 +803,7 @@ public abstract class AEBaseContainer extends Container
if( !isg.isEmpty() && releaseQty > 0 )
{
IAEItemStack ais = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( isg );
IAEItemStack ais = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( isg );
ais.setStackSize( 1 );
final IAEItemStack extracted = ais.copy();
@@ -893,7 +893,7 @@ public abstract class AEBaseContainer extends Container
}
else
{
IAEItemStack ais = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() );
IAEItemStack ais = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() );
ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
if( ais != null )
{
@@ -942,7 +942,7 @@ public abstract class AEBaseContainer extends Container
}
else
{
IAEItemStack ais = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() );
IAEItemStack ais = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( player.inventory.getItemStack() );
ais.setStackSize( 1 );
ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
if( ais == null )
@@ -1041,7 +1041,7 @@ public abstract class AEBaseContainer extends Container
return input;
}
final IAEItemStack ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(),
AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( input ),
Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( input ),
this.getActionSource() );
if( ais == null )
{
src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
+2 -2
View File
@@ -225,11 +225,11 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
final IItemHandler inv = this.getUpgradeable().getInventoryByName( "config" );
final ItemStack is = this.getUpgradeable().getInventoryByName( "cell" ).getStackInSlot( 0 );
final IStorageChannel channel = is.getItem() instanceof IStorageCell ? ( (IStorageCell) is.getItem() ).getChannel() : AEApi.instance()
final IStorageChannel channel = is.getItem() instanceof IStorageCell ? ( (IStorageCell) is.getItem() ).getChannel() : Api.INSTANCE
.storage()
.getStorageChannel( IItemStorageChannel.class );
final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( is, null, channel );
final IMEInventory cellInv = Api.INSTANCE.registries().cell().getCellInventory( is, null, channel );
Iterator<IAEStack> i = new NullIterator<>();
if( cellInv != null )
src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
+2 -2
View File
@@ -209,7 +209,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 );
final PacketMEInventoryUpdate c = this.result.isSimulation() ? new PacketMEInventoryUpdate( (byte) 2 ) : null;
final IItemList<IAEItemStack> plan = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
final IItemList<IAEItemStack> plan = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.result.populatePlan( plan );
this.setUsedBytes( this.result.getByteTotal() );
@@ -226,7 +226,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
p.setStackSize( out.getCountRequestable() );
final IStorageGrid sg = this.getGrid().getCache( IStorageGrid.class );
final IMEInventory<IAEItemStack> items = sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
final IMEInventory<IAEItemStack> items = sg.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) );
IAEItemStack m = null;
if( c != null && this.result.isSimulation() )
src/main/java/appeng/container/implementations/ContainerCraftingCPU.java
+1 -1
View File
@@ -53,7 +53,7 @@ import appeng.util.Platform;
public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorHandlerReceiver<IAEItemStack>, ICustomNameObject
{
private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
private final IItemList<IAEItemStack> list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
private IGrid network;
private CraftingCPUCluster monitor = null;
private String cpuName = null;
src/main/java/appeng/container/implementations/ContainerInscriber.java
+4 -4
View File
@@ -120,14 +120,14 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres
if( s == this.middle )
{
IItemDefinition press = AEApi.instance().definitions().materials().namePress();
IItemDefinition press = Api.INSTANCE.definitions().materials().namePress();
if( press.isSameAs( top ) || press.isSameAs( bot ) )
{
return !press.isSameAs( is );
}
boolean matches = false;
for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() )
for( final IInscriberRecipe recipe : Api.INSTANCE.registries().inscriber().getRecipes() )
{
final boolean matchA = !top
.isEmpty() && ( Platform.itemComparisons().isSameItem( top, recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) || Platform
@@ -168,14 +168,14 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres
}
// name presses
final IItemDefinition namePress = AEApi.instance().definitions().materials().namePress();
final IItemDefinition namePress = Api.INSTANCE.definitions().materials().namePress();
if( namePress.isSameAs( otherSlot ) )
{
return namePress.isSameAs( is );
}
// everything else
for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() )
for( final IInscriberRecipe recipe : Api.INSTANCE.registries().inscriber().getRecipes() )
{
boolean isValid = false;
if( Platform.itemComparisons().isSameItem( otherSlot, recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) )
src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
+3 -3
View File
@@ -78,7 +78,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
private final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5];
private final IMEMonitor<IAEItemStack> monitor;
private final IItemList<IAEItemStack> items = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
private final IItemList<IAEItemStack> items = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
private final IConfigManager clientCM;
private final ITerminalHost host;
@GuiSync( 99 )
@@ -109,7 +109,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
this.serverCM = monitorable.getConfigManager();
this.monitor = monitorable.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
this.monitor = monitorable.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) );
if( this.monitor != null )
{
this.monitor.addListener( this, null );
@@ -189,7 +189,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
if( Platform.isServer() )
{
if( this.monitor != this.host.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) )
if( this.monitor != this.host.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) ) )
{
this.setValidContainer( false );
}
src/main/java/appeng/container/implementations/ContainerNetworkStatus.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class ContainerNetworkStatus extends AEBaseContainer
for( final Class<? extends IGridHost> machineClass : this.network.getMachinesClasses() )
{
final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
final IItemList<IAEItemStack> list = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
for( final IGridNode machine : this.network.getMachines( machineClass ) )
{
final IGridBlock blk = machine.getGridBlock();
src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+3 -3
View File
@@ -237,7 +237,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
}
// add a new encoded pattern.
Optional<ItemStack> maybePattern = AEApi.instance().definitions().items().encodedPattern().maybeStack( 1 );
Optional<ItemStack> maybePattern = Api.INSTANCE.definitions().items().encodedPattern().maybeStack( 1 );
if( maybePattern.isPresent() )
{
output = maybePattern.get();
@@ -334,7 +334,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
return false;
}
final IDefinitions definitions = AEApi.instance().definitions();
final IDefinitions definitions = Api.INSTANCE.definitions();
boolean isPattern = definitions.items().encodedPattern().isSameAs( output );
isPattern |= definitions.materials().blankPattern().isSameAs( output );
@@ -419,7 +419,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
}
final IMEMonitor<IAEItemStack> storage = this.getPatternTerminal()
.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) );
final IItemList<IAEItemStack> all = storage.getStorageList();
final ItemStack is = r.getCraftingResult( ic );
src/main/java/appeng/container/implementations/ContainerQuartzKnife.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class ContainerQuartzKnife extends AEBaseContainer
{
if( ContainerQuartzKnife.this.myName.length() > 0 )
{
return AEApi.instance().definitions().materials().namePress().maybeStack( 1 ).map( namePressStack ->
return Api.INSTANCE.definitions().materials().namePress().maybeStack( 1 ).map( namePressStack ->
{
final CompoundNBT compound = namePressStack.getOrCreateTag();
compound.putString("InscribeName", ContainerQuartzKnife.this.myName);
src/main/java/appeng/container/implementations/ContainerSecurityStation.java
+1 -1
View File
@@ -156,7 +156,7 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements
networkEncodable = (INetworkEncodable) term.getItem();
}
final IWirelessTermHandler wTermHandler = AEApi.instance().registries().wireless().getWirelessTerminalHandler( term );
final IWirelessTermHandler wTermHandler = Api.INSTANCE.registries().wireless().getWirelessTerminalHandler( term );
if( wTermHandler != null )
{
networkEncodable = wTermHandler;
src/main/java/appeng/container/implementations/ContainerStorageBus.java
+1 -1
View File
@@ -159,7 +159,7 @@ public class ContainerStorageBus extends ContainerUpgradeable
if( cellInv != null )
{
final IItemList<IAEItemStack> list = cellInv
.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() );
.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() );
i = list.iterator();
}
src/main/java/appeng/container/slot/SlotCraftingTerm.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
return;
}
final IMEMonitor<IAEItemStack> inv = this.storage.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
final IMEMonitor<IAEItemStack> inv = this.storage.getInventory( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) );
final int howManyPerCraft = this.getStack().getCount();
int maxTimesToCraft = 0;
src/main/java/appeng/container/slot/SlotPatternTerm.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SlotPatternTerm extends SlotCraftingTerm
public AppEngPacket getRequest( final boolean shift ) throws IOException
{
return new PacketPatternSlot( this
.getPattern(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( this.getStack() ), shift );
.getPattern(), Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createStack( this.getStack() ), shift );
}
@Override
src/main/java/appeng/container/slot/SlotRestrictedInput.java
+6 -6
View File
@@ -122,7 +122,7 @@ public class SlotRestrictedInput extends AppEngSlot
return false;
}
final IDefinitions definitions = AEApi.instance().definitions();
final IDefinitions definitions = Api.INSTANCE.definitions();
final IMaterials materials = definitions.materials();
final IItems items = definitions.items();
@@ -170,7 +170,7 @@ public class SlotRestrictedInput extends AppEngSlot
return true;
}
for( final ItemStack optional : AEApi.instance().registries().inscriber().getOptionals() )
for( final ItemStack optional : Api.INSTANCE.registries().inscriber().getOptionals() )
{
if( Platform.itemComparisons().isSameItem( i, optional ) )
{
@@ -194,7 +194,7 @@ public class SlotRestrictedInput extends AppEngSlot
case VIEW_CELL:
return items.viewCell().isSameAs( i );
case ORE:
return appeng.api.AEApi.instance().registries().grinder().getRecipeForInput( i ) != null;
return appeng.api.Api.INSTANCE.registries().grinder().getRecipeForInput( i ) != null;
case FUEL:
return TileEntityFurnace.getItemBurnTime( i ) > 0;
case POWERED_TOOL:
@@ -208,20 +208,20 @@ public class SlotRestrictedInput extends AppEngSlot
case SPATIAL_STORAGE_CELLS:
return i.getItem() instanceof ISpatialStorageCell && ( (ISpatialStorageCell) i.getItem() ).isSpatialStorage( i );
case STORAGE_CELLS:
return AEApi.instance().registries().cell().isCellHandled( i );
return Api.INSTANCE.registries().cell().isCellHandled( i );
case WORKBENCH_CELL:
return i.getItem() instanceof ICellWorkbenchItem && ( (ICellWorkbenchItem) i.getItem() ).isEditable( i );
case STORAGE_COMPONENT:
return i.getItem() instanceof IStorageComponent && ( (IStorageComponent) i.getItem() ).isStorageComponent( i );
case TRASH:
if( AEApi.instance().registries().cell().isCellHandled( i ) )
if( Api.INSTANCE.registries().cell().isCellHandled( i ) )
{
return false;
}
return !( i.getItem() instanceof IStorageComponent && ( (IStorageComponent) i.getItem() ).isStorageComponent( i ) );
case ENCODABLE_ITEM:
return i.getItem() instanceof INetworkEncodable || AEApi.instance().registries().wireless().isWirelessTerminal( i );
return i.getItem() instanceof INetworkEncodable || Api.INSTANCE.registries().wireless().isWirelessTerminal( i );
case BIOMETRIC_CARD:
return i.getItem() instanceof IBiometricCard;
case UPGRADES: