mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-22 04:52:21 +00:00
Minetweaker / 327
This commit is contained in:
1 parent
5f54cd3eaa
commit
e43d4662f9
4 files changed
+97
-14
No files matched your search
@@ -32,13 +32,20 @@ public interface IOreDictEntry extends IIngredient {
|
||||
@ZenMethod
|
||||
public void add(IItemStack item);
|
||||
|
||||
@ZenMethod
|
||||
public void add(IItemStack... items);
|
||||
|
||||
@ZenMethod
|
||||
public void addAll(IOreDictEntry entry);
|
||||
|
||||
@ZenMethod
|
||||
public void remove(IItemStack item);
|
||||
|
||||
@ZenOperator(OperatorType.CONTAINS)
|
||||
@ZenMethod
|
||||
public void remove(IItemStack... items);
|
||||
|
||||
|
||||
@ZenOperator(OperatorType.CONTAINS)
|
||||
public boolean contains(IItemStack item);
|
||||
|
||||
@ZenMethod
|
||||
|
||||
+37
-13
@@ -6,28 +6,25 @@
|
||||
|
||||
package minetweaker.mc1710.oredict;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc1710.util.MineTweakerHacks;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemCondition;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IItemTransformer;
|
||||
import minetweaker.api.item.IngredientOr;
|
||||
import minetweaker.api.item.IngredientStack;
|
||||
import minetweaker.api.item.*;
|
||||
import minetweaker.api.liquid.ILiquidStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.api.oredict.IngredientOreDict;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.mc1710.util.MineTweakerHacks;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
@@ -68,7 +65,17 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Override
|
||||
public void add(IItemStack... items) {
|
||||
for(IItemStack item : items){
|
||||
ItemStack stack = getItemStack(item);
|
||||
if (stack != null) {
|
||||
MineTweakerAPI.apply(new ActionAddItem(id, stack));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IItemStack getFirstItem() {
|
||||
List<ItemStack> items = OreDictionary.getOres(id);
|
||||
if (items.isEmpty()) {
|
||||
@@ -101,6 +108,23 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(IItemStack... items) {
|
||||
for(IItemStack item : items){
|
||||
ItemStack result = null;
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
if (item.matches(getIItemStackWildcardSize(itemStack))) {
|
||||
result = itemStack;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (result != null) {
|
||||
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean contains(IItemStack item) {
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
|
||||
@@ -67,6 +67,16 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(IItemStack... items) {
|
||||
for(IItemStack item : items){
|
||||
ItemStack stack = getItemStack(item);
|
||||
if (stack != null) {
|
||||
MineTweakerAPI.apply(new ActionAddItem(id, stack));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addAll(IOreDictEntry entry) {
|
||||
if (entry instanceof MCOreDictEntry) {
|
||||
@@ -90,6 +100,22 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void remove(IItemStack... items) {
|
||||
for(IItemStack item : items){
|
||||
ItemStack result = null;
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
if (item.matches(getIItemStackWildcardSize(itemStack))) {
|
||||
result = itemStack;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (result != null) {
|
||||
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean contains(IItemStack item) {
|
||||
|
||||
@@ -67,6 +67,16 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(IItemStack... items) {
|
||||
for(IItemStack item : items){
|
||||
ItemStack stack = getItemStack(item);
|
||||
if (stack != null) {
|
||||
MineTweakerAPI.apply(new ActionAddItem(id, stack));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addAll(IOreDictEntry entry) {
|
||||
if (entry instanceof MCOreDictEntry) {
|
||||
@@ -90,6 +100,22 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void remove(IItemStack... items) {
|
||||
for(IItemStack item : items){
|
||||
ItemStack result = null;
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
if (item.matches(getIItemStackWildcardSize(itemStack))) {
|
||||
result = itemStack;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (result != null) {
|
||||
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean contains(IItemStack item) {
|
||||
|
||||
Reference in new issue
Block a user