From 5d624c7c50b5d27640c076db6c21a9881dce69fc Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 19 Nov 2016 23:12:22 +0100 Subject: [PATCH] snake_cased all items and their names --- .../mod/blocks/BlockColoredLamp.java | 2 +- .../mod/blocks/BlockCrystal.java | 2 +- .../mod/blocks/BlockInputter.java | 2 +- .../mod/blocks/BlockMisc.java | 2 +- .../mod/blocks/InitBlocks.java | 176 ++-- .../metalists/TheColoredLampColors.java | 42 +- .../mod/blocks/metalists/TheMiscBlocks.java | 20 +- .../mod/booklet/InitBooklet.java | 24 +- .../mod/booklet/gui/GuiBooklet.java | 4 +- .../mod/crafting/BlockCrafting.java | 2 +- .../mod/crafting/ItemCrafting.java | 2 +- .../mod/inventory/gui/GuiBag.java | 4 +- .../mod/inventory/gui/GuiBioReactor.java | 2 +- .../mod/inventory/gui/GuiBreaker.java | 2 +- .../mod/inventory/gui/GuiCanolaPress.java | 2 +- .../mod/inventory/gui/GuiCoalGenerator.java | 2 +- .../mod/inventory/gui/GuiCoffeeMachine.java | 2 +- .../inventory/gui/GuiDirectionalBreaker.java | 2 +- .../mod/inventory/gui/GuiDrill.java | 2 +- .../mod/inventory/gui/GuiDropper.java | 2 +- .../mod/inventory/gui/GuiEnergizer.java | 2 +- .../mod/inventory/gui/GuiEnervator.java | 2 +- .../mod/inventory/gui/GuiFarmer.java | 2 +- .../mod/inventory/gui/GuiFeeder.java | 2 +- .../inventory/gui/GuiFermentingBarrel.java | 2 +- .../mod/inventory/gui/GuiFilter.java | 2 +- .../mod/inventory/gui/GuiFluidCollector.java | 2 +- .../mod/inventory/gui/GuiFurnaceDouble.java | 2 +- .../mod/inventory/gui/GuiGiantChest.java | 2 +- .../mod/inventory/gui/GuiGrinder.java | 4 +- .../mod/inventory/gui/GuiInputter.java | 8 +- .../gui/GuiLaserRelayItemWhitelist.java | 2 +- .../mod/inventory/gui/GuiMiner.java | 2 +- .../mod/inventory/gui/GuiOilGenerator.java | 2 +- .../mod/inventory/gui/GuiPhantomPlacer.java | 2 +- .../mod/inventory/gui/GuiRangedCollector.java | 2 +- .../mod/inventory/gui/GuiRepairer.java | 2 +- .../mod/inventory/gui/GuiSmileyCloud.java | 2 +- .../mod/inventory/gui/GuiXPSolidifier.java | 2 +- .../mod/items/InitItems.java | 306 +++---- .../mod/items/ItemCrystal.java | 4 +- .../mod/items/ItemDrill.java | 2 +- .../actuallyadditions/mod/items/ItemDust.java | 2 +- .../mod/items/ItemFoods.java | 4 +- .../actuallyadditions/mod/items/ItemJams.java | 2 +- .../actuallyadditions/mod/items/ItemMisc.java | 4 +- .../mod/items/metalists/TheCrystals.java | 12 +- .../mod/items/metalists/TheDusts.java | 16 +- .../mod/items/metalists/TheFoods.java | 42 +- .../mod/items/metalists/TheJams.java | 14 +- .../mod/items/metalists/TheMiscItems.java | 52 +- .../coffee/CoffeeMachineRecipeCategory.java | 2 +- .../jei/crusher/CrusherRecipeCategory.java | 2 +- .../empowerer/EmpowererRecipeCategory.java | 2 +- .../ReconstructorRecipeCategory.java | 2 +- .../mod/misc/SoundHandler.java | 4 +- .../actuallyadditions/mod/util/AssetUtil.java | 2 +- .../actuallyadditions/mod/util/ItemUtil.java | 16 +- .../assets/actuallyadditions/lang/en_US.lang | 810 +++++++++--------- .../assets/actuallyadditions/sounds.json | 4 +- 60 files changed, 824 insertions(+), 824 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index a8270c8a2..5450bd817 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -160,7 +160,7 @@ public class BlockColoredLamp extends BlockBase{ @Override public String getUnlocalizedName(ItemStack stack){ - return InitBlocks.blockColoredLamp.getUnlocalizedName()+ALL_LAMP_TYPES[stack.getItemDamage()].name; + return InitBlocks.blockColoredLamp.getUnlocalizedName()+"_"+ALL_LAMP_TYPES[stack.getItemDamage()].regName; } } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 80c98edc4..6fd06d7bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -89,7 +89,7 @@ public class BlockCrystal extends BlockBase{ @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_CRYSTALS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+"_"+ALL_CRYSTALS[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java index 47fe66827..120122221 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -124,7 +124,7 @@ public class BlockInputter extends BlockContainerBase{ this.toPick = this.rand.nextInt(NAME_FLAVOR_AMOUNTS)+1; } - return StringUtil.localize(this.getUnlocalizedName()+".name")+" ("+StringUtil.localize("tile."+ModUtil.MOD_ID+".blockInputter.add."+this.toPick+".name")+")"; + return StringUtil.localize(this.getUnlocalizedName()+".name")+" ("+StringUtil.localize("tile."+ModUtil.MOD_ID+".block_inputter.add."+this.toPick+".name")+")"; } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java index 4e7e9b75d..b84c9bb3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -87,7 +87,7 @@ public class BlockMisc extends BlockBase{ @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= ALL_MISC_BLOCKS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_MISC_BLOCKS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_MISC_BLOCKS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+"_"+ALL_MISC_BLOCKS[stack.getItemDamage()].name; } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index 55ffa4519..9e4ae0b65 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -112,97 +112,97 @@ public final class InitBlocks{ public static void init(){ ModUtil.LOGGER.info("Initializing Blocks..."); - blockFarmer = new BlockFarmer("blockFarmer"); - blockBioReactor = new BlockBioReactor("blockBioReactor"); - blockDistributorItem = new BlockDistributorItem("blockDistributorItem"); - blockEmpowerer = new BlockEmpowerer("blockEmpowerer"); - blockTinyTorch = new BlockTinyTorch("blockTinyTorch"); - blockShockSuppressor = new BlockShockSuppressor("blockShockSuppressor"); - blockDisplayStand = new BlockDisplayStand("blockDisplayStand"); - blockPlayerInterface = new BlockPlayerInterface("blockPlayerInterface"); - blockItemViewer = new BlockItemViewer("blockItemViewer"); - blockFireworkBox = new BlockFireworkBox("blockFireworkBox"); - blockMiner = new BlockMiner("blockMiner"); - blockAtomicReconstructor = new BlockAtomicReconstructor("blockAtomicReconstructor"); - blockCrystal = new BlockCrystal("blockCrystal", false); - blockCrystalEmpowered = new BlockCrystal("blockCrystalEmpowered", true); - blockBlackLotus = new BlockBlackLotus("blockBlackLotus"); - blockLaserRelay = new BlockLaserRelay("blockLaserRelay", Type.ENERGY_BASIC); - blockLaserRelayAdvanced = new BlockLaserRelay("blockLaserRelayAdvanced", Type.ENERGY_ADVANCED); - blockLaserRelayExtreme = new BlockLaserRelay("blockLaserRelayExtreme", Type.ENERGY_EXTREME); - blockLaserRelayFluids = new BlockLaserRelay("blockLaserRelayFluids", Type.FLUIDS); - blockLaserRelayItem = new BlockLaserRelay("blockLaserRelayItem", Type.ITEM); - blockLaserRelayItemWhitelist = new BlockLaserRelay("blockLaserRelayItemWhitelist", Type.ITEM_WHITELIST); - blockRangedCollector = new BlockRangedCollector("blockRangedCollector"); - blockDirectionalBreaker = new BlockDirectionalBreaker("blockDirectionalBreaker"); - blockLeafGenerator = new BlockLeafGenerator("blockLeafGenerator"); - blockSmileyCloud = new BlockSmileyCloud("blockSmileyCloud"); - blockXPSolidifier = new BlockXPSolidifier("blockXPSolidifier"); - blockTestifiBucksGreenWall = new BlockGeneric("blockTestifiBucksGreenWall"); - blockTestifiBucksWhiteWall = new BlockGeneric("blockTestifiBucksWhiteWall"); - blockTestifiBucksGreenStairs = new BlockStair(blockTestifiBucksGreenWall, "blockTestifiBucksGreenStairs"); - blockTestifiBucksWhiteStairs = new BlockStair(blockTestifiBucksWhiteWall, "blockTestifiBucksWhiteStairs"); - blockTestifiBucksGreenSlab = new BlockSlabs("blockTestifiBucksGreenSlab", blockTestifiBucksGreenWall); - blockTestifiBucksWhiteSlab = new BlockSlabs("blockTestifiBucksWhiteSlab", blockTestifiBucksWhiteWall); - blockTestifiBucksGreenFence = new BlockWallAA("blockTestifiBucksGreenFence", blockTestifiBucksGreenWall); - blockTestifiBucksWhiteFence = new BlockWallAA("blockTestifiBucksWhiteFence", blockTestifiBucksWhiteWall); - blockColoredLamp = new BlockColoredLamp(false, "blockColoredLamp"); - blockColoredLampOn = new BlockColoredLamp(true, "blockColoredLampOn"); - blockLampPowerer = new BlockLampPowerer("blockLampPowerer"); - blockTreasureChest = new BlockTreasureChest("blockTreasureChest"); - blockEnergizer = new BlockEnergizer(true, "blockEnergizer"); - blockEnervator = new BlockEnergizer(false, "blockEnervator"); - blockLavaFactoryController = new BlockLavaFactoryController("blockLavaFactoryController"); - blockCanolaPress = new BlockCanolaPress("blockCanolaPress"); - blockPhantomface = new BlockPhantom(BlockPhantom.Type.FACE, "blockPhantomface"); - blockPhantomPlacer = new BlockPhantom(BlockPhantom.Type.PLACER, "blockPhantomPlacer"); - blockPhantomLiquiface = new BlockPhantom(BlockPhantom.Type.LIQUIFACE, "blockPhantomLiquiface"); - blockPhantomEnergyface = new BlockPhantom(BlockPhantom.Type.ENERGYFACE, "blockPhantomEnergyface"); - blockPhantomRedstoneface = new BlockPhantom(BlockPhantom.Type.REDSTONEFACE, "blockPhantomRedstoneface"); - blockPhantomBreaker = new BlockPhantom(BlockPhantom.Type.BREAKER, "blockPhantomBreaker"); - blockCoalGenerator = new BlockCoalGenerator("blockCoalGenerator"); - blockOilGenerator = new BlockOilGenerator("blockOilGenerator"); - blockFermentingBarrel = new BlockFermentingBarrel("blockFermentingBarrel"); - blockRice = new BlockPlant("blockRice", 1, 2); + blockFarmer = new BlockFarmer("block_farmer"); + blockBioReactor = new BlockBioReactor("block_bio_reactor"); + blockDistributorItem = new BlockDistributorItem("block_distributor_item"); + blockEmpowerer = new BlockEmpowerer("block_empowerer"); + blockTinyTorch = new BlockTinyTorch("block_tiny_torch"); + blockShockSuppressor = new BlockShockSuppressor("block_shock_suppressor"); + blockDisplayStand = new BlockDisplayStand("block_display_stand"); + blockPlayerInterface = new BlockPlayerInterface("block_player_interface"); + blockItemViewer = new BlockItemViewer("block_item_viewer"); + blockFireworkBox = new BlockFireworkBox("block_firework_box"); + blockMiner = new BlockMiner("block_miner"); + blockAtomicReconstructor = new BlockAtomicReconstructor("block_atomic_reconstructor"); + blockCrystal = new BlockCrystal("block_crystal", false); + blockCrystalEmpowered = new BlockCrystal("block_crystal_empowered", true); + blockBlackLotus = new BlockBlackLotus("block_black_lotus"); + blockLaserRelay = new BlockLaserRelay("block_laser_relay", Type.ENERGY_BASIC); + blockLaserRelayAdvanced = new BlockLaserRelay("block_laser_relay_advanced", Type.ENERGY_ADVANCED); + blockLaserRelayExtreme = new BlockLaserRelay("block_laser_relay_extreme", Type.ENERGY_EXTREME); + blockLaserRelayFluids = new BlockLaserRelay("block_laser_relay_fluids", Type.FLUIDS); + blockLaserRelayItem = new BlockLaserRelay("block_laser_relay_item", Type.ITEM); + blockLaserRelayItemWhitelist = new BlockLaserRelay("block_laser_relay_item_whitelist", Type.ITEM_WHITELIST); + blockRangedCollector = new BlockRangedCollector("block_ranged_collector"); + blockDirectionalBreaker = new BlockDirectionalBreaker("block_directional_breaker"); + blockLeafGenerator = new BlockLeafGenerator("block_leaf_generator"); + blockSmileyCloud = new BlockSmileyCloud("block_smiley_cloud"); + blockXPSolidifier = new BlockXPSolidifier("block_xp_solidifier"); + blockTestifiBucksGreenWall = new BlockGeneric("block_testifi_bucks_green_wall"); + blockTestifiBucksWhiteWall = new BlockGeneric("block_testifi_bucks_white_wall"); + blockTestifiBucksGreenStairs = new BlockStair(blockTestifiBucksGreenWall, "block_testifi_bucks_green_stairs"); + blockTestifiBucksWhiteStairs = new BlockStair(blockTestifiBucksWhiteWall, "block_testifi_bucks_white_stairs"); + blockTestifiBucksGreenSlab = new BlockSlabs("block_testifi_bucks_green_slab", blockTestifiBucksGreenWall); + blockTestifiBucksWhiteSlab = new BlockSlabs("block_testifi_bucks_white_slab", blockTestifiBucksWhiteWall); + blockTestifiBucksGreenFence = new BlockWallAA("block_testifi_bucks_green_fence", blockTestifiBucksGreenWall); + blockTestifiBucksWhiteFence = new BlockWallAA("block_testifi_bucks_white_fence", blockTestifiBucksWhiteWall); + blockColoredLamp = new BlockColoredLamp(false, "block_colored_lamp"); + blockColoredLampOn = new BlockColoredLamp(true, "block_colored_lamp_on"); + blockLampPowerer = new BlockLampPowerer("block_lamp_powerer"); + blockTreasureChest = new BlockTreasureChest("block_treasure_chest"); + blockEnergizer = new BlockEnergizer(true, "block_energizer"); + blockEnervator = new BlockEnergizer(false, "block_enervator"); + blockLavaFactoryController = new BlockLavaFactoryController("block_lava_factory_controller"); + blockCanolaPress = new BlockCanolaPress("block_canola_press"); + blockPhantomface = new BlockPhantom(BlockPhantom.Type.FACE, "block_phantomface"); + blockPhantomPlacer = new BlockPhantom(BlockPhantom.Type.PLACER, "block_phantom_placer"); + blockPhantomLiquiface = new BlockPhantom(BlockPhantom.Type.LIQUIFACE, "block_phantom_liquiface"); + blockPhantomEnergyface = new BlockPhantom(BlockPhantom.Type.ENERGYFACE, "block_phantom_energyface"); + blockPhantomRedstoneface = new BlockPhantom(BlockPhantom.Type.REDSTONEFACE, "block_phantom_redstoneface"); + blockPhantomBreaker = new BlockPhantom(BlockPhantom.Type.BREAKER, "block_phantom_breaker"); + blockCoalGenerator = new BlockCoalGenerator("block_coal_generator"); + blockOilGenerator = new BlockOilGenerator("block_oil_generator"); + blockFermentingBarrel = new BlockFermentingBarrel("block_fermenting_barrel"); + blockRice = new BlockPlant("block_rice", 1, 2); CompatUtil.registerMFRPlant(blockRice); - blockCanola = new BlockPlant("blockCanola", 2, 3); + blockCanola = new BlockPlant("block_canola", 2, 3); CompatUtil.registerMFRPlant(blockCanola); - blockFlax = new BlockPlant("blockFlax", 2, 4); + blockFlax = new BlockPlant("block_flax", 2, 4); CompatUtil.registerMFRPlant(blockFlax); - blockCoffee = new BlockPlant("blockCoffee", 2, 2); + blockCoffee = new BlockPlant("block_coffee", 2, 2); CompatUtil.registerMFRPlant(blockCoffee); - blockCompost = new BlockCompost("blockCompost"); - blockMisc = new BlockMisc("blockMisc"); - blockFeeder = new BlockFeeder("blockFeeder"); - blockGiantChest = new BlockGiantChest("blockGiantChest", 0); - blockGiantChestMedium = new BlockGiantChest("blockGiantChestMedium", 1); - blockGiantChestLarge = new BlockGiantChest("blockGiantChestLarge", 2); - blockGrinder = new BlockGrinder(false, "blockGrinder"); - blockGrinderDouble = new BlockGrinder(true, "blockGrinderDouble"); - blockFurnaceDouble = new BlockFurnaceDouble("blockFurnaceDouble"); - blockInputter = new BlockInputter(false, "blockInputter"); - blockInputterAdvanced = new BlockInputter(true, "blockInputterAdvanced"); - blockFishingNet = new BlockFishingNet("blockFishingNet"); - blockFurnaceSolar = new BlockFurnaceSolar("blockFurnaceSolar"); - blockHeatCollector = new BlockHeatCollector("blockHeatCollector"); - blockItemRepairer = new BlockItemRepairer("blockItemRepairer"); - blockGreenhouseGlass = new BlockGreenhouseGlass("blockGreenhouseGlass"); - blockBreaker = new BlockBreaker(false, "blockBreaker"); - blockPlacer = new BlockBreaker(true, "blockPlacer"); - blockDropper = new BlockDropper("blockDropper"); - blockFluidPlacer = new BlockFluidCollector(true, "blockFluidPlacer"); - blockFluidCollector = new BlockFluidCollector(false, "blockFluidCollector"); - blockCoffeeMachine = new BlockCoffeeMachine("blockCoffeeMachine"); - blockPhantomBooster = new BlockPhantomBooster("blockPhantomBooster"); - blockWildPlant = new BlockWildPlant("blockWild"); - blockQuartzWall = new BlockWallAA("blockQuartzWall", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); - blockChiseledQuartzWall = new BlockWallAA("blockChiseledQuartzWall", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); - blockPillarQuartzWall = new BlockWallAA("blockPillarQuartzWall", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); - blockQuartzStair = new BlockStair(blockMisc, "blockQuartzStair", TheMiscBlocks.QUARTZ.ordinal()); - blockChiseledQuartzStair = new BlockStair(blockMisc, "blockChiseledQuartzStair", TheMiscBlocks.QUARTZ_CHISELED.ordinal()); - blockPillarQuartzStair = new BlockStair(blockMisc, "blockPillarQuartzStair", TheMiscBlocks.QUARTZ_PILLAR.ordinal()); - blockQuartzSlab = new BlockSlabs("blockQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); - blockChiseledQuartzSlab = new BlockSlabs("blockChiseledQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); - blockPillarQuartzSlab = new BlockSlabs("blockPillarQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); + blockCompost = new BlockCompost("block_compost"); + blockMisc = new BlockMisc("block_misc"); + blockFeeder = new BlockFeeder("block_feeder"); + blockGiantChest = new BlockGiantChest("block_giant_chest", 0); + blockGiantChestMedium = new BlockGiantChest("block_giant_chest_medium", 1); + blockGiantChestLarge = new BlockGiantChest("block_giant_chest_large", 2); + blockGrinder = new BlockGrinder(false, "block_grinder"); + blockGrinderDouble = new BlockGrinder(true, "block_grinder_double"); + blockFurnaceDouble = new BlockFurnaceDouble("block_furnace_double"); + blockInputter = new BlockInputter(false, "block_inputter"); + blockInputterAdvanced = new BlockInputter(true, "block_inputter_advanced"); + blockFishingNet = new BlockFishingNet("block_fishing_net"); + blockFurnaceSolar = new BlockFurnaceSolar("block_furnace_solar"); + blockHeatCollector = new BlockHeatCollector("block_heat_collector"); + blockItemRepairer = new BlockItemRepairer("block_item_repairer"); + blockGreenhouseGlass = new BlockGreenhouseGlass("block_greenhouse_glass"); + blockBreaker = new BlockBreaker(false, "block_breaker"); + blockPlacer = new BlockBreaker(true, "block_placer"); + blockDropper = new BlockDropper("block_dropper"); + blockFluidPlacer = new BlockFluidCollector(true, "block_fluid_placer"); + blockFluidCollector = new BlockFluidCollector(false, "block_fluid_collector"); + blockCoffeeMachine = new BlockCoffeeMachine("block_coffee_machine"); + blockPhantomBooster = new BlockPhantomBooster("block_phantom_booster"); + blockWildPlant = new BlockWildPlant("block_wild"); + blockQuartzWall = new BlockWallAA("block_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); + blockChiseledQuartzWall = new BlockWallAA("block_chiseled_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); + blockPillarQuartzWall = new BlockWallAA("block_pillar_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); + blockQuartzStair = new BlockStair(blockMisc, "block_quartz_stair", TheMiscBlocks.QUARTZ.ordinal()); + blockChiseledQuartzStair = new BlockStair(blockMisc, "block_chiseled_quartz_stair", TheMiscBlocks.QUARTZ_CHISELED.ordinal()); + blockPillarQuartzStair = new BlockStair(blockMisc, "block_pillar_quartz_stair", TheMiscBlocks.QUARTZ_PILLAR.ordinal()); + blockQuartzSlab = new BlockSlabs("block_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); + blockChiseledQuartzSlab = new BlockSlabs("block_chiseled_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); + blockPillarQuartzSlab = new BlockSlabs("block_pillar_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java index cf8e39efa..10d0607df 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java @@ -12,34 +12,36 @@ package de.ellpeck.actuallyadditions.mod.blocks.metalists; public enum TheColoredLampColors{ - WHITE("White"), - ORANGE("Orange"), - MAGENTA("Magenta"), - LIGHT_BLUE("LightBlue"), - YELLOW("Yellow"), - LIME("Lime"), - PINK("Pink"), - GRAY("Gray"), - LIGHT_GRAY("LightGray"), - CYAN("Cyan"), - PURPLE("Purple"), - BLUE("Blue"), - BROWN("Brown"), - GREEN("Green"), - RED("Red"), - BLACK("Black"); + WHITE("White", "white"), + ORANGE("Orange", "orange"), + MAGENTA("Magenta", "magenta"), + LIGHT_BLUE("LightBlue", "light_blue"), + YELLOW("Yellow", "yellow"), + LIME("Lime", "lime"), + PINK("Pink", "pink"), + GRAY("Gray", "gray"), + LIGHT_GRAY("LightGray", "light_gray"), + CYAN("Cyan", "cyan"), + PURPLE("Purple", "purple"), + BLUE("Blue", "blue"), + BROWN("Brown", "brown"), + GREEN("Green", "green"), + RED("Red", "red"), + BLACK("Black", "black"); - public final String name; + public final String regName; + public final String oreName; - TheColoredLampColors(String name){ - this.name = name; + TheColoredLampColors(String oreName, String regName){ + this.oreName = oreName; + this.regName = regName; } public static TheColoredLampColors getColorFromDyeName(String color){ if(color.substring(0, 3).equals("dye")){ String actualName = color.substring(3); for(int i = 0; i < values().length; i++){ - String aName = values()[i].name; + String aName = values()[i].oreName; if(aName != null){ if(aName.equalsIgnoreCase(actualName)){ return values()[i]; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java index ecfad5592..9001c3928 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java @@ -14,16 +14,16 @@ import net.minecraft.item.EnumRarity; public enum TheMiscBlocks{ - QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.RARE), - QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.RARE), - QUARTZ("BlackQuartz", EnumRarity.RARE), - ORE_QUARTZ("OreBlackQuartz", EnumRarity.EPIC), - WOOD_CASING("WoodCasing", EnumRarity.COMMON), - CHARCOAL_BLOCK("Charcoal", EnumRarity.COMMON), - ENDERPEARL_BLOCK("Enderpearl", EnumRarity.RARE), - LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.UNCOMMON), - ENDER_CASING("EnderCasing", EnumRarity.EPIC), - IRON_CASING("IronCasing", EnumRarity.RARE); + QUARTZ_PILLAR("black_quartz_pillar", EnumRarity.RARE), + QUARTZ_CHISELED("black_quartz_chiseled", EnumRarity.RARE), + QUARTZ("black_quartz", EnumRarity.RARE), + ORE_QUARTZ("ore_black_quartz", EnumRarity.EPIC), + WOOD_CASING("wood_casing", EnumRarity.COMMON), + CHARCOAL_BLOCK("charcoal", EnumRarity.COMMON), + ENDERPEARL_BLOCK("enderpearl", EnumRarity.RARE), + LAVA_FACTORY_CASE("lava_factory_case", EnumRarity.UNCOMMON), + ENDER_CASING("ender_casing", EnumRarity.EPIC), + IRON_CASING("iron_casing", EnumRarity.RARE); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index cef1e72a2..c5aee82d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -108,7 +108,7 @@ public final class InitBooklet{ chaptersIntroduction[1] = new BookletChapter("videoGuide", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.YOUTUBE_ICON.ordinal()), new PageLinkButton(1, "https://www.youtube.com/watch?v=fhjz0Ew56pM")).setImportant(); new BookletChapter("intro", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3)); ArrayList crystalPages = new ArrayList(); - crystalPages.addAll(Arrays.asList(new PageTextOnly(1).addTextReplacement("", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setWildcard())); + crystalPages.addAll(Arrays.asList(new PageTextOnly(1).addTextReplacement("", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "page_atomic_reconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setWildcard())); for(int i = 0; i < LensRecipeHandler.MAIN_PAGE_RECIPES.size(); i++){ crystalPages.add(new PageReconstructor(7+i, LensRecipeHandler.MAIN_PAGE_RECIPES.get(i)).setNoText()); } @@ -117,7 +117,7 @@ public final class InitBooklet{ chaptersIntroduction[5] = new BookletChapter("crystals", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), crystalPages.toArray(new BookletPage[crystalPages.size()])).setSpecial(); chaptersIntroduction[4] = new BookletChapter("coalGen", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).setWildcard().addTextReplacement("", TileEntityCoalGenerator.PRODUCE)); ArrayList empowererPages = new ArrayList(); - empowererPages.addAll(Arrays.asList(new PageTextOnly(1), new PagePicture(2, "pageEmpowerer", 137), new PageCrafting(3, BlockCrafting.recipeEmpowerer), new PageCrafting(4, BlockCrafting.recipeDisplayStand))); + empowererPages.addAll(Arrays.asList(new PageTextOnly(1), new PagePicture(2, "page_empowerer", 137), new PageCrafting(3, BlockCrafting.recipeEmpowerer), new PageCrafting(4, BlockCrafting.recipeDisplayStand))); for(int i = 0; i < EmpowererHandler.MAIN_PAGE_RECIPES.size(); i++){ empowererPages.add(new PageEmpowerer(7+i, EmpowererHandler.MAIN_PAGE_RECIPES.get(i)).setNoText()); } @@ -128,7 +128,7 @@ public final class InitBooklet{ chaptersIntroduction[3] = new BookletChapter("rf", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(Items.REDSTONE), new PageTextOnly(1)); //Miscellaneous - new BookletChapter("worms", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemWorm), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemWorm)), new PagePicture(2, "pageWorms", 145)).setImportant(); + new BookletChapter("worms", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemWorm), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemWorm)), new PagePicture(2, "page_worms", 145)).setImportant(); new BookletChapter("banners", ActuallyAdditionsAPI.entryMisc, new ItemStack(Items.BANNER, 1, 15), new PageTextOnly(1)); new BookletChapter("miscDecorStuffsAndThings", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTestifiBucksGreenWall), new PageTextOnly(1), new PageReconstructor(2, LensRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensRecipeHandler.recipeGreenWall).setNoText()); chaptersIntroduction[2] = new BookletChapter("quartz", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).addItemToPage(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("", OreGen.QUARTZ_MIN).addTextReplacement("", OreGen.QUARTZ_MAX), new PageTextOnly(2).addItemToPage(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText()); @@ -145,9 +145,9 @@ public final class InitBooklet{ new BookletChapter("enderStar", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.ENDER_STAR.ordinal()), new PageCrafting(1, ItemCrafting.recipeEnderStar)); new BookletChapter("spawnerShard", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.SPAWNER_SHARD.ordinal()), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.SPAWNER_SHARD.ordinal()))); - new BookletChapter("treasureChest", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTreasureChest), new PagePicture(1, "pageTreasureChest", 150).addItemToPage(new ItemStack(InitBlocks.blockTreasureChest)), new PageTextOnly(2)).setSpecial(); - new BookletChapter("lushCaves", ActuallyAdditionsAPI.entryMisc, new ItemStack(Blocks.STONE), new PageTextOnly(1), new PagePicture(2, "pageLushCaves", 0).setNoText()); - new BookletChapter("hairBalls", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemHairyBall), new PagePicture(1, "pageFurBalls", 110).addItemToPage(new ItemStack(InitItems.itemHairyBall)), new PageTextOnly(2)).setSpecial(); + new BookletChapter("treasureChest", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTreasureChest), new PagePicture(1, "page_treasure_chest", 150).addItemToPage(new ItemStack(InitBlocks.blockTreasureChest)), new PageTextOnly(2)).setSpecial(); + new BookletChapter("lushCaves", ActuallyAdditionsAPI.entryMisc, new ItemStack(Blocks.STONE), new PageTextOnly(1), new PagePicture(2, "page_lush_caves", 0).setNoText()); + new BookletChapter("hairBalls", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemHairyBall), new PagePicture(1, "page_fur_balls", 110).addItemToPage(new ItemStack(InitItems.itemHairyBall)), new PageTextOnly(2)).setSpecial(); new BookletChapter("blackLotus", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockBlackLotus), new PageTextOnly(1).addItemToPage(new ItemStack(InitBlocks.blockBlackLotus)), new PageCrafting(2, ItemCrafting.recipeBlackDye)); new BookletChapter("waterBowl", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemWaterBowl), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemWaterBowl))); new BookletChapter("tinyTorch", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTinyTorch), new PageCrafting(1, BlockCrafting.recipesTinyTorch).setWildcard()).setSpecial(); @@ -164,8 +164,8 @@ public final class InitBooklet{ //Laser Relays chaptersIntroduction[7] = new BookletChapter("laserIntro", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitItems.itemLaserWrench), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("", TileEntityLaserRelay.MAX_DISTANCE), new PageCrafting(3, ItemCrafting.recipeLaserWrench).setNoText()).setImportant(); - new BookletChapter("laserRelays", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitBlocks.blockLaserRelay), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("", TileEntityLaserRelayEnergy.CAP).addTextReplacement("", TileEntityLaserRelayEnergyAdvanced.CAP).addTextReplacement("", TileEntityLaserRelayEnergyExtreme.CAP), new PagePicture(3, "pageLaserRelay", 0).setNoText(), new PageCrafting(4, BlockCrafting.recipeLaserRelay).setWildcard().setNoText(), new PageCrafting(5, BlockCrafting.recipeLaserRelayAdvanced).setWildcard().setNoText(), new PageCrafting(6, BlockCrafting.recipeLaserRelayExtreme).setWildcard().setNoText()); - new BookletChapter("itemStorage", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitBlocks.blockLaserRelayItemWhitelist), new PageTextOnly(1), new PageTextOnly(2), new PagePicture(3, "pageItemLaserRelayBasic", 78), new PagePicture(4, "pageItemLaserRelayFail", 84), new PagePicture(5, "pageItemLaserRelayTransfer", 78), new PagePicture(6, "pageItemLaserRelayWhitelistChest", 76), new PagePicture(7, "pageItemLaserRelayWhitelistInterface", 75), new PagePicture(8, "pageItemLaserRelaySystem", 75), new PageTextOnly(9), new PageCrafting(10, BlockCrafting.recipeLaserRelayItem).setWildcard().setNoText(), new PageCrafting(11, BlockCrafting.recipeLaserRelayItemWhitelist).setWildcard().setNoText(), new PageCrafting(12, BlockCrafting.recipeItemInterface).setNoText()); + new BookletChapter("laserRelays", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitBlocks.blockLaserRelay), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("", TileEntityLaserRelayEnergy.CAP).addTextReplacement("", TileEntityLaserRelayEnergyAdvanced.CAP).addTextReplacement("", TileEntityLaserRelayEnergyExtreme.CAP), new PagePicture(3, "page_laser_relay", 0).setNoText(), new PageCrafting(4, BlockCrafting.recipeLaserRelay).setWildcard().setNoText(), new PageCrafting(5, BlockCrafting.recipeLaserRelayAdvanced).setWildcard().setNoText(), new PageCrafting(6, BlockCrafting.recipeLaserRelayExtreme).setWildcard().setNoText()); + new BookletChapter("itemStorage", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitBlocks.blockLaserRelayItemWhitelist), new PageTextOnly(1), new PageTextOnly(2), new PagePicture(3, "page_item_laser_relay_basic", 78), new PagePicture(4, "pageItemLaserRelayFail", 84), new PagePicture(5, "pageItemLaserRelayTransfer", 78), new PagePicture(6, "pageItemLaserRelayWhitelistChest", 76), new PagePicture(7, "pageItemLaserRelayWhitelistInterface", 75), new PagePicture(8, "pageItemLaserRelaySystem", 75), new PageTextOnly(9), new PageCrafting(10, BlockCrafting.recipeLaserRelayItem).setWildcard().setNoText(), new PageCrafting(11, BlockCrafting.recipeLaserRelayItemWhitelist).setWildcard().setNoText(), new PageCrafting(12, BlockCrafting.recipeItemInterface).setNoText()); new BookletChapter("fluidLaser", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitBlocks.blockLaserRelayFluids), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFluidLaser).setNoText()); //No RF Using Blocks @@ -188,10 +188,10 @@ public final class InitBooklet{ new BookletChapter("farmer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFarmer), new PageTextOnly(1).addTextReplacement("", TileEntityFarmer.USE_PER_OPERATION), new PageCrafting(2, BlockCrafting.recipeFarmer).setWildcard().setNoText()).setImportant(); new BookletChapter("fireworkBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFireworkBox), new PageTextOnly(1).addTextReplacement("", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial(); new BookletChapter("miner", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockMiner), new PageTextOnly(1).addTextReplacement("", TileEntityMiner.ENERGY_USE_PER_BLOCK).addTextReplacement("", TileEntityMiner.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial(); - new BookletChapterCoffee("coffeeMachine", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockCoffeeMachine), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemCoffeeBean)).addTextReplacement("", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("", TileEntityCoffeeMachine.WATER_USE), new PageTextOnly(2).addItemToPage(new ItemStack(InitItems.itemCoffee)), new PagePicture(3, "pageCoffeeMachine", 115), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine).setWildcard().setNoText(), new PageCrafting(5, ItemCrafting.recipeCup).setNoText()).setImportant(); + new BookletChapterCoffee("coffeeMachine", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockCoffeeMachine), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemCoffeeBean)).addTextReplacement("", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("", TileEntityCoffeeMachine.WATER_USE), new PageTextOnly(2).addItemToPage(new ItemStack(InitItems.itemCoffee)), new PagePicture(3, "page_coffee_machine", 115), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine).setWildcard().setNoText(), new PageCrafting(5, ItemCrafting.recipeCup).setNoText()).setImportant(); new BookletChapterCrusher("crusher", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockGrinderDouble), new PageTextOnly(1).addTextReplacement("", TileEntityGrinder.ENERGY_USE), new PageCrafting(2, BlockCrafting.recipeCrusher).setWildcard().setNoText(), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher).setWildcard().setNoText(), new PageCrusherRecipe(4, CrusherCrafting.recipeIronHorseArmor).setNoText(), new PageCrusherRecipe(5, CrusherCrafting.recipeGoldHorseArmor).setNoText(), new PageCrusherRecipe(6, CrusherCrafting.recipeDiamondHorseArmor).setNoText()); new BookletChapter("furnaceDouble", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFurnaceDouble), new PageCrafting(1, BlockCrafting.recipeFurnace).setWildcard().addTextReplacement("", TileEntityFurnaceDouble.ENERGY_USE)); - new BookletChapter("lavaFactory", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockLavaFactoryController), new PageTextOnly(1).addTextReplacement("", TileEntityLavaFactoryController.ENERGY_USE), new PagePicture(2, "pageLavaFactory", 0).setNoText(), new PageCrafting(3, BlockCrafting.recipeLavaFactory).setNoText(), new PageCrafting(4, BlockCrafting.recipeCasing).setNoText()); + new BookletChapter("lavaFactory", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockLavaFactoryController), new PageTextOnly(1).addTextReplacement("", TileEntityLavaFactoryController.ENERGY_USE), new PagePicture(2, "page_lava_factory", 0).setNoText(), new PageCrafting(3, BlockCrafting.recipeLavaFactory).setNoText(), new PageCrafting(4, BlockCrafting.recipeCasing).setNoText()); new BookletChapter("energizer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockEnergizer), new PageCrafting(1, BlockCrafting.recipeEnergizer), new PageCrafting(2, BlockCrafting.recipeEnervator)); new BookletChapter("repairer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockItemRepairer), new PageCrafting(1, BlockCrafting.recipeRepairer).addTextReplacement("", TileEntityItemRepairer.ENERGY_USE)); new BookletChapter("longRangeBreaker", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("", TileEntityDirectionalBreaker.ENERGY_USE).addTextReplacement("", TileEntityDirectionalBreaker.RANGE), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker).setWildcard()); @@ -219,7 +219,7 @@ public final class InitBooklet{ } new BookletChapter("aiots", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.emeraldPaxel), aiotPages.toArray(new BookletPage[aiotPages.size()])).setImportant(); - new BookletChapter("jams", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "pageJamHouse", 150), new PageTextOnly(3)); + new BookletChapter("jams", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "page_jam_house", 150), new PageTextOnly(3)); ArrayList potionRingPages = new ArrayList(); potionRingPages.add(new PageTextOnly(potionRingPages.size()+1)); @@ -242,7 +242,7 @@ public final class InitBooklet{ //Updates and infos new BookletChapter("changelog", ActuallyAdditionsAPI.entryUpdatesAndInfos, new ItemStack(Items.CLOCK), new PageLinkButton(1, UpdateChecker.CHANGELOG_LINK)); new BookletChapter("curse", ActuallyAdditionsAPI.entryUpdatesAndInfos, new ItemStack(Items.FLINT_AND_STEEL), new PageLinkButton(1, "http://ellpeck.de/actadd")); - new BookletChapter("patreon", ActuallyAdditionsAPI.entryUpdatesAndInfos, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), new PageLinkButton(1, "http://patreon.com/Ellpeck"), new PagePicture(2, "pagePatreon", 153)).setImportant(); + new BookletChapter("patreon", ActuallyAdditionsAPI.entryUpdatesAndInfos, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), new PageLinkButton(1, "http://patreon.com/Ellpeck"), new PagePicture(2, "page_patreon", 153)).setImportant(); new BookletChapter("website", ActuallyAdditionsAPI.entryUpdatesAndInfos, new ItemStack(InitItems.itemBooklet), new PageLinkButton(1, "http://ellpeck.de")); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java index 7dbe49f4f..991aecae1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java @@ -39,8 +39,8 @@ import java.util.List; public abstract class GuiBooklet extends GuiBookletBase{ public static final int BUTTONS_PER_PAGE = 12; - public static final ResourceLocation RES_LOC_GUI = AssetUtil.getBookletGuiLocation("guiBooklet"); - public static final ResourceLocation RES_LOC_GADGETS = AssetUtil.getBookletGuiLocation("guiBookletGadgets"); + public static final ResourceLocation RES_LOC_GUI = AssetUtil.getBookletGuiLocation("gui_booklet"); + public static final ResourceLocation RES_LOC_GADGETS = AssetUtil.getBookletGuiLocation("gui_booklet_gadgets"); protected final BookmarkButton[] bookmarkButtons = new BookmarkButton[12]; public GuiScreen previousScreen; public GuiBookletBase parentPage; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index 7abc7b9b6..791e6d066 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -821,7 +821,7 @@ public final class BlockCrafting{ "GCG", "DQD", "GCG", 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 'G', "glowstone", - 'D', "dye"+BlockColoredLamp.ALL_LAMP_TYPES[i].name, + 'D', "dye"+BlockColoredLamp.ALL_LAMP_TYPES[i].oreName, 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); RECIPES_LAMPS[i] = RecipeUtil.lastIRecipe(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index cd288206e..19fcab77c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -293,7 +293,7 @@ public final class ItemCrafting{ for(int i = 0; i < 16; i++){ if(i != TheColoredLampColors.LIGHT_BLUE.ordinal()){ - GameRegistry.addRecipe(new RecipeKeepDataShapeless(new ItemStack(InitItems.itemDrill, 1, i), new ItemStack(InitItems.itemDrill, 1, Util.WILDCARD), lightBlueDrill.copy(), "dye"+TheColoredLampColors.values()[i].name)); + GameRegistry.addRecipe(new RecipeKeepDataShapeless(new ItemStack(InitItems.itemDrill, 1, i), new ItemStack(InitItems.itemDrill, 1, Util.WILDCARD), lightBlueDrill.copy(), "dye"+TheColoredLampColors.values()[i].oreName)); RECIPES_DRILL_COLORING.add(RecipeUtil.lastIRecipe()); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java index db1ab557d..85dec9d7c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java @@ -34,8 +34,8 @@ import java.util.List; @SideOnly(Side.CLIENT) public class GuiBag extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiBag"); - private static final ResourceLocation RES_LOC_VOID = AssetUtil.getGuiLocation("guiVoidBag"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bag"); + private static final ResourceLocation RES_LOC_VOID = AssetUtil.getGuiLocation("gui_void_bag"); private final ContainerBag container; private final boolean isVoid; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java index 08ac0a7de..57d10fb69 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java @@ -23,7 +23,7 @@ import java.io.IOException; public class GuiBioReactor extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiBioReactor"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bio_reactor"); private final TileEntityBioReactor tile; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java index 3ca67be11..dbfb4455d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiBreaker extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiBreaker"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityBreaker breaker; public GuiBreaker(InventoryPlayer inventory, TileEntityBase tile){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java index cfb1fb159..2e17dc570 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiCanolaPress extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiCanolaPress"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_canola_press"); private final TileEntityCanolaPress press; private EnergyDisplay energy; private FluidDisplay fluid; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java index 00ce52702..296629c26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiCoalGenerator extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiCoalGenerator"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_coal_generator"); private final TileEntityCoalGenerator generator; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java index ea43f81c4..f889a90aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java @@ -31,7 +31,7 @@ import java.util.Collections; @SideOnly(Side.CLIENT) public class GuiCoffeeMachine extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiCoffeeMachine"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_coffee_machine"); private final TileEntityCoffeeMachine machine; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java index ba0676d37..a7efeaae9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiDirectionalBreaker extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiDirectionalBreaker"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_directional_breaker"); private final TileEntityDirectionalBreaker breaker; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java index 4957a1f40..75874ac76 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiDrill extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiDrill"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_drill"); public GuiDrill(InventoryPlayer inventory){ super(new ContainerDrill(inventory)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java index ad94d37e7..b65a1252f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiDropper extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiBreaker"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityDropper dropper; public GuiDropper(InventoryPlayer inventory, TileEntityBase tile){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java index 2f716e5e8..54cb7e3ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiEnergizer extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiEnergizer"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_energizer"); private final TileEntityEnergizer energizer; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java index b1b4d182d..076bc3b02 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiEnervator extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiEnergizer"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_energizer"); private final TileEntityEnervator enervator; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java index c8b3ab1a1..089b3e54c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiFarmer extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiFarmer"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_farmer"); private final TileEntityFarmer farmer; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index fbb9bead4..3c05030bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -28,7 +28,7 @@ import java.util.Arrays; @SideOnly(Side.CLIENT) public class GuiFeeder extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiFeeder"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_feeder"); public final TileEntityFeeder tileFeeder; public GuiFeeder(InventoryPlayer inventory, TileEntityBase tile){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java index c7d5a7ac3..7de565dbb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiFermentingBarrel extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiFermentingBarrel"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_fermenting_barrel"); private final TileEntityFermentingBarrel press; private FluidDisplay input; private FluidDisplay output; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java index 25e86dce1..b92a1de26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiFilter extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiFilter"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_filter"); public GuiFilter(InventoryPlayer inventory){ super(new ContainerFilter(inventory)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java index bf46afa2f..0b8977751 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiFluidCollector extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiFluidCollector"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_fluid_collector"); private final TileEntityFluidCollector collector; private FluidDisplay fluid; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java index 8608c09e9..0a5155bdf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java @@ -30,7 +30,7 @@ import java.util.Collections; @SideOnly(Side.CLIENT) public class GuiFurnaceDouble extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiFurnaceDouble"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_furnace_double"); private final TileEntityFurnaceDouble tileFurnace; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java index d03efb097..8a0ee2fde 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java @@ -30,7 +30,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiGiantChest extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiGiantChest"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_giant_chest"); private final TileEntityGiantChest chest; private final int page; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java index 0f7a9dd1d..45118da0f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java @@ -30,8 +30,8 @@ import java.util.Collections; @SideOnly(Side.CLIENT) public class GuiGrinder extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiGrinder"); - private static final ResourceLocation RES_LOC_DOUBLE = AssetUtil.getGuiLocation("guiGrinderDouble"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_grinder"); + private static final ResourceLocation RES_LOC_DOUBLE = AssetUtil.getGuiLocation("gui_grinder_double"); private final TileEntityGrinder tileGrinder; private final boolean isDouble; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index 040784dc1..722a4ff30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -46,8 +46,8 @@ public class GuiInputter extends GuiContainer{ StringUtil.localize("info."+ModUtil.MOD_ID+".gui.east"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.south"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.west")}; - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiInputter"); - private static final ResourceLocation RES_LOC_ADVANCED = AssetUtil.getGuiLocation("guiInputterAdvanced"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_inputter"); + private static final ResourceLocation RES_LOC_ADVANCED = AssetUtil.getGuiLocation("gui_inputter_advanced"); public final TileEntityInputter tileInputter; private final int x; private final int y; @@ -264,7 +264,7 @@ public class GuiInputter extends GuiContainer{ @SideOnly(Side.CLIENT) public static class SmallerButton extends GuiButton{ - public final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiInputter"); + public final ResourceLocation resLoc = AssetUtil.getGuiLocation("gui_inputter"); private final boolean smaller; public SmallerButton(int id, int x, int y, String display){ @@ -308,7 +308,7 @@ public class GuiInputter extends GuiContainer{ @SideOnly(Side.CLIENT) public static class TinyButton extends GuiButton{ - public final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiInputter"); + public final ResourceLocation resLoc = AssetUtil.getGuiLocation("gui_inputter"); public TinyButton(int id, int x, int y){ super(id, x, y, 8, 8, ""); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java index 9414165d5..048fdb3f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java @@ -33,7 +33,7 @@ import java.util.List; @SideOnly(Side.CLIENT) public class GuiLaserRelayItemWhitelist extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiLaserRelayItemWhitelist"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_laser_relay_item_whitelist"); private final TileEntityLaserRelayItemWhitelist tile; private FilterSettingsGui leftFilter; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java index e078d9c28..85d3bbf10 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMiner extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiBreaker"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityMiner miner; public GuiMiner(InventoryPlayer inventory, TileEntityBase tile){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java index df46df7ed..25be3c131 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiOilGenerator extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiOilGenerator"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_oil_generator"); private final TileEntityOilGenerator generator; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java index bc67a9aa5..4097e9f2c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java @@ -33,7 +33,7 @@ import java.util.List; @SideOnly(Side.CLIENT) public class GuiPhantomPlacer extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiBreaker"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityPhantomPlacer placer; public GuiPhantomPlacer(InventoryPlayer inventory, TileEntityBase tile){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java index 0a02c3dcd..b1efbb7d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiRangedCollector extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiRangedCollector"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_ranged_collector"); private final TileEntityRangedCollector collector; private FilterSettingsGui filter; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java index 3d4354456..e5d494d34 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java @@ -26,7 +26,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiRepairer extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiRepairer"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_repairer"); private final TileEntityItemRepairer tileRepairer; private EnergyDisplay energy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java index e3ad1b4b3..609145272 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java @@ -35,7 +35,7 @@ import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiSmileyCloud extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiSmileyCloud"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_smiley_cloud"); private final int x; private final int y; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java index f72506304..9daf8351c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiXPSolidifier extends GuiContainer{ - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiXPSolidifier"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_xp_solidifier"); private final TileEntityXPSolidifier solidifier; public GuiXPSolidifier(InventoryPlayer inventory, TileEntityBase tile){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index 7e4316f0d..59d93e81e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -202,168 +202,168 @@ public final class InitItems{ itemVoidBag = new ItemBag("item_void_bag", true); itemWorm = new ItemWorm("item_worm"); itemPlayerProbe = new ItemPlayerProbe("item_player_probe"); - itemFilter = new ItemFilter("itemFilter"); - itemWaterBowl = new ItemWaterBowl("itemWaterBowl"); - itemSpawnerChanger = new ItemSpawnerChanger("itemSpawnerChanger"); - itemMisc = new ItemMisc("itemMisc"); - itemCrateKeeper = new ItemGeneric("itemCrateKeeper").setMaxStackSize(1); - itemColorLens = new ItemLens("itemColorLens", ActuallyAdditionsAPI.lensColor); - itemExplosionLens = new ItemLens("itemExplosionLens", ActuallyAdditionsAPI.lensDetonation); - itemDamageLens = new ItemLens("itemDamageLens", ActuallyAdditionsAPI.lensDeath); - itemMoreDamageLens = new ItemLens("itemMoreDamageLens", ActuallyAdditionsAPI.lensEvenMoarDeath); - itemDisenchantingLens = new ItemLens("itemDisenchantingLens", ActuallyAdditionsAPI.lensDisenchanting); - itemMiningLens = new ItemLens("itemMiningLens", ActuallyAdditionsAPI.lensMining); - itemCrystal = new ItemCrystal("itemCrystal", false); - itemCrystalEmpowered = new ItemCrystal("itemCrystalEmpowered", true); - itemLaserWrench = new ItemLaserWrench("itemLaserWrench"); - itemChestToCrateUpgrade = new ItemChestToCrateUpgrade("itemChestToCrateUpgrade", TileEntityChest.class, InitBlocks.blockGiantChest.getDefaultState()); - itemSmallToMediumCrateUpgrade = new ItemChestToCrateUpgrade("itemSmallToMediumCrateUpgrade", TileEntityGiantChest.class, InitBlocks.blockGiantChestMedium.getDefaultState()); - itemMediumToLargeCrateUpgrade = new ItemChestToCrateUpgrade("itemMediumToLargeCrateUpgrade", TileEntityGiantChestMedium.class, InitBlocks.blockGiantChestLarge.getDefaultState()); - itemBooklet = new ItemBooklet("itemBooklet"); - itemGrowthRing = new ItemGrowthRing("itemGrowthRing"); - itemMagnetRing = new ItemMagnetRing("itemSuctionRing"); - itemWaterRemovalRing = new ItemWaterRemovalRing("itemWaterRemovalRing"); - itemHelmEmerald = new ItemArmorAA("itemHelmEmerald", InitArmorMaterials.armorMaterialEmerald, 0, new ItemStack(Items.EMERALD)); - itemChestEmerald = new ItemArmorAA("itemChestEmerald", InitArmorMaterials.armorMaterialEmerald, 1, new ItemStack(Items.EMERALD)); - itemPantsEmerald = new ItemArmorAA("itemPantsEmerald", InitArmorMaterials.armorMaterialEmerald, 2, new ItemStack(Items.EMERALD)); - itemBootsEmerald = new ItemArmorAA("itemBootsEmerald", InitArmorMaterials.armorMaterialEmerald, 3, new ItemStack(Items.EMERALD)); - itemHelmObsidian = new ItemArmorAA("itemHelmObsidian", InitArmorMaterials.armorMaterialObsidian, 0, new ItemStack(Blocks.OBSIDIAN)); - itemChestObsidian = new ItemArmorAA("itemChestObsidian", InitArmorMaterials.armorMaterialObsidian, 1, new ItemStack(Blocks.OBSIDIAN)); - itemPantsObsidian = new ItemArmorAA("itemPantsObsidian", InitArmorMaterials.armorMaterialObsidian, 2, new ItemStack(Blocks.OBSIDIAN)); - itemBootsObsidian = new ItemArmorAA("itemBootsObsidian", InitArmorMaterials.armorMaterialObsidian, 3, new ItemStack(Blocks.OBSIDIAN)); - itemHelmQuartz = new ItemArmorAA("itemHelmQuartz", InitArmorMaterials.armorMaterialQuartz, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); - itemChestQuartz = new ItemArmorAA("itemChestQuartz", InitArmorMaterials.armorMaterialQuartz, 1, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); - itemPantsQuartz = new ItemArmorAA("itemPantsQuartz", InitArmorMaterials.armorMaterialQuartz, 2, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); - itemBootsQuartz = new ItemArmorAA("itemBootsQuartz", InitArmorMaterials.armorMaterialQuartz, 3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); - itemTeleStaff = new ItemTeleStaff("itemTeleStaff"); - itemWingsOfTheBats = new ItemWingsOfTheBats("itemWingsOfTheBats"); - itemDrill = new ItemDrill("itemDrill"); - itemBattery = new ItemBattery("itemBattery", 1000000, 5000); - itemBatteryDouble = new ItemBattery("itemBatteryDouble", 2000000, 10000); - itemBatteryTriple = new ItemBattery("itemBatteryTriple", 4000000, 15000); - itemBatteryQuadruple = new ItemBattery("itemBatteryQuadruple", 8000000, 20000); - itemBatteryQuintuple = new ItemBattery("itemBatteryQuintuple", 16000000, 25000); - itemDrillUpgradeSpeed = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED, "itemDrillUpgradeSpeed"); - itemDrillUpgradeSpeedII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II, "itemDrillUpgradeSpeedII"); - itemDrillUpgradeSpeedIII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III, "itemDrillUpgradeSpeedIII"); - itemDrillUpgradeSilkTouch = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SILK_TOUCH, "itemDrillUpgradeSilkTouch"); - itemDrillUpgradeFortune = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE, "itemDrillUpgradeFortune"); - itemDrillUpgradeFortuneII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE_II, "itemDrillUpgradeFortuneII"); - itemDrillUpgradeThreeByThree = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE, "itemDrillUpgradeThreeByThree"); - itemDrillUpgradeFiveByFive = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE, "itemDrillUpgradeFiveByFive"); - itemDrillUpgradeBlockPlacing = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.PLACER, "itemDrillUpgradeBlockPlacing"); - itemFertilizer = new ItemFertilizer("itemFertilizer"); - itemCoffee = new ItemCoffee("itemCoffee"); - itemPhantomConnector = new ItemPhantomConnector("itemPhantomConnector"); - itemResonantRice = new ItemResonantRice("itemResonantRice"); - itemFoods = new ItemFoods("itemFood"); - itemJams = new ItemJams("itemJam"); - itemKnife = new ItemKnife("itemKnife"); - itemCrafterOnAStick = new ItemCrafterOnAStick("itemCrafterOnAStick"); - itemDust = new ItemDust("itemDust"); - itemSolidifiedExperience = new ItemSolidifiedExperience("itemSolidifiedExperience"); - itemLeafBlower = new ItemLeafBlower(false, "itemLeafBlower"); - itemLeafBlowerAdvanced = new ItemLeafBlower(true, "itemLeafBlowerAdvanced"); - itemPotionRing = new ItemPotionRing(false, "itemPotionRing"); - itemPotionRingAdvanced = new ItemPotionRing(true, "itemPotionRingAdvanced"); - itemHairyBall = new ItemHairyBall("itemHairyBall"); - itemCoffeeBean = new ItemCoffeeBean("itemCoffeeBeans"); - itemRiceSeed = new ItemSeed("itemRiceSeed", "seedRice", InitBlocks.blockRice, itemFoods, TheFoods.RICE.ordinal()); + itemFilter = new ItemFilter("item_filter"); + itemWaterBowl = new ItemWaterBowl("item_water_bowl"); + itemSpawnerChanger = new ItemSpawnerChanger("item_spawner_changer"); + itemMisc = new ItemMisc("item_misc"); + itemCrateKeeper = new ItemGeneric("item_crate_keeper").setMaxStackSize(1); + itemColorLens = new ItemLens("item_color_lens", ActuallyAdditionsAPI.lensColor); + itemExplosionLens = new ItemLens("item_explosion_lens", ActuallyAdditionsAPI.lensDetonation); + itemDamageLens = new ItemLens("item_damage_lens", ActuallyAdditionsAPI.lensDeath); + itemMoreDamageLens = new ItemLens("item_more_damage_lens", ActuallyAdditionsAPI.lensEvenMoarDeath); + itemDisenchantingLens = new ItemLens("item_disenchanting_lens", ActuallyAdditionsAPI.lensDisenchanting); + itemMiningLens = new ItemLens("item_mining_lens", ActuallyAdditionsAPI.lensMining); + itemCrystal = new ItemCrystal("item_crystal", false); + itemCrystalEmpowered = new ItemCrystal("item_crystal_empowered", true); + itemLaserWrench = new ItemLaserWrench("item_laser_wrench"); + itemChestToCrateUpgrade = new ItemChestToCrateUpgrade("item_chest_to_crate_upgrade", TileEntityChest.class, InitBlocks.blockGiantChest.getDefaultState()); + itemSmallToMediumCrateUpgrade = new ItemChestToCrateUpgrade("item_small_to_medium_crate_upgrade", TileEntityGiantChest.class, InitBlocks.blockGiantChestMedium.getDefaultState()); + itemMediumToLargeCrateUpgrade = new ItemChestToCrateUpgrade("item_medium_to_large_crate_upgrade", TileEntityGiantChestMedium.class, InitBlocks.blockGiantChestLarge.getDefaultState()); + itemBooklet = new ItemBooklet("item_booklet"); + itemGrowthRing = new ItemGrowthRing("item_growth_ring"); + itemMagnetRing = new ItemMagnetRing("item_suction_ring"); + itemWaterRemovalRing = new ItemWaterRemovalRing("item_water_removal_ring"); + itemHelmEmerald = new ItemArmorAA("item_helm_emerald", InitArmorMaterials.armorMaterialEmerald, 0, new ItemStack(Items.EMERALD)); + itemChestEmerald = new ItemArmorAA("item_chest_emerald", InitArmorMaterials.armorMaterialEmerald, 1, new ItemStack(Items.EMERALD)); + itemPantsEmerald = new ItemArmorAA("item_pants_emerald", InitArmorMaterials.armorMaterialEmerald, 2, new ItemStack(Items.EMERALD)); + itemBootsEmerald = new ItemArmorAA("item_boots_emerald", InitArmorMaterials.armorMaterialEmerald, 3, new ItemStack(Items.EMERALD)); + itemHelmObsidian = new ItemArmorAA("item_helm_obsidian", InitArmorMaterials.armorMaterialObsidian, 0, new ItemStack(Blocks.OBSIDIAN)); + itemChestObsidian = new ItemArmorAA("item_chest_obsidian", InitArmorMaterials.armorMaterialObsidian, 1, new ItemStack(Blocks.OBSIDIAN)); + itemPantsObsidian = new ItemArmorAA("item_pants_obsidian", InitArmorMaterials.armorMaterialObsidian, 2, new ItemStack(Blocks.OBSIDIAN)); + itemBootsObsidian = new ItemArmorAA("item_boots_obsidian", InitArmorMaterials.armorMaterialObsidian, 3, new ItemStack(Blocks.OBSIDIAN)); + itemHelmQuartz = new ItemArmorAA("item_helm_quartz", InitArmorMaterials.armorMaterialQuartz, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + itemChestQuartz = new ItemArmorAA("item_chest_quartz", InitArmorMaterials.armorMaterialQuartz, 1, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + itemPantsQuartz = new ItemArmorAA("item_pants_quartz", InitArmorMaterials.armorMaterialQuartz, 2, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + itemBootsQuartz = new ItemArmorAA("item_boots_quartz", InitArmorMaterials.armorMaterialQuartz, 3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + itemTeleStaff = new ItemTeleStaff("item_tele_staff"); + itemWingsOfTheBats = new ItemWingsOfTheBats("item_wings_of_the_bats"); + itemDrill = new ItemDrill("item_drill"); + itemBattery = new ItemBattery("item_battery", 1000000, 5000); + itemBatteryDouble = new ItemBattery("item_battery_double", 2000000, 10000); + itemBatteryTriple = new ItemBattery("item_battery_triple", 4000000, 15000); + itemBatteryQuadruple = new ItemBattery("item_battery_quadruple", 8000000, 20000); + itemBatteryQuintuple = new ItemBattery("item_battery_quintuple", 16000000, 25000); + itemDrillUpgradeSpeed = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED, "item_drill_upgrade_speed"); + itemDrillUpgradeSpeedII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II, "item_drill_upgrade_speed_ii"); + itemDrillUpgradeSpeedIII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III, "item_drill_upgrade_speed_iii"); + itemDrillUpgradeSilkTouch = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SILK_TOUCH, "item_drill_upgrade_silk_touch"); + itemDrillUpgradeFortune = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE, "item_drill_upgrade_fortune"); + itemDrillUpgradeFortuneII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE_II, "item_drill_upgrade_fortune_ii"); + itemDrillUpgradeThreeByThree = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE, "item_drill_upgrade_three_by_three"); + itemDrillUpgradeFiveByFive = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE, "item_drill_upgrade_five_by_five"); + itemDrillUpgradeBlockPlacing = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.PLACER, "item_drill_upgrade_block_placing"); + itemFertilizer = new ItemFertilizer("item_fertilizer"); + itemCoffee = new ItemCoffee("item_coffee"); + itemPhantomConnector = new ItemPhantomConnector("item_phantom_connector"); + itemResonantRice = new ItemResonantRice("item_resonant_rice"); + itemFoods = new ItemFoods("item_food"); + itemJams = new ItemJams("item_jam"); + itemKnife = new ItemKnife("item_knife"); + itemCrafterOnAStick = new ItemCrafterOnAStick("item_crafter_on_a_stick"); + itemDust = new ItemDust("item_dust"); + itemSolidifiedExperience = new ItemSolidifiedExperience("item_solidified_experience"); + itemLeafBlower = new ItemLeafBlower(false, "item_leaf_blower"); + itemLeafBlowerAdvanced = new ItemLeafBlower(true, "item_leaf_blower_advanced"); + itemPotionRing = new ItemPotionRing(false, "item_potion_ring"); + itemPotionRingAdvanced = new ItemPotionRing(true, "item_potion_ring_advanced"); + itemHairyBall = new ItemHairyBall("item_hairy_ball"); + itemCoffeeBean = new ItemCoffeeBean("item_coffee_beans"); + itemRiceSeed = new ItemSeed("item_rice_seed", "seedRice", InitBlocks.blockRice, itemFoods, TheFoods.RICE.ordinal()); CompatUtil.registerMFRSeed(itemRiceSeed, InitBlocks.blockRice); - itemCanolaSeed = new ItemFoodSeed("itemCanolaSeed", "seedCanola", InitBlocks.blockCanola, itemMisc, TheMiscItems.CANOLA.ordinal(), 1, 0.01F, 10).setPotionEffect(new PotionEffect(MobEffects.NAUSEA, 1000, 0), 0.2F); + itemCanolaSeed = new ItemFoodSeed("item_canola_seed", "seedCanola", InitBlocks.blockCanola, itemMisc, TheMiscItems.CANOLA.ordinal(), 1, 0.01F, 10).setPotionEffect(new PotionEffect(MobEffects.NAUSEA, 1000, 0), 0.2F); CompatUtil.registerMFRSeed(itemCanolaSeed, InitBlocks.blockCanola); - itemFlaxSeed = new ItemSeed("itemFlaxSeed", "seedFlax", InitBlocks.blockFlax, Items.STRING, 0); + itemFlaxSeed = new ItemSeed("item_flax_seed", "seedFlax", InitBlocks.blockFlax, Items.STRING, 0); CompatUtil.registerMFRSeed(itemFlaxSeed, InitBlocks.blockFlax); - itemCoffeeSeed = new ItemSeed("itemCoffeeSeed", "seedCoffeeBeans", InitBlocks.blockCoffee, itemCoffeeBean, 0); + itemCoffeeSeed = new ItemSeed("item_coffee_seed", "seedCoffeeBeans", InitBlocks.blockCoffee, itemCoffeeBean, 0); CompatUtil.registerMFRSeed(itemCoffeeSeed, InitBlocks.blockCoffee); - itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemPickaxeEmerald", EnumRarity.EPIC); - itemAxeEmerald = new ItemAxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemAxeEmerald", EnumRarity.EPIC); - itemShovelEmerald = new ItemShovelAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemShovelEmerald", EnumRarity.EPIC); - itemSwordEmerald = new ItemSwordAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemSwordEmerald", EnumRarity.EPIC); - itemHoeEmerald = new ItemHoeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemHoeEmerald", EnumRarity.EPIC); - itemPickaxeObsidian = new ItemPickaxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemPickaxeObsidian", EnumRarity.UNCOMMON); - itemAxeObsidian = new ItemAxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemAxeObsidian", EnumRarity.UNCOMMON); - itemShovelObsidian = new ItemShovelAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemShovelObsidian", EnumRarity.UNCOMMON); - itemSwordObsidian = new ItemSwordAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemSwordObsidian", EnumRarity.UNCOMMON); - itemHoeObsidian = new ItemHoeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemHoeObsidian", EnumRarity.UNCOMMON); - itemPickaxeQuartz = new ItemPickaxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemPickaxeQuartz", EnumRarity.RARE); - itemAxeQuartz = new ItemAxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemAxeQuartz", EnumRarity.RARE); - itemShovelQuartz = new ItemShovelAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemShovelQuartz", EnumRarity.RARE); - itemSwordQuartz = new ItemSwordAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemSwordQuartz", EnumRarity.RARE); - itemHoeQuartz = new ItemHoeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemHoeQuartz", EnumRarity.RARE); - woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plankWood", "woodenPaxel", EnumRarity.UNCOMMON, 5192733); - stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, new ItemStack(Blocks.COBBLESTONE), "stonePaxel", EnumRarity.UNCOMMON, 7040621); - ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, new ItemStack(Items.IRON_INGOT), "ironPaxel", EnumRarity.RARE, 10920613); - goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, new ItemStack(Items.GOLD_INGOT), "goldPaxel", EnumRarity.RARE, 16770048); - diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.DIAMOND, new ItemStack(Items.DIAMOND), "diamondPaxel", EnumRarity.EPIC, 3250376); - emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "emeraldPaxel", EnumRarity.EPIC, 7723338); - obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "obsidianPaxel", EnumRarity.EPIC, 4166); - quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "quartzPaxel", EnumRarity.RARE, 1710103); + itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "item_pickaxe_emerald", EnumRarity.EPIC); + itemAxeEmerald = new ItemAxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "item_axe_emerald", EnumRarity.EPIC); + itemShovelEmerald = new ItemShovelAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "item_shovel_emerald", EnumRarity.EPIC); + itemSwordEmerald = new ItemSwordAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "item_sword_emerald", EnumRarity.EPIC); + itemHoeEmerald = new ItemHoeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "item_hoe_emerald", EnumRarity.EPIC); + itemPickaxeObsidian = new ItemPickaxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "item_pickaxe_obsidian", EnumRarity.UNCOMMON); + itemAxeObsidian = new ItemAxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "item_axe_obsidian", EnumRarity.UNCOMMON); + itemShovelObsidian = new ItemShovelAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "item_shovel_obsidian", EnumRarity.UNCOMMON); + itemSwordObsidian = new ItemSwordAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "item_sword_obsidian", EnumRarity.UNCOMMON); + itemHoeObsidian = new ItemHoeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "item_hoe_obsidian", EnumRarity.UNCOMMON); + itemPickaxeQuartz = new ItemPickaxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "item_pickaxe_quartz", EnumRarity.RARE); + itemAxeQuartz = new ItemAxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "item_axe_quartz", EnumRarity.RARE); + itemShovelQuartz = new ItemShovelAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "item_shovel_quartz", EnumRarity.RARE); + itemSwordQuartz = new ItemSwordAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "item_sword_quartz", EnumRarity.RARE); + itemHoeQuartz = new ItemHoeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "item_hoe_quartz", EnumRarity.RARE); + woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plank_wood", "wooden_paxel", EnumRarity.UNCOMMON, 5192733); + stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, new ItemStack(Blocks.COBBLESTONE), "stone_paxel", EnumRarity.UNCOMMON, 7040621); + ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, new ItemStack(Items.IRON_INGOT), "iron_paxel", EnumRarity.RARE, 10920613); + goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, new ItemStack(Items.GOLD_INGOT), "gold_paxel", EnumRarity.RARE, 16770048); + diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.DIAMOND, new ItemStack(Items.DIAMOND), "diamond_paxel", EnumRarity.EPIC, 3250376); + emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "emerald_paxel", EnumRarity.EPIC, 7723338); + obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "obsidian_paxel", EnumRarity.EPIC, 4166); + quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "quartz_paxel", EnumRarity.RARE, 1710103); - itemPickaxeCrystalRed = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemPickaxeCrystalRed", Util.CRYSTAL_RED_RARITY); - itemAxeCrystalRed = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemAxeCrystalRed", Util.CRYSTAL_RED_RARITY); - itemShovelCrystalRed = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemShovelCrystalRed", Util.CRYSTAL_RED_RARITY); - itemSwordCrystalRed = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemSwordCrystalRed", Util.CRYSTAL_RED_RARITY); - itemHoeCrystalRed = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemHoeCrystalRed", Util.CRYSTAL_RED_RARITY); - itemHelmCrystalRed = new ItemArmorAA("itemHelmCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); - itemChestCrystalRed = new ItemArmorAA("itemChestCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); - itemPantsCrystalRed = new ItemArmorAA("itemPantsCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); - itemBootsCrystalRed = new ItemArmorAA("itemBootsCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); - itemPaxelCrystalRed = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemPaxelCrystalRed", Util.CRYSTAL_RED_RARITY, 16711689); + itemPickaxeCrystalRed = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "item_pickaxe_crystal_red", Util.CRYSTAL_RED_RARITY); + itemAxeCrystalRed = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "item_axe_crystal_red", Util.CRYSTAL_RED_RARITY); + itemShovelCrystalRed = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "item_shovel_crystal_red", Util.CRYSTAL_RED_RARITY); + itemSwordCrystalRed = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "item_sword_crystal_red", Util.CRYSTAL_RED_RARITY); + itemHoeCrystalRed = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "item_hoe_crystal_red", Util.CRYSTAL_RED_RARITY); + itemHelmCrystalRed = new ItemArmorAA("item_helm_crystal_red", InitArmorMaterials.armorMaterialCrystalRed, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); + itemChestCrystalRed = new ItemArmorAA("item_chest_crystal_red", InitArmorMaterials.armorMaterialCrystalRed, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); + itemPantsCrystalRed = new ItemArmorAA("item_pants_crystal_red", InitArmorMaterials.armorMaterialCrystalRed, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); + itemBootsCrystalRed = new ItemArmorAA("item_boots_crystal_red", InitArmorMaterials.armorMaterialCrystalRed, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), Util.CRYSTAL_RED_RARITY); + itemPaxelCrystalRed = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "item_paxel_crystal_red", Util.CRYSTAL_RED_RARITY, 16711689); - itemPickaxeCrystalBlue = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemPickaxeCrystalBlue", Util.CRYSTAL_BLUE_RARITY); - itemAxeCrystalBlue = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemAxeCrystalBlue", Util.CRYSTAL_BLUE_RARITY); - itemShovelCrystalBlue = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemShovelCrystalBlue", Util.CRYSTAL_BLUE_RARITY); - itemSwordCrystalBlue = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemSwordCrystalBlue", Util.CRYSTAL_BLUE_RARITY); - itemHoeCrystalBlue = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemHoeCrystalBlue", Util.CRYSTAL_BLUE_RARITY); - itemHelmCrystalBlue = new ItemArmorAA("itemHelmCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); - itemChestCrystalBlue = new ItemArmorAA("itemChestCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); - itemPantsCrystalBlue = new ItemArmorAA("itemPantsCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); - itemBootsCrystalBlue = new ItemArmorAA("itemBootsCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); - itemPaxelCrystalBlue = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemPaxelCrystalBlue", Util.CRYSTAL_BLUE_RARITY, 3014911); + itemPickaxeCrystalBlue = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "item_pickaxe_crystal_blue", Util.CRYSTAL_BLUE_RARITY); + itemAxeCrystalBlue = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "item_axe_crystal_blue", Util.CRYSTAL_BLUE_RARITY); + itemShovelCrystalBlue = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "item_shovel_crystal_blue", Util.CRYSTAL_BLUE_RARITY); + itemSwordCrystalBlue = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "item_sword_crystal_blue", Util.CRYSTAL_BLUE_RARITY); + itemHoeCrystalBlue = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "item_hoe_crystal_blue", Util.CRYSTAL_BLUE_RARITY); + itemHelmCrystalBlue = new ItemArmorAA("item_helm_crystal_blue", InitArmorMaterials.armorMaterialCrystalBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); + itemChestCrystalBlue = new ItemArmorAA("item_chest_crystal_blue", InitArmorMaterials.armorMaterialCrystalBlue, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); + itemPantsCrystalBlue = new ItemArmorAA("item_pants_crystal_blue", InitArmorMaterials.armorMaterialCrystalBlue, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); + itemBootsCrystalBlue = new ItemArmorAA("item_boots_crystal_blue", InitArmorMaterials.armorMaterialCrystalBlue, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), Util.CRYSTAL_BLUE_RARITY); + itemPaxelCrystalBlue = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "item_paxel_crystal_blue", Util.CRYSTAL_BLUE_RARITY, 3014911); - itemPickaxeCrystalLightBlue = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemPickaxeCrystalLightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemAxeCrystalLightBlue = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemAxeCrystalLightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemShovelCrystalLightBlue = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemShovelCrystalLightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemSwordCrystalLightBlue = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemSwordCrystalLightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemHoeCrystalLightBlue = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemHoeCrystalLightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemHelmCrystalLightBlue = new ItemArmorAA("itemHelmCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemChestCrystalLightBlue = new ItemArmorAA("itemChestCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemPantsCrystalLightBlue = new ItemArmorAA("itemPantsCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemBootsCrystalLightBlue = new ItemArmorAA("itemBootsCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); - itemPaxelCrystalLightBlue = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemPaxelCrystalLightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY, 4093108); + itemPickaxeCrystalLightBlue = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "item_pickaxe_crystal_light_blue", Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemAxeCrystalLightBlue = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "item_axe_crystal_light_blue", Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemShovelCrystalLightBlue = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "item_shovel_crystal_light_blue", Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemSwordCrystalLightBlue = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "item_sword_crystal_light_blue", Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemHoeCrystalLightBlue = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "item_hoe_crystal_light_blue", Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemHelmCrystalLightBlue = new ItemArmorAA("item_helm_crystal_light_blue", InitArmorMaterials.armorMaterialCrystalLightBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemChestCrystalLightBlue = new ItemArmorAA("item_chest_crystal_light_blue", InitArmorMaterials.armorMaterialCrystalLightBlue, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemPantsCrystalLightBlue = new ItemArmorAA("item_pants_crystal_light_blue", InitArmorMaterials.armorMaterialCrystalLightBlue, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemBootsCrystalLightBlue = new ItemArmorAA("item_boots_crystal_light_blue", InitArmorMaterials.armorMaterialCrystalLightBlue, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), Util.CRYSTAL_LIGHT_BLUE_RARITY); + itemPaxelCrystalLightBlue = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "item_paxel_crystal_light_blue", Util.CRYSTAL_LIGHT_BLUE_RARITY, 4093108); - itemPickaxeCrystalBlack = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemPickaxeCrystalBlack", Util.CRYSTAL_BLACK_RARITY); - itemAxeCrystalBlack = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemAxeCrystalBlack", Util.CRYSTAL_BLACK_RARITY); - itemShovelCrystalBlack = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemShovelCrystalBlack", Util.CRYSTAL_BLACK_RARITY); - itemSwordCrystalBlack = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemSwordCrystalBlack", Util.CRYSTAL_BLACK_RARITY); - itemHoeCrystalBlack = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemHoeCrystalBlack", Util.CRYSTAL_BLACK_RARITY); - itemHelmCrystalBlack = new ItemArmorAA("itemHelmCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); - itemChestCrystalBlack = new ItemArmorAA("itemChestCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); - itemPantsCrystalBlack = new ItemArmorAA("itemPantsCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); - itemBootsCrystalBlack = new ItemArmorAA("itemBootsCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); - itemPaxelCrystalBlack = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemPaxelCrystalBlack", Util.CRYSTAL_BLACK_RARITY, 2631982); + itemPickaxeCrystalBlack = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "item_pickaxe_crystal_black", Util.CRYSTAL_BLACK_RARITY); + itemAxeCrystalBlack = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "item_axe_crystal_black", Util.CRYSTAL_BLACK_RARITY); + itemShovelCrystalBlack = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "item_shovel_crystal_black", Util.CRYSTAL_BLACK_RARITY); + itemSwordCrystalBlack = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "item_sword_crystal_black", Util.CRYSTAL_BLACK_RARITY); + itemHoeCrystalBlack = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "item_hoe_crystal_black", Util.CRYSTAL_BLACK_RARITY); + itemHelmCrystalBlack = new ItemArmorAA("item_helm_crystal_black", InitArmorMaterials.armorMaterialCrystalBlack, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); + itemChestCrystalBlack = new ItemArmorAA("item_chest_crystal_black", InitArmorMaterials.armorMaterialCrystalBlack, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); + itemPantsCrystalBlack = new ItemArmorAA("item_pants_crystal_black", InitArmorMaterials.armorMaterialCrystalBlack, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); + itemBootsCrystalBlack = new ItemArmorAA("item_boots_crystal_black", InitArmorMaterials.armorMaterialCrystalBlack, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), Util.CRYSTAL_BLACK_RARITY); + itemPaxelCrystalBlack = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "item_paxel_crystal_black", Util.CRYSTAL_BLACK_RARITY, 2631982); - itemPickaxeCrystalGreen = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemPickaxeCrystalGreen", Util.CRYSTAL_GREEN_RARITY); - itemAxeCrystalGreen = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemAxeCrystalGreen", Util.CRYSTAL_GREEN_RARITY); - itemShovelCrystalGreen = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemShovelCrystalGreen", Util.CRYSTAL_GREEN_RARITY); - itemSwordCrystalGreen = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemSwordCrystalGreen", Util.CRYSTAL_GREEN_RARITY); - itemHoeCrystalGreen = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemHoeCrystalGreen", Util.CRYSTAL_GREEN_RARITY); - itemHelmCrystalGreen = new ItemArmorAA("itemHelmCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); - itemChestCrystalGreen = new ItemArmorAA("itemChestCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); - itemPantsCrystalGreen = new ItemArmorAA("itemPantsCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); - itemBootsCrystalGreen = new ItemArmorAA("itemBootsCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); - itemPaxelCrystalGreen = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemPaxelCrystalGreen", Util.CRYSTAL_GREEN_RARITY, 46848); + itemPickaxeCrystalGreen = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "item_pickaxe_crystal_green", Util.CRYSTAL_GREEN_RARITY); + itemAxeCrystalGreen = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "item_axe_crystal_green", Util.CRYSTAL_GREEN_RARITY); + itemShovelCrystalGreen = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "item_shovel_crystal_green", Util.CRYSTAL_GREEN_RARITY); + itemSwordCrystalGreen = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "item_sword_crystal_green", Util.CRYSTAL_GREEN_RARITY); + itemHoeCrystalGreen = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "item_hoe_crystal_green", Util.CRYSTAL_GREEN_RARITY); + itemHelmCrystalGreen = new ItemArmorAA("item_helm_crystal_green", InitArmorMaterials.armorMaterialCrystalGreen, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); + itemChestCrystalGreen = new ItemArmorAA("item_chest_crystal_green", InitArmorMaterials.armorMaterialCrystalGreen, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); + itemPantsCrystalGreen = new ItemArmorAA("item_pants_crystal_green", InitArmorMaterials.armorMaterialCrystalGreen, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); + itemBootsCrystalGreen = new ItemArmorAA("item_boots_crystal_green", InitArmorMaterials.armorMaterialCrystalGreen, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), Util.CRYSTAL_GREEN_RARITY); + itemPaxelCrystalGreen = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "item_paxel_crystal_green", Util.CRYSTAL_GREEN_RARITY, 46848); - itemPickaxeCrystalWhite = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemPickaxeCrystalWhite", Util.CRYSTAL_WHITE_RARITY); - itemAxeCrystalWhite = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemAxeCrystalWhite", Util.CRYSTAL_WHITE_RARITY); - itemShovelCrystalWhite = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemShovelCrystalWhite", Util.CRYSTAL_WHITE_RARITY); - itemSwordCrystalWhite = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemSwordCrystalWhite", Util.CRYSTAL_WHITE_RARITY); - itemHoeCrystalWhite = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemHoeCrystalWhite", Util.CRYSTAL_WHITE_RARITY); - itemHelmCrystalWhite = new ItemArmorAA("itemHelmCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); - itemChestCrystalWhite = new ItemArmorAA("itemChestCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); - itemPantsCrystalWhite = new ItemArmorAA("itemPantsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); - itemBootsCrystalWhite = new ItemArmorAA("itemBootsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); - itemPaxelCrystalWhite = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemPaxelCrystalWhite", Util.CRYSTAL_WHITE_RARITY, 14606302); + itemPickaxeCrystalWhite = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "item_pickaxe_crystal_white", Util.CRYSTAL_WHITE_RARITY); + itemAxeCrystalWhite = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "item_axe_crystal_white", Util.CRYSTAL_WHITE_RARITY); + itemShovelCrystalWhite = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "item_shovel_crystal_white", Util.CRYSTAL_WHITE_RARITY); + itemSwordCrystalWhite = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "item_sword_crystal_white", Util.CRYSTAL_WHITE_RARITY); + itemHoeCrystalWhite = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "item_hoe_crystal_white", Util.CRYSTAL_WHITE_RARITY); + itemHelmCrystalWhite = new ItemArmorAA("item_helm_crystal_white", InitArmorMaterials.armorMaterialCrystalWhite, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); + itemChestCrystalWhite = new ItemArmorAA("item_chest_crystal_white", InitArmorMaterials.armorMaterialCrystalWhite, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); + itemPantsCrystalWhite = new ItemArmorAA("item_pants_crystal_white", InitArmorMaterials.armorMaterialCrystalWhite, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); + itemBootsCrystalWhite = new ItemArmorAA("item_boots_crystal_white", InitArmorMaterials.armorMaterialCrystalWhite, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY); + itemPaxelCrystalWhite = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "item_paxel_crystal_white", Util.CRYSTAL_WHITE_RARITY, 14606302); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index d8e0bff2c..9c502acbe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -48,7 +48,7 @@ public class ItemCrystal extends ItemBase{ @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= BlockCrystal.ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+BlockCrystal.ALL_CRYSTALS[stack.getItemDamage()].name; + return stack.getItemDamage() >= BlockCrystal.ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+"_"+BlockCrystal.ALL_CRYSTALS[stack.getItemDamage()].name; } @@ -68,7 +68,7 @@ public class ItemCrystal extends ItemBase{ @Override protected void registerRendering(){ for(int i = 0; i < BlockCrystal.ALL_CRYSTALS.length; i++){ - String name = this.getRegistryName()+BlockCrystal.ALL_CRYSTALS[i].name; + String name = this.getRegistryName()+"_"+BlockCrystal.ALL_CRYSTALS[i].name; ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(name), "inventory"); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 5e7f637c9..70e101ea3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -360,7 +360,7 @@ public class ItemDrill extends ItemEnergy{ @Override protected void registerRendering(){ for(int i = 0; i < 16; i++){ - String name = this.getRegistryName()+TheColoredLampColors.values()[i].name; + String name = this.getRegistryName()+"_"+TheColoredLampColors.values()[i].regName; ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(name), "inventory"); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index b30c232af..543cfddf2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -43,7 +43,7 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{ @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= ALL_DUSTS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_DUSTS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_DUSTS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+"_"+ALL_DUSTS[stack.getItemDamage()].name; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index a7fbab4e8..7219d37c2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -86,7 +86,7 @@ public class ItemFoods extends ItemFoodBase{ @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= ALL_FOODS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_FOODS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_FOODS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+"_"+ALL_FOODS[stack.getItemDamage()].name; } @@ -106,7 +106,7 @@ public class ItemFoods extends ItemFoodBase{ @Override protected void registerRendering(){ for(int i = 0; i < ALL_FOODS.length; i++){ - String name = this.getRegistryName()+ALL_FOODS[i].name; + String name = this.getRegistryName()+"_"+ALL_FOODS[i].name; ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name), "inventory"); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java index f5d924c83..08ce16f33 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -52,7 +52,7 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= ALL_JAMS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_JAMS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_JAMS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+"_"+ALL_JAMS[stack.getItemDamage()].name; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index 39c5ec4de..6e153e9e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -48,7 +48,7 @@ public class ItemMisc extends ItemBase{ @Override public String getUnlocalizedName(ItemStack stack){ - return stack.getItemDamage() >= ALL_MISC_ITEMS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_MISC_ITEMS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_MISC_ITEMS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+"_"+ALL_MISC_ITEMS[stack.getItemDamage()].name; } @@ -70,7 +70,7 @@ public class ItemMisc extends ItemBase{ @Override protected void registerRendering(){ for(int i = 0; i < ALL_MISC_ITEMS.length; i++){ - String name = this.getRegistryName()+ALL_MISC_ITEMS[i].name; + String name = this.getRegistryName()+"_"+ALL_MISC_ITEMS[i].name; ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(name), "inventory"); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java index 315808b8f..b470e735b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java @@ -15,12 +15,12 @@ import net.minecraft.item.EnumRarity; public enum TheCrystals{ - REDSTONE("Red", Util.CRYSTAL_RED_RARITY, 158F/255F, 43F/255F, 39F/255F), - LAPIS("Blue", Util.CRYSTAL_BLUE_RARITY, 37F/255F, 49F/255F, 147F/255F), - DIAMOND("LightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY, 99F/255F, 135F/255F, 210F/255F), - COAL("Black", Util.CRYSTAL_BLACK_RARITY, 0.2F, 0.2F, 0.2F), - EMERALD("Green", Util.CRYSTAL_GREEN_RARITY, 54F/255F, 75F/255F, 24F/255F), - IRON("White", Util.CRYSTAL_WHITE_RARITY, 0.8F, 0.8F, 0.8F); + REDSTONE("red", Util.CRYSTAL_RED_RARITY, 158F/255F, 43F/255F, 39F/255F), + LAPIS("blue", Util.CRYSTAL_BLUE_RARITY, 37F/255F, 49F/255F, 147F/255F), + DIAMOND("light_blue", Util.CRYSTAL_LIGHT_BLUE_RARITY, 99F/255F, 135F/255F, 210F/255F), + COAL("black", Util.CRYSTAL_BLACK_RARITY, 0.2F, 0.2F, 0.2F), + EMERALD("green", Util.CRYSTAL_GREEN_RARITY, 54F/255F, 75F/255F, 24F/255F), + IRON("white", Util.CRYSTAL_WHITE_RARITY, 0.8F, 0.8F, 0.8F); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java index 1ffc2e117..4cf0f6cc9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java @@ -15,14 +15,14 @@ import net.minecraft.item.EnumRarity; public enum TheDusts{ - IRON("Iron", 7826534, EnumRarity.COMMON), - GOLD("Gold", 14335744, EnumRarity.UNCOMMON), - DIAMOND("Diamond", 292003, EnumRarity.RARE), - EMERALD("Emerald", 4319527, EnumRarity.EPIC), - LAPIS("Lapis", 1849791, EnumRarity.UNCOMMON), - QUARTZ("Quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.UNCOMMON), - COAL("Coal", 0, EnumRarity.UNCOMMON), - QUARTZ_BLACK("QuartzBlack", 18, EnumRarity.RARE); + IRON("iron", 7826534, EnumRarity.COMMON), + GOLD("gold", 14335744, EnumRarity.UNCOMMON), + DIAMOND("diamond", 292003, EnumRarity.RARE), + EMERALD("emerald", 4319527, EnumRarity.EPIC), + LAPIS("lapis", 1849791, EnumRarity.UNCOMMON), + QUARTZ("quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.UNCOMMON), + COAL("coal", 0, EnumRarity.UNCOMMON), + QUARTZ_BLACK("quartz_black", 18, EnumRarity.RARE); public final String name; public final int color; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java index 7ba7d729f..83b8895cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java @@ -18,27 +18,27 @@ import net.minecraft.item.ItemStack; public enum TheFoods{ - CHEESE("Cheese", 1, 0.05F, false, 3, EnumRarity.COMMON), - PUMPKIN_STEW("PumpkinStew", 6, 0.3F, true, 30, EnumRarity.COMMON), - CARROT_JUICE("CarrotJuice", 4, 0.2F, true, 20, EnumRarity.COMMON), - FISH_N_CHIPS("FishNChips", 14, 0.65F, false, 40, EnumRarity.UNCOMMON), - FRENCH_FRIES("FrenchFries", 10, 0.6F, false, 32, EnumRarity.COMMON), - FRENCH_FRY("FrenchFry", 2, 0.025F, false, 3, EnumRarity.COMMON), - SPAGHETTI("Spaghetti", 7, 0.4F, false, 38, EnumRarity.COMMON), - NOODLE("Noodle", 1, 0.01F, false, 3, EnumRarity.COMMON), - CHOCOLATE_CAKE("ChocolateCake", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), - CHOCOLATE("Chocolate", 3, 0.3F, false, 15, EnumRarity.COMMON), - TOAST("Toast", 3, 0.08F, false, 25, EnumRarity.COMMON), - SUBMARINE_SANDWICH("SubmarineSandwich", 9, 0.4F, false, 40, EnumRarity.UNCOMMON), - BIG_COOKIE("BigCookie", 4, 0.25F, false, 20, EnumRarity.UNCOMMON), - HAMBURGER("Hamburger", 13, 0.65F, false, 40, EnumRarity.COMMON), - PIZZA("Pizza", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), - BAGUETTE("Baguette", 6, 0.5F, false, 25, EnumRarity.COMMON), - RICE("Rice", 2, 0.05F, false, 10, EnumRarity.UNCOMMON), - RICE_BREAD("RiceBread", 6, 0.5F, false, 25, EnumRarity.UNCOMMON), - DOUGHNUT("Doughnut", 2, 0.1F, false, 10, EnumRarity.EPIC), - CHOCOLATE_TOAST("ChocolateToast", 5, 0.2F, false, 40, EnumRarity.RARE), - BACON("Bacon", 4, 0.1F, false, 30, EnumRarity.COMMON); + CHEESE("cheese", 1, 0.05F, false, 3, EnumRarity.COMMON), + PUMPKIN_STEW("pumpkin_stew", 6, 0.3F, true, 30, EnumRarity.COMMON), + CARROT_JUICE("carrot_juice", 4, 0.2F, true, 20, EnumRarity.COMMON), + FISH_N_CHIPS("fish_n_chips", 14, 0.65F, false, 40, EnumRarity.UNCOMMON), + FRENCH_FRIES("french_fries", 10, 0.6F, false, 32, EnumRarity.COMMON), + FRENCH_FRY("french_fry", 2, 0.025F, false, 3, EnumRarity.COMMON), + SPAGHETTI("spaghetti", 7, 0.4F, false, 38, EnumRarity.COMMON), + NOODLE("noodle", 1, 0.01F, false, 3, EnumRarity.COMMON), + CHOCOLATE_CAKE("chocolate_cake", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), + CHOCOLATE("chocolate", 3, 0.3F, false, 15, EnumRarity.COMMON), + TOAST("toast", 3, 0.08F, false, 25, EnumRarity.COMMON), + SUBMARINE_SANDWICH("submarine_sandwich", 9, 0.4F, false, 40, EnumRarity.UNCOMMON), + BIG_COOKIE("big_cookie", 4, 0.25F, false, 20, EnumRarity.UNCOMMON), + HAMBURGER("hamburger", 13, 0.65F, false, 40, EnumRarity.COMMON), + PIZZA("pizza", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), + BAGUETTE("baguette", 6, 0.5F, false, 25, EnumRarity.COMMON), + RICE("rice", 2, 0.05F, false, 10, EnumRarity.UNCOMMON), + RICE_BREAD("rice_bread", 6, 0.5F, false, 25, EnumRarity.UNCOMMON), + DOUGHNUT("doughnut", 2, 0.1F, false, 10, EnumRarity.EPIC), + CHOCOLATE_TOAST("chocolate_toast", 5, 0.2F, false, 40, EnumRarity.RARE), + BACON("bacon", 4, 0.1F, false, 30, EnumRarity.COMMON); public final String name; public final int healAmount; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java index 4e44b5cb5..a8d7c0f3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java @@ -14,13 +14,13 @@ import net.minecraft.item.EnumRarity; public enum TheJams{ - CU_BA_RA("CuBaRa", 6, 0.1F, EnumRarity.RARE, 5, 12, 12595273), - GRA_KI_BA("GraKiBa", 6, 0.1F, EnumRarity.RARE, 16, 13, 5492820), - PL_AP_LE("PlApLe", 6, 0.1F, EnumRarity.RARE, 15, 3, 13226009), - CH_AP_CI("ChApCi", 6, 0.1F, EnumRarity.RARE, 10, 1, 13189222), - HO_ME_KI("HoMeKi", 6, 0.1F, EnumRarity.RARE, 10, 14, 2031360), - PI_CO("PiCo", 6, 0.1F, EnumRarity.RARE, 9, 1, 16056203), - HO_ME_CO("HoMeCo", 6, 0.1F, EnumRarity.RARE, 10, 13, 10462208); + CU_BA_RA("cu_ba_ra", 6, 0.1F, EnumRarity.RARE, 5, 12, 12595273), + GRA_KI_BA("gra_ki_ba", 6, 0.1F, EnumRarity.RARE, 16, 13, 5492820), + PL_AP_LE("pl_ap_le", 6, 0.1F, EnumRarity.RARE, 15, 3, 13226009), + CH_AP_CI("ch_ap_ci", 6, 0.1F, EnumRarity.RARE, 10, 1, 13189222), + HO_ME_KI("ho_me_ki", 6, 0.1F, EnumRarity.RARE, 10, 14, 2031360), + PI_CO("pi_co", 6, 0.1F, EnumRarity.RARE, 9, 1, 16056203), + HO_ME_CO("ho_me_co", 6, 0.1F, EnumRarity.RARE, 10, 13, 10462208); public final String name; public final int healAmount; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java index 4289e6442..379d6d49d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java @@ -15,32 +15,32 @@ import net.minecraft.item.EnumRarity; public enum TheMiscItems{ - PAPER_CONE("PaperCone", EnumRarity.COMMON), - MASHED_FOOD("MashedFood", EnumRarity.UNCOMMON), - KNIFE_BLADE("KnifeBlade", EnumRarity.COMMON), - KNIFE_HANDLE("KnifeHandle", EnumRarity.COMMON), - DOUGH("Dough", EnumRarity.COMMON), - QUARTZ("BlackQuartz", EnumRarity.EPIC), - RING("Ring", EnumRarity.UNCOMMON), - COIL("Coil", EnumRarity.COMMON), - COIL_ADVANCED("CoilAdvanced", EnumRarity.UNCOMMON), - RICE_DOUGH("RiceDough", EnumRarity.UNCOMMON), - TINY_COAL("TinyCoal", EnumRarity.COMMON), - TINY_CHAR("TinyCharcoal", EnumRarity.COMMON), - RICE_SLIME("RiceSlime", EnumRarity.UNCOMMON), - CANOLA("Canola", EnumRarity.UNCOMMON), - CUP("Cup", EnumRarity.UNCOMMON), - BAT_WING("BatWing", EnumRarity.RARE), - DRILL_CORE("DrillCore", EnumRarity.UNCOMMON), - BLACK_DYE("BlackDye", EnumRarity.EPIC), - LENS("Lens", EnumRarity.UNCOMMON), - ENDER_STAR("EnderStar", EnumRarity.EPIC), - SPAWNER_SHARD("SpawnerShard", EnumRarity.EPIC), - BIOMASS("Biomass", EnumRarity.UNCOMMON), - BIOCOAL("Biocoal", EnumRarity.RARE), - CRYSTALLIZED_CANOLA_SEED("CrystallizedCanolaSeed", EnumRarity.UNCOMMON), - EMPOWERED_CANOLA_SEED("EmpoweredCanolaSeed", EnumRarity.RARE), - YOUTUBE_ICON("YoutubeIcon", Util.FALLBACK_RARITY); + PAPER_CONE("paper_cone", EnumRarity.COMMON), + MASHED_FOOD("mashed_food", EnumRarity.UNCOMMON), + KNIFE_BLADE("knife_blade", EnumRarity.COMMON), + KNIFE_HANDLE("knife_handle", EnumRarity.COMMON), + DOUGH("dough", EnumRarity.COMMON), + QUARTZ("black_quartz", EnumRarity.EPIC), + RING("ring", EnumRarity.UNCOMMON), + COIL("coil", EnumRarity.COMMON), + COIL_ADVANCED("coil_advanced", EnumRarity.UNCOMMON), + RICE_DOUGH("rice_dough", EnumRarity.UNCOMMON), + TINY_COAL("tiny_coal", EnumRarity.COMMON), + TINY_CHAR("tiny_charcoal", EnumRarity.COMMON), + RICE_SLIME("rice_slime", EnumRarity.UNCOMMON), + CANOLA("canola", EnumRarity.UNCOMMON), + CUP("cup", EnumRarity.UNCOMMON), + BAT_WING("bat_wing", EnumRarity.RARE), + DRILL_CORE("drill_core", EnumRarity.UNCOMMON), + BLACK_DYE("black_dye", EnumRarity.EPIC), + LENS("lens", EnumRarity.UNCOMMON), + ENDER_STAR("ender_star", EnumRarity.EPIC), + SPAWNER_SHARD("spawner_shard", EnumRarity.EPIC), + BIOMASS("biomass", EnumRarity.UNCOMMON), + BIOCOAL("biocoal", EnumRarity.RARE), + CRYSTALLIZED_CANOLA_SEED("crystallized_canola_seed", EnumRarity.UNCOMMON), + EMPOWERED_CANOLA_SEED("empowered_canola_seed", EnumRarity.RARE), + YOUTUBE_ICON("youtube_icon", Util.FALLBACK_RARITY); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java index 0c31435fd..4ed0aa847 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java @@ -25,7 +25,7 @@ public class CoffeeMachineRecipeCategory extends BlankRecipeCategory tooltip.actuallyadditions.laser.connected.desc= tooltip.actuallyadditions.laser.cantConnect.desc=Can't connect: The relays are either part of the same network, the stored relay isn't the same type or doesn't exist anymore or it is too far away! -tooltip.actuallyadditions.itemBooklet.desc=Or "Booklet", if you will -tooltip.actuallyadditions.itemBooklet.sub.1=This book guides you through all of -tooltip.actuallyadditions.itemBooklet.sub.2=the features that Actually Additions -tooltip.actuallyadditions.itemBooklet.sub.3=has to offer. -tooltip.actuallyadditions.itemBooklet.sub.4=Use while holding to open. +tooltip.actuallyadditions.item_booklet.desc=Or "Booklet", if you will +tooltip.actuallyadditions.item_booklet.sub.1=This book guides you through all of +tooltip.actuallyadditions.item_booklet.sub.2=the features that Actually Additions +tooltip.actuallyadditions.item_booklet.sub.3=has to offer. +tooltip.actuallyadditions.item_booklet.sub.4=Use while holding to open. tooltip.actuallyadditions.playerProbe.disconnect.1=The player you were probing has broken the connection before you could strap him to the Player Interface! Data will be cleared! tooltip.actuallyadditions.playerProbe.disconnect.2=The player you were probing has disconnected before you could strap him to the Player Interface! Data will be cleared! tooltip.actuallyadditions.playerProbe.probing=Probing diff --git a/src/main/resources/assets/actuallyadditions/sounds.json b/src/main/resources/assets/actuallyadditions/sounds.json index aedb30d28..db6ab871e 100644 --- a/src/main/resources/assets/actuallyadditions/sounds.json +++ b/src/main/resources/assets/actuallyadditions/sounds.json @@ -1,6 +1,6 @@ { - "duhDuhDuhDuuuh": { "category": "record", "sounds":["actuallyadditions:duhDuhDuhDuuuh"] }, - "coffeeMachine": { "category": "block", "sounds":["actuallyadditions:coffeeMachine"] }, + "duh_duh_duh_duuuh": { "category": "record", "sounds":["actuallyadditions:duh_duh_duh_duuuh"] }, + "coffee_machine": { "category": "block", "sounds":["actuallyadditions:coffee_machine"] }, "reconstructor": { "category": "block", "sounds":["actuallyadditions:reconstructor"] }, "crusher": { "category": "block", "sounds":["actuallyadditions:crusher"] } } \ No newline at end of file