mirror of
https://github.com/GTNewHorizons/ModTweaker.git
synced 2026-11-20 20:32:18 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
0cc3fa06c2
commit
655636b7e9
231 files changed
+10024
-8585
No files matched your search
@@ -11,22 +11,23 @@ import minetweaker.api.item.IngredientOr;
|
||||
import minetweaker.api.liquid.ILiquidStack;
|
||||
import minetweaker.api.minecraft.MineTweakerMC;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
|
||||
|
||||
public class MCAspectStack implements IAspectStack {
|
||||
|
||||
|
||||
private final AspectStack stack;
|
||||
private final List<IAspectStack> aspects;
|
||||
|
||||
|
||||
public MCAspectStack(AspectStack stack) {
|
||||
if(stack == null) throw new IllegalArgumentException("stack cannot be null");
|
||||
|
||||
if (stack == null) throw new IllegalArgumentException("stack cannot be null");
|
||||
|
||||
this.stack = stack;
|
||||
this.aspects = Collections.<IAspectStack>singletonList(this);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public IItemStack applyTransform(IItemStack arg0, IPlayer arg1) {
|
||||
return null;
|
||||
@@ -34,20 +35,20 @@ public class MCAspectStack implements IAspectStack {
|
||||
|
||||
@Override
|
||||
public boolean contains(IIngredient ingredient) {
|
||||
if(ingredient instanceof MCAspectStack) {
|
||||
List<IAspectStack> aspects = ((MCAspectStack)ingredient).getAspects();
|
||||
|
||||
if((aspects == null) || (aspects.size() != 1)) {
|
||||
if (ingredient instanceof MCAspectStack) {
|
||||
List<IAspectStack> aspects = ((MCAspectStack) ingredient).getAspects();
|
||||
|
||||
if ((aspects == null) || (aspects.size() != 1)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return matches(aspects.get(0));
|
||||
} else {
|
||||
List<IItemStack> iitems = ingredient.getItems();
|
||||
if ((iitems == null) || (iitems.size() != 1)) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return matches((IItemStack)iitems.get(0));
|
||||
return matches((IItemStack) iitems.get(0));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,7 +66,7 @@ public class MCAspectStack implements IAspectStack {
|
||||
public List<IItemStack> getItems() {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<IAspectStack> getAspects() {
|
||||
return this.aspects;
|
||||
@@ -94,29 +95,29 @@ public class MCAspectStack implements IAspectStack {
|
||||
@Override
|
||||
public boolean matches(IItemStack item) {
|
||||
ItemStack internal = MineTweakerMC.getItemStack(item);
|
||||
|
||||
if(internal != null) {
|
||||
|
||||
if (internal != null) {
|
||||
AspectList itemAspectList = new AspectList(internal);
|
||||
|
||||
if(itemAspectList.aspects.keySet().contains(stack.aspect.getTag())) {
|
||||
|
||||
if (itemAspectList.aspects.keySet().contains(stack.aspect.getTag())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
public boolean matches(IAspectStack aspect) {
|
||||
if(aspect != null) {
|
||||
if (aspect != null) {
|
||||
Object internal = aspect.getInternal();
|
||||
|
||||
if(internal != null && internal instanceof AspectStack) {
|
||||
if(this.stack.aspect.getTag().equals(((AspectStack)internal).aspect.getTag())) {
|
||||
|
||||
if (internal != null && internal instanceof AspectStack) {
|
||||
if (this.stack.aspect.getTag().equals(((AspectStack) internal).aspect.getTag())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -167,17 +168,17 @@ public class MCAspectStack implements IAspectStack {
|
||||
AspectStack result = new AspectStack(this.stack.aspect, amount);
|
||||
return new MCAspectStack(result);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
|
||||
sb.append("<aspect:").append(stack.aspect.getName()).append('>');
|
||||
|
||||
if(stack.amount > 1) {
|
||||
|
||||
if (stack.amount > 1) {
|
||||
sb.append(" * ").append(stack.amount);
|
||||
}
|
||||
|
||||
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user