Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

snake_cased all items and their names

Browse source
This commit is contained in:
Ellpeck 2016-11-19 23:12:22 +01:00
parent 07b97ada87
commit 5d624c7c50
60 changed files with 824 additions and 824 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
View file

@ -160,7 +160,7 @@ public class BlockColoredLamp extends BlockBase{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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;
} }
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
View file

@ -89,7 +89,7 @@ public class BlockCrystal extends BlockBase{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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 @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java
View file

@ -124,7 +124,7 @@ public class BlockInputter extends BlockContainerBase{
this.toPick = this.rand.nextInt(NAME_FLAVOR_AMOUNTS)+1; 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")+")";
} }
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java
View file

@ -87,7 +87,7 @@ public class BlockMisc extends BlockBase{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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;
} }
} }
} }

176
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java
View file

@ -112,97 +112,97 @@ public final class InitBlocks{
public static void init(){ public static void init(){
ModUtil.LOGGER.info("Initializing Blocks..."); ModUtil.LOGGER.info("Initializing Blocks...");
blockFarmer = new BlockFarmer("blockFarmer"); blockFarmer = new BlockFarmer("block_farmer");
blockBioReactor = new BlockBioReactor("blockBioReactor"); blockBioReactor = new BlockBioReactor("block_bio_reactor");
blockDistributorItem = new BlockDistributorItem("blockDistributorItem"); blockDistributorItem = new BlockDistributorItem("block_distributor_item");
blockEmpowerer = new BlockEmpowerer("blockEmpowerer"); blockEmpowerer = new BlockEmpowerer("block_empowerer");
blockTinyTorch = new BlockTinyTorch("blockTinyTorch"); blockTinyTorch = new BlockTinyTorch("block_tiny_torch");
blockShockSuppressor = new BlockShockSuppressor("blockShockSuppressor"); blockShockSuppressor = new BlockShockSuppressor("block_shock_suppressor");
blockDisplayStand = new BlockDisplayStand("blockDisplayStand"); blockDisplayStand = new BlockDisplayStand("block_display_stand");
blockPlayerInterface = new BlockPlayerInterface("blockPlayerInterface"); blockPlayerInterface = new BlockPlayerInterface("block_player_interface");
blockItemViewer = new BlockItemViewer("blockItemViewer"); blockItemViewer = new BlockItemViewer("block_item_viewer");
blockFireworkBox = new BlockFireworkBox("blockFireworkBox"); blockFireworkBox = new BlockFireworkBox("block_firework_box");
blockMiner = new BlockMiner("blockMiner"); blockMiner = new BlockMiner("block_miner");
blockAtomicReconstructor = new BlockAtomicReconstructor("blockAtomicReconstructor"); blockAtomicReconstructor = new BlockAtomicReconstructor("block_atomic_reconstructor");
blockCrystal = new BlockCrystal("blockCrystal", false); blockCrystal = new BlockCrystal("block_crystal", false);
blockCrystalEmpowered = new BlockCrystal("blockCrystalEmpowered", true); blockCrystalEmpowered = new BlockCrystal("block_crystal_empowered", true);
blockBlackLotus = new BlockBlackLotus("blockBlackLotus"); blockBlackLotus = new BlockBlackLotus("block_black_lotus");
blockLaserRelay = new BlockLaserRelay("blockLaserRelay", Type.ENERGY_BASIC); blockLaserRelay = new BlockLaserRelay("block_laser_relay", Type.ENERGY_BASIC);
blockLaserRelayAdvanced = new BlockLaserRelay("blockLaserRelayAdvanced", Type.ENERGY_ADVANCED); blockLaserRelayAdvanced = new BlockLaserRelay("block_laser_relay_advanced", Type.ENERGY_ADVANCED);
blockLaserRelayExtreme = new BlockLaserRelay("blockLaserRelayExtreme", Type.ENERGY_EXTREME); blockLaserRelayExtreme = new BlockLaserRelay("block_laser_relay_extreme", Type.ENERGY_EXTREME);
blockLaserRelayFluids = new BlockLaserRelay("blockLaserRelayFluids", Type.FLUIDS); blockLaserRelayFluids = new BlockLaserRelay("block_laser_relay_fluids", Type.FLUIDS);
blockLaserRelayItem = new BlockLaserRelay("blockLaserRelayItem", Type.ITEM); blockLaserRelayItem = new BlockLaserRelay("block_laser_relay_item", Type.ITEM);
blockLaserRelayItemWhitelist = new BlockLaserRelay("blockLaserRelayItemWhitelist", Type.ITEM_WHITELIST); blockLaserRelayItemWhitelist = new BlockLaserRelay("block_laser_relay_item_whitelist", Type.ITEM_WHITELIST);
blockRangedCollector = new BlockRangedCollector("blockRangedCollector"); blockRangedCollector = new BlockRangedCollector("block_ranged_collector");
blockDirectionalBreaker = new BlockDirectionalBreaker("blockDirectionalBreaker"); blockDirectionalBreaker = new BlockDirectionalBreaker("block_directional_breaker");
blockLeafGenerator = new BlockLeafGenerator("blockLeafGenerator"); blockLeafGenerator = new BlockLeafGenerator("block_leaf_generator");
blockSmileyCloud = new BlockSmileyCloud("blockSmileyCloud"); blockSmileyCloud = new BlockSmileyCloud("block_smiley_cloud");
blockXPSolidifier = new BlockXPSolidifier("blockXPSolidifier"); blockXPSolidifier = new BlockXPSolidifier("block_xp_solidifier");
blockTestifiBucksGreenWall = new BlockGeneric("blockTestifiBucksGreenWall"); blockTestifiBucksGreenWall = new BlockGeneric("block_testifi_bucks_green_wall");
blockTestifiBucksWhiteWall = new BlockGeneric("blockTestifiBucksWhiteWall"); blockTestifiBucksWhiteWall = new BlockGeneric("block_testifi_bucks_white_wall");
blockTestifiBucksGreenStairs = new BlockStair(blockTestifiBucksGreenWall, "blockTestifiBucksGreenStairs"); blockTestifiBucksGreenStairs = new BlockStair(blockTestifiBucksGreenWall, "block_testifi_bucks_green_stairs");
blockTestifiBucksWhiteStairs = new BlockStair(blockTestifiBucksWhiteWall, "blockTestifiBucksWhiteStairs"); blockTestifiBucksWhiteStairs = new BlockStair(blockTestifiBucksWhiteWall, "block_testifi_bucks_white_stairs");
blockTestifiBucksGreenSlab = new BlockSlabs("blockTestifiBucksGreenSlab", blockTestifiBucksGreenWall); blockTestifiBucksGreenSlab = new BlockSlabs("block_testifi_bucks_green_slab", blockTestifiBucksGreenWall);
blockTestifiBucksWhiteSlab = new BlockSlabs("blockTestifiBucksWhiteSlab", blockTestifiBucksWhiteWall); blockTestifiBucksWhiteSlab = new BlockSlabs("block_testifi_bucks_white_slab", blockTestifiBucksWhiteWall);
blockTestifiBucksGreenFence = new BlockWallAA("blockTestifiBucksGreenFence", blockTestifiBucksGreenWall); blockTestifiBucksGreenFence = new BlockWallAA("block_testifi_bucks_green_fence", blockTestifiBucksGreenWall);
blockTestifiBucksWhiteFence = new BlockWallAA("blockTestifiBucksWhiteFence", blockTestifiBucksWhiteWall); blockTestifiBucksWhiteFence = new BlockWallAA("block_testifi_bucks_white_fence", blockTestifiBucksWhiteWall);
blockColoredLamp = new BlockColoredLamp(false, "blockColoredLamp"); blockColoredLamp = new BlockColoredLamp(false, "block_colored_lamp");
blockColoredLampOn = new BlockColoredLamp(true, "blockColoredLampOn"); blockColoredLampOn = new BlockColoredLamp(true, "block_colored_lamp_on");
blockLampPowerer = new BlockLampPowerer("blockLampPowerer"); blockLampPowerer = new BlockLampPowerer("block_lamp_powerer");
blockTreasureChest = new BlockTreasureChest("blockTreasureChest"); blockTreasureChest = new BlockTreasureChest("block_treasure_chest");
blockEnergizer = new BlockEnergizer(true, "blockEnergizer"); blockEnergizer = new BlockEnergizer(true, "block_energizer");
blockEnervator = new BlockEnergizer(false, "blockEnervator"); blockEnervator = new BlockEnergizer(false, "block_enervator");
blockLavaFactoryController = new BlockLavaFactoryController("blockLavaFactoryController"); blockLavaFactoryController = new BlockLavaFactoryController("block_lava_factory_controller");
blockCanolaPress = new BlockCanolaPress("blockCanolaPress"); blockCanolaPress = new BlockCanolaPress("block_canola_press");
blockPhantomface = new BlockPhantom(BlockPhantom.Type.FACE, "blockPhantomface"); blockPhantomface = new BlockPhantom(BlockPhantom.Type.FACE, "block_phantomface");
blockPhantomPlacer = new BlockPhantom(BlockPhantom.Type.PLACER, "blockPhantomPlacer"); blockPhantomPlacer = new BlockPhantom(BlockPhantom.Type.PLACER, "block_phantom_placer");
blockPhantomLiquiface = new BlockPhantom(BlockPhantom.Type.LIQUIFACE, "blockPhantomLiquiface"); blockPhantomLiquiface = new BlockPhantom(BlockPhantom.Type.LIQUIFACE, "block_phantom_liquiface");
blockPhantomEnergyface = new BlockPhantom(BlockPhantom.Type.ENERGYFACE, "blockPhantomEnergyface"); blockPhantomEnergyface = new BlockPhantom(BlockPhantom.Type.ENERGYFACE, "block_phantom_energyface");
blockPhantomRedstoneface = new BlockPhantom(BlockPhantom.Type.REDSTONEFACE, "blockPhantomRedstoneface"); blockPhantomRedstoneface = new BlockPhantom(BlockPhantom.Type.REDSTONEFACE, "block_phantom_redstoneface");
blockPhantomBreaker = new BlockPhantom(BlockPhantom.Type.BREAKER, "blockPhantomBreaker"); blockPhantomBreaker = new BlockPhantom(BlockPhantom.Type.BREAKER, "block_phantom_breaker");
blockCoalGenerator = new BlockCoalGenerator("blockCoalGenerator"); blockCoalGenerator = new BlockCoalGenerator("block_coal_generator");
blockOilGenerator = new BlockOilGenerator("blockOilGenerator"); blockOilGenerator = new BlockOilGenerator("block_oil_generator");
blockFermentingBarrel = new BlockFermentingBarrel("blockFermentingBarrel"); blockFermentingBarrel = new BlockFermentingBarrel("block_fermenting_barrel");
blockRice = new BlockPlant("blockRice", 1, 2); blockRice = new BlockPlant("block_rice", 1, 2);
CompatUtil.registerMFRPlant(blockRice); CompatUtil.registerMFRPlant(blockRice);
blockCanola = new BlockPlant("blockCanola", 2, 3); blockCanola = new BlockPlant("block_canola", 2, 3);
CompatUtil.registerMFRPlant(blockCanola); CompatUtil.registerMFRPlant(blockCanola);
blockFlax = new BlockPlant("blockFlax", 2, 4); blockFlax = new BlockPlant("block_flax", 2, 4);
CompatUtil.registerMFRPlant(blockFlax); CompatUtil.registerMFRPlant(blockFlax);
blockCoffee = new BlockPlant("blockCoffee", 2, 2); blockCoffee = new BlockPlant("block_coffee", 2, 2);
CompatUtil.registerMFRPlant(blockCoffee); CompatUtil.registerMFRPlant(blockCoffee);
blockCompost = new BlockCompost("blockCompost"); blockCompost = new BlockCompost("block_compost");
blockMisc = new BlockMisc("blockMisc"); blockMisc = new BlockMisc("block_misc");
blockFeeder = new BlockFeeder("blockFeeder"); blockFeeder = new BlockFeeder("block_feeder");
blockGiantChest = new BlockGiantChest("blockGiantChest", 0); blockGiantChest = new BlockGiantChest("block_giant_chest", 0);
blockGiantChestMedium = new BlockGiantChest("blockGiantChestMedium", 1); blockGiantChestMedium = new BlockGiantChest("block_giant_chest_medium", 1);
blockGiantChestLarge = new BlockGiantChest("blockGiantChestLarge", 2); blockGiantChestLarge = new BlockGiantChest("block_giant_chest_large", 2);
blockGrinder = new BlockGrinder(false, "blockGrinder"); blockGrinder = new BlockGrinder(false, "block_grinder");
blockGrinderDouble = new BlockGrinder(true, "blockGrinderDouble"); blockGrinderDouble = new BlockGrinder(true, "block_grinder_double");
blockFurnaceDouble = new BlockFurnaceDouble("blockFurnaceDouble"); blockFurnaceDouble = new BlockFurnaceDouble("block_furnace_double");
blockInputter = new BlockInputter(false, "blockInputter"); blockInputter = new BlockInputter(false, "block_inputter");
blockInputterAdvanced = new BlockInputter(true, "blockInputterAdvanced"); blockInputterAdvanced = new BlockInputter(true, "block_inputter_advanced");
blockFishingNet = new BlockFishingNet("blockFishingNet"); blockFishingNet = new BlockFishingNet("block_fishing_net");
blockFurnaceSolar = new BlockFurnaceSolar("blockFurnaceSolar"); blockFurnaceSolar = new BlockFurnaceSolar("block_furnace_solar");
blockHeatCollector = new BlockHeatCollector("blockHeatCollector"); blockHeatCollector = new BlockHeatCollector("block_heat_collector");
blockItemRepairer = new BlockItemRepairer("blockItemRepairer"); blockItemRepairer = new BlockItemRepairer("block_item_repairer");
blockGreenhouseGlass = new BlockGreenhouseGlass("blockGreenhouseGlass"); blockGreenhouseGlass = new BlockGreenhouseGlass("block_greenhouse_glass");
blockBreaker = new BlockBreaker(false, "blockBreaker"); blockBreaker = new BlockBreaker(false, "block_breaker");
blockPlacer = new BlockBreaker(true, "blockPlacer"); blockPlacer = new BlockBreaker(true, "block_placer");
blockDropper = new BlockDropper("blockDropper"); blockDropper = new BlockDropper("block_dropper");
blockFluidPlacer = new BlockFluidCollector(true, "blockFluidPlacer"); blockFluidPlacer = new BlockFluidCollector(true, "block_fluid_placer");
blockFluidCollector = new BlockFluidCollector(false, "blockFluidCollector"); blockFluidCollector = new BlockFluidCollector(false, "block_fluid_collector");
blockCoffeeMachine = new BlockCoffeeMachine("blockCoffeeMachine"); blockCoffeeMachine = new BlockCoffeeMachine("block_coffee_machine");
blockPhantomBooster = new BlockPhantomBooster("blockPhantomBooster"); blockPhantomBooster = new BlockPhantomBooster("block_phantom_booster");
blockWildPlant = new BlockWildPlant("blockWild"); blockWildPlant = new BlockWildPlant("block_wild");
blockQuartzWall = new BlockWallAA("blockQuartzWall", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); blockQuartzWall = new BlockWallAA("block_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ.ordinal());
blockChiseledQuartzWall = new BlockWallAA("blockChiseledQuartzWall", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); blockChiseledQuartzWall = new BlockWallAA("block_chiseled_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal());
blockPillarQuartzWall = new BlockWallAA("blockPillarQuartzWall", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); blockPillarQuartzWall = new BlockWallAA("block_pillar_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal());
blockQuartzStair = new BlockStair(blockMisc, "blockQuartzStair", TheMiscBlocks.QUARTZ.ordinal()); blockQuartzStair = new BlockStair(blockMisc, "block_quartz_stair", TheMiscBlocks.QUARTZ.ordinal());
blockChiseledQuartzStair = new BlockStair(blockMisc, "blockChiseledQuartzStair", TheMiscBlocks.QUARTZ_CHISELED.ordinal()); blockChiseledQuartzStair = new BlockStair(blockMisc, "block_chiseled_quartz_stair", TheMiscBlocks.QUARTZ_CHISELED.ordinal());
blockPillarQuartzStair = new BlockStair(blockMisc, "blockPillarQuartzStair", TheMiscBlocks.QUARTZ_PILLAR.ordinal()); blockPillarQuartzStair = new BlockStair(blockMisc, "block_pillar_quartz_stair", TheMiscBlocks.QUARTZ_PILLAR.ordinal());
blockQuartzSlab = new BlockSlabs("blockQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); blockQuartzSlab = new BlockSlabs("block_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ.ordinal());
blockChiseledQuartzSlab = new BlockSlabs("blockChiseledQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); blockChiseledQuartzSlab = new BlockSlabs("block_chiseled_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal());
blockPillarQuartzSlab = new BlockSlabs("blockPillarQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); blockPillarQuartzSlab = new BlockSlabs("block_pillar_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal());
} }
} }

42
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java
View file

@ -12,34 +12,36 @@ package de.ellpeck.actuallyadditions.mod.blocks.metalists;
public enum TheColoredLampColors{ public enum TheColoredLampColors{
WHITE("White"), WHITE("White", "white"),
ORANGE("Orange"), ORANGE("Orange", "orange"),
MAGENTA("Magenta"), MAGENTA("Magenta", "magenta"),
LIGHT_BLUE("LightBlue"), LIGHT_BLUE("LightBlue", "light_blue"),
YELLOW("Yellow"), YELLOW("Yellow", "yellow"),
LIME("Lime"), LIME("Lime", "lime"),
PINK("Pink"), PINK("Pink", "pink"),
GRAY("Gray"), GRAY("Gray", "gray"),
LIGHT_GRAY("LightGray"), LIGHT_GRAY("LightGray", "light_gray"),
CYAN("Cyan"), CYAN("Cyan", "cyan"),
PURPLE("Purple"), PURPLE("Purple", "purple"),
BLUE("Blue"), BLUE("Blue", "blue"),
BROWN("Brown"), BROWN("Brown", "brown"),
GREEN("Green"), GREEN("Green", "green"),
RED("Red"), RED("Red", "red"),
BLACK("Black"); BLACK("Black", "black");
public final String name; public final String regName;
public final String oreName;
TheColoredLampColors(String name){ TheColoredLampColors(String oreName, String regName){
this.name = name; this.oreName = oreName;
this.regName = regName;
} }
public static TheColoredLampColors getColorFromDyeName(String color){ public static TheColoredLampColors getColorFromDyeName(String color){
if(color.substring(0, 3).equals("dye")){ if(color.substring(0, 3).equals("dye")){
String actualName = color.substring(3); String actualName = color.substring(3);
for(int i = 0; i < values().length; i++){ for(int i = 0; i < values().length; i++){
String aName = values()[i].name; String aName = values()[i].oreName;
if(aName != null){ if(aName != null){
if(aName.equalsIgnoreCase(actualName)){ if(aName.equalsIgnoreCase(actualName)){
return values()[i]; return values()[i];

20
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java
View file

@ -14,16 +14,16 @@ import net.minecraft.item.EnumRarity;
public enum TheMiscBlocks{ public enum TheMiscBlocks{
QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.RARE), QUARTZ_PILLAR("black_quartz_pillar", EnumRarity.RARE),
QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.RARE), QUARTZ_CHISELED("black_quartz_chiseled", EnumRarity.RARE),
QUARTZ("BlackQuartz", EnumRarity.RARE), QUARTZ("black_quartz", EnumRarity.RARE),
ORE_QUARTZ("OreBlackQuartz", EnumRarity.EPIC), ORE_QUARTZ("ore_black_quartz", EnumRarity.EPIC),
WOOD_CASING("WoodCasing", EnumRarity.COMMON), WOOD_CASING("wood_casing", EnumRarity.COMMON),
CHARCOAL_BLOCK("Charcoal", EnumRarity.COMMON), CHARCOAL_BLOCK("charcoal", EnumRarity.COMMON),
ENDERPEARL_BLOCK("Enderpearl", EnumRarity.RARE), ENDERPEARL_BLOCK("enderpearl", EnumRarity.RARE),
LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.UNCOMMON), LAVA_FACTORY_CASE("lava_factory_case", EnumRarity.UNCOMMON),
ENDER_CASING("EnderCasing", EnumRarity.EPIC), ENDER_CASING("ender_casing", EnumRarity.EPIC),
IRON_CASING("IronCasing", EnumRarity.RARE); IRON_CASING("iron_casing", EnumRarity.RARE);
public final String name; public final String name;
public final EnumRarity rarity; public final EnumRarity rarity;

24
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java
View file

@ -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(); 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)); new BookletChapter("intro", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3));
ArrayList<BookletPage> crystalPages = new ArrayList<BookletPage>(); ArrayList<BookletPage> crystalPages = new ArrayList<BookletPage>();
crystalPages.addAll(Arrays.asList(new PageTextOnly(1).addTextReplacement("<rf>", 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("<rf>", 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++){ for(int i = 0; i < LensRecipeHandler.MAIN_PAGE_RECIPES.size(); i++){
crystalPages.add(new PageReconstructor(7+i, LensRecipeHandler.MAIN_PAGE_RECIPES.get(i)).setNoText()); 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[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("<rf>", TileEntityCoalGenerator.PRODUCE)); chaptersIntroduction[4] = new BookletChapter("coalGen", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).setWildcard().addTextReplacement("<rf>", TileEntityCoalGenerator.PRODUCE));
ArrayList<BookletPage> empowererPages = new ArrayList<BookletPage>(); ArrayList<BookletPage> empowererPages = new ArrayList<BookletPage>();
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++){ for(int i = 0; i < EmpowererHandler.MAIN_PAGE_RECIPES.size(); i++){
empowererPages.add(new PageEmpowerer(7+i, EmpowererHandler.MAIN_PAGE_RECIPES.get(i)).setNoText()); 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)); chaptersIntroduction[3] = new BookletChapter("rf", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(Items.REDSTONE), new PageTextOnly(1));
//Miscellaneous //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("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()); 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("<lowest>", OreGen.QUARTZ_MIN).addTextReplacement("<highest>", 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()); 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("<lowest>", OreGen.QUARTZ_MIN).addTextReplacement("<highest>", 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("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("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("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, "pageLushCaves", 0).setNoText()); 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, "pageFurBalls", 110).addItemToPage(new ItemStack(InitItems.itemHairyBall)), new PageTextOnly(2)).setSpecial(); 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("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("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(); 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 //Laser Relays
chaptersIntroduction[7] = new BookletChapter("laserIntro", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitItems.itemLaserWrench), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("<range>", TileEntityLaserRelay.MAX_DISTANCE), new PageCrafting(3, ItemCrafting.recipeLaserWrench).setNoText()).setImportant(); chaptersIntroduction[7] = new BookletChapter("laserIntro", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitItems.itemLaserWrench), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("<range>", 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("<cap1>", TileEntityLaserRelayEnergy.CAP).addTextReplacement("<cap2>", TileEntityLaserRelayEnergyAdvanced.CAP).addTextReplacement("<cap3>", 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("laserRelays", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitBlocks.blockLaserRelay), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("<cap1>", TileEntityLaserRelayEnergy.CAP).addTextReplacement("<cap2>", TileEntityLaserRelayEnergyAdvanced.CAP).addTextReplacement("<cap3>", 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, "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("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()); new BookletChapter("fluidLaser", ActuallyAdditionsAPI.entryLaserRelays, new ItemStack(InitBlocks.blockLaserRelayFluids), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFluidLaser).setNoText());
//No RF Using Blocks //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("<energy>", TileEntityFarmer.USE_PER_OPERATION), new PageCrafting(2, BlockCrafting.recipeFarmer).setWildcard().setNoText()).setImportant(); new BookletChapter("farmer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFarmer), new PageTextOnly(1).addTextReplacement("<energy>", 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("<rf>", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial(); new BookletChapter("fireworkBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFireworkBox), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial();
new BookletChapter("miner", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockMiner), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityMiner.ENERGY_USE_PER_BLOCK).addTextReplacement("<range>", TileEntityMiner.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial(); new BookletChapter("miner", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockMiner), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityMiner.ENERGY_USE_PER_BLOCK).addTextReplacement("<range>", 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("<rf>", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("<coffee>", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("<water>", 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("<rf>", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("<coffee>", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("<water>", 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("<rf>", 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 BookletChapterCrusher("crusher", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockGrinderDouble), new PageTextOnly(1).addTextReplacement("<rf>", 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("<rf>", TileEntityFurnaceDouble.ENERGY_USE)); new BookletChapter("furnaceDouble", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFurnaceDouble), new PageCrafting(1, BlockCrafting.recipeFurnace).setWildcard().addTextReplacement("<rf>", TileEntityFurnaceDouble.ENERGY_USE));
new BookletChapter("lavaFactory", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockLavaFactoryController), new PageTextOnly(1).addTextReplacement("<rf>", 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("<rf>", 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("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("<rf>", TileEntityItemRepairer.ENERGY_USE)); new BookletChapter("repairer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockItemRepairer), new PageCrafting(1, BlockCrafting.recipeRepairer).addTextReplacement("<rf>", TileEntityItemRepairer.ENERGY_USE));
new BookletChapter("longRangeBreaker", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityDirectionalBreaker.ENERGY_USE).addTextReplacement("<range>", TileEntityDirectionalBreaker.RANGE), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker).setWildcard()); new BookletChapter("longRangeBreaker", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityDirectionalBreaker.ENERGY_USE).addTextReplacement("<range>", 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("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<BookletPage> potionRingPages = new ArrayList<BookletPage>(); ArrayList<BookletPage> potionRingPages = new ArrayList<BookletPage>();
potionRingPages.add(new PageTextOnly(potionRingPages.size()+1)); potionRingPages.add(new PageTextOnly(potionRingPages.size()+1));
@ -242,7 +242,7 @@ public final class InitBooklet{
//Updates and infos //Updates and infos
new BookletChapter("changelog", ActuallyAdditionsAPI.entryUpdatesAndInfos, new ItemStack(Items.CLOCK), new PageLinkButton(1, UpdateChecker.CHANGELOG_LINK)); 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("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")); new BookletChapter("website", ActuallyAdditionsAPI.entryUpdatesAndInfos, new ItemStack(InitItems.itemBooklet), new PageLinkButton(1, "http://ellpeck.de"));
} }
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java
View file

@ -39,8 +39,8 @@ import java.util.List;
public abstract class GuiBooklet extends GuiBookletBase{ public abstract class GuiBooklet extends GuiBookletBase{
public static final int BUTTONS_PER_PAGE = 12; public static final int BUTTONS_PER_PAGE = 12;
public static final ResourceLocation RES_LOC_GUI = AssetUtil.getBookletGuiLocation("guiBooklet"); public static final ResourceLocation RES_LOC_GUI = AssetUtil.getBookletGuiLocation("gui_booklet");
public static final ResourceLocation RES_LOC_GADGETS = AssetUtil.getBookletGuiLocation("guiBookletGadgets"); public static final ResourceLocation RES_LOC_GADGETS = AssetUtil.getBookletGuiLocation("gui_booklet_gadgets");
protected final BookmarkButton[] bookmarkButtons = new BookmarkButton[12]; protected final BookmarkButton[] bookmarkButtons = new BookmarkButton[12];
public GuiScreen previousScreen; public GuiScreen previousScreen;
public GuiBookletBase parentPage; public GuiBookletBase parentPage;

2
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java
View file

@ -821,7 +821,7 @@ public final class BlockCrafting{
"GCG", "DQD", "GCG", "GCG", "DQD", "GCG",
'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()),
'G', "glowstone", '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()))); 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
RECIPES_LAMPS[i] = RecipeUtil.lastIRecipe(); RECIPES_LAMPS[i] = RecipeUtil.lastIRecipe();
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
View file

@ -293,7 +293,7 @@ public final class ItemCrafting{
for(int i = 0; i < 16; i++){ for(int i = 0; i < 16; i++){
if(i != TheColoredLampColors.LIGHT_BLUE.ordinal()){ 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()); RECIPES_DRILL_COLORING.add(RecipeUtil.lastIRecipe());
} }
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java
View file

@ -34,8 +34,8 @@ import java.util.List;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiBag extends GuiContainer{ public class GuiBag extends GuiContainer{
private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiBag"); private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bag");
private static final ResourceLocation RES_LOC_VOID = AssetUtil.getGuiLocation("guiVoidBag"); private static final ResourceLocation RES_LOC_VOID = AssetUtil.getGuiLocation("gui_void_bag");
private final ContainerBag container; private final ContainerBag container;
private final boolean isVoid; private final boolean isVoid;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java
View file

@ -23,7 +23,7 @@ import java.io.IOException;
public class GuiBioReactor extends GuiContainer{ 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 final TileEntityBioReactor tile;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiBreaker extends GuiContainer{ 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; private final TileEntityBreaker breaker;
public GuiBreaker(InventoryPlayer inventory, TileEntityBase tile){ public GuiBreaker(InventoryPlayer inventory, TileEntityBase tile){

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiCanolaPress extends GuiContainer{ 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 final TileEntityCanolaPress press;
private EnergyDisplay energy; private EnergyDisplay energy;
private FluidDisplay fluid; private FluidDisplay fluid;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiCoalGenerator extends GuiContainer{ 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 final TileEntityCoalGenerator generator;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java
View file

@ -31,7 +31,7 @@ import java.util.Collections;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiCoffeeMachine extends GuiContainer{ 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 final TileEntityCoffeeMachine machine;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiDirectionalBreaker extends GuiContainer{ 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 final TileEntityDirectionalBreaker breaker;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiDrill extends GuiContainer{ 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){ public GuiDrill(InventoryPlayer inventory){
super(new ContainerDrill(inventory)); super(new ContainerDrill(inventory));

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiDropper extends GuiContainer{ 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; private final TileEntityDropper dropper;
public GuiDropper(InventoryPlayer inventory, TileEntityBase tile){ public GuiDropper(InventoryPlayer inventory, TileEntityBase tile){

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiEnergizer extends GuiContainer{ 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 final TileEntityEnergizer energizer;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiEnervator extends GuiContainer{ 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 final TileEntityEnervator enervator;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiFarmer extends GuiContainer{ 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 final TileEntityFarmer farmer;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java
View file

@ -28,7 +28,7 @@ import java.util.Arrays;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiFeeder extends GuiContainer{ 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 final TileEntityFeeder tileFeeder;
public GuiFeeder(InventoryPlayer inventory, TileEntityBase tile){ public GuiFeeder(InventoryPlayer inventory, TileEntityBase tile){

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiFermentingBarrel extends GuiContainer{ 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 final TileEntityFermentingBarrel press;
private FluidDisplay input; private FluidDisplay input;
private FluidDisplay output; private FluidDisplay output;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiFilter extends GuiContainer{ 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){ public GuiFilter(InventoryPlayer inventory){
super(new ContainerFilter(inventory)); super(new ContainerFilter(inventory));

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiFluidCollector extends GuiContainer{ 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 final TileEntityFluidCollector collector;
private FluidDisplay fluid; private FluidDisplay fluid;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java
View file

@ -30,7 +30,7 @@ import java.util.Collections;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiFurnaceDouble extends GuiContainer{ 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 final TileEntityFurnaceDouble tileFurnace;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java
View file

@ -30,7 +30,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiGiantChest extends GuiContainer{ 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 TileEntityGiantChest chest;
private final int page; private final int page;

4
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java
View file

@ -30,8 +30,8 @@ import java.util.Collections;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiGrinder extends GuiContainer{ public class GuiGrinder extends GuiContainer{
private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiGrinder"); private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_grinder");
private static final ResourceLocation RES_LOC_DOUBLE = AssetUtil.getGuiLocation("guiGrinderDouble"); private static final ResourceLocation RES_LOC_DOUBLE = AssetUtil.getGuiLocation("gui_grinder_double");
private final TileEntityGrinder tileGrinder; private final TileEntityGrinder tileGrinder;
private final boolean isDouble; private final boolean isDouble;
private EnergyDisplay energy; private EnergyDisplay energy;

8
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java
View file

@ -46,8 +46,8 @@ public class GuiInputter extends GuiContainer{
StringUtil.localize("info."+ModUtil.MOD_ID+".gui.east"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.east"),
StringUtil.localize("info."+ModUtil.MOD_ID+".gui.south"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.south"),
StringUtil.localize("info."+ModUtil.MOD_ID+".gui.west")}; StringUtil.localize("info."+ModUtil.MOD_ID+".gui.west")};
private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiInputter"); private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_inputter");
private static final ResourceLocation RES_LOC_ADVANCED = AssetUtil.getGuiLocation("guiInputterAdvanced"); private static final ResourceLocation RES_LOC_ADVANCED = AssetUtil.getGuiLocation("gui_inputter_advanced");
public final TileEntityInputter tileInputter; public final TileEntityInputter tileInputter;
private final int x; private final int x;
private final int y; private final int y;
@ -264,7 +264,7 @@ public class GuiInputter extends GuiContainer{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public static class SmallerButton extends GuiButton{ 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; private final boolean smaller;
public SmallerButton(int id, int x, int y, String display){ public SmallerButton(int id, int x, int y, String display){
@ -308,7 +308,7 @@ public class GuiInputter extends GuiContainer{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public static class TinyButton extends GuiButton{ 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){ public TinyButton(int id, int x, int y){
super(id, x, y, 8, 8, ""); super(id, x, y, 8, 8, "");

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java
View file

@ -33,7 +33,7 @@ import java.util.List;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiLaserRelayItemWhitelist extends GuiContainer{ 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 final TileEntityLaserRelayItemWhitelist tile;
private FilterSettingsGui leftFilter; private FilterSettingsGui leftFilter;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java
View file

@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiMiner extends GuiContainer{ 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; private final TileEntityMiner miner;
public GuiMiner(InventoryPlayer inventory, TileEntityBase tile){ public GuiMiner(InventoryPlayer inventory, TileEntityBase tile){

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiOilGenerator extends GuiContainer{ 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 final TileEntityOilGenerator generator;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java
View file

@ -33,7 +33,7 @@ import java.util.List;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiPhantomPlacer extends GuiContainer{ 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; private final TileEntityPhantomPlacer placer;
public GuiPhantomPlacer(InventoryPlayer inventory, TileEntityBase tile){ public GuiPhantomPlacer(InventoryPlayer inventory, TileEntityBase tile){

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java
View file

@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiRangedCollector extends GuiContainer{ 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 final TileEntityRangedCollector collector;
private FilterSettingsGui filter; private FilterSettingsGui filter;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java
View file

@ -26,7 +26,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiRepairer extends GuiContainer{ 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 final TileEntityItemRepairer tileRepairer;
private EnergyDisplay energy; private EnergyDisplay energy;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java
View file

@ -35,7 +35,7 @@ import java.io.IOException;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiSmileyCloud extends GuiContainer{ 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 x;
private final int y; private final int y;

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java
View file

@ -28,7 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiXPSolidifier extends GuiContainer{ 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; private final TileEntityXPSolidifier solidifier;
public GuiXPSolidifier(InventoryPlayer inventory, TileEntityBase tile){ public GuiXPSolidifier(InventoryPlayer inventory, TileEntityBase tile){

306
src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java
View file

@ -202,168 +202,168 @@ public final class InitItems{
itemVoidBag = new ItemBag("item_void_bag", true); itemVoidBag = new ItemBag("item_void_bag", true);
itemWorm = new ItemWorm("item_worm"); itemWorm = new ItemWorm("item_worm");
itemPlayerProbe = new ItemPlayerProbe("item_player_probe"); itemPlayerProbe = new ItemPlayerProbe("item_player_probe");
itemFilter = new ItemFilter("itemFilter"); itemFilter = new ItemFilter("item_filter");
itemWaterBowl = new ItemWaterBowl("itemWaterBowl"); itemWaterBowl = new ItemWaterBowl("item_water_bowl");
itemSpawnerChanger = new ItemSpawnerChanger("itemSpawnerChanger"); itemSpawnerChanger = new ItemSpawnerChanger("item_spawner_changer");
itemMisc = new ItemMisc("itemMisc"); itemMisc = new ItemMisc("item_misc");
itemCrateKeeper = new ItemGeneric("itemCrateKeeper").setMaxStackSize(1); itemCrateKeeper = new ItemGeneric("item_crate_keeper").setMaxStackSize(1);
itemColorLens = new ItemLens("itemColorLens", ActuallyAdditionsAPI.lensColor); itemColorLens = new ItemLens("item_color_lens", ActuallyAdditionsAPI.lensColor);
itemExplosionLens = new ItemLens("itemExplosionLens", ActuallyAdditionsAPI.lensDetonation); itemExplosionLens = new ItemLens("item_explosion_lens", ActuallyAdditionsAPI.lensDetonation);
itemDamageLens = new ItemLens("itemDamageLens", ActuallyAdditionsAPI.lensDeath); itemDamageLens = new ItemLens("item_damage_lens", ActuallyAdditionsAPI.lensDeath);
itemMoreDamageLens = new ItemLens("itemMoreDamageLens", ActuallyAdditionsAPI.lensEvenMoarDeath); itemMoreDamageLens = new ItemLens("item_more_damage_lens", ActuallyAdditionsAPI.lensEvenMoarDeath);
itemDisenchantingLens = new ItemLens("itemDisenchantingLens", ActuallyAdditionsAPI.lensDisenchanting); itemDisenchantingLens = new ItemLens("item_disenchanting_lens", ActuallyAdditionsAPI.lensDisenchanting);
itemMiningLens = new ItemLens("itemMiningLens", ActuallyAdditionsAPI.lensMining); itemMiningLens = new ItemLens("item_mining_lens", ActuallyAdditionsAPI.lensMining);
itemCrystal = new ItemCrystal("itemCrystal", false); itemCrystal = new ItemCrystal("item_crystal", false);
itemCrystalEmpowered = new ItemCrystal("itemCrystalEmpowered", true); itemCrystalEmpowered = new ItemCrystal("item_crystal_empowered", true);
itemLaserWrench = new ItemLaserWrench("itemLaserWrench"); itemLaserWrench = new ItemLaserWrench("item_laser_wrench");
itemChestToCrateUpgrade = new ItemChestToCrateUpgrade("itemChestToCrateUpgrade", TileEntityChest.class, InitBlocks.blockGiantChest.getDefaultState()); itemChestToCrateUpgrade = new ItemChestToCrateUpgrade("item_chest_to_crate_upgrade", TileEntityChest.class, InitBlocks.blockGiantChest.getDefaultState());
itemSmallToMediumCrateUpgrade = new ItemChestToCrateUpgrade("itemSmallToMediumCrateUpgrade", TileEntityGiantChest.class, InitBlocks.blockGiantChestMedium.getDefaultState()); itemSmallToMediumCrateUpgrade = new ItemChestToCrateUpgrade("item_small_to_medium_crate_upgrade", TileEntityGiantChest.class, InitBlocks.blockGiantChestMedium.getDefaultState());
itemMediumToLargeCrateUpgrade = new ItemChestToCrateUpgrade("itemMediumToLargeCrateUpgrade", TileEntityGiantChestMedium.class, InitBlocks.blockGiantChestLarge.getDefaultState()); itemMediumToLargeCrateUpgrade = new ItemChestToCrateUpgrade("item_medium_to_large_crate_upgrade", TileEntityGiantChestMedium.class, InitBlocks.blockGiantChestLarge.getDefaultState());
itemBooklet = new ItemBooklet("itemBooklet"); itemBooklet = new ItemBooklet("item_booklet");
itemGrowthRing = new ItemGrowthRing("itemGrowthRing"); itemGrowthRing = new ItemGrowthRing("item_growth_ring");
itemMagnetRing = new ItemMagnetRing("itemSuctionRing"); itemMagnetRing = new ItemMagnetRing("item_suction_ring");
itemWaterRemovalRing = new ItemWaterRemovalRing("itemWaterRemovalRing"); itemWaterRemovalRing = new ItemWaterRemovalRing("item_water_removal_ring");
itemHelmEmerald = new ItemArmorAA("itemHelmEmerald", InitArmorMaterials.armorMaterialEmerald, 0, new ItemStack(Items.EMERALD)); itemHelmEmerald = new ItemArmorAA("item_helm_emerald", InitArmorMaterials.armorMaterialEmerald, 0, new ItemStack(Items.EMERALD));
itemChestEmerald = new ItemArmorAA("itemChestEmerald", InitArmorMaterials.armorMaterialEmerald, 1, new ItemStack(Items.EMERALD)); itemChestEmerald = new ItemArmorAA("item_chest_emerald", InitArmorMaterials.armorMaterialEmerald, 1, new ItemStack(Items.EMERALD));
itemPantsEmerald = new ItemArmorAA("itemPantsEmerald", InitArmorMaterials.armorMaterialEmerald, 2, new ItemStack(Items.EMERALD)); itemPantsEmerald = new ItemArmorAA("item_pants_emerald", InitArmorMaterials.armorMaterialEmerald, 2, new ItemStack(Items.EMERALD));
itemBootsEmerald = new ItemArmorAA("itemBootsEmerald", InitArmorMaterials.armorMaterialEmerald, 3, new ItemStack(Items.EMERALD)); itemBootsEmerald = new ItemArmorAA("item_boots_emerald", InitArmorMaterials.armorMaterialEmerald, 3, new ItemStack(Items.EMERALD));
itemHelmObsidian = new ItemArmorAA("itemHelmObsidian", InitArmorMaterials.armorMaterialObsidian, 0, new ItemStack(Blocks.OBSIDIAN)); itemHelmObsidian = new ItemArmorAA("item_helm_obsidian", InitArmorMaterials.armorMaterialObsidian, 0, new ItemStack(Blocks.OBSIDIAN));
itemChestObsidian = new ItemArmorAA("itemChestObsidian", InitArmorMaterials.armorMaterialObsidian, 1, new ItemStack(Blocks.OBSIDIAN)); itemChestObsidian = new ItemArmorAA("item_chest_obsidian", InitArmorMaterials.armorMaterialObsidian, 1, new ItemStack(Blocks.OBSIDIAN));
itemPantsObsidian = new ItemArmorAA("itemPantsObsidian", InitArmorMaterials.armorMaterialObsidian, 2, new ItemStack(Blocks.OBSIDIAN)); itemPantsObsidian = new ItemArmorAA("item_pants_obsidian", InitArmorMaterials.armorMaterialObsidian, 2, new ItemStack(Blocks.OBSIDIAN));
itemBootsObsidian = new ItemArmorAA("itemBootsObsidian", InitArmorMaterials.armorMaterialObsidian, 3, new ItemStack(Blocks.OBSIDIAN)); itemBootsObsidian = new ItemArmorAA("item_boots_obsidian", InitArmorMaterials.armorMaterialObsidian, 3, new ItemStack(Blocks.OBSIDIAN));
itemHelmQuartz = new ItemArmorAA("itemHelmQuartz", InitArmorMaterials.armorMaterialQuartz, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); itemHelmQuartz = new ItemArmorAA("item_helm_quartz", 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())); itemChestQuartz = new ItemArmorAA("item_chest_quartz", 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())); itemPantsQuartz = new ItemArmorAA("item_pants_quartz", 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())); itemBootsQuartz = new ItemArmorAA("item_boots_quartz", InitArmorMaterials.armorMaterialQuartz, 3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()));
itemTeleStaff = new ItemTeleStaff("itemTeleStaff"); itemTeleStaff = new ItemTeleStaff("item_tele_staff");
itemWingsOfTheBats = new ItemWingsOfTheBats("itemWingsOfTheBats"); itemWingsOfTheBats = new ItemWingsOfTheBats("item_wings_of_the_bats");
itemDrill = new ItemDrill("itemDrill"); itemDrill = new ItemDrill("item_drill");
itemBattery = new ItemBattery("itemBattery", 1000000, 5000); itemBattery = new ItemBattery("item_battery", 1000000, 5000);
itemBatteryDouble = new ItemBattery("itemBatteryDouble", 2000000, 10000); itemBatteryDouble = new ItemBattery("item_battery_double", 2000000, 10000);
itemBatteryTriple = new ItemBattery("itemBatteryTriple", 4000000, 15000); itemBatteryTriple = new ItemBattery("item_battery_triple", 4000000, 15000);
itemBatteryQuadruple = new ItemBattery("itemBatteryQuadruple", 8000000, 20000); itemBatteryQuadruple = new ItemBattery("item_battery_quadruple", 8000000, 20000);
itemBatteryQuintuple = new ItemBattery("itemBatteryQuintuple", 16000000, 25000); itemBatteryQuintuple = new ItemBattery("item_battery_quintuple", 16000000, 25000);
itemDrillUpgradeSpeed = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED, "itemDrillUpgradeSpeed"); itemDrillUpgradeSpeed = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED, "item_drill_upgrade_speed");
itemDrillUpgradeSpeedII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II, "itemDrillUpgradeSpeedII"); itemDrillUpgradeSpeedII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_II, "item_drill_upgrade_speed_ii");
itemDrillUpgradeSpeedIII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III, "itemDrillUpgradeSpeedIII"); itemDrillUpgradeSpeedIII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SPEED_III, "item_drill_upgrade_speed_iii");
itemDrillUpgradeSilkTouch = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SILK_TOUCH, "itemDrillUpgradeSilkTouch"); itemDrillUpgradeSilkTouch = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.SILK_TOUCH, "item_drill_upgrade_silk_touch");
itemDrillUpgradeFortune = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE, "itemDrillUpgradeFortune"); itemDrillUpgradeFortune = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE, "item_drill_upgrade_fortune");
itemDrillUpgradeFortuneII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE_II, "itemDrillUpgradeFortuneII"); itemDrillUpgradeFortuneII = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FORTUNE_II, "item_drill_upgrade_fortune_ii");
itemDrillUpgradeThreeByThree = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE, "itemDrillUpgradeThreeByThree"); itemDrillUpgradeThreeByThree = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.THREE_BY_THREE, "item_drill_upgrade_three_by_three");
itemDrillUpgradeFiveByFive = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE, "itemDrillUpgradeFiveByFive"); itemDrillUpgradeFiveByFive = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE, "item_drill_upgrade_five_by_five");
itemDrillUpgradeBlockPlacing = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.PLACER, "itemDrillUpgradeBlockPlacing"); itemDrillUpgradeBlockPlacing = new ItemDrillUpgrade(ItemDrillUpgrade.UpgradeType.PLACER, "item_drill_upgrade_block_placing");
itemFertilizer = new ItemFertilizer("itemFertilizer"); itemFertilizer = new ItemFertilizer("item_fertilizer");
itemCoffee = new ItemCoffee("itemCoffee"); itemCoffee = new ItemCoffee("item_coffee");
itemPhantomConnector = new ItemPhantomConnector("itemPhantomConnector"); itemPhantomConnector = new ItemPhantomConnector("item_phantom_connector");
itemResonantRice = new ItemResonantRice("itemResonantRice"); itemResonantRice = new ItemResonantRice("item_resonant_rice");
itemFoods = new ItemFoods("itemFood"); itemFoods = new ItemFoods("item_food");
itemJams = new ItemJams("itemJam"); itemJams = new ItemJams("item_jam");
itemKnife = new ItemKnife("itemKnife"); itemKnife = new ItemKnife("item_knife");
itemCrafterOnAStick = new ItemCrafterOnAStick("itemCrafterOnAStick"); itemCrafterOnAStick = new ItemCrafterOnAStick("item_crafter_on_a_stick");
itemDust = new ItemDust("itemDust"); itemDust = new ItemDust("item_dust");
itemSolidifiedExperience = new ItemSolidifiedExperience("itemSolidifiedExperience"); itemSolidifiedExperience = new ItemSolidifiedExperience("item_solidified_experience");
itemLeafBlower = new ItemLeafBlower(false, "itemLeafBlower"); itemLeafBlower = new ItemLeafBlower(false, "item_leaf_blower");
itemLeafBlowerAdvanced = new ItemLeafBlower(true, "itemLeafBlowerAdvanced"); itemLeafBlowerAdvanced = new ItemLeafBlower(true, "item_leaf_blower_advanced");
itemPotionRing = new ItemPotionRing(false, "itemPotionRing"); itemPotionRing = new ItemPotionRing(false, "item_potion_ring");
itemPotionRingAdvanced = new ItemPotionRing(true, "itemPotionRingAdvanced"); itemPotionRingAdvanced = new ItemPotionRing(true, "item_potion_ring_advanced");
itemHairyBall = new ItemHairyBall("itemHairyBall"); itemHairyBall = new ItemHairyBall("item_hairy_ball");
itemCoffeeBean = new ItemCoffeeBean("itemCoffeeBeans"); itemCoffeeBean = new ItemCoffeeBean("item_coffee_beans");
itemRiceSeed = new ItemSeed("itemRiceSeed", "seedRice", InitBlocks.blockRice, itemFoods, TheFoods.RICE.ordinal()); itemRiceSeed = new ItemSeed("item_rice_seed", "seedRice", InitBlocks.blockRice, itemFoods, TheFoods.RICE.ordinal());
CompatUtil.registerMFRSeed(itemRiceSeed, InitBlocks.blockRice); 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); 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); 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); CompatUtil.registerMFRSeed(itemCoffeeSeed, InitBlocks.blockCoffee);
itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemPickaxeEmerald", EnumRarity.EPIC); itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "item_pickaxe_emerald", EnumRarity.EPIC);
itemAxeEmerald = new ItemAxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "itemAxeEmerald", 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), "itemShovelEmerald", 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), "itemSwordEmerald", 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), "itemHoeEmerald", 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), "itemPickaxeObsidian", EnumRarity.UNCOMMON); itemPickaxeObsidian = new ItemPickaxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "item_pickaxe_obsidian", EnumRarity.UNCOMMON);
itemAxeObsidian = new ItemAxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "itemAxeObsidian", 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), "itemShovelObsidian", 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), "itemSwordObsidian", 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), "itemHoeObsidian", 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()), "itemPickaxeQuartz", EnumRarity.RARE); 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()), "itemAxeQuartz", 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()), "itemShovelQuartz", 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()), "itemSwordQuartz", 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()), "itemHoeQuartz", 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, "plankWood", "woodenPaxel", EnumRarity.UNCOMMON, 5192733); woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plank_wood", "wooden_paxel", EnumRarity.UNCOMMON, 5192733);
stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, new ItemStack(Blocks.COBBLESTONE), "stonePaxel", EnumRarity.UNCOMMON, 7040621); 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), "ironPaxel", EnumRarity.RARE, 10920613); 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), "goldPaxel", EnumRarity.RARE, 16770048); 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), "diamondPaxel", EnumRarity.EPIC, 3250376); diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.DIAMOND, new ItemStack(Items.DIAMOND), "diamond_paxel", EnumRarity.EPIC, 3250376);
emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "emeraldPaxel", EnumRarity.EPIC, 7723338); emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.EMERALD), "emerald_paxel", EnumRarity.EPIC, 7723338);
obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.OBSIDIAN), "obsidianPaxel", EnumRarity.EPIC, 4166); 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()), "quartzPaxel", EnumRarity.RARE, 1710103); 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); 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()), "itemAxeCrystalRed", 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()), "itemShovelCrystalRed", 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()), "itemSwordCrystalRed", 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()), "itemHoeCrystalRed", 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("itemHelmCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 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("itemChestCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 1, 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("itemPantsCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 2, 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("itemBootsCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 3, 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()), "itemPaxelCrystalRed", Util.CRYSTAL_RED_RARITY, 16711689); 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); 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()), "itemAxeCrystalBlue", 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()), "itemShovelCrystalBlue", 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()), "itemSwordCrystalBlue", 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()), "itemHoeCrystalBlue", 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("itemHelmCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 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("itemChestCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 1, 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("itemPantsCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 2, 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("itemBootsCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 3, 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()), "itemPaxelCrystalBlue", Util.CRYSTAL_BLUE_RARITY, 3014911); 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); 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()), "itemAxeCrystalLightBlue", 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()), "itemShovelCrystalLightBlue", 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()), "itemSwordCrystalLightBlue", 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()), "itemHoeCrystalLightBlue", 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("itemHelmCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 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("itemChestCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 1, 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("itemPantsCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 2, 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("itemBootsCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 3, 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()), "itemPaxelCrystalLightBlue", Util.CRYSTAL_LIGHT_BLUE_RARITY, 4093108); 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); 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()), "itemAxeCrystalBlack", 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()), "itemShovelCrystalBlack", 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()), "itemSwordCrystalBlack", 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()), "itemHoeCrystalBlack", 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("itemHelmCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 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("itemChestCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 1, 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("itemPantsCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 2, 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("itemBootsCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 3, 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()), "itemPaxelCrystalBlack", Util.CRYSTAL_BLACK_RARITY, 2631982); 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); 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()), "itemAxeCrystalGreen", 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()), "itemShovelCrystalGreen", 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()), "itemSwordCrystalGreen", 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()), "itemHoeCrystalGreen", 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("itemHelmCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), 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("itemChestCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 1, 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("itemPantsCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 2, 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("itemBootsCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 3, 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()), "itemPaxelCrystalGreen", Util.CRYSTAL_GREEN_RARITY, 46848); 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); 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()), "itemAxeCrystalWhite", 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()), "itemShovelCrystalWhite", 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()), "itemSwordCrystalWhite", 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()), "itemHoeCrystalWhite", 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("itemHelmCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 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("itemChestCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 1, 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("itemPantsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 2, 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("itemBootsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 3, 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()), "itemPaxelCrystalWhite", Util.CRYSTAL_WHITE_RARITY, 14606302); itemPaxelCrystalWhite = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "item_paxel_crystal_white", Util.CRYSTAL_WHITE_RARITY, 14606302);
} }
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java
View file

