From c67ad222701d2f17a7084d0d9e41a42b6c9f0729 Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Sun, 10 Aug 2014 22:08:43 +0200 Subject: [PATCH] - Fixed spaces in item names (Note: they are now ignored: and are considered the same) - Fixed block info command in 1.6.4 and 1.7.2 --- .../MineTweakerImplementationAPI.java | 6 +++-- .../minetweaker/mc164/ForgeEventHandler.java | 2 -- .../mc164/block/MCBlockDefinition.java | 3 +++ .../minetweaker/mc164/block/MCItemBlock.java | 21 +++++++++++++-- .../mc164/brackets/ItemBracketHandler.java | 2 +- .../minetweaker/mc164/player/MCPlayer.java | 22 ++++++++++++++++ .../mods/mfr/machines/Harvester.java | 24 ++++++++++++----- .../mc1710/brackets/ItemBracketHandler.java | 26 ++++++++++++++----- .../mc172/brackets/ItemBracketHandler.java | 21 ++++++++++++--- .../minetweaker/mc172/player/MCPlayer.java | 15 +++++++++++ 10 files changed, 118 insertions(+), 24 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index 2d89e7b..6c44241 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -89,11 +89,13 @@ public class MineTweakerImplementationAPI { try { displayName = " -- " + item.makeStack(0).getDisplayName(); - } catch (Exception ex) { + } catch (Throwable ex) { // some mods (such as buildcraft) may throw exceptions when calling // getDisplayName on an item stack that doesn't contain valid NBT data + // also seems to cause errors in some other cases too + displayName = " -- Name could not be retrieved due to an error: " + ex; } - + MineTweakerAPI.logCommand("<" + item.getId() + ">" + displayName); } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java index b7cc99f..be9ad7f 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java @@ -18,8 +18,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; public class ForgeEventHandler { @ForgeSubscribe public void onPlayerInteract(PlayerInteractEvent ev) { - System.out.println("Player interact"); - minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent( MineTweakerMC.getIPlayer(ev.entityPlayer), MineTweakerMC.getDimension(ev.entityPlayer.getEntityWorld()), diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java index 3ae613f..6da08f9 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java @@ -17,6 +17,9 @@ public class MCBlockDefinition implements IBlockDefinition { private final Block block; public MCBlockDefinition(Block block) { + if (block == null) + throw new IllegalArgumentException("block cannot be null"); + this.block = block; } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCItemBlock.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCItemBlock.java index 3a762fc..3ae2e5b 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCItemBlock.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCItemBlock.java @@ -59,9 +59,26 @@ public class MCItemBlock implements IBlock { @Override public boolean matches(IBlock block) { - return getDefinition() == block.getDefinition() + if (getDefinition() != block.getDefinition()) { + System.out.println("Different block"); + return false; + } + + if (getMeta() != OreDictionary.WILDCARD_VALUE && getMeta() != block.getMeta()) { + System.out.println("Different meta"); + return false; + } + + if (getTileData() != null && (block.getTileData() == null || !block.getTileData().contains(getTileData()))) { + System.out.println("Different tile data"); + return false; + } + + return true; + +/* return getDefinition() == block.getDefinition() && (getMeta() == OreDictionary.WILDCARD_VALUE || getMeta() == block.getMeta()) - && (getTileData() == null || (block.getTileData() != null && block.getTileData().contains(getTileData()))); + && (getTileData() == null || (block.getTileData() != null && block.getTileData().contains(getTileData())));*/ } @Override diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/brackets/ItemBracketHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/brackets/ItemBracketHandler.java index 66f51e7..114d58c 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/brackets/ItemBracketHandler.java @@ -41,7 +41,7 @@ public class ItemBracketHandler implements IBracketHandler { for (Item item : Item.itemsList) { if (item == null) continue; - itemNames.put(item.getUnlocalizedName(), item); + itemNames.put(item.getUnlocalizedName().replace(" ", ""), item); } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java index 0c92c14..842e60f 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java @@ -100,4 +100,26 @@ public class MCPlayer implements IPlayer { MineTweakerMod.INSTANCE.openBrowser(player.username, url); } } + + @Override + public int hashCode() { + int hash = 3; + hash = 59 * hash + (this.player != null ? this.player.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final MCPlayer other = (MCPlayer) obj; + if (this.player != other.player && (this.player == null || !this.player.equals(other.player))) { + return false; + } + return true; + } } diff --git a/MineTweaker3-MC164-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Harvester.java b/MineTweaker3-MC164-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Harvester.java index df481ac..64f7455 100644 --- a/MineTweaker3-MC164-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Harvester.java +++ b/MineTweaker3-MC164-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Harvester.java @@ -122,7 +122,8 @@ public class Harvester { @Override public HarvestType getHarvestType() { // WARNING: first type will be used - return harvestables.get(0).type; + // Also, take into account the possibility of having no harvestable yet + return harvestables.isEmpty() ? HarvestType.Normal : harvestables.get(0).type; } @Override @@ -132,29 +133,39 @@ public class Harvester { @Override public boolean canBeHarvested(World world, Map map, int x, int y, int z) { + System.out.println("canBeHarvested start"); + for (TweakerHarvestable harvestable : harvestables) { if (harvestable.block.matches(MineTweakerMC.getBlock(world, x, y, z))) return true; } - System.out.println("No blocks match"); + System.out.println("canBeHarvested end"); + return false; } @Override public List getDrops(World world, Random random, Map map, int x, int y, int z) { + System.out.println("getDrops start"); + IBlock block = MineTweakerMC.getBlock(world, x, y, z); for (TweakerHarvestable harvestable : harvestables) { if (harvestable.block.matches(block)) { if (harvestable.possibleDrops == null) { Block mcBlock = ((MCBlockDefinition) block.getDefinition()).getInternalBlock(); - return mcBlock.getBlockDropped(world, x, y, z, block.getMeta(), 0); + List result = mcBlock.getBlockDropped(world, x, y, z, block.getMeta(), 0); + //return Collections.EMPTY_LIST; + System.out.println("getDrops end"); + return result; } else { - return Arrays.asList(MineTweakerMC.getItemStacks(WeightedItemStack.pickRandomDrops(random, harvestable.possibleDrops))); + List result = Arrays.asList(MineTweakerMC.getItemStacks(WeightedItemStack.pickRandomDrops(random, harvestable.possibleDrops))); + System.out.println("getDrops end"); + return result; } } } - + System.out.println("getDrops end"); return Collections.EMPTY_LIST; } @@ -197,6 +208,7 @@ public class Harvester { } } else { TweakerHarvestablePartial factoryFruit = new TweakerHarvestablePartial(blockId); + factoryFruit.harvestables.add(harvestable); FactoryRegistry.registerHarvestable(factoryFruit); } } @@ -259,7 +271,7 @@ public class Harvester { fruits.remove(key); } } - + @Override public boolean canUndo() { return true; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java index 989ae0a..47a326a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java @@ -6,15 +6,17 @@ package minetweaker.mc1710.brackets; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Set; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; -import minetweaker.mc1710.item.MCItemStack; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientAny; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import stanhebben.zenscript.ZenTokener; import stanhebben.zenscript.expression.ExpressionInt; @@ -33,10 +35,20 @@ import stanhebben.zenscript.util.ZenPosition; */ @BracketHandler(priority=100) public class ItemBracketHandler implements IBracketHandler { + private static final Map itemNames; + + static { + itemNames = new HashMap(); + for (String itemName : (Set) Item.itemRegistry.getKeys()) { + itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemName)); + } + } + public static IItemStack getItem(String name, int meta) { - Item item = (Item) Item.itemRegistry.getObject(name); + //Item item = (Item) Item.itemRegistry.getObject(name); + Item item = itemNames.get(name); if (item != null) { - return new MCItemStack(new ItemStack(item, 1, meta), true); + return getIItemStackWildcardSize(item, meta); } else { return null; } @@ -93,9 +105,9 @@ public class ItemBracketHandler implements IBracketHandler { valueBuilder.append(token.getValue()); } - Item item = (Item) Item.itemRegistry.getObject(valueBuilder.toString()); - if (item != null) { - return new ItemReferenceSymbol(valueBuilder.toString(), meta); + String itemName = valueBuilder.toString(); + if (itemNames.containsKey(itemName)) { + return new ItemReferenceSymbol(itemName, meta); } return null; diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java index 44afa21..27f89b0 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java @@ -6,7 +6,10 @@ package minetweaker.mc172.brackets; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Set; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; @@ -32,8 +35,18 @@ import stanhebben.zenscript.util.ZenPosition; */ @BracketHandler(priority=100) public class ItemBracketHandler implements IBracketHandler { + private static final Map itemNames; + + static { + itemNames = new HashMap(); + for (String itemName : (Set) Item.itemRegistry.getKeys()) { + itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemName)); + } + } + public static IItemStack getItem(String name, int meta) { - Item item = (Item) Item.itemRegistry.getObject(name); + //Item item = (Item) Item.itemRegistry.getObject(name); + Item item = itemNames.get(name); if (item != null) { return getIItemStackWildcardSize(item, meta); } else { @@ -92,9 +105,9 @@ public class ItemBracketHandler implements IBracketHandler { valueBuilder.append(token.getValue()); } - Item item = (Item) Item.itemRegistry.getObject(valueBuilder.toString()); - if (item != null) { - return new ItemReferenceSymbol(valueBuilder.toString(), meta); + String itemName = valueBuilder.toString(); + if (itemNames.containsKey(itemName)) { + return new ItemReferenceSymbol(itemName, meta); } return null; diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java index 5982f7a..b107170 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java @@ -104,4 +104,19 @@ public class MCPlayer implements IPlayer { (EntityPlayerMP) player); } } + + @Override + public boolean equals(Object other) { + if (other.getClass() != this.getClass()) + return false; + + return ((MCPlayer) other).player == player; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 23 * hash + (this.player != null ? this.player.hashCode() : 0); + return hash; + } }