mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-18 19:29:08 +00:00
Tests for 1.8
This commit is contained in:
1 parent
b2b13776f1
commit
2c4299c33c
4 files changed
+22
-10
No files matched your search
@@ -10,6 +10,7 @@ import static minetweaker.mc18.MineTweakerMod.NETWORK;
|
||||
import minetweaker.IPlatformFunctions;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.api.item.IItemDefinition;
|
||||
import minetweaker.mc18.brackets.ItemBracketHandler;
|
||||
import minetweaker.mc18.chat.MCChatMessage;
|
||||
import minetweaker.mc18.item.MCItemDefinition;
|
||||
import minetweaker.mc18.network.MineTweakerLoadScriptsPacket;
|
||||
@@ -40,7 +41,7 @@ public class MCPlatformFunctions implements IPlatformFunctions {
|
||||
Item item = Item.getItemById(id);
|
||||
if (item == null)
|
||||
return null;
|
||||
String sid = (String) Item.itemRegistry.getNameForObject(item);
|
||||
String sid = ItemBracketHandler.getStringFromItem(item);
|
||||
return new MCItemDefinition(sid, item);
|
||||
}
|
||||
}
|
||||
+13
-5
@@ -8,9 +8,7 @@ package minetweaker.mc18.brackets;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import minetweaker.IBracketHandler;
|
||||
@@ -19,6 +17,8 @@ import minetweaker.annotations.BracketHandler;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IngredientAny;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import stanhebben.zenscript.ZenTokener;
|
||||
import stanhebben.zenscript.compiler.IEnvironmentGlobal;
|
||||
@@ -32,23 +32,31 @@ import stanhebben.zenscript.type.ZenType;
|
||||
import stanhebben.zenscript.type.natives.IJavaMethod;
|
||||
import stanhebben.zenscript.util.ZenPosition;
|
||||
|
||||
import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@BracketHandler(priority = 100)
|
||||
public class ItemBracketHandler implements IBracketHandler {
|
||||
private static final Map<String, Item> itemNames;
|
||||
public static final BiMap<String, Item> itemNames;
|
||||
|
||||
static {
|
||||
itemNames = new HashMap<String, Item>();
|
||||
for (String itemName : (Set<String>) Item.itemRegistry.getKeys()) {
|
||||
itemNames = HashBiMap.create();
|
||||
for (ResourceLocation itemRes : (Set<ResourceLocation>) Item.itemRegistry.getKeys()) {
|
||||
String itemName = itemRes.getResourceDomain() + ":" + itemRes.getResourcePath();
|
||||
itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemName));
|
||||
System.out.println(itemName + " : " + (Item) Item.itemRegistry.getObject(itemName));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static String getStringFromItem(Item item) {
|
||||
return itemNames.inverse().get(item);
|
||||
}
|
||||
|
||||
public static IItemStack getItem(String name, int meta) {
|
||||
// Item item = (Item) Item.itemRegistry.getObject(name);
|
||||
Item item = itemNames.get(name);
|
||||
|
||||
@@ -30,6 +30,7 @@ import minetweaker.mc18.util.MineTweakerPlatformUtils;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fml.common.registry.EntityRegistry;
|
||||
@@ -52,8 +53,9 @@ public class MCGame implements IGame {
|
||||
@Override
|
||||
public List<IItemDefinition> getItems() {
|
||||
List<IItemDefinition> result = new ArrayList<IItemDefinition>();
|
||||
for (String item : (Set<String>) Item.itemRegistry.getKeys()) {
|
||||
result.add(new MCItemDefinition(item, (Item) Item.itemRegistry.getObject(item)));
|
||||
for (ResourceLocation res: (Set<ResourceLocation>) Item.itemRegistry.getKeys()) {
|
||||
|
||||
result.add(new MCItemDefinition(res.getResourceDomain() + ":" + res.getResourcePath(), (Item) Item.itemRegistry.getObject(res)));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@ import minetweaker.mc18.actions.SetBlockHardnessAction;
|
||||
import minetweaker.mc18.actions.SetStackSizeAction;
|
||||
import minetweaker.mc18.actions.SetTranslationAction;
|
||||
import minetweaker.mc18.block.MCItemBlock;
|
||||
import minetweaker.mc18.brackets.ItemBracketHandler;
|
||||
import minetweaker.mc18.data.NBTConverter;
|
||||
import minetweaker.mc18.liquid.MCLiquidStack;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
@@ -85,7 +86,7 @@ public class MCItemStack implements IItemStack {
|
||||
|
||||
@Override
|
||||
public IItemDefinition getDefinition() {
|
||||
return new MCItemDefinition((String) Item.itemRegistry.getNameForObject(stack.getItem()), stack.getItem());
|
||||
return new MCItemDefinition(ItemBracketHandler.getStringFromItem(stack.getItem()), stack.getItem());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -370,7 +371,7 @@ public class MCItemStack implements IItemStack {
|
||||
public String toString() {
|
||||
StringBuilder result = new StringBuilder();
|
||||
result.append('<');
|
||||
result.append(Item.itemRegistry.getNameForObject(stack.getItem()));
|
||||
result.append(ItemBracketHandler.getStringFromItem(stack.getItem()));
|
||||
|
||||
if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
|
||||
result.append(":*");
|
||||
|
||||
Reference in new issue
Block a user