@ -48,7 +48,7 @@ public class ItemCrystal extends ItemBase{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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 @Override
protected void registerRendering(){ protected void registerRendering(){
for(int i = 0; i < BlockCrystal.ALL_CRYSTALS.length; i++){ 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"); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(name), "inventory");
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
View file

@ -360,7 +360,7 @@ public class ItemDrill extends ItemEnergy{
@Override @Override
protected void registerRendering(){ protected void registerRendering(){
for(int i = 0; i < 16; i++){ 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"); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(name), "inventory");
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java
View file

@ -43,7 +43,7 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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;
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java
View file

@ -86,7 +86,7 @@ public class ItemFoods extends ItemFoodBase{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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 @Override
protected void registerRendering(){ protected void registerRendering(){
for(int i = 0; i < ALL_FOODS.length; i++){ 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"); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name), "inventory");
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java
View file

@ -52,7 +52,7 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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;
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java
View file

@ -48,7 +48,7 @@ public class ItemMisc extends ItemBase{
@Override @Override
public String getUnlocalizedName(ItemStack stack){ 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 @Override
protected void registerRendering(){ protected void registerRendering(){
for(int i = 0; i < ALL_MISC_ITEMS.length; i++){ 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"); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(name), "inventory");
} }
} }

12
src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java
View file

@ -15,12 +15,12 @@ import net.minecraft.item.EnumRarity;
public enum TheCrystals{ public enum TheCrystals{
REDSTONE("Red", Util.CRYSTAL_RED_RARITY, 158F/255F, 43F/255F, 39F/255F), REDSTONE("red", Util.CRYSTAL_RED_RARITY, 158F/255F, 43F/255F, 39F/255F),
LAPIS("Blue", Util.CRYSTAL_BLUE_RARITY, 37F/255F, 49F/255F, 147F/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), 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), COAL("black", Util.CRYSTAL_BLACK_RARITY, 0.2F, 0.2F, 0.2F),
EMERALD("Green", Util.CRYSTAL_GREEN_RARITY, 54F/255F, 75F/255F, 24F/255F), EMERALD("green", Util.CRYSTAL_GREEN_RARITY, 54F/255F, 75F/255F, 24F/255F),
IRON("White", Util.CRYSTAL_WHITE_RARITY, 0.8F, 0.8F, 0.8F); IRON("white", Util.CRYSTAL_WHITE_RARITY, 0.8F, 0.8F, 0.8F);
public final String name; public final String name;
public final EnumRarity rarity; public final EnumRarity rarity;

16
src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java
View file

@ -15,14 +15,14 @@ import net.minecraft.item.EnumRarity;
public enum TheDusts{ public enum TheDusts{
IRON("Iron", 7826534, EnumRarity.COMMON), IRON("iron", 7826534, EnumRarity.COMMON),
GOLD("Gold", 14335744, EnumRarity.UNCOMMON), GOLD("gold", 14335744, EnumRarity.UNCOMMON),
DIAMOND("Diamond", 292003, EnumRarity.RARE), DIAMOND("diamond", 292003, EnumRarity.RARE),
EMERALD("Emerald", 4319527, EnumRarity.EPIC), EMERALD("emerald", 4319527, EnumRarity.EPIC),
LAPIS("Lapis", 1849791, EnumRarity.UNCOMMON), LAPIS("lapis", 1849791, EnumRarity.UNCOMMON),
QUARTZ("Quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.UNCOMMON), QUARTZ("quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.UNCOMMON),
COAL("Coal", 0, EnumRarity.UNCOMMON), COAL("coal", 0, EnumRarity.UNCOMMON),
QUARTZ_BLACK("QuartzBlack", 18, EnumRarity.RARE); QUARTZ_BLACK("quartz_black", 18, EnumRarity.RARE);
public final String name; public final String name;
public final int color; public final int color;

42
src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java
View file

@ -18,27 +18,27 @@ import net.minecraft.item.ItemStack;
public enum TheFoods{ public enum TheFoods{
CHEESE("Cheese", 1, 0.05F, false, 3, EnumRarity.COMMON), CHEESE("cheese", 1, 0.05F, false, 3, EnumRarity.COMMON),
PUMPKIN_STEW("PumpkinStew", 6, 0.3F, true, 30, EnumRarity.COMMON), PUMPKIN_STEW("pumpkin_stew", 6, 0.3F, true, 30, EnumRarity.COMMON),
CARROT_JUICE("CarrotJuice", 4, 0.2F, true, 20, EnumRarity.COMMON), CARROT_JUICE("carrot_juice", 4, 0.2F, true, 20, EnumRarity.COMMON),
FISH_N_CHIPS("FishNChips", 14, 0.65F, false, 40, EnumRarity.UNCOMMON), FISH_N_CHIPS("fish_n_chips", 14, 0.65F, false, 40, EnumRarity.UNCOMMON),
FRENCH_FRIES("FrenchFries", 10, 0.6F, false, 32, EnumRarity.COMMON), FRENCH_FRIES("french_fries", 10, 0.6F, false, 32, EnumRarity.COMMON),
FRENCH_FRY("FrenchFry", 2, 0.025F, false, 3, EnumRarity.COMMON), FRENCH_FRY("french_fry", 2, 0.025F, false, 3, EnumRarity.COMMON),
SPAGHETTI("Spaghetti", 7, 0.4F, false, 38, EnumRarity.COMMON), SPAGHETTI("spaghetti", 7, 0.4F, false, 38, EnumRarity.COMMON),
NOODLE("Noodle", 1, 0.01F, false, 3, EnumRarity.COMMON), NOODLE("noodle", 1, 0.01F, false, 3, EnumRarity.COMMON),
CHOCOLATE_CAKE("ChocolateCake", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), CHOCOLATE_CAKE("chocolate_cake", 16, 0.8F, false, 45, EnumRarity.UNCOMMON),
CHOCOLATE("Chocolate", 3, 0.3F, false, 15, EnumRarity.COMMON), CHOCOLATE("chocolate", 3, 0.3F, false, 15, EnumRarity.COMMON),
TOAST("Toast", 3, 0.08F, false, 25, EnumRarity.COMMON), TOAST("toast", 3, 0.08F, false, 25, EnumRarity.COMMON),
SUBMARINE_SANDWICH("SubmarineSandwich", 9, 0.4F, false, 40, EnumRarity.UNCOMMON), SUBMARINE_SANDWICH("submarine_sandwich", 9, 0.4F, false, 40, EnumRarity.UNCOMMON),
BIG_COOKIE("BigCookie", 4, 0.25F, false, 20, EnumRarity.UNCOMMON), BIG_COOKIE("big_cookie", 4, 0.25F, false, 20, EnumRarity.UNCOMMON),
HAMBURGER("Hamburger", 13, 0.65F, false, 40, EnumRarity.COMMON), HAMBURGER("hamburger", 13, 0.65F, false, 40, EnumRarity.COMMON),
PIZZA("Pizza", 16, 0.8F, false, 45, EnumRarity.UNCOMMON), PIZZA("pizza", 16, 0.8F, false, 45, EnumRarity.UNCOMMON),
BAGUETTE("Baguette", 6, 0.5F, false, 25, EnumRarity.COMMON), BAGUETTE("baguette", 6, 0.5F, false, 25, EnumRarity.COMMON),
RICE("Rice", 2, 0.05F, false, 10, EnumRarity.UNCOMMON), RICE("rice", 2, 0.05F, false, 10, EnumRarity.UNCOMMON),
RICE_BREAD("RiceBread", 6, 0.5F, false, 25, EnumRarity.UNCOMMON), RICE_BREAD("rice_bread", 6, 0.5F, false, 25, EnumRarity.UNCOMMON),
DOUGHNUT("Doughnut", 2, 0.1F, false, 10, EnumRarity.EPIC), DOUGHNUT("doughnut", 2, 0.1F, false, 10, EnumRarity.EPIC),
CHOCOLATE_TOAST("ChocolateToast", 5, 0.2F, false, 40, EnumRarity.RARE), CHOCOLATE_TOAST("chocolate_toast", 5, 0.2F, false, 40, EnumRarity.RARE),
BACON("Bacon", 4, 0.1F, false, 30, EnumRarity.COMMON); BACON("bacon", 4, 0.1F, false, 30, EnumRarity.COMMON);
public final String name; public final String name;
public final int healAmount; public final int healAmount;

14
src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java
View file

@ -14,13 +14,13 @@ import net.minecraft.item.EnumRarity;
public enum TheJams{ public enum TheJams{
CU_BA_RA("CuBaRa", 6, 0.1F, EnumRarity.RARE, 5, 12, 12595273), CU_BA_RA("cu_ba_ra", 6, 0.1F, EnumRarity.RARE, 5, 12, 12595273),
GRA_KI_BA("GraKiBa", 6, 0.1F, EnumRarity.RARE, 16, 13, 5492820), GRA_KI_BA("gra_ki_ba", 6, 0.1F, EnumRarity.RARE, 16, 13, 5492820),
PL_AP_LE("PlApLe", 6, 0.1F, EnumRarity.RARE, 15, 3, 13226009), PL_AP_LE("pl_ap_le", 6, 0.1F, EnumRarity.RARE, 15, 3, 13226009),
CH_AP_CI("ChApCi", 6, 0.1F, EnumRarity.RARE, 10, 1, 13189222), CH_AP_CI("ch_ap_ci", 6, 0.1F, EnumRarity.RARE, 10, 1, 13189222),
HO_ME_KI("HoMeKi", 6, 0.1F, EnumRarity.RARE, 10, 14, 2031360), HO_ME_KI("ho_me_ki", 6, 0.1F, EnumRarity.RARE, 10, 14, 2031360),
PI_CO("PiCo", 6, 0.1F, EnumRarity.RARE, 9, 1, 16056203), PI_CO("pi_co", 6, 0.1F, EnumRarity.RARE, 9, 1, 16056203),
HO_ME_CO("HoMeCo", 6, 0.1F, EnumRarity.RARE, 10, 13, 10462208); HO_ME_CO("ho_me_co", 6, 0.1F, EnumRarity.RARE, 10, 13, 10462208);
public final String name; public final String name;
public final int healAmount; public final int healAmount;

52
src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java
View file

@ -15,32 +15,32 @@ import net.minecraft.item.EnumRarity;
public enum TheMiscItems{ public enum TheMiscItems{
PAPER_CONE("PaperCone", EnumRarity.COMMON), PAPER_CONE("paper_cone", EnumRarity.COMMON),
MASHED_FOOD("MashedFood", EnumRarity.UNCOMMON), MASHED_FOOD("mashed_food", EnumRarity.UNCOMMON),
KNIFE_BLADE("KnifeBlade", EnumRarity.COMMON), KNIFE_BLADE("knife_blade", EnumRarity.COMMON),
KNIFE_HANDLE("KnifeHandle", EnumRarity.COMMON), KNIFE_HANDLE("knife_handle", EnumRarity.COMMON),
DOUGH("Dough", EnumRarity.COMMON), DOUGH("dough", EnumRarity.COMMON),
QUARTZ("BlackQuartz", EnumRarity.EPIC), QUARTZ("black_quartz", EnumRarity.EPIC),
RING("Ring", EnumRarity.UNCOMMON), RING("ring", EnumRarity.UNCOMMON),
COIL("Coil", EnumRarity.COMMON), COIL("coil", EnumRarity.COMMON),
COIL_ADVANCED("CoilAdvanced", EnumRarity.UNCOMMON), COIL_ADVANCED("coil_advanced", EnumRarity.UNCOMMON),
RICE_DOUGH("RiceDough", EnumRarity.UNCOMMON), RICE_DOUGH("rice_dough", EnumRarity.UNCOMMON),
TINY_COAL("TinyCoal", EnumRarity.COMMON), TINY_COAL("tiny_coal", EnumRarity.COMMON),
TINY_CHAR("TinyCharcoal", EnumRarity.COMMON), TINY_CHAR("tiny_charcoal", EnumRarity.COMMON),
RICE_SLIME("RiceSlime", EnumRarity.UNCOMMON), RICE_SLIME("rice_slime", EnumRarity.UNCOMMON),
CANOLA("Canola", EnumRarity.UNCOMMON), CANOLA("canola", EnumRarity.UNCOMMON),
CUP("Cup", EnumRarity.UNCOMMON), CUP("cup", EnumRarity.UNCOMMON),
BAT_WING("BatWing", EnumRarity.RARE), BAT_WING("bat_wing", EnumRarity.RARE),
DRILL_CORE("DrillCore", EnumRarity.UNCOMMON), DRILL_CORE("drill_core", EnumRarity.UNCOMMON),
BLACK_DYE("BlackDye", EnumRarity.EPIC), BLACK_DYE("black_dye", EnumRarity.EPIC),
LENS("Lens", EnumRarity.UNCOMMON), LENS("lens", EnumRarity.UNCOMMON),
ENDER_STAR("EnderStar", EnumRarity.EPIC), ENDER_STAR("ender_star", EnumRarity.EPIC),
SPAWNER_SHARD("SpawnerShard", EnumRarity.EPIC), SPAWNER_SHARD("spawner_shard", EnumRarity.EPIC),
BIOMASS("Biomass", EnumRarity.UNCOMMON), BIOMASS("biomass", EnumRarity.UNCOMMON),
BIOCOAL("Biocoal", EnumRarity.RARE), BIOCOAL("biocoal", EnumRarity.RARE),
CRYSTALLIZED_CANOLA_SEED("CrystallizedCanolaSeed", EnumRarity.UNCOMMON), CRYSTALLIZED_CANOLA_SEED("crystallized_canola_seed", EnumRarity.UNCOMMON),
EMPOWERED_CANOLA_SEED("EmpoweredCanolaSeed", EnumRarity.RARE), EMPOWERED_CANOLA_SEED("empowered_canola_seed", EnumRarity.RARE),
YOUTUBE_ICON("YoutubeIcon", Util.FALLBACK_RARITY); YOUTUBE_ICON("youtube_icon", Util.FALLBACK_RARITY);
public final String name; public final String name;
public final EnumRarity rarity; public final EnumRarity rarity;

2
src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java
View file

@ -25,7 +25,7 @@ public class CoffeeMachineRecipeCategory extends BlankRecipeCategory<CoffeeMachi
private final IDrawable background; private final IDrawable background;
public CoffeeMachineRecipeCategory(IGuiHelper helper){ public CoffeeMachineRecipeCategory(IGuiHelper helper){
this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiNEICoffeeMachine"), 0, 0, 126, 92); this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_nei_coffee_machine"), 0, 0, 126, 92);
} }
@Override @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java
View file

@ -26,7 +26,7 @@ public class CrusherRecipeCategory extends BlankRecipeCategory<CrusherRecipeWrap
private final IDrawable background; private final IDrawable background;
public CrusherRecipeCategory(IGuiHelper helper){ public CrusherRecipeCategory(IGuiHelper helper){
this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiGrinder"), 60, 13, 56, 79); this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_grinder"), 60, 13, 56, 79);
} }
@Override @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java
View file

@ -25,7 +25,7 @@ public class EmpowererRecipeCategory extends BlankRecipeCategory<EmpowererRecipe
private final IDrawable background; private final IDrawable background;
public EmpowererRecipeCategory(IGuiHelper helper){ public EmpowererRecipeCategory(IGuiHelper helper){
this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiNEIEmpowerer"), 0, 0, 135, 80); this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_nei_empowerer"), 0, 0, 135, 80);
} }
@Override @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java
View file

@ -29,7 +29,7 @@ public class ReconstructorRecipeCategory extends BlankRecipeCategory<Reconstruct
private final IDrawable background; private final IDrawable background;
public ReconstructorRecipeCategory(IGuiHelper helper){ public ReconstructorRecipeCategory(IGuiHelper helper){
this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiNEIAtomicReconstructor"), 0, 0, 96, 60); this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_nei_atomic_reconstructor"), 0, 0, 96, 60);
} }
@Override @Override

4
src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java
View file

@ -28,8 +28,8 @@ public final class SoundHandler{
public static void init(){ public static void init(){
size = SoundEvent.REGISTRY.getKeys().size(); size = SoundEvent.REGISTRY.getKeys().size();
duhDuhDuhDuuuh = registerSound("duhDuhDuhDuuuh"); duhDuhDuhDuuuh = registerSound("duh_duh_duh_duuuh");
coffeeMachine = registerSound("coffeeMachine"); coffeeMachine = registerSound("coffee_machine");
reconstructor = registerSound("reconstructor"); reconstructor = registerSound("reconstructor");
crusher = registerSound("crusher"); crusher = registerSound("crusher");
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
View file

@ -38,7 +38,7 @@ import java.util.Locale;
public final class AssetUtil{ public final class AssetUtil{
public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory"); public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("gui_inventory");
public static ResourceLocation getGuiLocation(String file){ public static ResourceLocation getGuiLocation(String file){
return new ResourceLocation(ModUtil.MOD_ID, "textures/gui/"+file+".png"); return new ResourceLocation(ModUtil.MOD_ID, "textures/gui/"+file+".png");

16
src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java
View file

@ -49,7 +49,7 @@ public final class ItemUtil{
block.setCreativeTab(addTab ? CreativeTab.INSTANCE : null); block.setCreativeTab(addTab ? CreativeTab.INSTANCE : null);
addUnderscoreNameToMapUnderscorelessName(name); addUnderscoreNameToMapUnderscorelessName(block.getRegistryName());
} }
public static void registerItem(Item item, String name, boolean addTab){ public static void registerItem(Item item, String name, boolean addTab){
@ -64,14 +64,12 @@ public final class ItemUtil{
ActuallyAdditions.proxy.addColoredItem(item); ActuallyAdditions.proxy.addColoredItem(item);
} }
addUnderscoreNameToMapUnderscorelessName(name); addUnderscoreNameToMapUnderscorelessName(item.getRegistryName());
} }
private static void addUnderscoreNameToMapUnderscorelessName(String name){ private static void addUnderscoreNameToMapUnderscorelessName(ResourceLocation name){
String nameId = ModUtil.MOD_ID+":"+name; String underscoreless = name.toString().replaceAll("_", "");
UNDERSCORELESS_TO_UNDERSCORED_NAMES.put(underscoreless, name.toString());
String underscoreless = nameId.replaceAll("_", "");
UNDERSCORELESS_TO_UNDERSCORED_NAMES.put(underscoreless, nameId);
} }
public static boolean remapName(FMLMissingMappingsEvent.MissingMapping mapping){ public static boolean remapName(FMLMissingMappingsEvent.MissingMapping mapping){
@ -80,11 +78,11 @@ public final class ItemUtil{
String newName = UNDERSCORELESS_TO_UNDERSCORED_NAMES.get(mapping.name); String newName = UNDERSCORELESS_TO_UNDERSCORED_NAMES.get(mapping.name);
ResourceLocation newResLoc = new ResourceLocation(newName); ResourceLocation newResLoc = new ResourceLocation(newName);
if(Block.REGISTRY.containsKey(newResLoc)){ if(Block.REGISTRY.containsKey(newResLoc) && mapping.type == GameRegistry.Type.BLOCK){
mapping.remap(Block.REGISTRY.getObject(newResLoc)); mapping.remap(Block.REGISTRY.getObject(newResLoc));
return true; return true;
} }
else if(Item.REGISTRY.containsKey(newResLoc)){ else if(Item.REGISTRY.containsKey(newResLoc) && mapping.type == GameRegistry.Type.ITEM){
mapping.remap(Item.REGISTRY.getObject(newResLoc)); mapping.remap(Item.REGISTRY.getObject(newResLoc));
return true; return true;
} }

810
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -108,414 +108,414 @@ death.actuallyadditions.atomicReconstructor.4=%s shouldn't have ate that Reconst
death.actuallyadditions.atomicReconstructor.5=%s should have used some re-construction foam. death.actuallyadditions.atomicReconstructor.5=%s should have used some re-construction foam.
#Blocks #Blocks
tile.actuallyadditions.blockCompost.name=Compost tile.actuallyadditions.block_compost.name=Compost
tile.actuallyadditions.blockMiscOreBlackQuartz.name=Black Quartz Ore tile.actuallyadditions.block_misc_ore_black_quartz.name=Black Quartz Ore
tile.actuallyadditions.blockMiscBlackQuartz.name=Block of Black Quartz tile.actuallyadditions.block_misc_black_quartz.name=Block of Black Quartz
tile.actuallyadditions.blockMiscBlackQuartzChiseled.name=Chiseled Block of Black Quartz tile.actuallyadditions.block_misc_black_quartz_chiseled.name=Chiseled Block of Black Quartz
tile.actuallyadditions.blockMiscBlackQuartzPillar.name=Pillar of Black Quartz tile.actuallyadditions.block_misc_black_quartz_pillar.name=Pillar of Black Quartz
tile.actuallyadditions.blockFeeder.name=Automatic Feeder tile.actuallyadditions.block_feeder.name=Automatic Feeder
tile.actuallyadditions.blockGiantChest.name=Small Storage Crate tile.actuallyadditions.block_giant_chest.name=Small Storage Crate
tile.actuallyadditions.blockGiantChestMedium.name=Medium Storage Crate tile.actuallyadditions.block_giant_chest_medium.name=Medium Storage Crate
tile.actuallyadditions.blockGiantChestLarge.name=Large Storage Crate tile.actuallyadditions.block_giant_chest_large.name=Large Storage Crate
tile.actuallyadditions.blockGrinder.name=Crusher tile.actuallyadditions.block_grinder.name=Crusher
tile.actuallyadditions.blockGrinderDouble.name=Double Crusher tile.actuallyadditions.block_grinder_double.name=Double Crusher
tile.actuallyadditions.blockFurnaceDouble.name=Powered Furnace tile.actuallyadditions.block_furnace_double.name=Powered Furnace
tile.actuallyadditions.blockFishingNet.name=Fishing Net tile.actuallyadditions.block_fishing_net.name=Fishing Net
tile.actuallyadditions.blockFurnaceSolar.name=Solar Panel tile.actuallyadditions.block_furnace_solar.name=Solar Panel
tile.actuallyadditions.blockHeatCollector.name=Heat Collector tile.actuallyadditions.block_heat_collector.name=Heat Collector
tile.actuallyadditions.blockItemRepairer.name=Item Repairer tile.actuallyadditions.block_item_repairer.name=Item Repairer
tile.actuallyadditions.blockMiscWoodCasing.name=Wood Casing tile.actuallyadditions.block_misc_wood_casing.name=Wood Casing
tile.actuallyadditions.blockGreenhouseGlass.name=Greenhouse Glass tile.actuallyadditions.block_greenhouse_glass.name=Greenhouse Glass
tile.actuallyadditions.blockEnergizer.name=Energizer tile.actuallyadditions.block_energizer.name=Energizer
tile.actuallyadditions.blockEnervator.name=Enervator tile.actuallyadditions.block_enervator.name=Enervator
tile.actuallyadditions.blockRice.name=Rice Plant tile.actuallyadditions.block_rice.name=Rice Plant
tile.actuallyadditions.blockMiscCharcoal.name=Block of Charcoal tile.actuallyadditions.block_misc_charcoal.name=Block of Charcoal
tile.actuallyadditions.blockCoalGenerator.name=Coal Generator tile.actuallyadditions.block_coal_generator.name=Coal Generator
tile.actuallyadditions.blockLampPowerer.name=Lamp Controller tile.actuallyadditions.block_lamp_powerer.name=Lamp Controller
tile.actuallyadditions.blockColoredLampWhite.name=White Lamp tile.actuallyadditions.block_colored_lamp_white.name=White Lamp
tile.actuallyadditions.blockColoredLampOrange.name=Orange Lamp tile.actuallyadditions.block_colored_lamp_orange.name=Orange Lamp
tile.actuallyadditions.blockColoredLampMagenta.name=Magenta Lamp tile.actuallyadditions.block_colored_lamp_magenta.name=Magenta Lamp
tile.actuallyadditions.blockColoredLampYellow.name=Yellow Lamp tile.actuallyadditions.block_colored_lamp_yellow.name=Yellow Lamp
tile.actuallyadditions.blockColoredLampLightBlue.name=Light Blue Lamp tile.actuallyadditions.block_colored_lamp_light_blue.name=Light Blue Lamp
tile.actuallyadditions.blockColoredLampBlue.name=Blue Lamp tile.actuallyadditions.block_colored_lamp_blue.name=Blue Lamp
tile.actuallyadditions.blockColoredLampGray.name=Gray Lamp tile.actuallyadditions.block_colored_lamp_gray.name=Gray Lamp
tile.actuallyadditions.blockColoredLampLightGray.name=Light Gray Lamp tile.actuallyadditions.block_colored_lamp_light_gray.name=Light Gray Lamp
tile.actuallyadditions.blockColoredLampGreen.name=Green Lamp tile.actuallyadditions.block_colored_lamp_green.name=Green Lamp
tile.actuallyadditions.blockColoredLampBlack.name=Black Lamp tile.actuallyadditions.block_colored_lamp_black.name=Black Lamp
tile.actuallyadditions.blockColoredLampBrown.name=Brown Lamp tile.actuallyadditions.block_colored_lamp_brown.name=Brown Lamp
tile.actuallyadditions.blockColoredLampRed.name=Red Lamp tile.actuallyadditions.block_colored_lamp_red.name=Red Lamp
tile.actuallyadditions.blockColoredLampLime.name=Lime Lamp tile.actuallyadditions.block_colored_lamp_lime.name=Lime Lamp
tile.actuallyadditions.blockColoredLampPink.name=Pink Lamp tile.actuallyadditions.block_colored_lamp_pink.name=Pink Lamp
tile.actuallyadditions.blockColoredLampCyan.name=Cyan Lamp tile.actuallyadditions.block_colored_lamp_cyan.name=Cyan Lamp
tile.actuallyadditions.blockColoredLampPurple.name=Purple Lamp tile.actuallyadditions.block_colored_lamp_purple.name=Purple Lamp
tile.actuallyadditions.blockPhantomface.name=Phantomface tile.actuallyadditions.block_phantomface.name=Phantomface
tile.actuallyadditions.blockPlayerInterface.name=Player Interface tile.actuallyadditions.block_player_interface.name=Player Interface
tile.actuallyadditions.blockPhantomEnergyface.name=Phantom Energyface tile.actuallyadditions.block_phantom_energyface.name=Phantom Energyface
tile.actuallyadditions.blockPhantomRedstoneface.name=Phantom Redstoneface tile.actuallyadditions.block_phantom_redstoneface.name=Phantom Redstoneface
tile.actuallyadditions.blockPhantomLiquiface.name=Phantom Liquiface tile.actuallyadditions.block_phantom_liquiface.name=Phantom Liquiface
tile.actuallyadditions.blockPhantomPlacer.name=Phantom Placer tile.actuallyadditions.block_phantom_placer.name=Phantom Placer
tile.actuallyadditions.blockPhantomBreaker.name=Phantom Breaker tile.actuallyadditions.block_phantom_breaker.name=Phantom Breaker
tile.actuallyadditions.blockLavaFactoryController.name=Lava Factory Controller tile.actuallyadditions.block_lava_factory_controller.name=Lava Factory Controller
tile.actuallyadditions.blockMiscLavaFactoryCase.name=Casing tile.actuallyadditions.block_misc_lava_factory_case.name=Casing
tile.actuallyadditions.blockFluidPlacer.name=Fluid Placer tile.actuallyadditions.block_fluid_placer.name=Fluid Placer
tile.actuallyadditions.blockFluidCollector.name=Fluid Collector tile.actuallyadditions.block_fluid_collector.name=Fluid Collector
tile.actuallyadditions.blockPhantomBooster.name=Phantom Booster tile.actuallyadditions.block_phantom_booster.name=Phantom Booster
tile.actuallyadditions.blockCoffee.name=Coffee Plant tile.actuallyadditions.block_coffee.name=Coffee Plant
tile.actuallyadditions.blockWildCanola.name=Wild Canola tile.actuallyadditions.block_wild_canola.name=Wild Canola
tile.actuallyadditions.blockWildRice.name=Wild Rice tile.actuallyadditions.block_wild_rice.name=Wild Rice
tile.actuallyadditions.blockWildCoffee.name=Wild Coffee tile.actuallyadditions.block_wild_coffee.name=Wild Coffee
tile.actuallyadditions.blockWildFlax.name=Wild Flax tile.actuallyadditions.block_wild_flax.name=Wild Flax
tile.actuallyadditions.blockTestifiBucksGreenWall.name=Ethetic Green Block tile.actuallyadditions.block_testifi_bucks_green_wall.name=Ethetic Green Block
tile.actuallyadditions.blockTestifiBucksWhiteWall.name=Ethetic Quartz tile.actuallyadditions.block_testifi_bucks_white_wall.name=Ethetic Quartz
tile.actuallyadditions.blockTestifiBucksGreenStairs.name=Ethetic Green Stairs tile.actuallyadditions.block_testifi_bucks_green_stairs.name=Ethetic Green Stairs
tile.actuallyadditions.blockTestifiBucksWhiteStairs.name=Ethetic Quartz Stairs tile.actuallyadditions.block_testifi_bucks_white_stairs.name=Ethetic Quartz Stairs
tile.actuallyadditions.blockTestifiBucksGreenSlab.name=Ethetic Green Slab tile.actuallyadditions.block_testifi_bucks_green_slab.name=Ethetic Green Slab
tile.actuallyadditions.blockTestifiBucksWhiteSlab.name=Ethetic Quartz Slab tile.actuallyadditions.block_testifi_bucks_white_slab.name=Ethetic Quartz Slab
tile.actuallyadditions.blockCanola.name=Canola Plant tile.actuallyadditions.block_canola.name=Canola Plant
tile.actuallyadditions.blockTreasureChest.name=Treasure Chest tile.actuallyadditions.block_treasure_chest.name=Treasure Chest
tile.actuallyadditions.blockCanolaPress.name=Canola Press tile.actuallyadditions.block_canola_press.name=Canola Press
tile.actuallyadditions.blockFermentingBarrel.name=Fermenting Barrel tile.actuallyadditions.block_fermenting_barrel.name=Fermenting Barrel
tile.actuallyadditions.blockCanolaOil.name=Canola Oil tile.actuallyadditions.block_canola_oil.name=Canola Oil
tile.actuallyadditions.blockOil.name=Oil tile.actuallyadditions.block_oil.name=Oil
tile.actuallyadditions.blockCrystalOil.name=Crystallized Oil tile.actuallyadditions.block_crystal_oil.name=Crystallized Oil
tile.actuallyadditions.blockEmpoweredOil.name=Empowered Oil tile.actuallyadditions.block_empowered_oil.name=Empowered Oil
tile.actuallyadditions.blockMiscEnderpearl.name=Block of Enderpearl tile.actuallyadditions.block_misc_enderpearl.name=Block of Enderpearl
tile.actuallyadditions.blockOilGenerator.name=Oil Generator tile.actuallyadditions.block_oil_generator.name=Oil Generator
tile.actuallyadditions.blockBreaker.name=Auto-Breaker tile.actuallyadditions.block_breaker.name=Auto-Breaker
tile.actuallyadditions.blockPlacer.name=Auto-Placer tile.actuallyadditions.block_placer.name=Auto-Placer
tile.actuallyadditions.blockDropper.name=Automatic Precision Dropper tile.actuallyadditions.block_dropper.name=Automatic Precision Dropper
tile.actuallyadditions.blockMiscEnderCasing.name=Ender Casing tile.actuallyadditions.block_misc_ender_casing.name=Ender Casing
tile.actuallyadditions.blockFlax.name=Flax Plant tile.actuallyadditions.block_flax.name=Flax Plant
tile.actuallyadditions.blockCoffeeMachine.name=Coffee Maker tile.actuallyadditions.block_coffee_machine.name=Coffee Maker
tile.actuallyadditions.blockXPSolidifier.name=Experience Solidifier tile.actuallyadditions.block_xp_solidifier.name=Experience Solidifier
tile.actuallyadditions.blockSmileyCloud.name=Smiley Cloud tile.actuallyadditions.block_smiley_cloud.name=Smiley Cloud
tile.actuallyadditions.blockLeafGenerator.name=Leaf-Eating Generator tile.actuallyadditions.block_leaf_generator.name=Leaf-Eating Generator
tile.actuallyadditions.blockDirectionalBreaker.name=Long-Range Breaker tile.actuallyadditions.block_directional_breaker.name=Long-Range Breaker
tile.actuallyadditions.blockRangedCollector.name=Ranged Collector tile.actuallyadditions.block_ranged_collector.name=Ranged Collector
tile.actuallyadditions.blockLaserRelay.name=Energy Laser Relay tile.actuallyadditions.block_laser_relay.name=Energy Laser Relay
tile.actuallyadditions.blockLaserRelayAdvanced.name=Advanced Energy Laser Relay tile.actuallyadditions.block_laser_relay_advanced.name=Advanced Energy Laser Relay
tile.actuallyadditions.blockLaserRelayExtreme.name=Extreme Energy Laser Relay tile.actuallyadditions.block_laser_relay_extreme.name=Extreme Energy Laser Relay
tile.actuallyadditions.blockLaserRelayFluids.name=Fluid Laser Relay tile.actuallyadditions.block_laser_relay_fluids.name=Fluid Laser Relay
tile.actuallyadditions.blockMiscIronCasing.name=Iron Casing tile.actuallyadditions.block_misc_iron_casing.name=Iron Casing
tile.actuallyadditions.blockBlackLotus.name=Black Lotus tile.actuallyadditions.block_black_lotus.name=Black Lotus
tile.actuallyadditions.blockTestifiBucksWhiteFence.name=Ethetic Quartz Wall tile.actuallyadditions.block_testifi_bucks_white_fence.name=Ethetic Quartz Wall
tile.actuallyadditions.blockTestifiBucksGreenFence.name=Ethetic Green Wall tile.actuallyadditions.block_testifi_bucks_green_fence.name=Ethetic Green Wall
tile.actuallyadditions.blockCrystalRed.name=Restonia Crystal Block tile.actuallyadditions.block_crystal_red.name=Restonia Crystal Block
tile.actuallyadditions.blockCrystalBlue.name=Palis Crystal Block tile.actuallyadditions.block_crystal_blue.name=Palis Crystal Block
tile.actuallyadditions.blockCrystalLightBlue.name=Diamatine Crystal Block tile.actuallyadditions.block_crystal_light_blue.name=Diamatine Crystal Block
tile.actuallyadditions.blockCrystalGreen.name=Emeradic Crystal Block tile.actuallyadditions.block_crystal_green.name=Emeradic Crystal Block
tile.actuallyadditions.blockCrystalBlack.name=Void Crystal Block tile.actuallyadditions.block_crystal_black.name=Void Crystal Block
tile.actuallyadditions.blockCrystalWhite.name=Enori Crystal Block tile.actuallyadditions.block_crystal_white.name=Enori Crystal Block
tile.actuallyadditions.blockCrystalEmpoweredRed.name=Empowered Restonia Crystal Block tile.actuallyadditions.block_crystal_empowered_red.name=Empowered Restonia Crystal Block
tile.actuallyadditions.blockCrystalEmpoweredBlue.name=Empowered Palis Crystal Block tile.actuallyadditions.block_crystal_empowered_blue.name=Empowered Palis Crystal Block
tile.actuallyadditions.blockCrystalEmpoweredLightBlue.name=Empowered Diamatine Crystal Block tile.actuallyadditions.block_crystal_empowered_light_blue.name=Empowered Diamatine Crystal Block
tile.actuallyadditions.blockCrystalEmpoweredGreen.name=Empowered Emeradic Crystal Block tile.actuallyadditions.block_crystal_empowered_green.name=Empowered Emeradic Crystal Block
tile.actuallyadditions.blockCrystalEmpoweredBlack.name=Empowered Void Crystal Block tile.actuallyadditions.block_crystal_empowered_black.name=Empowered Void Crystal Block
tile.actuallyadditions.blockCrystalEmpoweredWhite.name=Empowered Enori Crystal Block tile.actuallyadditions.block_crystal_empowered_white.name=Empowered Enori Crystal Block
tile.actuallyadditions.blockMiner.name=Vertical Digger tile.actuallyadditions.block_miner.name=Vertical Digger
tile.actuallyadditions.blockFireworkBox.name=Firework Box tile.actuallyadditions.block_firework_box.name=Firework Box
tile.actuallyadditions.blockQuartzWall.name=Black Quartz Wall tile.actuallyadditions.block_quartz_wall.name=Black Quartz Wall
tile.actuallyadditions.blockQuartzStair.name=Black Quartz Stairs tile.actuallyadditions.block_quartz_stair.name=Black Quartz Stairs
tile.actuallyadditions.blockQuartzSlab.name=Black Quartz Slab tile.actuallyadditions.block_quartz_slab.name=Black Quartz Slab
tile.actuallyadditions.blockChiseledQuartzWall.name=Chiseled Black Quartz Wall tile.actuallyadditions.block_chiseled_quartz_wall.name=Chiseled Black Quartz Wall
tile.actuallyadditions.blockChiseledQuartzStair.name=Chiseled Black Quartz Stairs tile.actuallyadditions.block_chiseled_quartz_stair.name=Chiseled Black Quartz Stairs
tile.actuallyadditions.blockChiseledQuartzSlab.name=Chiseled Black Quartz Slab tile.actuallyadditions.block_chiseled_quartz_slab.name=Chiseled Black Quartz Slab
tile.actuallyadditions.blockPillarQuartzWall.name=Black Quartz Pillar Wall tile.actuallyadditions.block_pillar_quartz_wall.name=Black Quartz Pillar Wall
tile.actuallyadditions.blockPillarQuartzStair.name=Black Quartz Pillar Stairs tile.actuallyadditions.block_pillar_quartz_stair.name=Black Quartz Pillar Stairs
tile.actuallyadditions.blockPillarQuartzSlab.name=Black Quartz Pillar Slab tile.actuallyadditions.block_pillar_quartz_slab.name=Black Quartz Pillar Slab
tile.actuallyadditions.blockLaserRelayItem.name=Item Laser Relay tile.actuallyadditions.block_laser_relay_item.name=Item Laser Relay
tile.actuallyadditions.blockLaserRelayItemWhitelist.name=Advanced Item Laser Relay tile.actuallyadditions.block_laser_relay_item_whitelist.name=Advanced Item Laser Relay
tile.actuallyadditions.blockItemViewer.name=Item Interface tile.actuallyadditions.block_item_viewer.name=Item Interface
tile.actuallyadditions.blockImpureIron.name=Impure Iron tile.actuallyadditions.block_impure_iron.name=Impure Iron
tile.actuallyadditions.blockBookletStand.name=Wall-Mount Manual tile.actuallyadditions.block_booklet_stand.name=Wall-Mount Manual
tile.actuallyadditions.blockDisplayStand.name=Display Stand tile.actuallyadditions.block_display_stand.name=Display Stand
tile.actuallyadditions.blockShockSuppressor.name=Shock Absorber tile.actuallyadditions.block_shock_suppressor.name=Shock Absorber
tile.actuallyadditions.blockTinyTorch.name=Tiny Torch tile.actuallyadditions.block_tiny_torch.name=Tiny Torch
tile.actuallyadditions.blockEmpowerer.name=Empowerer tile.actuallyadditions.block_empowerer.name=Empowerer
tile.actuallyadditions.blockDistributorItem.name=Item Distributor tile.actuallyadditions.block_distributor_item.name=Item Distributor
tile.actuallyadditions.blockBioReactor.name=Bio Reactor tile.actuallyadditions.block_bio_reactor.name=Bio Reactor
tile.actuallyadditions.blockFarmer.name=Farmer tile.actuallyadditions.block_farmer.name=Farmer
#ESD #ESD
tile.actuallyadditions.blockInputter.name=ESD tile.actuallyadditions.block_inputter.name=ESD
tile.actuallyadditions.blockInputterAdvanced.name=Advanced ESD tile.actuallyadditions.block_inputter_advanced.name=Advanced ESD
tile.actuallyadditions.blockInputter.add.1.name=Ellpeck's Slot Device tile.actuallyadditions.block_inputter.add.1.name=Ellpeck's Slot Device
tile.actuallyadditions.blockInputter.add.2.name=Ethereal System Dude tile.actuallyadditions.block_inputter.add.2.name=Ethereal System Dude
tile.actuallyadditions.blockInputter.add.3.name=Energy Stuff Distributor tile.actuallyadditions.block_inputter.add.3.name=Energy Stuff Distributor
tile.actuallyadditions.blockInputter.add.4.name=Existing Stuff Donator tile.actuallyadditions.block_inputter.add.4.name=Existing Stuff Donator
tile.actuallyadditions.blockInputter.add.5.name=ExtraUtils Stealing Device tile.actuallyadditions.block_inputter.add.5.name=ExtraUtils Stealing Device
tile.actuallyadditions.blockInputter.add.6.name=Experienced Sauce Deriver tile.actuallyadditions.block_inputter.add.6.name=Experienced Sauce Deriver
tile.actuallyadditions.blockInputter.add.7.name=Excellent Spaghetti Dessert tile.actuallyadditions.block_inputter.add.7.name=Excellent Spaghetti Dessert
tile.actuallyadditions.blockInputter.add.8.name=Extraordinary Sample Deliverer tile.actuallyadditions.block_inputter.add.8.name=Extraordinary Sample Deliverer
tile.actuallyadditions.blockInputter.add.9.name=Express Sending Doughnut tile.actuallyadditions.block_inputter.add.9.name=Express Sending Doughnut
tile.actuallyadditions.blockInputter.add.10.name=Expelling Sugar Dagger tile.actuallyadditions.block_inputter.add.10.name=Expelling Sugar Dagger
tile.actuallyadditions.blockInputter.add.11.name=Extra-Long Solidifying Dissociation tile.actuallyadditions.block_inputter.add.11.name=Extra-Long Solidifying Dissociation
tile.actuallyadditions.blockInputter.add.12.name=Energetic Solo Dancer tile.actuallyadditions.block_inputter.add.12.name=Energetic Solo Dancer
tile.actuallyadditions.blockInputter.add.13.name=Efficient Sucking Dilettant tile.actuallyadditions.block_inputter.add.13.name=Efficient Sucking Dilettant
tile.actuallyadditions.blockInputter.add.14.name=Extreme Sand Digger tile.actuallyadditions.block_inputter.add.14.name=Extreme Sand Digger
tile.actuallyadditions.blockInputter.add.15.name=Ending Serious Daughter tile.actuallyadditions.block_inputter.add.15.name=Ending Serious Daughter
#Reconstructor #Reconstructor
tile.actuallyadditions.blockAtomicReconstructor.name=Atomic Reconstructor tile.actuallyadditions.block_atomic_reconstructor.name=Atomic Reconstructor
tile.actuallyadditions.blockAtomicReconstructor.info.1.1=Molecular tile.actuallyadditions.block_atomic_reconstructor.info.1.1=Molecular
tile.actuallyadditions.blockAtomicReconstructor.info.1.2=Material tile.actuallyadditions.block_atomic_reconstructor.info.1.2=Material
tile.actuallyadditions.blockAtomicReconstructor.info.1.3=Quarkal tile.actuallyadditions.block_atomic_reconstructor.info.1.3=Quarkal
tile.actuallyadditions.blockAtomicReconstructor.info.1.4=Atomatic tile.actuallyadditions.block_atomic_reconstructor.info.1.4=Atomatic
tile.actuallyadditions.blockAtomicReconstructor.info.1.5=Tiny Bit tile.actuallyadditions.block_atomic_reconstructor.info.1.5=Tiny Bit
tile.actuallyadditions.blockAtomicReconstructor.info.1.6=Component tile.actuallyadditions.block_atomic_reconstructor.info.1.6=Component
tile.actuallyadditions.blockAtomicReconstructor.info.1.7=Vittle tile.actuallyadditions.block_atomic_reconstructor.info.1.7=Vittle
tile.actuallyadditions.blockAtomicReconstructor.info.1.8=Transmaterial tile.actuallyadditions.block_atomic_reconstructor.info.1.8=Transmaterial
tile.actuallyadditions.blockAtomicReconstructor.info.1.9=Partial tile.actuallyadditions.block_atomic_reconstructor.info.1.9=Partial
tile.actuallyadditions.blockAtomicReconstructor.info.1.10=Spatial tile.actuallyadditions.block_atomic_reconstructor.info.1.10=Spatial
tile.actuallyadditions.blockAtomicReconstructor.info.1.11=Stuffy tile.actuallyadditions.block_atomic_reconstructor.info.1.11=Stuffy
tile.actuallyadditions.blockAtomicReconstructor.info.1.12=Interdimensional tile.actuallyadditions.block_atomic_reconstructor.info.1.12=Interdimensional
tile.actuallyadditions.blockAtomicReconstructor.info.2.1=Recombobulizer tile.actuallyadditions.block_atomic_reconstructor.info.2.1=Recombobulizer
tile.actuallyadditions.blockAtomicReconstructor.info.2.2=Shiftulator tile.actuallyadditions.block_atomic_reconstructor.info.2.2=Shiftulator
tile.actuallyadditions.blockAtomicReconstructor.info.2.3=Recombinator tile.actuallyadditions.block_atomic_reconstructor.info.2.3=Recombinator
tile.actuallyadditions.blockAtomicReconstructor.info.2.4=Modulator tile.actuallyadditions.block_atomic_reconstructor.info.2.4=Modulator
tile.actuallyadditions.blockAtomicReconstructor.info.2.5=Moleculizer tile.actuallyadditions.block_atomic_reconstructor.info.2.5=Moleculizer
tile.actuallyadditions.blockAtomicReconstructor.info.2.6=Modificulator tile.actuallyadditions.block_atomic_reconstructor.info.2.6=Modificulator
tile.actuallyadditions.blockAtomicReconstructor.info.2.7=Changer tile.actuallyadditions.block_atomic_reconstructor.info.2.7=Changer
tile.actuallyadditions.blockAtomicReconstructor.info.2.8=Atomizer tile.actuallyadditions.block_atomic_reconstructor.info.2.8=Atomizer
tile.actuallyadditions.blockAtomicReconstructor.info.2.9=Makerator tile.actuallyadditions.block_atomic_reconstructor.info.2.9=Makerator
tile.actuallyadditions.blockAtomicReconstructor.info.2.10=Swapper tile.actuallyadditions.block_atomic_reconstructor.info.2.10=Swapper
tile.actuallyadditions.blockAtomicReconstructor.info.2.11=Exchanger tile.actuallyadditions.block_atomic_reconstructor.info.2.11=Exchanger
tile.actuallyadditions.blockAtomicReconstructor.info.2.12=Replacer tile.actuallyadditions.block_atomic_reconstructor.info.2.12=Replacer
tile.actuallyadditions.blockAtomicReconstructor.info.2.13=Differentiator tile.actuallyadditions.block_atomic_reconstructor.info.2.13=Differentiator
tile.actuallyadditions.blockAtomicReconstructor.info.2.14=Receiver tile.actuallyadditions.block_atomic_reconstructor.info.2.14=Receiver
#Items #Items
item.actuallyadditions.itemDrill.name=Drill item.actuallyadditions.item_drill.name=Drill
item.actuallyadditions.itemFoodRice.name=Rice item.actuallyadditions.item_food_rice.name=Rice
item.actuallyadditions.itemFoodDoughnut.name=Doughnut item.actuallyadditions.item_food_doughnut.name=Doughnut
item.actuallyadditions.itemMiscRiceDough.name=Rice Dough item.actuallyadditions.item_misc_rice_dough.name=Rice Dough
item.actuallyadditions.itemFoodRiceBread.name=Rice Bread item.actuallyadditions.item_food_rice_bread.name=Rice Bread
item.actuallyadditions.itemRiceSeed.name=Rice Seeds item.actuallyadditions.item_rice_seed.name=Rice Seeds
item.actuallyadditions.itemMiscTinyCoal.name=Tiny Coal item.actuallyadditions.item_misc_tiny_coal.name=Tiny Coal
item.actuallyadditions.itemMiscTinyCharcoal.name=Tiny Charcoal item.actuallyadditions.item_misc_tiny_charcoal.name=Tiny Charcoal
item.actuallyadditions.itemMiscRiceSlime.name=Rice Slimeball item.actuallyadditions.item_misc_rice_slime.name=Rice Slimeball
item.actuallyadditions.itemBattery.name=Single Battery item.actuallyadditions.item_battery.name=Single Battery
item.actuallyadditions.itemBatteryDouble.name=Double Battery item.actuallyadditions.item_battery_double.name=Double Battery
item.actuallyadditions.itemBatteryTriple.name=Triple Battery item.actuallyadditions.item_battery_triple.name=Triple Battery
item.actuallyadditions.itemBatteryQuadruple.name=Quadruple Battery item.actuallyadditions.item_battery_quadruple.name=Quadruple Battery
item.actuallyadditions.itemBatteryQuintuple.name=Quintuple Battery item.actuallyadditions.item_battery_quintuple.name=Quintuple Battery
item.actuallyadditions.itemGrowthRing.name=Ring of Growth item.actuallyadditions.item_growth_ring.name=Ring of Growth
item.actuallyadditions.itemWaterRemovalRing.name=Ring of Liquid Banning item.actuallyadditions.item_water_removal_ring.name=Ring of Liquid Banning
item.actuallyadditions.itemSuctionRing.name=Ring of Magnetizing item.actuallyadditions.item_suction_ring.name=Ring of Magnetizing
item.actuallyadditions.itemBucketCanolaOil.name=Canola Oil Bucket item.actuallyadditions.item_bucket_canola_oil.name=Canola Oil Bucket
item.actuallyadditions.itemBucketOil.name=Oil Bucket item.actuallyadditions.item_bucket_oil.name=Oil Bucket
item.actuallyadditions.itemWingsOfTheBats.name=Wings Of The Bats item.actuallyadditions.item_wings_of_the_bats.name=Wings Of The Bats
item.actuallyadditions.itemMiscBatWing.name=Bat's Wing item.actuallyadditions.item_misc_bat_wing.name=Bat's Wing
item.actuallyadditions.woodenPaxel.name=Wooden AIOT item.actuallyadditions.wooden_paxel.name=Wooden AIOT
item.actuallyadditions.stonePaxel.name=Stone AIOT item.actuallyadditions.stone_paxel.name=Stone AIOT
item.actuallyadditions.ironPaxel.name=Iron AIOT item.actuallyadditions.iron_paxel.name=Iron AIOT
item.actuallyadditions.goldPaxel.name=Golden AIOT item.actuallyadditions.gold_paxel.name=Golden AIOT
item.actuallyadditions.diamondPaxel.name=Diamond AIOT item.actuallyadditions.diamond_paxel.name=Diamond AIOT
item.actuallyadditions.emeraldPaxel.name=Emerald AIOT item.actuallyadditions.emerald_paxel.name=Emerald AIOT
item.actuallyadditions.obsidianPaxel.name=Obsidian AIOT item.actuallyadditions.obsidian_paxel.name=Obsidian AIOT
item.actuallyadditions.quartzPaxel.name=Black Quartz AIOT item.actuallyadditions.quartz_paxel.name=Black Quartz AIOT
item.actuallyadditions.itemPhantomConnector.name=Phantom Connector item.actuallyadditions.item_phantom_connector.name=Phantom Connector
item.actuallyadditions.itemMiscCup.name=Empty Cup item.actuallyadditions.item_misc_cup.name=Empty Cup
item.actuallyadditions.itemCoffee.name=Cup with Coffee item.actuallyadditions.item_coffee.name=Cup with Coffee
item.actuallyadditions.itemCoffeeSeed.name=Coffee Seeds item.actuallyadditions.item_coffee_seed.name=Coffee Seeds
item.actuallyadditions.itemCoffeeBeans.name=Coffee Beans item.actuallyadditions.item_coffee_beans.name=Coffee Beans
item.actuallyadditions.itemCanolaSeed.name=Canola Seeds item.actuallyadditions.item_canola_seed.name=Canola Seeds
item.actuallyadditions.itemMiscCanola.name=Canola item.actuallyadditions.item_misc_canola.name=Canola
item.actuallyadditions.itemResonantRice.name=Resonant Rice item.actuallyadditions.item_resonant_rice.name=Resonant Rice
item.actuallyadditions.itemDrillUpgradeSpeed.name=Drill Speed Augment I item.actuallyadditions.item_drill_upgrade_speed.name=Drill Speed Augment I
item.actuallyadditions.itemDrillUpgradeSpeedII.name=Drill Speed Augment II item.actuallyadditions.item_drill_upgrade_speed_ii.name=Drill Speed Augment II
item.actuallyadditions.itemDrillUpgradeSpeedIII.name=Drill Speed Augment III item.actuallyadditions.item_drill_upgrade_speed_iii.name=Drill Speed Augment III
item.actuallyadditions.itemDrillUpgradeSilkTouch.name=Drill Silk Touch Augment item.actuallyadditions.item_drill_upgrade_silk_touch.name=Drill Silk Touch Augment
item.actuallyadditions.itemDrillUpgradeFortune.name=Drill Fortune Augment I item.actuallyadditions.item_drill_upgrade_fortune.name=Drill Fortune Augment I
item.actuallyadditions.itemDrillUpgradeFortuneII.name=Drill Fortune Augment II (Gives Fortune III!) item.actuallyadditions.item_drill_upgrade_fortune_ii.name=Drill Fortune Augment II (Gives Fortune III!)
item.actuallyadditions.itemDrillUpgradeBlockPlacing.name=Drill Block Placing Augment item.actuallyadditions.item_drill_upgrade_block_placing.name=Drill Block Placing Augment
item.actuallyadditions.itemDrillUpgradeThreeByThree.name=Drill Mining Augment I item.actuallyadditions.item_drill_upgrade_three_by_three.name=Drill Mining Augment I
item.actuallyadditions.itemDrillUpgradeFiveByFive.name=Drill Mining Augment II item.actuallyadditions.item_drill_upgrade_five_by_five.name=Drill Mining Augment II
item.actuallyadditions.itemMiscMashedFood.name=Bio-Mash item.actuallyadditions.item_misc_mashed_food.name=Bio-Mash
item.actuallyadditions.itemFertilizer.name=Fertilizer item.actuallyadditions.item_fertilizer.name=Fertilizer
item.actuallyadditions.itemMiscDough.name=Dough item.actuallyadditions.item_misc_dough.name=Dough
item.actuallyadditions.itemMiscPaperCone.name=Paper Cone item.actuallyadditions.item_misc_paper_cone.name=Paper Cone
item.actuallyadditions.itemMiscKnifeBlade.name=Knife Blade item.actuallyadditions.item_misc_knife_blade.name=Knife Blade
item.actuallyadditions.itemMiscKnifeHandle.name=Knife Handle item.actuallyadditions.item_misc_knife_handle.name=Knife Handle
item.actuallyadditions.itemMiscBlackQuartz.name=Black Quartz item.actuallyadditions.item_misc_black_quartz.name=Black Quartz
item.actuallyadditions.itemMiscRing.name=Ring item.actuallyadditions.item_misc_ring.name=Ring
item.actuallyadditions.itemTeleStaff.name=Teleport Staff item.actuallyadditions.item_tele_staff.name=Teleport Staff
item.actuallyadditions.itemJamCuBaRa.name=CuBaRa-Jam item.actuallyadditions.item_jam_cu_ba_ra.name=CuBaRa-Jam
item.actuallyadditions.itemJamGraKiBa.name=GraKiBa-Jam item.actuallyadditions.item_jam_gra_ki_ba.name=GraKiBa-Jam
item.actuallyadditions.itemJamPlApLe.name=PlApLe-Jam item.actuallyadditions.item_jam_pl_ap_le.name=PlApLe-Jam
item.actuallyadditions.itemJamChApCi.name=ChApCi-Jam item.actuallyadditions.item_jam_ch_ap_ci.name=ChApCi-Jam
item.actuallyadditions.itemJamHoMeKi.name=HoMeKi-Jam item.actuallyadditions.item_jam_ho_me_ki.name=HoMeKi-Jam
item.actuallyadditions.itemJamHoMeCo.name=HoMeCo-Jam item.actuallyadditions.item_jam_ho_me_co.name=HoMeCo-Jam
item.actuallyadditions.itemJamPiCo.name=PiCo-Jam item.actuallyadditions.item_jam_pi_co.name=PiCo-Jam
item.actuallyadditions.itemHairyBall.name=Ball of Fur item.actuallyadditions.item_hairy_ball.name=Ball of Fur
item.actuallyadditions.itemLeafBlower.name=Leaf Blower item.actuallyadditions.item_leaf_blower.name=Leaf Blower
item.actuallyadditions.itemLeafBlowerAdvanced.name=Advanced Leaf Blower item.actuallyadditions.item_leaf_blower_advanced.name=Advanced Leaf Blower
item.actuallyadditions.itemKnife.name=Knife item.actuallyadditions.item_knife.name=Knife
item.actuallyadditions.itemPickaxeEmerald.name=Emerald Pickaxe item.actuallyadditions.item_pickaxe_emerald.name=Emerald Pickaxe
item.actuallyadditions.itemAxeEmerald.name=Emerald Axe item.actuallyadditions.item_axe_emerald.name=Emerald Axe
item.actuallyadditions.itemShovelEmerald.name=Emerald Shovel item.actuallyadditions.item_shovel_emerald.name=Emerald Shovel
item.actuallyadditions.itemHoeEmerald.name=Emerald Hoe item.actuallyadditions.item_hoe_emerald.name=Emerald Hoe
item.actuallyadditions.itemSwordEmerald.name=Emerald Sword item.actuallyadditions.item_sword_emerald.name=Emerald Sword
item.actuallyadditions.itemPickaxeQuartz.name=Black Quartz Pickaxe item.actuallyadditions.item_pickaxe_quartz.name=Black Quartz Pickaxe
item.actuallyadditions.itemAxeQuartz.name=Black Quartz Axe item.actuallyadditions.item_axe_quartz.name=Black Quartz Axe
item.actuallyadditions.itemShovelQuartz.name=Black Quartz Shovel item.actuallyadditions.item_shovel_quartz.name=Black Quartz Shovel
item.actuallyadditions.itemHoeQuartz.name=Black Quartz Hoe item.actuallyadditions.item_hoe_quartz.name=Black Quartz Hoe
item.actuallyadditions.itemSwordQuartz.name=Black Quartz Sword item.actuallyadditions.item_sword_quartz.name=Black Quartz Sword
item.actuallyadditions.itemPickaxeObsidian.name=Obsidian Pickaxe item.actuallyadditions.item_pickaxe_obsidian.name=Obsidian Pickaxe
item.actuallyadditions.itemAxeObsidian.name=Obsidian Axe item.actuallyadditions.item_axe_obsidian.name=Obsidian Axe
item.actuallyadditions.itemShovelObsidian.name=Obsidian Shovel item.actuallyadditions.item_shovel_obsidian.name=Obsidian Shovel
item.actuallyadditions.itemHoeObsidian.name=Obsidian Hoe item.actuallyadditions.item_hoe_obsidian.name=Obsidian Hoe
item.actuallyadditions.itemSwordObsidian.name=Obsidian Sword item.actuallyadditions.item_sword_obsidian.name=Obsidian Sword
item.actuallyadditions.itemCrafterOnAStick.name=Crafting Table On A Stick item.actuallyadditions.item_crafter_on_a_stick.name=Crafting Table On A Stick
item.actuallyadditions.itemFoodBaguette.name=Baguette item.actuallyadditions.item_food_baguette.name=Baguette
item.actuallyadditions.itemFoodPizza.name=Pizza item.actuallyadditions.item_food_pizza.name=Pizza
item.actuallyadditions.itemFoodHamburger.name=Hamburger item.actuallyadditions.item_food_hamburger.name=Hamburger
item.actuallyadditions.itemFoodBigCookie.name=Big Cookie item.actuallyadditions.item_food_big_cookie.name=Big Cookie
item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich item.actuallyadditions.item_food_submarine_sandwich.name=Submarine Sandwich
item.actuallyadditions.itemFoodToast.name=Toast item.actuallyadditions.item_food_toast.name=Toast
item.actuallyadditions.itemFoodChocolateToast.name=Toast o' Chocolate item.actuallyadditions.item_food_chocolate_toast.name=Toast o' Chocolate
item.actuallyadditions.itemFoodChocolate.name=Chocolate item.actuallyadditions.item_food_chocolate.name=Chocolate
item.actuallyadditions.itemFoodChocolateCake.name=Chocolate Cake item.actuallyadditions.item_food_chocolate_cake.name=Chocolate Cake
item.actuallyadditions.itemFoodNoodle.name=Noodle item.actuallyadditions.item_food_noodle.name=Noodle
item.actuallyadditions.itemFoodSpaghetti.name=Spaghetti item.actuallyadditions.item_food_spaghetti.name=Spaghetti
item.actuallyadditions.itemFoodFrenchFry.name=French Fry item.actuallyadditions.item_food_french_fry.name=French Fry
item.actuallyadditions.itemFoodFrenchFries.name=French Fries item.actuallyadditions.item_food_french_fries.name=French Fries
item.actuallyadditions.itemFoodFishNChips.name=Fish 'N' Chips item.actuallyadditions.item_food_fish_n_chips.name=Fish 'N' Chips
item.actuallyadditions.itemFoodCarrotJuice.name=Carrot Juice item.actuallyadditions.item_food_carrot_juice.name=Carrot Juice
item.actuallyadditions.itemFoodPumpkinStew.name=Pumpkin Stew item.actuallyadditions.item_food_pumpkin_stew.name=Pumpkin Stew
item.actuallyadditions.itemFoodCheese.name=Cheese item.actuallyadditions.item_food_cheese.name=Cheese
item.actuallyadditions.itemMiscCoil.name=Basic Coil item.actuallyadditions.item_misc_coil.name=Basic Coil
item.actuallyadditions.itemMiscCoilAdvanced.name=Advanced Coil item.actuallyadditions.item_misc_coil_advanced.name=Advanced Coil
item.actuallyadditions.itemPotionRing.name=Ring of item.actuallyadditions.item_potion_ring.name=Ring of
item.actuallyadditions.itemPotionRingAdvanced.name=Advanced Ring of item.actuallyadditions.item_potion_ring_advanced.name=Advanced Ring of
item.actuallyadditions.itemSolidifiedExperience.name=Solidified Experience item.actuallyadditions.item_solidified_experience.name=Solidified Experience
item.actuallyadditions.itemDustIron.name=Crushed Iron item.actuallyadditions.item_dust_iron.name=Crushed Iron
item.actuallyadditions.itemDustGold.name=Crushed Gold item.actuallyadditions.item_dust_gold.name=Crushed Gold
item.actuallyadditions.itemDustDiamond.name=Crushed Diamond item.actuallyadditions.item_dust_diamond.name=Crushed Diamond
item.actuallyadditions.itemDustLapis.name=Crushed Lapis item.actuallyadditions.item_dust_lapis.name=Crushed Lapis
item.actuallyadditions.itemDustEmerald.name=Crushed Emerald item.actuallyadditions.item_dust_emerald.name=Crushed Emerald
item.actuallyadditions.itemDustQuartz.name=Crushed Quartz item.actuallyadditions.item_dust_quartz.name=Crushed Quartz
item.actuallyadditions.itemDustCoal.name=Crushed Coal item.actuallyadditions.item_dust_coal.name=Crushed Coal
item.actuallyadditions.itemDustQuartzBlack.name=Crushed Black Quartz item.actuallyadditions.item_dust_quartz_black.name=Crushed Black Quartz
item.actuallyadditions.itemFlaxSeed.name=Flax Seeds item.actuallyadditions.item_flax_seed.name=Flax Seeds
item.actuallyadditions.itemHelmObsidian.name=Obsidian Helmet item.actuallyadditions.item_helm_obsidian.name=Obsidian Helmet
item.actuallyadditions.itemChestObsidian.name=Obsidian Chestplate item.actuallyadditions.item_chest_obsidian.name=Obsidian Chestplate
item.actuallyadditions.itemPantsObsidian.name=Obsidian Pants item.actuallyadditions.item_pants_obsidian.name=Obsidian Pants
item.actuallyadditions.itemBootsObsidian.name=Obsidian Boots item.actuallyadditions.item_boots_obsidian.name=Obsidian Boots
item.actuallyadditions.itemHelmEmerald.name=Emerald Helmet item.actuallyadditions.item_helm_emerald.name=Emerald Helmet
item.actuallyadditions.itemChestEmerald.name=Emerald Chestplate item.actuallyadditions.item_chest_emerald.name=Emerald Chestplate
item.actuallyadditions.itemPantsEmerald.name=Emerald Pants item.actuallyadditions.item_pants_emerald.name=Emerald Pants
item.actuallyadditions.itemBootsEmerald.name=Emerald Boots item.actuallyadditions.item_boots_emerald.name=Emerald Boots
item.actuallyadditions.itemHelmQuartz.name=Black Quartz Helmet item.actuallyadditions.item_helm_quartz.name=Black Quartz Helmet
item.actuallyadditions.itemChestQuartz.name=Black Quartz Chestplate item.actuallyadditions.item_chest_quartz.name=Black Quartz Chestplate
item.actuallyadditions.itemPantsQuartz.name=Black Quartz Pants item.actuallyadditions.item_pants_quartz.name=Black Quartz Pants
item.actuallyadditions.itemBootsQuartz.name=Black Quartz Boots item.actuallyadditions.item_boots_quartz.name=Black Quartz Boots
item.actuallyadditions.itemBooklet.name=Actually Additions Manual item.actuallyadditions.item_booklet.name=Actually Additions Manual
item.actuallyadditions.itemRarmorModuleReconstructor.name=Reconstruction Module item.actuallyadditions.item_rarmor_module_reconstructor.name=Reconstruction Module
item.actuallyadditions.itemLaserWrench.name=Laser Wrench item.actuallyadditions.item_laser_wrench.name=Laser Wrench
item.actuallyadditions.itemChestToCrateUpgrade.name=Chest To Storage Crate Upgrade item.actuallyadditions.item_chest_to_crate_upgrade.name=Chest To Storage Crate Upgrade
item.actuallyadditions.itemSmallToMediumCrateUpgrade.name=Small To Medium Storage Crate Upgrade item.actuallyadditions.item_small_to_medium_crate_upgrade.name=Small To Medium Storage Crate Upgrade
item.actuallyadditions.itemMediumToLargeCrateUpgrade.name=Medium To Large Storage Crate Upgrade item.actuallyadditions.item_medium_to_large_crate_upgrade.name=Medium To Large Storage Crate Upgrade
item.actuallyadditions.itemMiscDrillCore.name=Drill Core item.actuallyadditions.item_misc_drill_core.name=Drill Core
item.actuallyadditions.itemMiscBlackDye.name=Black Dye item.actuallyadditions.item_misc_black_dye.name=Black Dye
item.actuallyadditions.itemCrystalRed.name=Restonia Crystal item.actuallyadditions.item_crystal_red.name=Restonia Crystal
item.actuallyadditions.itemCrystalBlue.name=Palis Crystal item.actuallyadditions.item_crystal_blue.name=Palis Crystal
item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal item.actuallyadditions.item_crystal_light_blue.name=Diamatine Crystal
item.actuallyadditions.itemCrystalGreen.name=Emeradic Crystal item.actuallyadditions.item_crystal_green.name=Emeradic Crystal
item.actuallyadditions.itemCrystalBlack.name=Void Crystal item.actuallyadditions.item_crystal_black.name=Void Crystal
item.actuallyadditions.itemCrystalWhite.name=Enori Crystal item.actuallyadditions.item_crystal_white.name=Enori Crystal
item.actuallyadditions.itemCrystalEmpoweredRed.name=Empowered Restonia Crystal item.actuallyadditions.item_crystal_empowered_red.name=Empowered Restonia Crystal
item.actuallyadditions.itemCrystalEmpoweredBlue.name=Empowered Palis Crystal item.actuallyadditions.item_crystal_empowered_blue.name=Empowered Palis Crystal
item.actuallyadditions.itemCrystalEmpoweredLightBlue.name=Empowered Diamatine Crystal item.actuallyadditions.item_crystal_empowered_light_blue.name=Empowered Diamatine Crystal
item.actuallyadditions.itemCrystalEmpoweredGreen.name=Empowered Emeradic Crystal item.actuallyadditions.item_crystal_empowered_green.name=Empowered Emeradic Crystal
item.actuallyadditions.itemCrystalEmpoweredBlack.name=Empowered Void Crystal item.actuallyadditions.item_crystal_empowered_black.name=Empowered Void Crystal
item.actuallyadditions.itemCrystalEmpoweredWhite.name=Empowered Enori Crystal item.actuallyadditions.item_crystal_empowered_white.name=Empowered Enori Crystal
item.actuallyadditions.itemMiscLens.name=Lens item.actuallyadditions.item_misc_lens.name=Lens
item.actuallyadditions.itemColorLens.name=Lens of Color item.actuallyadditions.item_color_lens.name=Lens of Color
item.actuallyadditions.itemExplosionLens.name=Lens of Detonation item.actuallyadditions.item_explosion_lens.name=Lens of Detonation
item.actuallyadditions.itemDamageLens.name=Lens of Certain Death item.actuallyadditions.item_damage_lens.name=Lens of Certain Death
item.actuallyadditions.itemDisenchantingLens.name=Lens of Disenchanting item.actuallyadditions.item_disenchanting_lens.name=Lens of Disenchanting
item.actuallyadditions.itemCrateKeeper.name=Storage Crate Keeper item.actuallyadditions.item_crate_keeper.name=Storage Crate Keeper
item.actuallyadditions.itemPickaxeCrystalRed.name=Restonia Crystal Pickaxe item.actuallyadditions.item_pickaxe_crystal_red.name=Restonia Crystal Pickaxe
item.actuallyadditions.itemAxeCrystalRed.name=Restonia Crystal Axe item.actuallyadditions.item_axe_crystal_red.name=Restonia Crystal Axe
item.actuallyadditions.itemShovelCrystalRed.name=Restonia Crystal Shovel item.actuallyadditions.item_shovel_crystal_red.name=Restonia Crystal Shovel
item.actuallyadditions.itemSwordCrystalRed.name=Restonia Crystal Sword item.actuallyadditions.item_sword_crystal_red.name=Restonia Crystal Sword
item.actuallyadditions.itemHoeCrystalRed.name=Restonia Crystal Hoe item.actuallyadditions.item_hoe_crystal_red.name=Restonia Crystal Hoe
item.actuallyadditions.itemHelmCrystalRed.name=Restonia Crystal Helmet item.actuallyadditions.item_helm_crystal_red.name=Restonia Crystal Helmet
item.actuallyadditions.itemChestCrystalRed.name=Restonia Crystal Chestplate item.actuallyadditions.item_chest_crystal_red.name=Restonia Crystal Chestplate
item.actuallyadditions.itemPantsCrystalRed.name=Restonia Crystal Pants item.actuallyadditions.item_pants_crystal_red.name=Restonia Crystal Pants
item.actuallyadditions.itemBootsCrystalRed.name=Restonia Crystal Boots item.actuallyadditions.item_boots_crystal_red.name=Restonia Crystal Boots
item.actuallyadditions.itemPickaxeCrystalBlue.name=Palis Crystal Pickaxe item.actuallyadditions.item_pickaxe_crystal_blue.name=Palis Crystal Pickaxe
item.actuallyadditions.itemAxeCrystalBlue.name=Palis Crystal Axe item.actuallyadditions.item_axe_crystal_blue.name=Palis Crystal Axe
item.actuallyadditions.itemShovelCrystalBlue.name=Palis Crystal Shovel item.actuallyadditions.item_shovel_crystal_blue.name=Palis Crystal Shovel
item.actuallyadditions.itemSwordCrystalBlue.name=Palis Crystal Sword item.actuallyadditions.item_sword_crystal_blue.name=Palis Crystal Sword
item.actuallyadditions.itemHoeCrystalBlue.name=Palis Crystal Hoe item.actuallyadditions.item_hoe_crystal_blue.name=Palis Crystal Hoe
item.actuallyadditions.itemHelmCrystalBlue.name=Palis Crystal Helmet item.actuallyadditions.item_helm_crystal_blue.name=Palis Crystal Helmet
item.actuallyadditions.itemChestCrystalBlue.name=Palis Crystal Chestplate item.actuallyadditions.item_chest_crystal_blue.name=Palis Crystal Chestplate
item.actuallyadditions.itemPantsCrystalBlue.name=Palis Crystal Pants item.actuallyadditions.item_pants_crystal_blue.name=Palis Crystal Pants
item.actuallyadditions.itemBootsCrystalBlue.name=Palis Crystal Boots item.actuallyadditions.item_boots_crystal_blue.name=Palis Crystal Boots
item.actuallyadditions.itemPickaxeCrystalLightBlue.name=Diamatine Crystal Pickaxe item.actuallyadditions.item_pickaxe_crystal_light_blue.name=Diamatine Crystal Pickaxe
item.actuallyadditions.itemAxeCrystalLightBlue.name=Diamatine Crystal Axe item.actuallyadditions.item_axe_crystal_light_blue.name=Diamatine Crystal Axe
item.actuallyadditions.itemShovelCrystalLightBlue.name=Diamatine Crystal Shovel item.actuallyadditions.item_shovel_crystal_light_blue.name=Diamatine Crystal Shovel
item.actuallyadditions.itemSwordCrystalLightBlue.name=Diamatine Crystal Sword item.actuallyadditions.item_sword_crystal_light_blue.name=Diamatine Crystal Sword
item.actuallyadditions.itemHoeCrystalLightBlue.name=Diamatine Crystal Hoe item.actuallyadditions.item_hoe_crystal_light_blue.name=Diamatine Crystal Hoe
item.actuallyadditions.itemHelmCrystalLightBlue.name=Diamatine Crystal Helmet item.actuallyadditions.item_helm_crystal_light_blue.name=Diamatine Crystal Helmet
item.actuallyadditions.itemChestCrystalLightBlue.name=Diamatine Crystal Chestplate item.actuallyadditions.item_chest_crystal_light_blue.name=Diamatine Crystal Chestplate
item.actuallyadditions.itemPantsCrystalLightBlue.name=Diamatine Crystal Pants item.actuallyadditions.item_pants_crystal_light_blue.name=Diamatine Crystal Pants
item.actuallyadditions.itemBootsCrystalLightBlue.name=Diamatine Crystal Boots item.actuallyadditions.item_boots_crystal_light_blue.name=Diamatine Crystal Boots
item.actuallyadditions.itemPickaxeCrystalBlack.name=Void Crystal Pickaxe item.actuallyadditions.item_pickaxe_crystal_black.name=Void Crystal Pickaxe
item.actuallyadditions.itemAxeCrystalBlack.name=Void Crystal Axe item.actuallyadditions.item_axe_crystal_black.name=Void Crystal Axe
item.actuallyadditions.itemShovelCrystalBlack.name=Void Crystal Shovel item.actuallyadditions.item_shovel_crystal_black.name=Void Crystal Shovel
item.actuallyadditions.itemSwordCrystalBlack.name=Void Crystal Sword item.actuallyadditions.item_sword_crystal_black.name=Void Crystal Sword
item.actuallyadditions.itemHoeCrystalBlack.name=Void Crystal Hoe item.actuallyadditions.item_hoe_crystal_black.name=Void Crystal Hoe
item.actuallyadditions.itemHelmCrystalBlack.name=Void Crystal Helmet item.actuallyadditions.item_helm_crystal_black.name=Void Crystal Helmet
item.actuallyadditions.itemChestCrystalBlack.name=Void Crystal Chestplate item.actuallyadditions.item_chest_crystal_black.name=Void Crystal Chestplate
item.actuallyadditions.itemPantsCrystalBlack.name=Void Crystal Pants item.actuallyadditions.item_pants_crystal_black.name=Void Crystal Pants
item.actuallyadditions.itemBootsCrystalBlack.name=Void Crystal Boots item.actuallyadditions.item_boots_crystal_black.name=Void Crystal Boots
item.actuallyadditions.itemPickaxeCrystalGreen.name=Emeradic Crystal Pickaxe item.actuallyadditions.item_pickaxe_crystal_green.name=Emeradic Crystal Pickaxe
item.actuallyadditions.itemAxeCrystalGreen.name=Emeradic Crystal Axe item.actuallyadditions.item_axe_crystal_green.name=Emeradic Crystal Axe
item.actuallyadditions.itemShovelCrystalGreen.name=Emeradic Crystal Shovel item.actuallyadditions.item_shovel_crystal_green.name=Emeradic Crystal Shovel
item.actuallyadditions.itemSwordCrystalGreen.name=Emeradic Crystal Sword item.actuallyadditions.item_sword_crystal_green.name=Emeradic Crystal Sword
item.actuallyadditions.itemHoeCrystalGreen.name=Emeradic Crystal Hoe item.actuallyadditions.item_hoe_crystal_green.name=Emeradic Crystal Hoe
item.actuallyadditions.itemHelmCrystalGreen.name=Emeradic Crystal Helmet item.actuallyadditions.item_helm_crystal_green.name=Emeradic Crystal Helmet
item.actuallyadditions.itemChestCrystalGreen.name=Emeradic Crystal Chest item.actuallyadditions.item_chest_crystal_green.name=Emeradic Crystal Chest
item.actuallyadditions.itemPantsCrystalGreen.name=Emeradic Crystal Pants item.actuallyadditions.item_pants_crystal_green.name=Emeradic Crystal Pants
item.actuallyadditions.itemBootsCrystalGreen.name=Emeradic Crystal Boots item.actuallyadditions.item_boots_crystal_green.name=Emeradic Crystal Boots
item.actuallyadditions.itemPickaxeCrystalWhite.name=Enori Crystal Pickaxe item.actuallyadditions.item_pickaxe_crystal_white.name=Enori Crystal Pickaxe
item.actuallyadditions.itemAxeCrystalWhite.name=Enori Crystal Axe item.actuallyadditions.item_axe_crystal_white.name=Enori Crystal Axe
item.actuallyadditions.itemShovelCrystalWhite.name=Enori Crystal Shovel item.actuallyadditions.item_shovel_crystal_white.name=Enori Crystal Shovel
item.actuallyadditions.itemSwordCrystalWhite.name=Enori Crystal Sword item.actuallyadditions.item_sword_crystal_white.name=Enori Crystal Sword
item.actuallyadditions.itemHoeCrystalWhite.name=Enori Crystal Hoe item.actuallyadditions.item_hoe_crystal_white.name=Enori Crystal Hoe
item.actuallyadditions.itemHelmCrystalWhite.name=Enori Crystal Helmet item.actuallyadditions.item_helm_crystal_white.name=Enori Crystal Helmet
item.actuallyadditions.itemChestCrystalWhite.name=Enori Crystal Chest item.actuallyadditions.item_chest_crystal_white.name=Enori Crystal Chest
item.actuallyadditions.itemPantsCrystalWhite.name=Enori Crystal Pants item.actuallyadditions.item_pants_crystal_white.name=Enori Crystal Pants
item.actuallyadditions.itemBootsCrystalWhite.name=Enori Crystal Boots item.actuallyadditions.item_boots_crystal_white.name=Enori Crystal Boots
item.actuallyadditions.itemPaxelCrystalRed.name=Restonia Crystal AIOT item.actuallyadditions.item_paxel_crystal_red.name=Restonia Crystal AIOT
item.actuallyadditions.itemPaxelCrystalBlue.name=Palis Crystal AIOT item.actuallyadditions.item_paxel_crystal_blue.name=Palis Crystal AIOT
item.actuallyadditions.itemPaxelCrystalLightBlue.name=Diamatine Crystal AIOT item.actuallyadditions.item_paxel_crystal_light_blue.name=Diamatine Crystal AIOT
item.actuallyadditions.itemPaxelCrystalBlack.name=Void Crystal AIOT item.actuallyadditions.item_paxel_crystal_black.name=Void Crystal AIOT
item.actuallyadditions.itemPaxelCrystalWhite.name=Enori Crystal AIOT item.actuallyadditions.item_paxel_crystal_white.name=Enori Crystal AIOT
item.actuallyadditions.itemPaxelCrystalGreen.name=Emeradic Crystal AIOT item.actuallyadditions.item_paxel_crystal_green.name=Emeradic Crystal AIOT
item.actuallyadditions.itemFoodBacon.name=Bacon item.actuallyadditions.item_food_bacon.name=Bacon
item.actuallyadditions.itemMiscEnderStar.name=Ender Star item.actuallyadditions.item_misc_ender_star.name=Ender Star
item.actuallyadditions.itemSpawnerChanger.name=Spawner Changer item.actuallyadditions.item_spawner_changer.name=Spawner Changer
item.actuallyadditions.itemMiscSpawnerShard.name=Spawner Shards item.actuallyadditions.item_misc_spawner_shard.name=Spawner Shards
item.actuallyadditions.itemMinecartFireworkBox.name=Firework Box Cart item.actuallyadditions.item_minecart_firework_box.name=Firework Box Cart
item.actuallyadditions.itemWaterBowl.name=Bowl of Water item.actuallyadditions.item_water_bowl.name=Bowl of Water
item.actuallyadditions.itemFilter.name=Item Filter item.actuallyadditions.item_filter.name=Item Filter
item.actuallyadditions.itemMiscBiomass.name=Biomass item.actuallyadditions.item_misc_biomass.name=Biomass
item.actuallyadditions.itemMiscBiocoal.name=Bio Coal item.actuallyadditions.item_misc_biocoal.name=Bio Coal
item.actuallyadditions.itemPlayerProbe.name=Player Probe item.actuallyadditions.item_player_probe.name=Player Probe
item.actuallyadditions.itemWorm.name=Worm item.actuallyadditions.item_worm.name=Worm
item.actuallyadditions.itemBag.name=Traveler's Sack item.actuallyadditions.item_bag.name=Traveler's Sack
item.actuallyadditions.itemVoidBag.name=Void Sack item.actuallyadditions.item_void_bag.name=Void Sack
item.actuallyadditions.itemMiscCrystallizedCanolaSeed.name=Crystallized Canola Seed item.actuallyadditions.item_misc_crystallized_canola_seed.name=Crystallized Canola Seed
item.actuallyadditions.itemMiscEmpoweredCanolaSeed.name=Empowered Canola Seed item.actuallyadditions.item_misc_empowered_canola_seed.name=Empowered Canola Seed
item.actuallyadditions.itemMiningLens.name=Lens of the Miner item.actuallyadditions.item_mining_lens.name=Lens of the Miner
item.actuallyadditions.itemMoreDamageLens.name=Lens of the Killer item.actuallyadditions.item_more_damage_lens.name=Lens of the Killer
item.actuallyadditions.itemFillingWand.name=Handheld Filler item.actuallyadditions.item_filling_wand.name=Handheld Filler
#Tooltips #Tooltips
tooltip.actuallyadditions.onSuffix.desc=On tooltip.actuallyadditions.onSuffix.desc=On
@ -545,11 +545,11 @@ tooltip.actuallyadditions.blockPhantomRange.desc=Range
tooltip.actuallyadditions.laser.stored.desc=<Laser stored!> tooltip.actuallyadditions.laser.stored.desc=<Laser stored!>
tooltip.actuallyadditions.laser.connected.desc=<Laser connected!> tooltip.actuallyadditions.laser.connected.desc=<Laser connected!>
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.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.item_booklet.desc=Or "Booklet", if you will
tooltip.actuallyadditions.itemBooklet.sub.1=This book guides you through all of tooltip.actuallyadditions.item_booklet.sub.1=This book guides you through all of
tooltip.actuallyadditions.itemBooklet.sub.2=the features that Actually Additions tooltip.actuallyadditions.item_booklet.sub.2=the features that Actually Additions
tooltip.actuallyadditions.itemBooklet.sub.3=has to offer. tooltip.actuallyadditions.item_booklet.sub.3=has to offer.
tooltip.actuallyadditions.itemBooklet.sub.4=Use while holding to open. 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.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.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 tooltip.actuallyadditions.playerProbe.probing=Probing

4
src/main/resources/assets/actuallyadditions/sounds.json
View file

@ -1,6 +1,6 @@
{ {
"duhDuhDuhDuuuh": { "category": "record", "sounds":["actuallyadditions:duhDuhDuhDuuuh"] }, "duh_duh_duh_duuuh": { "category": "record", "sounds":["actuallyadditions:duh_duh_duh_duuuh"] },
"coffeeMachine": { "category": "block", "sounds":["actuallyadditions:coffeeMachine"] }, "coffee_machine": { "category": "block", "sounds":["actuallyadditions:coffee_machine"] },
"reconstructor": { "category": "block", "sounds":["actuallyadditions:reconstructor"] }, "reconstructor": { "category": "block", "sounds":["actuallyadditions:reconstructor"] },
"crusher": { "category": "block", "sounds":["actuallyadditions:crusher"] } "crusher": { "category": "block", "sounds":["actuallyadditions:crusher"] }
} }