diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index 3ac926a3..09e11a8a 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -7,6 +7,8 @@ import java.util.HashMap; import java.util.List; import java.util.logging.Logger; +import com.google.common.collect.HashBiMap; + import tconstruct.library.crafting.Detailing; import tconstruct.library.crafting.LiquidCasting; import tconstruct.library.crafting.ToolBuilder; @@ -17,10 +19,8 @@ import tconstruct.library.tools.CustomMaterial; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.TToolMaterial; -import tconstruct.library.util.TabTools; +import mantle.lib.TabTools; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -512,170 +512,170 @@ public class TConstructRegistry * 5: Has rotational TileEntity data * 6: Custom placement logic */ - public static Block[] drawbridgeState = new Block[Integer.MAX_VALUE]; + public static HashMap drawbridgeState = new HashMap(); /** Blocks that are interchangable with each other. Ex: Still and flowing water */ - public static ItemStack[] interchangableBlockMapping = new ItemStack[Integer.MAX_VALUE]; + public static HashMap interchangableBlockMapping = new HashMap (); /** Blocks that place items, and vice versa */ - public static Item[] blockToItemMapping = new Item[Integer.MAX_VALUE]; + public static HashBiMap blockToItemMapping; static void initializeDrawbridgeState () { //TODO fix this mess and move to TMech - /* drawbridgeState[Blocks.stone] = 1; - drawbridgeState[Blocks.grass] = 1; - drawbridgeState[Blocks.dirt] = 1; - drawbridgeState[Blocks.cobblestone] = 1; - drawbridgeState[Blocks.bedrock] = 2; - drawbridgeState[Blocks.water] = 1; - drawbridgeState[Blocks.lava] = 1; - drawbridgeState[Blocks.sand] = 1; - drawbridgeState[Blocks.gravel] = 1; - drawbridgeState[Blocks.gold_ore] = 1; - drawbridgeState[Blocks.iron_ore] = 1; - drawbridgeState[Blocks.coal_ore] = 1; - drawbridgeState[Blocks.sponge] = 1; - drawbridgeState[Blocks.lapis_ore] = 1; - drawbridgeState[Blocks.lapis_block] = 1; - drawbridgeState[Blocks.dispenser] = 3; - drawbridgeState[Blocks.music] = 1; - drawbridgeState[Blocks.bed] = 2; - drawbridgeState[Blocks.railPowered] = 4; - drawbridgeState[Blocks.railDetector] = 4; - drawbridgeState[Blocks.sticky_piston] = 3; - drawbridgeState[Blocks.web] = 1; - drawbridgeState[Blocks.piston] = 3; - drawbridgeState[Blocks.piston_extension] = 2; - drawbridgeState[Blocks.plantYellow] = 1; - drawbridgeState[Blocks.plantRed] = 1; - drawbridgeState[Blocks.mushroomBrown] = 1; - drawbridgeState[Blocks.mushroomRed] = 1; - drawbridgeState[Blocks.gold_block] = 1; - drawbridgeState[Blocks.iron_block] = 1; - drawbridgeState[Blocks.brick_block] = 1; - drawbridgeState[Blocks.tnt] = 1; - drawbridgeState[Blocks.bookshelf] = 1; - drawbridgeState[Blocks.mossy_cobblestone] = 1; - drawbridgeState[Blocks.obsidian] = 1; - drawbridgeState[Blocks.torchWood] = 1; - drawbridgeState[Blocks.fire] = 1; - drawbridgeState[Blocks.mobSpawner] = 2; - drawbridgeState[Blocks.stairsWoodOak] = 3; - drawbridgeState[Blocks.chest] = 5; - drawbridgeState[Blocks.redstoneWire] = 1; - blockToItemMapping[Blocks.redstoneWire] = Items.redstone; - blockToItemMapping[Items.redstone] = Blocks.redstoneWire; - drawbridgeState[Blocks.diamond_ore] = 1; - drawbridgeState[Blocks.diamond_block] = 1; - drawbridgeState[Blocks.crafting_table] = 1; - drawbridgeState[Blocks.crops] = 2; - drawbridgeState[Blocks.tilledField] = 1; - drawbridgeState[Blocks.furnaceIdle] = 3; - drawbridgeState[Blocks.furnaceBurning] = 3; - interchangableBlockMapping[Blocks.furnaceIdle] = Blocks.furnaceBurning; - interchangableBlockMapping[Blocks.furnaceBurning] = Blocks.furnaceIdle; - drawbridgeState[Blocks.tilledField] = 1; - drawbridgeState[Blocks.signPost] = 3; - drawbridgeState[Blocks.doorWood] = 2; - drawbridgeState[Blocks.ladder] = 1; - drawbridgeState[Blocks.rail] = 4; - drawbridgeState[Blocks.stairsCobblestone] = 3; - drawbridgeState[Blocks.signWall] = 3; - drawbridgeState[Blocks.lever] = 3; - drawbridgeState[Blocks.pressurePlateStone] = 1; - drawbridgeState[Blocks.doorIron] = 2; - drawbridgeState[Blocks.pressurePlatePlanks] = 1; - drawbridgeState[Blocks.oreRedstone] = 1; - drawbridgeState[Blocks.oreRedstoneGlowing] = 1; - drawbridgeState[Blocks.torchRedstoneIdle] = 1; - drawbridgeState[Blocks.torchRedstoneActive] = 1; - drawbridgeState[Blocks.stoneButton] = 3; - drawbridgeState[Blocks.snow] = 1; - drawbridgeState[Blocks.ice] = 1; - drawbridgeState[Blocks.blockSnow] = 1; - drawbridgeState[Blocks.cactus] = 2; - drawbridgeState[Blocks.blockClay] = 1; - drawbridgeState[Blocks.reed] = 1; - drawbridgeState[Blocks.jukebox] = 1; - drawbridgeState[Blocks.fence] = 1; - drawbridgeState[Blocks.pumpkin] = 1; - drawbridgeState[Blocks.netherrack] = 1; - drawbridgeState[Blocks.slowSand] = 1; - drawbridgeState[Blocks.glowStone] = 1; - drawbridgeState[Blocks.portal] = 2; - drawbridgeState[Blocks.pumpkinLantern] = 1; - drawbridgeState[Blocks.cake] = 2; - drawbridgeState[Blocks.redstoneRepeaterIdle] = 3; - drawbridgeState[Blocks.redstoneRepeaterActive] = 3; - interchangableBlockMapping[Blocks.redstoneRepeaterIdle] = Blocks.redstoneRepeaterActive; - interchangableBlockMapping[Blocks.redstoneRepeaterActive] = Blocks.redstoneRepeaterIdle; - blockToItemMapping[Blocks.redstoneRepeaterIdle] = Items.redstoneRepeater.itemID; - blockToItemMapping[Blocks.redstoneRepeaterActive] = Items.redstoneRepeater.itemID; - blockToItemMapping[Items.redstoneRepeater] = Blocks.redstoneRepeaterIdle; - drawbridgeState[Blocks.lockedChest] = 5; - drawbridgeState[Blocks.trapdoor] = 3; - drawbridgeState[Blocks.mushroomCapBrown] = 1; - drawbridgeState[Blocks.mushroomCapRed] = 1; - drawbridgeState[Blocks.fenceIron] = 1; - drawbridgeState[Blocks.thinGlass] = 1; - drawbridgeState[Blocks.melon] = 1; - drawbridgeState[Blocks.pumpkinStem] = 2; - drawbridgeState[Blocks.melonStem] = 2; - drawbridgeState[Blocks.vine] = 3; - drawbridgeState[Blocks.fenceGate] = 3; - drawbridgeState[Blocks.stairsBrick] = 3; - drawbridgeState[Blocks.stairsStoneBrick] = 3; - drawbridgeState[Blocks.mycelium] = 1; - drawbridgeState[Blocks.waterlily] = 1; - drawbridgeState[Blocks.netherBrick] = 1; - drawbridgeState[Blocks.netherFence] = 1; - drawbridgeState[Blocks.netherFence] = 3; - drawbridgeState[Blocks.netherStalk] = 2; - drawbridgeState[Blocks.enchantmentTable] = 1; - drawbridgeState[Blocks.brewingStand] = 1; - drawbridgeState[Blocks.cauldron] = 1; - drawbridgeState[Blocks.endPortal] = 2; - drawbridgeState[Blocks.dragonEgg] = 1; - drawbridgeState[Blocks.redstoneLampIdle] = 1; - drawbridgeState[Blocks.redstoneLampActive] = 1; - drawbridgeState[Blocks.cocoaPlant] = 2; - drawbridgeState[Blocks.stairsSandStone] = 3; - drawbridgeState[Blocks.oreEmerald] = 1; - drawbridgeState[Blocks.enderChest] = 5; - drawbridgeState[Blocks.tripWireSource] = 1; - drawbridgeState[Blocks.tripWire] = 1; - drawbridgeState[Blocks.blockEmerald] = 1; - drawbridgeState[Blocks.stairsWoodSpruce] = 3; - drawbridgeState[Blocks.stairsWoodBirch] = 3; - drawbridgeState[Blocks.stairsWoodJungle] = 3; - drawbridgeState[Blocks.commandBlock] = 1; - drawbridgeState[Blocks.beacon] = 1; - drawbridgeState[Blocks.cobblestoneWall] = 1; - drawbridgeState[Blocks.flowerPot] = 1; - drawbridgeState[Blocks.carrot] = 2; - drawbridgeState[Blocks.potato] = 1; - drawbridgeState[Blocks.woodenButton] = 3; - drawbridgeState[Blocks.skull] = 2; - drawbridgeState[Blocks.chestTrapped] = 5; - drawbridgeState[Blocks.pressurePlateGold] = 1; - drawbridgeState[Blocks.pressurePlateIron] = 1; - drawbridgeState[Blocks.redstoneComparatorIdle] = 1; - drawbridgeState[Blocks.redstoneComparatorActive] = 1; - interchangableBlockMapping[Blocks.redstoneComparatorIdle] = Blocks.redstoneComparatorActive; - interchangableBlockMapping[Blocks.redstoneComparatorActive] = Blocks.redstoneComparatorIdle; - blockToItemMapping[Blocks.redstoneComparatorIdle] = Items.comparator.itemID; - blockToItemMapping[Blocks.redstoneComparatorActive] = Items.comparator.itemID; - blockToItemMapping[Items.comparator] = Blocks.redstoneComparatorIdle; - drawbridgeState[Blocks.daylightSensor] = 1; - drawbridgeState[Blocks.blockRedstone] = 1; - drawbridgeState[Blocks.oreNetherQuartz] = 1; - drawbridgeState[Blocks.hopperBlock] = 3; - drawbridgeState[Blocks.blockNetherQuartz] = 1; - drawbridgeState[Blocks.stairsNetherQuartz] = 3; - drawbridgeState[Blocks.railActivator] = 4; - drawbridgeState[Blocks.dropper] = 3; - interchangableBlockMapping[Blocks.dirt] = Blocks.grass; - interchangableBlockMapping[Blocks.grass] = Blocks.dirt; - */ + /* drawbridgeState[Blocks.stone] = 1; + drawbridgeState[Blocks.grass] = 1; + drawbridgeState[Blocks.dirt] = 1; + drawbridgeState[Blocks.cobblestone] = 1; + drawbridgeState[Blocks.bedrock] = 2; + drawbridgeState[Blocks.water] = 1; + drawbridgeState[Blocks.lava] = 1; + drawbridgeState[Blocks.sand] = 1; + drawbridgeState[Blocks.gravel] = 1; + drawbridgeState[Blocks.gold_ore] = 1; + drawbridgeState[Blocks.iron_ore] = 1; + drawbridgeState[Blocks.coal_ore] = 1; + drawbridgeState[Blocks.sponge] = 1; + drawbridgeState[Blocks.lapis_ore] = 1; + drawbridgeState[Blocks.lapis_block] = 1; + drawbridgeState[Blocks.dispenser] = 3; + drawbridgeState[Blocks.music] = 1; + drawbridgeState[Blocks.bed] = 2; + drawbridgeState[Blocks.railPowered] = 4; + drawbridgeState[Blocks.railDetector] = 4; + drawbridgeState[Blocks.sticky_piston] = 3; + drawbridgeState[Blocks.web] = 1; + drawbridgeState[Blocks.piston] = 3; + drawbridgeState[Blocks.piston_extension] = 2; + drawbridgeState[Blocks.plantYellow] = 1; + drawbridgeState[Blocks.plantRed] = 1; + drawbridgeState[Blocks.mushroomBrown] = 1; + drawbridgeState[Blocks.mushroomRed] = 1; + drawbridgeState[Blocks.gold_block] = 1; + drawbridgeState[Blocks.iron_block] = 1; + drawbridgeState[Blocks.brick_block] = 1; + drawbridgeState[Blocks.tnt] = 1; + drawbridgeState[Blocks.bookshelf] = 1; + drawbridgeState[Blocks.mossy_cobblestone] = 1; + drawbridgeState[Blocks.obsidian] = 1; + drawbridgeState[Blocks.torchWood] = 1; + drawbridgeState[Blocks.fire] = 1; + drawbridgeState[Blocks.mobSpawner] = 2; + drawbridgeState[Blocks.stairsWoodOak] = 3; + drawbridgeState[Blocks.chest] = 5; + drawbridgeState[Blocks.redstoneWire] = 1; + blockToItemMapping[Blocks.redstoneWire] = Items.redstone; + blockToItemMapping[Items.redstone] = Blocks.redstoneWire; + drawbridgeState[Blocks.diamond_ore] = 1; + drawbridgeState[Blocks.diamond_block] = 1; + drawbridgeState[Blocks.crafting_table] = 1; + drawbridgeState[Blocks.crops] = 2; + drawbridgeState[Blocks.tilledField] = 1; + drawbridgeState[Blocks.furnaceIdle] = 3; + drawbridgeState[Blocks.furnaceBurning] = 3; + interchangableBlockMapping[Blocks.furnaceIdle] = Blocks.furnaceBurning; + interchangableBlockMapping[Blocks.furnaceBurning] = Blocks.furnaceIdle; + drawbridgeState[Blocks.tilledField] = 1; + drawbridgeState[Blocks.signPost] = 3; + drawbridgeState[Blocks.doorWood] = 2; + drawbridgeState[Blocks.ladder] = 1; + drawbridgeState[Blocks.rail] = 4; + drawbridgeState[Blocks.stairsCobblestone] = 3; + drawbridgeState[Blocks.signWall] = 3; + drawbridgeState[Blocks.lever] = 3; + drawbridgeState[Blocks.pressurePlateStone] = 1; + drawbridgeState[Blocks.doorIron] = 2; + drawbridgeState[Blocks.pressurePlatePlanks] = 1; + drawbridgeState[Blocks.oreRedstone] = 1; + drawbridgeState[Blocks.oreRedstoneGlowing] = 1; + drawbridgeState[Blocks.torchRedstoneIdle] = 1; + drawbridgeState[Blocks.torchRedstoneActive] = 1; + drawbridgeState[Blocks.stoneButton] = 3; + drawbridgeState[Blocks.snow] = 1; + drawbridgeState[Blocks.ice] = 1; + drawbridgeState[Blocks.blockSnow] = 1; + drawbridgeState[Blocks.cactus] = 2; + drawbridgeState[Blocks.blockClay] = 1; + drawbridgeState[Blocks.reed] = 1; + drawbridgeState[Blocks.jukebox] = 1; + drawbridgeState[Blocks.fence] = 1; + drawbridgeState[Blocks.pumpkin] = 1; + drawbridgeState[Blocks.netherrack] = 1; + drawbridgeState[Blocks.slowSand] = 1; + drawbridgeState[Blocks.glowStone] = 1; + drawbridgeState[Blocks.portal] = 2; + drawbridgeState[Blocks.pumpkinLantern] = 1; + drawbridgeState[Blocks.cake] = 2; + drawbridgeState[Blocks.redstoneRepeaterIdle] = 3; + drawbridgeState[Blocks.redstoneRepeaterActive] = 3; + interchangableBlockMapping[Blocks.redstoneRepeaterIdle] = Blocks.redstoneRepeaterActive; + interchangableBlockMapping[Blocks.redstoneRepeaterActive] = Blocks.redstoneRepeaterIdle; + blockToItemMapping[Blocks.redstoneRepeaterIdle] = Items.redstoneRepeater.itemID; + blockToItemMapping[Blocks.redstoneRepeaterActive] = Items.redstoneRepeater.itemID; + blockToItemMapping[Items.redstoneRepeater] = Blocks.redstoneRepeaterIdle; + drawbridgeState[Blocks.lockedChest] = 5; + drawbridgeState[Blocks.trapdoor] = 3; + drawbridgeState[Blocks.mushroomCapBrown] = 1; + drawbridgeState[Blocks.mushroomCapRed] = 1; + drawbridgeState[Blocks.fenceIron] = 1; + drawbridgeState[Blocks.thinGlass] = 1; + drawbridgeState[Blocks.melon] = 1; + drawbridgeState[Blocks.pumpkinStem] = 2; + drawbridgeState[Blocks.melonStem] = 2; + drawbridgeState[Blocks.vine] = 3; + drawbridgeState[Blocks.fenceGate] = 3; + drawbridgeState[Blocks.stairsBrick] = 3; + drawbridgeState[Blocks.stairsStoneBrick] = 3; + drawbridgeState[Blocks.mycelium] = 1; + drawbridgeState[Blocks.waterlily] = 1; + drawbridgeState[Blocks.netherBrick] = 1; + drawbridgeState[Blocks.netherFence] = 1; + drawbridgeState[Blocks.netherFence] = 3; + drawbridgeState[Blocks.netherStalk] = 2; + drawbridgeState[Blocks.enchantmentTable] = 1; + drawbridgeState[Blocks.brewingStand] = 1; + drawbridgeState[Blocks.cauldron] = 1; + drawbridgeState[Blocks.endPortal] = 2; + drawbridgeState[Blocks.dragonEgg] = 1; + drawbridgeState[Blocks.redstoneLampIdle] = 1; + drawbridgeState[Blocks.redstoneLampActive] = 1; + drawbridgeState[Blocks.cocoaPlant] = 2; + drawbridgeState[Blocks.stairsSandStone] = 3; + drawbridgeState[Blocks.oreEmerald] = 1; + drawbridgeState[Blocks.enderChest] = 5; + drawbridgeState[Blocks.tripWireSource] = 1; + drawbridgeState[Blocks.tripWire] = 1; + drawbridgeState[Blocks.blockEmerald] = 1; + drawbridgeState[Blocks.stairsWoodSpruce] = 3; + drawbridgeState[Blocks.stairsWoodBirch] = 3; + drawbridgeState[Blocks.stairsWoodJungle] = 3; + drawbridgeState[Blocks.commandBlock] = 1; + drawbridgeState[Blocks.beacon] = 1; + drawbridgeState[Blocks.cobblestoneWall] = 1; + drawbridgeState[Blocks.flowerPot] = 1; + drawbridgeState[Blocks.carrot] = 2; + drawbridgeState[Blocks.potato] = 1; + drawbridgeState[Blocks.woodenButton] = 3; + drawbridgeState[Blocks.skull] = 2; + drawbridgeState[Blocks.chestTrapped] = 5; + drawbridgeState[Blocks.pressurePlateGold] = 1; + drawbridgeState[Blocks.pressurePlateIron] = 1; + drawbridgeState[Blocks.redstoneComparatorIdle] = 1; + drawbridgeState[Blocks.redstoneComparatorActive] = 1; + interchangableBlockMapping[Blocks.redstoneComparatorIdle] = Blocks.redstoneComparatorActive; + interchangableBlockMapping[Blocks.redstoneComparatorActive] = Blocks.redstoneComparatorIdle; + blockToItemMapping[Blocks.redstoneComparatorIdle] = Items.comparator.itemID; + blockToItemMapping[Blocks.redstoneComparatorActive] = Items.comparator.itemID; + blockToItemMapping[Items.comparator] = Blocks.redstoneComparatorIdle; + drawbridgeState[Blocks.daylightSensor] = 1; + drawbridgeState[Blocks.blockRedstone] = 1; + drawbridgeState[Blocks.oreNetherQuartz] = 1; + drawbridgeState[Blocks.hopperBlock] = 3; + drawbridgeState[Blocks.blockNetherQuartz] = 1; + drawbridgeState[Blocks.stairsNetherQuartz] = 3; + drawbridgeState[Blocks.railActivator] = 4; + drawbridgeState[Blocks.dropper] = 3; + interchangableBlockMapping[Blocks.dirt] = Blocks.grass; + interchangableBlockMapping[Blocks.grass] = Blocks.dirt; + */ } static