pick 97420a31d The big reformat of 2020

This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
+38 -52
View File
@@ -18,7 +18,6 @@
package appeng.util.item;
import java.util.Collection;
import appeng.api.AEApi;
@@ -27,61 +26,48 @@ import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemContainer;
public class ItemModList implements IItemContainer<IAEItemStack> {
public class ItemModList implements IItemContainer<IAEItemStack>
{
private final IItemContainer<IAEItemStack> backingStore;
private final IItemContainer<IAEItemStack> overrides = AEApi.instance().storage()
.getStorageChannel(IItemStorageChannel.class).createList();
private final IItemContainer<IAEItemStack> backingStore;
private final IItemContainer<IAEItemStack> overrides = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
public ItemModList(final IItemContainer<IAEItemStack> backend) {
this.backingStore = backend;
}
public ItemModList( final IItemContainer<IAEItemStack> backend )
{
this.backingStore = backend;
}
@Override
public void add(final IAEItemStack option) {
IAEItemStack over = this.overrides.findPrecise(option);
if (over == null) {
over = this.backingStore.findPrecise(option);
if (over == null) {
this.overrides.add(option);
} else {
option.add(over);
this.overrides.add(option);
}
} else {
this.overrides.add(option);
}
}
@Override
public void add( final IAEItemStack option )
{
IAEItemStack over = this.overrides.findPrecise( option );
if( over == null )
{
over = this.backingStore.findPrecise( option );
if( over == null )
{
this.overrides.add( option );
}
else
{
option.add( over );
this.overrides.add( option );
}
}
else
{
this.overrides.add( option );
}
}
@Override
public IAEItemStack findPrecise(final IAEItemStack i) {
final IAEItemStack over = this.overrides.findPrecise(i);
if (over == null) {
return this.backingStore.findPrecise(i);
}
return over;
}
@Override
public IAEItemStack findPrecise( final IAEItemStack i )
{
final IAEItemStack over = this.overrides.findPrecise( i );
if( over == null )
{
return this.backingStore.findPrecise( i );
}
return over;
}
@Override
public Collection<IAEItemStack> findFuzzy(final IAEItemStack input, final FuzzyMode fuzzy) {
return this.overrides.findFuzzy(input, fuzzy);
}
@Override
public Collection<IAEItemStack> findFuzzy( final IAEItemStack input, final FuzzyMode fuzzy )
{
return this.overrides.findFuzzy( input, fuzzy );
}
@Override
public boolean isEmpty()
{
return this.overrides.isEmpty() && this.backingStore.isEmpty();
}
@Override
public boolean isEmpty() {
return this.overrides.isEmpty() && this.backingStore.isEmpty();
}
}