From 99eb08a303448a89cae1769c078294550733c0ea Mon Sep 17 00:00:00 2001 From: Hubry Date: Fri, 5 Jul 2019 19:18:27 +0200 Subject: [PATCH] Convert items to objectholder, fix some i18n and missed recipes --- .../botania/common/block/ModBlocks.java | 618 ++++----- .../common/core/BotaniaCreativeTab.java | 35 +- .../vazkii/botania/common/item/ModItems.java | 1133 +++++++++-------- .../common/item/brew/ItemBrewBase.java | 4 +- .../equipment/bauble/ItemFlightTiara.java | 1 + .../botania/common/lexicon/LexiconData.java | 2 +- .../common/lexicon/WelcomeLexiconEntry.java | 2 +- .../botania/common/lib/LibItemNames.java | 144 ++- .../resources/assets/botania/lang/de_de.json | 2 +- .../resources/assets/botania/lang/en_us.json | 30 +- .../resources/assets/botania/lang/es_es.json | 28 +- .../resources/assets/botania/lang/fr_fr.json | 20 +- .../resources/assets/botania/lang/ja_jp.json | 2 +- .../resources/assets/botania/lang/ko_kr.json | 30 +- .../resources/assets/botania/lang/nl_nl.json | 30 +- .../resources/assets/botania/lang/pt_br.json | 30 +- .../resources/assets/botania/lang/ru_ru.json | 30 +- .../resources/assets/botania/lang/zh_cn.json | 30 +- .../resources/assets/botania/lang/zh_tw.json | 30 +- .../recipes/garden_of_glass/blazeblock.json | 2 +- .../recipes/garden_of_glass/cocoon.json | 2 +- .../garden_of_glass/root_to_sapling.json | 2 +- 22 files changed, 1135 insertions(+), 1072 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 6b4fced73..a2c0609e7 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -576,235 +576,235 @@ public final class ModBlocks { IForgeRegistry r = evt.getRegistry(); Item.Properties props = ModItems.defaultBuilder(); - r.register(new ItemBlockMod(whiteFlower, props).setRegistryName(whiteFlower.getRegistryName())); - r.register(new ItemBlockMod(orangeFlower, props).setRegistryName(orangeFlower.getRegistryName())); - r.register(new ItemBlockMod(magentaFlower, props).setRegistryName(magentaFlower.getRegistryName())); - r.register(new ItemBlockMod(lightBlueFlower, props).setRegistryName(lightBlueFlower.getRegistryName())); - r.register(new ItemBlockMod(yellowFlower, props).setRegistryName(yellowFlower.getRegistryName())); - r.register(new ItemBlockMod(limeFlower, props).setRegistryName(limeFlower.getRegistryName())); - r.register(new ItemBlockMod(pinkFlower, props).setRegistryName(pinkFlower.getRegistryName())); - r.register(new ItemBlockMod(grayFlower, props).setRegistryName(grayFlower.getRegistryName())); - r.register(new ItemBlockMod(lightGrayFlower, props).setRegistryName(lightGrayFlower.getRegistryName())); - r.register(new ItemBlockMod(cyanFlower, props).setRegistryName(cyanFlower.getRegistryName())); - r.register(new ItemBlockMod(purpleFlower, props).setRegistryName(purpleFlower.getRegistryName())); - r.register(new ItemBlockMod(blueFlower, props).setRegistryName(blueFlower.getRegistryName())); - r.register(new ItemBlockMod(brownFlower, props).setRegistryName(brownFlower.getRegistryName())); - r.register(new ItemBlockMod(greenFlower, props).setRegistryName(greenFlower.getRegistryName())); - r.register(new ItemBlockMod(redFlower, props).setRegistryName(redFlower.getRegistryName())); - r.register(new ItemBlockMod(blackFlower, props).setRegistryName(blackFlower.getRegistryName())); - r.register(new ItemBlockMod(defaultAltar, props).setRegistryName(defaultAltar.getRegistryName())); - r.register(new ItemBlockMod(forestAltar, props).setRegistryName(forestAltar.getRegistryName())); - r.register(new ItemBlockMod(plainsAltar, props).setRegistryName(plainsAltar.getRegistryName())); - r.register(new ItemBlockMod(mountainAltar, props).setRegistryName(mountainAltar.getRegistryName())); - r.register(new ItemBlockMod(fungalAltar, props).setRegistryName(fungalAltar.getRegistryName())); - r.register(new ItemBlockMod(swampAltar, props).setRegistryName(swampAltar.getRegistryName())); - r.register(new ItemBlockMod(desertAltar, props).setRegistryName(desertAltar.getRegistryName())); - r.register(new ItemBlockMod(taigaAltar, props).setRegistryName(taigaAltar.getRegistryName())); - r.register(new ItemBlockMod(mesaAltar, props).setRegistryName(mesaAltar.getRegistryName())); - r.register(new ItemBlockMod(mossyAltar, props).setRegistryName(mossyAltar.getRegistryName())); - r.register(new ItemBlockMod(livingrock, props).setRegistryName(livingrock.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrick, props).setRegistryName(livingrockBrick.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickChiseled, props).setRegistryName(livingrockBrickChiseled.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickCracked, props).setRegistryName(livingrockBrickCracked.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickMossy, props).setRegistryName(livingrockBrickMossy.getRegistryName())); - r.register(new ItemBlockMod(livingwood, props).setRegistryName(livingwood.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPlanks, props).setRegistryName(livingwoodPlanks.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPlanksMossy, props).setRegistryName(livingwoodPlanksMossy.getRegistryName())); - r.register(new ItemBlockMod(livingwoodFramed, props).setRegistryName(livingwoodFramed.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPatternFramed, props).setRegistryName(livingwoodPatternFramed.getRegistryName())); - r.register(new ItemBlockMod(livingwoodGlimmering, props).setRegistryName(livingwoodGlimmering.getRegistryName())); - r.register(new ItemBlockMod(manaSpreader, props).setRegistryName(manaSpreader.getRegistryName())); - r.register(new ItemBlockMod(redstoneSpreader, props).setRegistryName(redstoneSpreader.getRegistryName())); - r.register(new ItemBlockMod(elvenSpreader, props).setRegistryName(elvenSpreader.getRegistryName())); - r.register(new ItemBlockMod(gaiaSpreader, props).setRegistryName(gaiaSpreader.getRegistryName())); - r.register(new ItemBlockPool(manaPool, props).setRegistryName(manaPool.getRegistryName())); - r.register(new ItemBlockPool(creativePool, props).setRegistryName(creativePool.getRegistryName())); - r.register(new ItemBlockPool(dilutedPool, props).setRegistryName(dilutedPool.getRegistryName())); - r.register(new ItemBlockPool(fabulousPool, props).setRegistryName(fabulousPool.getRegistryName())); - r.register(new ItemBlockMod(runeAltar, props).setRegistryName(runeAltar.getRegistryName())); + register(r, new ItemBlockMod(whiteFlower, props), whiteFlower.getRegistryName()); + register(r, new ItemBlockMod(orangeFlower, props), orangeFlower.getRegistryName()); + register(r, new ItemBlockMod(magentaFlower, props), magentaFlower.getRegistryName()); + register(r, new ItemBlockMod(lightBlueFlower, props), lightBlueFlower.getRegistryName()); + register(r, new ItemBlockMod(yellowFlower, props), yellowFlower.getRegistryName()); + register(r, new ItemBlockMod(limeFlower, props), limeFlower.getRegistryName()); + register(r, new ItemBlockMod(pinkFlower, props), pinkFlower.getRegistryName()); + register(r, new ItemBlockMod(grayFlower, props), grayFlower.getRegistryName()); + register(r, new ItemBlockMod(lightGrayFlower, props), lightGrayFlower.getRegistryName()); + register(r, new ItemBlockMod(cyanFlower, props), cyanFlower.getRegistryName()); + register(r, new ItemBlockMod(purpleFlower, props), purpleFlower.getRegistryName()); + register(r, new ItemBlockMod(blueFlower, props), blueFlower.getRegistryName()); + register(r, new ItemBlockMod(brownFlower, props), brownFlower.getRegistryName()); + register(r, new ItemBlockMod(greenFlower, props), greenFlower.getRegistryName()); + register(r, new ItemBlockMod(redFlower, props), redFlower.getRegistryName()); + register(r, new ItemBlockMod(blackFlower, props), blackFlower.getRegistryName()); + register(r, new ItemBlockMod(defaultAltar, props), defaultAltar.getRegistryName()); + register(r, new ItemBlockMod(forestAltar, props), forestAltar.getRegistryName()); + register(r, new ItemBlockMod(plainsAltar, props), plainsAltar.getRegistryName()); + register(r, new ItemBlockMod(mountainAltar, props), mountainAltar.getRegistryName()); + register(r, new ItemBlockMod(fungalAltar, props), fungalAltar.getRegistryName()); + register(r, new ItemBlockMod(swampAltar, props), swampAltar.getRegistryName()); + register(r, new ItemBlockMod(desertAltar, props), desertAltar.getRegistryName()); + register(r, new ItemBlockMod(taigaAltar, props), taigaAltar.getRegistryName()); + register(r, new ItemBlockMod(mesaAltar, props), mesaAltar.getRegistryName()); + register(r, new ItemBlockMod(mossyAltar, props), mossyAltar.getRegistryName()); + register(r, new ItemBlockMod(livingrock, props), livingrock.getRegistryName()); + register(r, new ItemBlockMod(livingrockBrick, props), livingrockBrick.getRegistryName()); + register(r, new ItemBlockMod(livingrockBrickChiseled, props), livingrockBrickChiseled.getRegistryName()); + register(r, new ItemBlockMod(livingrockBrickCracked, props), livingrockBrickCracked.getRegistryName()); + register(r, new ItemBlockMod(livingrockBrickMossy, props), livingrockBrickMossy.getRegistryName()); + register(r, new ItemBlockMod(livingwood, props), livingwood.getRegistryName()); + register(r, new ItemBlockMod(livingwoodPlanks, props), livingwoodPlanks.getRegistryName()); + register(r, new ItemBlockMod(livingwoodPlanksMossy, props), livingwoodPlanksMossy.getRegistryName()); + register(r, new ItemBlockMod(livingwoodFramed, props), livingwoodFramed.getRegistryName()); + register(r, new ItemBlockMod(livingwoodPatternFramed, props), livingwoodPatternFramed.getRegistryName()); + register(r, new ItemBlockMod(livingwoodGlimmering, props), livingwoodGlimmering.getRegistryName()); + register(r, new ItemBlockMod(manaSpreader, props), manaSpreader.getRegistryName()); + register(r, new ItemBlockMod(redstoneSpreader, props), redstoneSpreader.getRegistryName()); + register(r, new ItemBlockMod(elvenSpreader, props), elvenSpreader.getRegistryName()); + register(r, new ItemBlockMod(gaiaSpreader, props), gaiaSpreader.getRegistryName()); + register(r, new ItemBlockPool(manaPool, props), manaPool.getRegistryName()); + register(r, new ItemBlockPool(creativePool, props), creativePool.getRegistryName()); + register(r, new ItemBlockPool(dilutedPool, props), dilutedPool.getRegistryName()); + register(r, new ItemBlockPool(fabulousPool, props), fabulousPool.getRegistryName()); + register(r, new ItemBlockMod(runeAltar, props), runeAltar.getRegistryName()); Item.Properties pylonProps = ModItems.defaultBuilder().setTEISR(() -> RenderTilePylon.TEISR::new); - r.register(new ItemBlockMod(manaPylon, pylonProps).setRegistryName(manaPylon.getRegistryName())); - r.register(new ItemBlockMod(naturaPylon, pylonProps).setRegistryName(naturaPylon.getRegistryName())); - r.register(new ItemBlockMod(gaiaPylon, pylonProps).setRegistryName(gaiaPylon.getRegistryName())); - r.register(new ItemBlockMod(pistonRelay, props).setRegistryName(pistonRelay.getRegistryName())); - r.register(new ItemBlockMod(distributor, props).setRegistryName(distributor.getRegistryName())); - r.register(new ItemBlockMod(manaVoid, props).setRegistryName(manaVoid.getRegistryName())); - r.register(new ItemBlockMod(manaDetector, props).setRegistryName(manaDetector.getRegistryName())); - r.register(new ItemBlockMod(enchanter, props).setRegistryName(enchanter.getRegistryName())); - r.register(new ItemBlockMod(turntable, props).setRegistryName(turntable.getRegistryName())); - r.register(new ItemBlockMod(tinyPlanet, props).setRegistryName(tinyPlanet.getRegistryName())); - r.register(new ItemBlockMod(alchemyCatalyst, props).setRegistryName(alchemyCatalyst.getRegistryName())); - r.register(new ItemBlockMod(openCrate, props).setRegistryName(openCrate.getRegistryName())); - r.register(new ItemBlockMod(craftCrate, props).setRegistryName(craftCrate.getRegistryName())); - r.register(new ItemBlockMod(forestEye, props).setRegistryName(forestEye.getRegistryName())); - r.register(new ItemBlockMod(manasteelBlock, props).setRegistryName(manasteelBlock.getRegistryName())); - r.register(new ItemBlockMod(terrasteelBlock, props).setRegistryName(terrasteelBlock.getRegistryName())); - r.register(new ItemBlockElven(elementiumBlock, props).setRegistryName(elementiumBlock.getRegistryName())); - r.register(new ItemBlockMod(manaDiamondBlock, props).setRegistryName(manaDiamondBlock.getRegistryName())); - r.register(new ItemBlockMod(dragonstoneBlock, props).setRegistryName(dragonstoneBlock.getRegistryName())); - r.register(new ItemBlockMod(wildDrum, props).setRegistryName(wildDrum.getRegistryName())); - r.register(new ItemBlockMod(gatheringDrum, props).setRegistryName(gatheringDrum.getRegistryName())); - r.register(new ItemBlockMod(canopyDrum, props).setRegistryName(canopyDrum.getRegistryName())); - r.register(new ItemBlockMod(whiteShinyFlower, props).setRegistryName(whiteShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(orangeShinyFlower, props).setRegistryName(orangeShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(magentaShinyFlower, props).setRegistryName(magentaShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(lightBlueShinyFlower, props).setRegistryName(lightBlueShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(yellowShinyFlower, props).setRegistryName(yellowShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(limeShinyFlower, props).setRegistryName(limeShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(pinkShinyFlower, props).setRegistryName(pinkShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(grayShinyFlower, props).setRegistryName(grayShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(lightGrayShinyFlower, props).setRegistryName(lightGrayShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(cyanShinyFlower, props).setRegistryName(cyanShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(purpleShinyFlower, props).setRegistryName(purpleShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(blueShinyFlower, props).setRegistryName(blueShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(brownShinyFlower, props).setRegistryName(brownShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(greenShinyFlower, props).setRegistryName(greenShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(redShinyFlower, props).setRegistryName(redShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(blackShinyFlower, props).setRegistryName(blackShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(abstrusePlatform, props).setRegistryName(abstrusePlatform.getRegistryName())); - r.register(new ItemBlockMod(spectralPlatform, props).setRegistryName(spectralPlatform.getRegistryName())); - r.register(new ItemBlockMod(infrangiblePlatform, props).setRegistryName(infrangiblePlatform.getRegistryName())); - r.register(new ItemBlockMod(alfPortal, props).setRegistryName(alfPortal.getRegistryName())); - r.register(new ItemBlockDreamwood(dreamwood, props).setRegistryName(dreamwood.getRegistryName())); - r.register(new ItemBlockDreamwood(dreamwoodPlanks, props).setRegistryName(dreamwoodPlanks.getRegistryName())); - r.register(new ItemBlockDreamwood(dreamwoodPlanksMossy, props).setRegistryName(dreamwoodPlanksMossy.getRegistryName())); - r.register(new ItemBlockDreamwood(dreamwoodFramed, props).setRegistryName(dreamwoodFramed.getRegistryName())); - r.register(new ItemBlockDreamwood(dreamwoodPatternFramed, props).setRegistryName(dreamwoodPatternFramed.getRegistryName())); - r.register(new ItemBlockDreamwood(dreamwoodGlimmering, props).setRegistryName(dreamwoodGlimmering.getRegistryName())); - r.register(new ItemBlockMod(conjurationCatalyst, props).setRegistryName(conjurationCatalyst.getRegistryName())); - r.register(new ItemBlockMod(bifrost, props).setRegistryName(bifrost.getRegistryName())); - r.register(new ItemBlockMod(whiteFloatingFlower, props).setRegistryName(whiteFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(orangeFloatingFlower, props).setRegistryName(orangeFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(magentaFloatingFlower, props).setRegistryName(magentaFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(lightBlueFloatingFlower, props).setRegistryName(lightBlueFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(yellowFloatingFlower, props).setRegistryName(yellowFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(limeFloatingFlower, props).setRegistryName(limeFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(pinkFloatingFlower, props).setRegistryName(pinkFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(grayFloatingFlower, props).setRegistryName(grayFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(lightGrayFloatingFlower, props).setRegistryName(lightGrayFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(cyanFloatingFlower, props).setRegistryName(cyanFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(purpleFloatingFlower, props).setRegistryName(purpleFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(blueFloatingFlower, props).setRegistryName(blueFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(brownFloatingFlower, props).setRegistryName(brownFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(greenFloatingFlower, props).setRegistryName(greenFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(redFloatingFlower, props).setRegistryName(redFloatingFlower.getRegistryName())); - r.register(new ItemBlockMod(blackFloatingFlower, props).setRegistryName(blackFloatingFlower.getRegistryName())); - r.register(new ItemBlockTinyPotato(tinyPotato, props).setRegistryName(tinyPotato.getRegistryName())); - r.register(new ItemBlockMod(spawnerClaw, props).setRegistryName(spawnerClaw.getRegistryName())); - r.register(new ItemBlockMod(azulejo0, props).setRegistryName(azulejo0.getRegistryName())); - r.register(new ItemBlockMod(azulejo1, props).setRegistryName(azulejo1.getRegistryName())); - r.register(new ItemBlockMod(azulejo2, props).setRegistryName(azulejo2.getRegistryName())); - r.register(new ItemBlockMod(azulejo3, props).setRegistryName(azulejo3.getRegistryName())); - r.register(new ItemBlockMod(azulejo4, props).setRegistryName(azulejo4.getRegistryName())); - r.register(new ItemBlockMod(azulejo5, props).setRegistryName(azulejo5.getRegistryName())); - r.register(new ItemBlockMod(azulejo6, props).setRegistryName(azulejo6.getRegistryName())); - r.register(new ItemBlockMod(azulejo7, props).setRegistryName(azulejo7.getRegistryName())); - r.register(new ItemBlockMod(azulejo8, props).setRegistryName(azulejo8.getRegistryName())); - r.register(new ItemBlockMod(azulejo9, props).setRegistryName(azulejo9.getRegistryName())); - r.register(new ItemBlockMod(azulejo10, props).setRegistryName(azulejo10.getRegistryName())); - r.register(new ItemBlockMod(azulejo11, props).setRegistryName(azulejo11.getRegistryName())); - r.register(new ItemBlockMod(azulejo12, props).setRegistryName(azulejo12.getRegistryName())); - r.register(new ItemBlockMod(azulejo13, props).setRegistryName(azulejo13.getRegistryName())); - r.register(new ItemBlockMod(azulejo14, props).setRegistryName(azulejo14.getRegistryName())); - r.register(new ItemBlockMod(azulejo15, props).setRegistryName(azulejo15.getRegistryName())); - r.register(new ItemBlockMod(enderEye, props).setRegistryName(enderEye.getRegistryName())); - r.register(new ItemBlockMod(starfield, props).setRegistryName(starfield.getRegistryName())); - r.register(new ItemBlockMod(rfGenerator, props).setRegistryName(rfGenerator.getRegistryName())); - r.register(new ItemBlockElven(elfGlass, props).setRegistryName(elfGlass.getRegistryName())); - r.register(new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))).setRegistryName(brewery.getRegistryName())); - r.register(new ItemBlockMod(manaGlass, props).setRegistryName(manaGlass.getRegistryName())); - r.register(new ItemBlockMod(terraPlate, props).setRegistryName(terraPlate.getRegistryName())); - r.register(new ItemBlockMod(redStringContainer, props).setRegistryName(redStringContainer.getRegistryName())); - r.register(new ItemBlockMod(redStringDispenser, props).setRegistryName(redStringDispenser.getRegistryName())); - r.register(new ItemBlockMod(redStringFertilizer, props).setRegistryName(redStringFertilizer.getRegistryName())); - r.register(new ItemBlockMod(redStringComparator, props).setRegistryName(redStringComparator.getRegistryName())); - r.register(new ItemBlockMod(redStringRelay, props).setRegistryName(redStringRelay.getRegistryName())); - r.register(new ItemBlockMod(prism, props).setRegistryName(prism.getRegistryName())); - r.register(new ItemBlockMod(enchantedSoil, props).setRegistryName(enchantedSoil.getRegistryName())); - r.register(new ItemBlockMod(petalBlockWhite, props).setRegistryName(petalBlockWhite.getRegistryName())); - r.register(new ItemBlockMod(petalBlockOrange, props).setRegistryName(petalBlockOrange.getRegistryName())); - r.register(new ItemBlockMod(petalBlockMagenta, props).setRegistryName(petalBlockMagenta.getRegistryName())); - r.register(new ItemBlockMod(petalBlockLightBlue, props).setRegistryName(petalBlockLightBlue.getRegistryName())); - r.register(new ItemBlockMod(petalBlockYellow, props).setRegistryName(petalBlockYellow.getRegistryName())); - r.register(new ItemBlockMod(petalBlockLime, props).setRegistryName(petalBlockLime.getRegistryName())); - r.register(new ItemBlockMod(petalBlockPink, props).setRegistryName(petalBlockPink.getRegistryName())); - r.register(new ItemBlockMod(petalBlockGray, props).setRegistryName(petalBlockGray.getRegistryName())); - r.register(new ItemBlockMod(petalBlockSilver, props).setRegistryName(petalBlockSilver.getRegistryName())); - r.register(new ItemBlockMod(petalBlockCyan, props).setRegistryName(petalBlockCyan.getRegistryName())); - r.register(new ItemBlockMod(petalBlockPurple, props).setRegistryName(petalBlockPurple.getRegistryName())); - r.register(new ItemBlockMod(petalBlockBlue, props).setRegistryName(petalBlockBlue.getRegistryName())); - r.register(new ItemBlockMod(petalBlockBrown, props).setRegistryName(petalBlockBrown.getRegistryName())); - r.register(new ItemBlockMod(petalBlockGreen, props).setRegistryName(petalBlockGreen.getRegistryName())); - r.register(new ItemBlockMod(petalBlockRed, props).setRegistryName(petalBlockRed.getRegistryName())); - r.register(new ItemBlockMod(petalBlockBlack, props).setRegistryName(petalBlockBlack.getRegistryName())); - r.register(new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))).setRegistryName(corporeaIndex.getRegistryName())); - r.register(new ItemBlockMod(corporeaFunnel, props).setRegistryName(corporeaFunnel.getRegistryName())); - r.register(new ItemBlockMod(whiteMushroom, props).setRegistryName(whiteMushroom.getRegistryName())); - r.register(new ItemBlockMod(orangeMushroom, props).setRegistryName(orangeMushroom.getRegistryName())); - r.register(new ItemBlockMod(magentaMushroom, props).setRegistryName(magentaMushroom.getRegistryName())); - r.register(new ItemBlockMod(lightBlueMushroom, props).setRegistryName(lightBlueMushroom.getRegistryName())); - r.register(new ItemBlockMod(yellowMushroom, props).setRegistryName(yellowMushroom.getRegistryName())); - r.register(new ItemBlockMod(limeMushroom, props).setRegistryName(limeMushroom.getRegistryName())); - r.register(new ItemBlockMod(pinkMushroom, props).setRegistryName(pinkMushroom.getRegistryName())); - r.register(new ItemBlockMod(grayMushroom, props).setRegistryName(grayMushroom.getRegistryName())); - r.register(new ItemBlockMod(lightGrayMushroom, props).setRegistryName(lightGrayMushroom.getRegistryName())); - r.register(new ItemBlockMod(cyanMushroom, props).setRegistryName(cyanMushroom.getRegistryName())); - r.register(new ItemBlockMod(purpleMushroom, props).setRegistryName(purpleMushroom.getRegistryName())); - r.register(new ItemBlockMod(blueMushroom, props).setRegistryName(blueMushroom.getRegistryName())); - r.register(new ItemBlockMod(brownMushroom, props).setRegistryName(brownMushroom.getRegistryName())); - r.register(new ItemBlockMod(greenMushroom, props).setRegistryName(greenMushroom.getRegistryName())); - r.register(new ItemBlockMod(redMushroom, props).setRegistryName(redMushroom.getRegistryName())); - r.register(new ItemBlockMod(blackMushroom, props).setRegistryName(blackMushroom.getRegistryName())); - r.register(new ItemBlockMod(pump, props).setRegistryName(pump.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerWhite, props).setRegistryName(doubleFlowerWhite.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerOrange, props).setRegistryName(doubleFlowerOrange.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerMagenta, props).setRegistryName(doubleFlowerMagenta.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerLightBlue, props).setRegistryName(doubleFlowerLightBlue.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerYellow, props).setRegistryName(doubleFlowerYellow.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerLime, props).setRegistryName(doubleFlowerLime.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerPink, props).setRegistryName(doubleFlowerPink.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerGray, props).setRegistryName(doubleFlowerGray.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerLightGray, props).setRegistryName(doubleFlowerLightGray.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerCyan, props).setRegistryName(doubleFlowerCyan.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerPurple, props).setRegistryName(doubleFlowerPurple.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerBlue, props).setRegistryName(doubleFlowerBlue.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerBrown, props).setRegistryName(doubleFlowerBrown.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerGreen, props).setRegistryName(doubleFlowerGreen.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerRed, props).setRegistryName(doubleFlowerRed.getRegistryName())); - r.register(new ItemBlockMod(doubleFlowerBlack, props).setRegistryName(doubleFlowerBlack.getRegistryName())); - r.register(new ItemBlockBlaze(blazeBlock, props).setRegistryName(blazeBlock.getRegistryName())); - r.register(new ItemBlockMod(corporeaInterceptor, props).setRegistryName(corporeaInterceptor.getRegistryName())); - r.register(new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaCrystalCube, TileCorporeaCrystalCube.class))).setRegistryName(corporeaCrystalCube.getRegistryName())); - r.register(new ItemBlockMod(incensePlate, props).setRegistryName(incensePlate.getRegistryName())); - r.register(new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))).setRegistryName(hourglass.getRegistryName())); - r.register(new ItemBlockMod(ghostRail, props).setRegistryName(ghostRail.getRegistryName())); - r.register(new ItemBlockMod(sparkChanger, props).setRegistryName(sparkChanger.getRegistryName())); - r.register(new ItemBlockMod(root, props).setRegistryName(root.getRegistryName())); - r.register(new ItemBlockMod(felPumpkin, props).setRegistryName(felPumpkin.getRegistryName())); - r.register(new ItemBlockMod(cocoon, props).setRegistryName(cocoon.getRegistryName())); - r.register(new ItemBlockMod(lightRelayDefault, props).setRegistryName(lightRelayDefault.getRegistryName())); - r.register(new ItemBlockMod(lightRelayDetector, props).setRegistryName(lightRelayDetector.getRegistryName())); - r.register(new ItemBlockMod(lightRelayFork, props).setRegistryName(lightRelayFork.getRegistryName())); - r.register(new ItemBlockMod(lightRelayToggle, props).setRegistryName(lightRelayToggle.getRegistryName())); - r.register(new ItemBlockMod(lightLauncher, props).setRegistryName(lightLauncher.getRegistryName())); - r.register(new ItemBlockMod(manaBomb, props).setRegistryName(manaBomb.getRegistryName())); - r.register(new ItemBlockMod(cacophonium, props).setRegistryName(cacophonium.getRegistryName())); - r.register(new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))).setRegistryName(bellows.getRegistryName())); - r.register(new ItemBlockMod(bifrostPerm, props).setRegistryName(bifrostPerm.getRegistryName())); - r.register(new ItemBlockMod(cellBlock, props).setRegistryName(cellBlock.getRegistryName())); - r.register(new ItemBlockMod(redStringInterceptor, props).setRegistryName(redStringInterceptor.getRegistryName())); - r.register(new ItemBlockMod(corporeaRetainer, props).setRegistryName(corporeaRetainer.getRegistryName())); - r.register(new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.class))).setRegistryName(teruTeruBozu.getRegistryName())); - r.register(new ItemBlockMod(shimmerrock, props).setRegistryName(shimmerrock.getRegistryName())); - r.register(new ItemBlockMod(shimmerwoodPlanks, props).setRegistryName(shimmerwoodPlanks.getRegistryName())); - r.register(new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))).setRegistryName(avatar.getRegistryName())); - r.register(new ItemBlockMod(dryGrass, props).setRegistryName(dryGrass.getRegistryName())); - r.register(new ItemBlockMod(goldenGrass, props).setRegistryName(goldenGrass.getRegistryName())); - r.register(new ItemBlockMod(vividGrass, props).setRegistryName(vividGrass.getRegistryName())); - r.register(new ItemBlockMod(scorchedGrass, props).setRegistryName(scorchedGrass.getRegistryName())); - r.register(new ItemBlockMod(infusedGrass, props).setRegistryName(infusedGrass.getRegistryName())); - r.register(new ItemBlockMod(mutatedGrass, props).setRegistryName(mutatedGrass.getRegistryName())); - r.register(new ItemBlockMod(animatedTorch, props).setRegistryName(animatedTorch.getRegistryName())); + register(r, new ItemBlockMod(manaPylon, pylonProps), manaPylon.getRegistryName()); + register(r, new ItemBlockMod(naturaPylon, pylonProps), naturaPylon.getRegistryName()); + register(r, new ItemBlockMod(gaiaPylon, pylonProps), gaiaPylon.getRegistryName()); + register(r, new ItemBlockMod(pistonRelay, props), pistonRelay.getRegistryName()); + register(r, new ItemBlockMod(distributor, props), distributor.getRegistryName()); + register(r, new ItemBlockMod(manaVoid, props), manaVoid.getRegistryName()); + register(r, new ItemBlockMod(manaDetector, props), manaDetector.getRegistryName()); + register(r, new ItemBlockMod(enchanter, props), enchanter.getRegistryName()); + register(r, new ItemBlockMod(turntable, props), turntable.getRegistryName()); + register(r, new ItemBlockMod(tinyPlanet, props), tinyPlanet.getRegistryName()); + register(r, new ItemBlockMod(alchemyCatalyst, props), alchemyCatalyst.getRegistryName()); + register(r, new ItemBlockMod(openCrate, props), openCrate.getRegistryName()); + register(r, new ItemBlockMod(craftCrate, props), craftCrate.getRegistryName()); + register(r, new ItemBlockMod(forestEye, props), forestEye.getRegistryName()); + register(r, new ItemBlockMod(manasteelBlock, props), manasteelBlock.getRegistryName()); + register(r, new ItemBlockMod(terrasteelBlock, props), terrasteelBlock.getRegistryName()); + register(r, new ItemBlockElven(elementiumBlock, props), elementiumBlock.getRegistryName()); + register(r, new ItemBlockMod(manaDiamondBlock, props), manaDiamondBlock.getRegistryName()); + register(r, new ItemBlockMod(dragonstoneBlock, props), dragonstoneBlock.getRegistryName()); + register(r, new ItemBlockMod(wildDrum, props), wildDrum.getRegistryName()); + register(r, new ItemBlockMod(gatheringDrum, props), gatheringDrum.getRegistryName()); + register(r, new ItemBlockMod(canopyDrum, props), canopyDrum.getRegistryName()); + register(r, new ItemBlockMod(whiteShinyFlower, props), whiteShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(orangeShinyFlower, props), orangeShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(magentaShinyFlower, props), magentaShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(lightBlueShinyFlower, props), lightBlueShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(yellowShinyFlower, props), yellowShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(limeShinyFlower, props), limeShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(pinkShinyFlower, props), pinkShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(grayShinyFlower, props), grayShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(lightGrayShinyFlower, props), lightGrayShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(cyanShinyFlower, props), cyanShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(purpleShinyFlower, props), purpleShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(blueShinyFlower, props), blueShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(brownShinyFlower, props), brownShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(greenShinyFlower, props), greenShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(redShinyFlower, props), redShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(blackShinyFlower, props), blackShinyFlower.getRegistryName()); + register(r, new ItemBlockMod(abstrusePlatform, props), abstrusePlatform.getRegistryName()); + register(r, new ItemBlockMod(spectralPlatform, props), spectralPlatform.getRegistryName()); + register(r, new ItemBlockMod(infrangiblePlatform, props), infrangiblePlatform.getRegistryName()); + register(r, new ItemBlockMod(alfPortal, props), alfPortal.getRegistryName()); + register(r, new ItemBlockDreamwood(dreamwood, props), dreamwood.getRegistryName()); + register(r, new ItemBlockDreamwood(dreamwoodPlanks, props), dreamwoodPlanks.getRegistryName()); + register(r, new ItemBlockDreamwood(dreamwoodPlanksMossy, props), dreamwoodPlanksMossy.getRegistryName()); + register(r, new ItemBlockDreamwood(dreamwoodFramed, props), dreamwoodFramed.getRegistryName()); + register(r, new ItemBlockDreamwood(dreamwoodPatternFramed, props), dreamwoodPatternFramed.getRegistryName()); + register(r, new ItemBlockDreamwood(dreamwoodGlimmering, props), dreamwoodGlimmering.getRegistryName()); + register(r, new ItemBlockMod(conjurationCatalyst, props), conjurationCatalyst.getRegistryName()); + register(r, new ItemBlockMod(bifrost, props), bifrost.getRegistryName()); + register(r, new ItemBlockMod(whiteFloatingFlower, props), whiteFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(orangeFloatingFlower, props), orangeFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(magentaFloatingFlower, props), magentaFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(lightBlueFloatingFlower, props), lightBlueFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(yellowFloatingFlower, props), yellowFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(limeFloatingFlower, props), limeFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(pinkFloatingFlower, props), pinkFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(grayFloatingFlower, props), grayFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(lightGrayFloatingFlower, props), lightGrayFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(cyanFloatingFlower, props), cyanFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(purpleFloatingFlower, props), purpleFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(blueFloatingFlower, props), blueFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(brownFloatingFlower, props), brownFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(greenFloatingFlower, props), greenFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(redFloatingFlower, props), redFloatingFlower.getRegistryName()); + register(r, new ItemBlockMod(blackFloatingFlower, props), blackFloatingFlower.getRegistryName()); + register(r, new ItemBlockTinyPotato(tinyPotato, props), tinyPotato.getRegistryName()); + register(r, new ItemBlockMod(spawnerClaw, props), spawnerClaw.getRegistryName()); + register(r, new ItemBlockMod(azulejo0, props), azulejo0.getRegistryName()); + register(r, new ItemBlockMod(azulejo1, props), azulejo1.getRegistryName()); + register(r, new ItemBlockMod(azulejo2, props), azulejo2.getRegistryName()); + register(r, new ItemBlockMod(azulejo3, props), azulejo3.getRegistryName()); + register(r, new ItemBlockMod(azulejo4, props), azulejo4.getRegistryName()); + register(r, new ItemBlockMod(azulejo5, props), azulejo5.getRegistryName()); + register(r, new ItemBlockMod(azulejo6, props), azulejo6.getRegistryName()); + register(r, new ItemBlockMod(azulejo7, props), azulejo7.getRegistryName()); + register(r, new ItemBlockMod(azulejo8, props), azulejo8.getRegistryName()); + register(r, new ItemBlockMod(azulejo9, props), azulejo9.getRegistryName()); + register(r, new ItemBlockMod(azulejo10, props), azulejo10.getRegistryName()); + register(r, new ItemBlockMod(azulejo11, props), azulejo11.getRegistryName()); + register(r, new ItemBlockMod(azulejo12, props), azulejo12.getRegistryName()); + register(r, new ItemBlockMod(azulejo13, props), azulejo13.getRegistryName()); + register(r, new ItemBlockMod(azulejo14, props), azulejo14.getRegistryName()); + register(r, new ItemBlockMod(azulejo15, props), azulejo15.getRegistryName()); + register(r, new ItemBlockMod(enderEye, props), enderEye.getRegistryName()); + register(r, new ItemBlockMod(starfield, props), starfield.getRegistryName()); + register(r, new ItemBlockMod(rfGenerator, props), rfGenerator.getRegistryName()); + register(r, new ItemBlockElven(elfGlass, props), elfGlass.getRegistryName()); + register(r, new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))), brewery.getRegistryName()); + register(r, new ItemBlockMod(manaGlass, props), manaGlass.getRegistryName()); + register(r, new ItemBlockMod(terraPlate, props), terraPlate.getRegistryName()); + register(r, new ItemBlockMod(redStringContainer, props), redStringContainer.getRegistryName()); + register(r, new ItemBlockMod(redStringDispenser, props), redStringDispenser.getRegistryName()); + register(r, new ItemBlockMod(redStringFertilizer, props), redStringFertilizer.getRegistryName()); + register(r, new ItemBlockMod(redStringComparator, props), redStringComparator.getRegistryName()); + register(r, new ItemBlockMod(redStringRelay, props), redStringRelay.getRegistryName()); + register(r, new ItemBlockMod(prism, props), prism.getRegistryName()); + register(r, new ItemBlockMod(enchantedSoil, props), enchantedSoil.getRegistryName()); + register(r, new ItemBlockMod(petalBlockWhite, props), petalBlockWhite.getRegistryName()); + register(r, new ItemBlockMod(petalBlockOrange, props), petalBlockOrange.getRegistryName()); + register(r, new ItemBlockMod(petalBlockMagenta, props), petalBlockMagenta.getRegistryName()); + register(r, new ItemBlockMod(petalBlockLightBlue, props), petalBlockLightBlue.getRegistryName()); + register(r, new ItemBlockMod(petalBlockYellow, props), petalBlockYellow.getRegistryName()); + register(r, new ItemBlockMod(petalBlockLime, props), petalBlockLime.getRegistryName()); + register(r, new ItemBlockMod(petalBlockPink, props), petalBlockPink.getRegistryName()); + register(r, new ItemBlockMod(petalBlockGray, props), petalBlockGray.getRegistryName()); + register(r, new ItemBlockMod(petalBlockSilver, props), petalBlockSilver.getRegistryName()); + register(r, new ItemBlockMod(petalBlockCyan, props), petalBlockCyan.getRegistryName()); + register(r, new ItemBlockMod(petalBlockPurple, props), petalBlockPurple.getRegistryName()); + register(r, new ItemBlockMod(petalBlockBlue, props), petalBlockBlue.getRegistryName()); + register(r, new ItemBlockMod(petalBlockBrown, props), petalBlockBrown.getRegistryName()); + register(r, new ItemBlockMod(petalBlockGreen, props), petalBlockGreen.getRegistryName()); + register(r, new ItemBlockMod(petalBlockRed, props), petalBlockRed.getRegistryName()); + register(r, new ItemBlockMod(petalBlockBlack, props), petalBlockBlack.getRegistryName()); + register(r, new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))), corporeaIndex.getRegistryName()); + register(r, new ItemBlockMod(corporeaFunnel, props), corporeaFunnel.getRegistryName()); + register(r, new ItemBlockMod(whiteMushroom, props), whiteMushroom.getRegistryName()); + register(r, new ItemBlockMod(orangeMushroom, props), orangeMushroom.getRegistryName()); + register(r, new ItemBlockMod(magentaMushroom, props), magentaMushroom.getRegistryName()); + register(r, new ItemBlockMod(lightBlueMushroom, props), lightBlueMushroom.getRegistryName()); + register(r, new ItemBlockMod(yellowMushroom, props), yellowMushroom.getRegistryName()); + register(r, new ItemBlockMod(limeMushroom, props), limeMushroom.getRegistryName()); + register(r, new ItemBlockMod(pinkMushroom, props), pinkMushroom.getRegistryName()); + register(r, new ItemBlockMod(grayMushroom, props), grayMushroom.getRegistryName()); + register(r, new ItemBlockMod(lightGrayMushroom, props), lightGrayMushroom.getRegistryName()); + register(r, new ItemBlockMod(cyanMushroom, props), cyanMushroom.getRegistryName()); + register(r, new ItemBlockMod(purpleMushroom, props), purpleMushroom.getRegistryName()); + register(r, new ItemBlockMod(blueMushroom, props), blueMushroom.getRegistryName()); + register(r, new ItemBlockMod(brownMushroom, props), brownMushroom.getRegistryName()); + register(r, new ItemBlockMod(greenMushroom, props), greenMushroom.getRegistryName()); + register(r, new ItemBlockMod(redMushroom, props), redMushroom.getRegistryName()); + register(r, new ItemBlockMod(blackMushroom, props), blackMushroom.getRegistryName()); + register(r, new ItemBlockMod(pump, props), pump.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerWhite, props), doubleFlowerWhite.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerOrange, props), doubleFlowerOrange.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerMagenta, props), doubleFlowerMagenta.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerLightBlue, props), doubleFlowerLightBlue.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerYellow, props), doubleFlowerYellow.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerLime, props), doubleFlowerLime.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerPink, props), doubleFlowerPink.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerGray, props), doubleFlowerGray.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerLightGray, props), doubleFlowerLightGray.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerCyan, props), doubleFlowerCyan.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerPurple, props), doubleFlowerPurple.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerBlue, props), doubleFlowerBlue.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerBrown, props), doubleFlowerBrown.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerGreen, props), doubleFlowerGreen.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerRed, props), doubleFlowerRed.getRegistryName()); + register(r, new ItemBlockMod(doubleFlowerBlack, props), doubleFlowerBlack.getRegistryName()); + register(r, new ItemBlockBlaze(blazeBlock, props), blazeBlock.getRegistryName()); + register(r, new ItemBlockMod(corporeaInterceptor, props), corporeaInterceptor.getRegistryName()); + register(r, new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaCrystalCube, TileCorporeaCrystalCube.class))), corporeaCrystalCube.getRegistryName()); + register(r, new ItemBlockMod(incensePlate, props), incensePlate.getRegistryName()); + register(r, new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))), hourglass.getRegistryName()); + register(r, new ItemBlockMod(ghostRail, props), ghostRail.getRegistryName()); + register(r, new ItemBlockMod(sparkChanger, props), sparkChanger.getRegistryName()); + register(r, new ItemBlockMod(root, props), root.getRegistryName()); + register(r, new ItemBlockMod(felPumpkin, props), felPumpkin.getRegistryName()); + register(r, new ItemBlockMod(cocoon, props), cocoon.getRegistryName()); + register(r, new ItemBlockMod(lightRelayDefault, props), lightRelayDefault.getRegistryName()); + register(r, new ItemBlockMod(lightRelayDetector, props), lightRelayDetector.getRegistryName()); + register(r, new ItemBlockMod(lightRelayFork, props), lightRelayFork.getRegistryName()); + register(r, new ItemBlockMod(lightRelayToggle, props), lightRelayToggle.getRegistryName()); + register(r, new ItemBlockMod(lightLauncher, props), lightLauncher.getRegistryName()); + register(r, new ItemBlockMod(manaBomb, props), manaBomb.getRegistryName()); + register(r, new ItemBlockMod(cacophonium, props), cacophonium.getRegistryName()); + register(r, new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))), bellows.getRegistryName()); + register(r, new ItemBlockMod(bifrostPerm, props), bifrostPerm.getRegistryName()); + register(r, new ItemBlockMod(cellBlock, props), cellBlock.getRegistryName()); + register(r, new ItemBlockMod(redStringInterceptor, props), redStringInterceptor.getRegistryName()); + register(r, new ItemBlockMod(corporeaRetainer, props), corporeaRetainer.getRegistryName()); + register(r, new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.class))), teruTeruBozu.getRegistryName()); + register(r, new ItemBlockMod(shimmerrock, props), shimmerrock.getRegistryName()); + register(r, new ItemBlockMod(shimmerwoodPlanks, props), shimmerwoodPlanks.getRegistryName()); + register(r, new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))), avatar.getRegistryName()); + register(r, new ItemBlockMod(dryGrass, props), dryGrass.getRegistryName()); + register(r, new ItemBlockMod(goldenGrass, props), goldenGrass.getRegistryName()); + register(r, new ItemBlockMod(vividGrass, props), vividGrass.getRegistryName()); + register(r, new ItemBlockMod(scorchedGrass, props), scorchedGrass.getRegistryName()); + register(r, new ItemBlockMod(infusedGrass, props), infusedGrass.getRegistryName()); + register(r, new ItemBlockMod(mutatedGrass, props), mutatedGrass.getRegistryName()); + register(r, new ItemBlockMod(animatedTorch, props), animatedTorch.getRegistryName()); } public static > void register(IForgeRegistry reg, IForgeRegistryEntry thing, ResourceLocation name) { @@ -826,61 +826,61 @@ public final class ModBlocks { @SubscribeEvent public static void initTileEntities(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); - r.register(TileEntityType.Builder.create(TileAltar::new, + register(r, TileEntityType.Builder.create(TileAltar::new, defaultAltar, forestAltar, plainsAltar, mountainAltar, fungalAltar, swampAltar, desertAltar, taigaAltar, mesaAltar, mossyAltar - ).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALTAR)); - r.register(TileEntityType.Builder.create(TileSpreader::new, manaSpreader, redstoneSpreader, elvenSpreader, gaiaSpreader).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPREADER)); - r.register(TileEntityType.Builder.create(TilePool::new, manaPool, dilutedPool, fabulousPool, creativePool).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.POOL)); - r.register(TileEntityType.Builder.create(TileRuneAltar::new, runeAltar).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RUNE_ALTAR)); - r.register(TileEntityType.Builder.create(TilePylon::new, manaPylon, naturaPylon, gaiaPylon).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PYLON)); - r.register(TileEntityType.Builder.create(TileDistributor::new, distributor).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DISTRIBUTOR)); - r.register(TileEntityType.Builder.create(TileManaVoid::new, manaVoid).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_VOID)); - r.register(TileEntityType.Builder.create(TileManaDetector::new, manaDetector).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_DETECTOR)); - r.register(TileEntityType.Builder.create(TileEnchanter::new, enchanter).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENCHANTER)); - r.register(TileEntityType.Builder.create(TileTurntable::new, turntable).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TURNTABLE)); - r.register(TileEntityType.Builder.create(TileTinyPlanet::new, tinyPlanet).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_PLANET)); - r.register(TileEntityType.Builder.create(TileOpenCrate::new, openCrate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.OPEN_CRATE)); - r.register(TileEntityType.Builder.create(TileCraftCrate::new, craftCrate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CRAFT_CRATE)); - r.register(TileEntityType.Builder.create(TileForestEye::new, forestEye).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FOREST_EYE)); - r.register(TileEntityType.Builder.create(TilePlatform::new, abstrusePlatform, spectralPlatform, infrangiblePlatform).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PLATFORM)); - r.register(TileEntityType.Builder.create(TileAlfPortal::new, alfPortal).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALF_PORTAL)); - r.register(TileEntityType.Builder.create(TileBifrost::new, bifrost).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BIFROST)); - r.register(TileEntityType.Builder.create(TileFloatingFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MINI_ISLAND)); - r.register(TileEntityType.Builder.create(TileTinyPotato::new, tinyPotato).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_POTATO)); - r.register(TileEntityType.Builder.create(TileSpawnerClaw::new, spawnerClaw).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPAWNER_CLAW)); - r.register(TileEntityType.Builder.create(TileEnderEye::new, enderEye).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENDER_EYE_BLOCK)); - r.register(TileEntityType.Builder.create(TileStarfield::new, starfield).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.STARFIELD)); - r.register(TileEntityType.Builder.create(TileRFGenerator::new, rfGenerator).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FLUXFIELD)); - r.register(TileEntityType.Builder.create(TileBrewery::new, brewery).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BREWERY)); - r.register(TileEntityType.Builder.create(TileTerraPlate::new, terraPlate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERRA_PLATE)); - r.register(TileEntityType.Builder.create(TileRedStringContainer::new, redStringContainer).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_CONTAINER)); - r.register(TileEntityType.Builder.create(TileRedStringDispenser::new, redStringDispenser).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_DISPENSER)); - r.register(TileEntityType.Builder.create(TileRedStringFertilizer::new, redStringFertilizer).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_FERTILIZER)); - r.register(TileEntityType.Builder.create(TileRedStringComparator::new, redStringComparator).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_COMPARATOR)); - r.register(TileEntityType.Builder.create(TileRedStringRelay::new, redStringRelay).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_RELAY)); - r.register(TileEntityType.Builder.create(TileManaFlame::new, manaFlame).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_FLAME)); - r.register(TileEntityType.Builder.create(TilePrism::new, prism).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PRISM)); - r.register(TileEntityType.Builder.create(TileCorporeaIndex::new, corporeaIndex).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX)); - r.register(TileEntityType.Builder.create(TileCorporeaFunnel::new, corporeaFunnel).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_FUNNEL)); - r.register(TileEntityType.Builder.create(TilePump::new, pump).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PUMP)); - r.register(TileEntityType.Builder.create(TileFakeAir::new, fakeAir).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FAKE_AIR)); - r.register(TileEntityType.Builder.create(TileCorporeaInterceptor::new, corporeaInterceptor).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INTERCEPTOR)); - r.register(TileEntityType.Builder.create(TileCorporeaCrystalCube::new, corporeaCrystalCube).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_CRYSTAL_CUBE)); - r.register(TileEntityType.Builder.create(TileIncensePlate::new, incensePlate).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.INCENSE_PLATE)); - r.register(TileEntityType.Builder.create(TileHourglass::new, hourglass).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.HOURGLASS)); - r.register(TileEntityType.Builder.create(TileSparkChanger::new, sparkChanger).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPARK_CHANGER)); - r.register(TileEntityType.Builder.create(TileCocoon::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.COCOON)); - r.register(TileEntityType.Builder.create(TileLightRelay::new, lightRelayDefault, lightRelayDetector, lightRelayToggle, lightRelayFork).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIGHT_RELAY)); - r.register(TileEntityType.Builder.create(TileCacophonium::new, cacophonium).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CACOPHONIUM)); - r.register(TileEntityType.Builder.create(TileBellows::new, bellows).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BELLOWS)); - r.register(TileEntityType.Builder.create(TileCell::new, cellBlock).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CELL_BLOCK)); - r.register(TileEntityType.Builder.create(TileRedStringInterceptor::new, redStringInterceptor).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_INTERCEPTOR)); - r.register(TileEntityType.Builder.create(TileGaiaHead::new, gaiaHead, gaiaHeadWall).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); - r.register(TileEntityType.Builder.create(TileCorporeaRetainer::new, corporeaRetainer).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_RETAINER)); - r.register(TileEntityType.Builder.create(TileTeruTeruBozu::new, teruTeruBozu).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERU_TERU_BOZU)); - r.register(TileEntityType.Builder.create(TileAvatar::new, avatar).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.AVATAR)); - r.register(TileEntityType.Builder.create(TileAnimatedTorch::new, animatedTorch).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ANIMATED_TORCH)); + ).build(null), LibBlockNames.ALTAR); + register(r, TileEntityType.Builder.create(TileSpreader::new, manaSpreader, redstoneSpreader, elvenSpreader, gaiaSpreader).build(null), LibBlockNames.SPREADER);; + register(r, TileEntityType.Builder.create(TilePool::new, manaPool, dilutedPool, fabulousPool, creativePool).build(null), LibBlockNames.POOL);; + register(r, TileEntityType.Builder.create(TileRuneAltar::new, runeAltar).build(null), LibBlockNames.RUNE_ALTAR);; + register(r, TileEntityType.Builder.create(TilePylon::new, manaPylon, naturaPylon, gaiaPylon).build(null), LibBlockNames.PYLON);; + register(r, TileEntityType.Builder.create(TileDistributor::new, distributor).build(null), LibBlockNames.DISTRIBUTOR);; + register(r, TileEntityType.Builder.create(TileManaVoid::new, manaVoid).build(null), LibBlockNames.MANA_VOID);; + register(r, TileEntityType.Builder.create(TileManaDetector::new, manaDetector).build(null), LibBlockNames.MANA_DETECTOR);; + register(r, TileEntityType.Builder.create(TileEnchanter::new, enchanter).build(null), LibBlockNames.ENCHANTER);; + register(r, TileEntityType.Builder.create(TileTurntable::new, turntable).build(null), LibBlockNames.TURNTABLE);; + register(r, TileEntityType.Builder.create(TileTinyPlanet::new, tinyPlanet).build(null), LibBlockNames.TINY_PLANET);; + register(r, TileEntityType.Builder.create(TileOpenCrate::new, openCrate).build(null), LibBlockNames.OPEN_CRATE);; + register(r, TileEntityType.Builder.create(TileCraftCrate::new, craftCrate).build(null), LibBlockNames.CRAFT_CRATE);; + register(r, TileEntityType.Builder.create(TileForestEye::new, forestEye).build(null), LibBlockNames.FOREST_EYE);; + register(r, TileEntityType.Builder.create(TilePlatform::new, abstrusePlatform, spectralPlatform, infrangiblePlatform).build(null), LibBlockNames.PLATFORM);; + register(r, TileEntityType.Builder.create(TileAlfPortal::new, alfPortal).build(null), LibBlockNames.ALF_PORTAL);; + register(r, TileEntityType.Builder.create(TileBifrost::new, bifrost).build(null), LibBlockNames.BIFROST);; + register(r, TileEntityType.Builder.create(TileFloatingFlower::new).build(null), LibBlockNames.MINI_ISLAND);; + register(r, TileEntityType.Builder.create(TileTinyPotato::new, tinyPotato).build(null), LibBlockNames.TINY_POTATO);; + register(r, TileEntityType.Builder.create(TileSpawnerClaw::new, spawnerClaw).build(null), LibBlockNames.SPAWNER_CLAW);; + register(r, TileEntityType.Builder.create(TileEnderEye::new, enderEye).build(null), LibBlockNames.ENDER_EYE_BLOCK);; + register(r, TileEntityType.Builder.create(TileStarfield::new, starfield).build(null), LibBlockNames.STARFIELD);; + register(r, TileEntityType.Builder.create(TileRFGenerator::new, rfGenerator).build(null), LibBlockNames.FLUXFIELD);; + register(r, TileEntityType.Builder.create(TileBrewery::new, brewery).build(null), LibBlockNames.BREWERY);; + register(r, TileEntityType.Builder.create(TileTerraPlate::new, terraPlate).build(null), LibBlockNames.TERRA_PLATE);; + register(r, TileEntityType.Builder.create(TileRedStringContainer::new, redStringContainer).build(null), LibBlockNames.RED_STRING_CONTAINER);; + register(r, TileEntityType.Builder.create(TileRedStringDispenser::new, redStringDispenser).build(null), LibBlockNames.RED_STRING_DISPENSER);; + register(r, TileEntityType.Builder.create(TileRedStringFertilizer::new, redStringFertilizer).build(null), LibBlockNames.RED_STRING_FERTILIZER);; + register(r, TileEntityType.Builder.create(TileRedStringComparator::new, redStringComparator).build(null), LibBlockNames.RED_STRING_COMPARATOR);; + register(r, TileEntityType.Builder.create(TileRedStringRelay::new, redStringRelay).build(null), LibBlockNames.RED_STRING_RELAY);; + register(r, TileEntityType.Builder.create(TileManaFlame::new, manaFlame).build(null), LibBlockNames.MANA_FLAME);; + register(r, TileEntityType.Builder.create(TilePrism::new, prism).build(null), LibBlockNames.PRISM);; + register(r, TileEntityType.Builder.create(TileCorporeaIndex::new, corporeaIndex).build(null), LibBlockNames.CORPOREA_INDEX);; + register(r, TileEntityType.Builder.create(TileCorporeaFunnel::new, corporeaFunnel).build(null), LibBlockNames.CORPOREA_FUNNEL);; + register(r, TileEntityType.Builder.create(TilePump::new, pump).build(null), LibBlockNames.PUMP);; + register(r, TileEntityType.Builder.create(TileFakeAir::new, fakeAir).build(null), LibBlockNames.FAKE_AIR);; + register(r, TileEntityType.Builder.create(TileCorporeaInterceptor::new, corporeaInterceptor).build(null), LibBlockNames.CORPOREA_INTERCEPTOR);; + register(r, TileEntityType.Builder.create(TileCorporeaCrystalCube::new, corporeaCrystalCube).build(null), LibBlockNames.CORPOREA_CRYSTAL_CUBE);; + register(r, TileEntityType.Builder.create(TileIncensePlate::new, incensePlate).build(null), LibBlockNames.INCENSE_PLATE);; + register(r, TileEntityType.Builder.create(TileHourglass::new, hourglass).build(null), LibBlockNames.HOURGLASS);; + register(r, TileEntityType.Builder.create(TileSparkChanger::new, sparkChanger).build(null), LibBlockNames.SPARK_CHANGER);; + register(r, TileEntityType.Builder.create(TileCocoon::new).build(null), LibBlockNames.COCOON);; + register(r, TileEntityType.Builder.create(TileLightRelay::new, lightRelayDefault, lightRelayDetector, lightRelayToggle, lightRelayFork).build(null), LibBlockNames.LIGHT_RELAY);; + register(r, TileEntityType.Builder.create(TileCacophonium::new, cacophonium).build(null), LibBlockNames.CACOPHONIUM);; + register(r, TileEntityType.Builder.create(TileBellows::new, bellows).build(null), LibBlockNames.BELLOWS);; + register(r, TileEntityType.Builder.create(TileCell::new, cellBlock).build(null), LibBlockNames.CELL_BLOCK);; + register(r, TileEntityType.Builder.create(TileRedStringInterceptor::new, redStringInterceptor).build(null), LibBlockNames.RED_STRING_INTERCEPTOR);; + register(r, TileEntityType.Builder.create(TileGaiaHead::new, gaiaHead, gaiaHeadWall).build(null), LibBlockNames.GAIA_HEAD);; + register(r, TileEntityType.Builder.create(TileCorporeaRetainer::new, corporeaRetainer).build(null), LibBlockNames.CORPOREA_RETAINER);; + register(r, TileEntityType.Builder.create(TileTeruTeruBozu::new, teruTeruBozu).build(null), LibBlockNames.TERU_TERU_BOZU);; + register(r, TileEntityType.Builder.create(TileAvatar::new, avatar).build(null), LibBlockNames.AVATAR);; + register(r, TileEntityType.Builder.create(TileAnimatedTorch::new, animatedTorch).build(null), LibBlockNames.ANIMATED_TORCH);; } @@ -934,20 +934,20 @@ public final class ModBlocks { default: case WHITE: return Blocks.WHITE_WOOL; case ORANGE: return Blocks.ORANGE_WOOL; - case MAGENTA: return Blocks.ORANGE_WOOL; - case LIGHT_BLUE: return Blocks.ORANGE_WOOL; - case YELLOW: return Blocks.ORANGE_WOOL; - case LIME: return Blocks.ORANGE_WOOL; - case PINK: return Blocks.ORANGE_WOOL; - case GRAY: return Blocks.ORANGE_WOOL; - case LIGHT_GRAY: return Blocks.ORANGE_WOOL; - case CYAN: return Blocks.ORANGE_WOOL; - case PURPLE: return Blocks.ORANGE_WOOL; - case BLUE: return Blocks.ORANGE_WOOL; - case BROWN: return Blocks.ORANGE_WOOL; - case GREEN: return Blocks.ORANGE_WOOL; - case RED: return Blocks.ORANGE_WOOL; - case BLACK: return Blocks.ORANGE_WOOL; + case MAGENTA: return Blocks.MAGENTA_WOOL; + case LIGHT_BLUE: return Blocks.LIGHT_BLUE_WOOL; + case YELLOW: return Blocks.YELLOW_WOOL; + case LIME: return Blocks.LIME_WOOL; + case PINK: return Blocks.PINK_WOOL; + case GRAY: return Blocks.GRAY_WOOL; + case LIGHT_GRAY: return Blocks.LIGHT_GRAY_WOOL; + case CYAN: return Blocks.CYAN_WOOL; + case PURPLE: return Blocks.PURPLE_WOOL; + case BLUE: return Blocks.BLUE_WOOL; + case BROWN: return Blocks.BROWN_WOOL; + case GREEN: return Blocks.GREEN_WOOL; + case RED: return Blocks.RED_WOOL; + case BLACK: return Blocks.BLACK_WOOL; } } @@ -956,20 +956,20 @@ public final class ModBlocks { default: case WHITE: return Blocks.WHITE_CARPET; case ORANGE: return Blocks.ORANGE_CARPET; - case MAGENTA: return Blocks.ORANGE_CARPET; - case LIGHT_BLUE: return Blocks.ORANGE_CARPET; - case YELLOW: return Blocks.ORANGE_CARPET; - case LIME: return Blocks.ORANGE_CARPET; - case PINK: return Blocks.ORANGE_CARPET; - case GRAY: return Blocks.ORANGE_CARPET; - case LIGHT_GRAY: return Blocks.ORANGE_CARPET; - case CYAN: return Blocks.ORANGE_CARPET; - case PURPLE: return Blocks.ORANGE_CARPET; - case BLUE: return Blocks.ORANGE_CARPET; - case BROWN: return Blocks.ORANGE_CARPET; - case GREEN: return Blocks.ORANGE_CARPET; - case RED: return Blocks.ORANGE_CARPET; - case BLACK: return Blocks.ORANGE_CARPET; + case MAGENTA: return Blocks.MAGENTA_CARPET; + case LIGHT_BLUE: return Blocks.LIGHT_BLUE_CARPET; + case YELLOW: return Blocks.YELLOW_CARPET; + case LIME: return Blocks.LIME_CARPET; + case PINK: return Blocks.PINK_CARPET; + case GRAY: return Blocks.GRAY_CARPET; + case LIGHT_GRAY: return Blocks.LIGHT_GRAY_CARPET; + case CYAN: return Blocks.CYAN_CARPET; + case PURPLE: return Blocks.PURPLE_CARPET; + case BLUE: return Blocks.BLUE_CARPET; + case BROWN: return Blocks.BROWN_CARPET; + case GREEN: return Blocks.GREEN_CARPET; + case RED: return Blocks.RED_CARPET; + case BLACK: return Blocks.BLACK_CARPET; } } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index ad07056a2..df7cc2c80 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.core; -import net.minecraft.item.DyeColor; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -625,7 +624,39 @@ public final class BotaniaCreativeTab extends ItemGroup { addItem(ModFluffBlocks.yellowPavementSlab); addItem(ModFluffBlocks.redPavementSlab); - ModItems.cosmetics.values().forEach(this::addItem); + addItem(ModItems.blackBowtie); + addItem(ModItems.blackTie); + addItem(ModItems.redGlasses); + addItem(ModItems.puffyScarf); + addItem(ModItems.engineerGoggles); + addItem(ModItems.eyepatch); + addItem(ModItems.wickedEyepatch); + addItem(ModItems.redRibbons); + addItem(ModItems.pinkFlowerBud); + addItem(ModItems.polkaDottedBows); + addItem(ModItems.blueButterfly); + addItem(ModItems.catEars); + addItem(ModItems.witchPin); + addItem(ModItems.devilTail); + addItem(ModItems.kamuiEye); + addItem(ModItems.googlyEyes); + addItem(ModItems.fourLeafClover); + addItem(ModItems.clockEye); + addItem(ModItems.unicornHorn); + addItem(ModItems.devilHorns); + addItem(ModItems.hyperPlus); + addItem(ModItems.botanistEmblem); + addItem(ModItems.ancientMask); + addItem(ModItems.eerieMask); + addItem(ModItems.alienAntenna); + addItem(ModItems.anaglyphGlasses); + addItem(ModItems.orangeShades); + addItem(ModItems.grouchoGlasses); + addItem(ModItems.thickEyebrows); + addItem(ModItems.lusitanicShield); + addItem(ModItems.tinyPotatoMask); + addItem(ModItems.questgiverMark); + addItem(ModItems.thinkingHand); } private void addTag(ResourceLocation tagId) { diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 4d76d55e4..91af76977 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -11,18 +11,13 @@ package vazkii.botania.common.item; import net.minecraft.client.gui.ScreenManager; -import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.DyeColor; import net.minecraft.item.Food; -import net.minecraft.item.Items; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.DyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.network.PacketBuffer; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.util.ResourceLocation; @@ -30,7 +25,6 @@ import net.minecraftforge.common.extensions.IForgeContainerType; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.network.IContainerFactory; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.item.IFloatingFlower; @@ -42,9 +36,7 @@ import vazkii.botania.client.gui.bag.GuiFlowerBag; import vazkii.botania.client.gui.box.ContainerBaubleBox; import vazkii.botania.client.gui.box.GuiBaubleBox; import vazkii.botania.client.render.tile.RenderTileGaiaHead; -import vazkii.botania.client.render.tile.TEISR; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; @@ -127,309 +119,336 @@ import vazkii.botania.common.item.rod.ItemSmeltRod; import vazkii.botania.common.item.rod.ItemTerraformRod; import vazkii.botania.common.item.rod.ItemTornadoRod; import vazkii.botania.common.item.rod.ItemWaterRod; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibOreDict; import java.util.*; import static vazkii.botania.common.block.ModBlocks.register; -// todo 1.13 objectholder ify everything @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +@ObjectHolder(LibMisc.MOD_ID) public final class ModItems { - @ObjectHolder("botania:" + LibItemNames.LEXICON) public static Item lexicon; - @ObjectHolder("botania:" + "white" + LibItemNames.PETAL_SUFFIX) public static Item whitePetal; - @ObjectHolder("botania:" + "orange" + LibItemNames.PETAL_SUFFIX) public static Item orangePetal; - @ObjectHolder("botania:" + "magenta" + LibItemNames.PETAL_SUFFIX) public static Item magentaPetal; - @ObjectHolder("botania:" + "light_blue" + LibItemNames.PETAL_SUFFIX) public static Item lightBluePetal; - @ObjectHolder("botania:" + "yellow" + LibItemNames.PETAL_SUFFIX) public static Item yellowPetal; - @ObjectHolder("botania:" + "lime" + LibItemNames.PETAL_SUFFIX) public static Item limePetal; - @ObjectHolder("botania:" + "pink" + LibItemNames.PETAL_SUFFIX) public static Item pinkPetal; - @ObjectHolder("botania:" + "gray" + LibItemNames.PETAL_SUFFIX) public static Item grayPetal; - @ObjectHolder("botania:" + "light_gray" + LibItemNames.PETAL_SUFFIX) public static Item lightGrayPetal; - @ObjectHolder("botania:" + "cyan" + LibItemNames.PETAL_SUFFIX) public static Item cyanPetal; - @ObjectHolder("botania:" + "purple" + LibItemNames.PETAL_SUFFIX) public static Item purplePetal; - @ObjectHolder("botania:" + "blue" + LibItemNames.PETAL_SUFFIX) public static Item bluePetal; - @ObjectHolder("botania:" + "brown" + LibItemNames.PETAL_SUFFIX) public static Item brownPetal; - @ObjectHolder("botania:" + "green" + LibItemNames.PETAL_SUFFIX) public static Item greenPetal; - @ObjectHolder("botania:" + "red" + LibItemNames.PETAL_SUFFIX) public static Item redPetal; - @ObjectHolder("botania:" + "black" + LibItemNames.PETAL_SUFFIX) public static Item blackPetal; + @ObjectHolder(LibItemNames.LEXICON) public static Item lexicon; + @ObjectHolder("white" + LibItemNames.PETAL_SUFFIX) public static Item whitePetal; + @ObjectHolder("orange" + LibItemNames.PETAL_SUFFIX) public static Item orangePetal; + @ObjectHolder("magenta" + LibItemNames.PETAL_SUFFIX) public static Item magentaPetal; + @ObjectHolder("light_blue" + LibItemNames.PETAL_SUFFIX) public static Item lightBluePetal; + @ObjectHolder("yellow" + LibItemNames.PETAL_SUFFIX) public static Item yellowPetal; + @ObjectHolder("lime" + LibItemNames.PETAL_SUFFIX) public static Item limePetal; + @ObjectHolder("pink" + LibItemNames.PETAL_SUFFIX) public static Item pinkPetal; + @ObjectHolder("gray" + LibItemNames.PETAL_SUFFIX) public static Item grayPetal; + @ObjectHolder("light_gray" + LibItemNames.PETAL_SUFFIX) public static Item lightGrayPetal; + @ObjectHolder("cyan" + LibItemNames.PETAL_SUFFIX) public static Item cyanPetal; + @ObjectHolder("purple" + LibItemNames.PETAL_SUFFIX) public static Item purplePetal; + @ObjectHolder("blue" + LibItemNames.PETAL_SUFFIX) public static Item bluePetal; + @ObjectHolder("brown" + LibItemNames.PETAL_SUFFIX) public static Item brownPetal; + @ObjectHolder("green" + LibItemNames.PETAL_SUFFIX) public static Item greenPetal; + @ObjectHolder("red" + LibItemNames.PETAL_SUFFIX) public static Item redPetal; + @ObjectHolder("black" + LibItemNames.PETAL_SUFFIX) public static Item blackPetal; - @ObjectHolder("botania:" + "white" + LibItemNames.DYE_SUFFIX) public static Item whiteDye; - @ObjectHolder("botania:" + "orange" + LibItemNames.DYE_SUFFIX) public static Item orangeDye; - @ObjectHolder("botania:" + "magenta" + LibItemNames.DYE_SUFFIX) public static Item magentaDye; - @ObjectHolder("botania:" + "light_blue" + LibItemNames.DYE_SUFFIX) public static Item lightBlueDye; - @ObjectHolder("botania:" + "yellow" + LibItemNames.DYE_SUFFIX) public static Item yellowDye; - @ObjectHolder("botania:" + "lime" + LibItemNames.DYE_SUFFIX) public static Item limeDye; - @ObjectHolder("botania:" + "pink" + LibItemNames.DYE_SUFFIX) public static Item pinkDye; - @ObjectHolder("botania:" + "gray" + LibItemNames.DYE_SUFFIX) public static Item grayDye; - @ObjectHolder("botania:" + "light_gray" + LibItemNames.DYE_SUFFIX) public static Item lightGrayDye; - @ObjectHolder("botania:" + "cyan" + LibItemNames.DYE_SUFFIX) public static Item cyanDye; - @ObjectHolder("botania:" + "purple" + LibItemNames.DYE_SUFFIX) public static Item purpleDye; - @ObjectHolder("botania:" + "blue" + LibItemNames.DYE_SUFFIX) public static Item blueDye; - @ObjectHolder("botania:" + "brown" + LibItemNames.DYE_SUFFIX) public static Item brownDye; - @ObjectHolder("botania:" + "green" + LibItemNames.DYE_SUFFIX) public static Item greenDye; - @ObjectHolder("botania:" + "red" + LibItemNames.DYE_SUFFIX) public static Item redDye; - @ObjectHolder("botania:" + "black" + LibItemNames.DYE_SUFFIX) public static Item blackDye; + @ObjectHolder("white" + LibItemNames.DYE_SUFFIX) public static Item whiteDye; + @ObjectHolder("orange" + LibItemNames.DYE_SUFFIX) public static Item orangeDye; + @ObjectHolder("magenta" + LibItemNames.DYE_SUFFIX) public static Item magentaDye; + @ObjectHolder("light_blue" + LibItemNames.DYE_SUFFIX) public static Item lightBlueDye; + @ObjectHolder("yellow" + LibItemNames.DYE_SUFFIX) public static Item yellowDye; + @ObjectHolder("lime" + LibItemNames.DYE_SUFFIX) public static Item limeDye; + @ObjectHolder("pink" + LibItemNames.DYE_SUFFIX) public static Item pinkDye; + @ObjectHolder("gray" + LibItemNames.DYE_SUFFIX) public static Item grayDye; + @ObjectHolder("light_gray" + LibItemNames.DYE_SUFFIX) public static Item lightGrayDye; + @ObjectHolder("cyan" + LibItemNames.DYE_SUFFIX) public static Item cyanDye; + @ObjectHolder("purple" + LibItemNames.DYE_SUFFIX) public static Item purpleDye; + @ObjectHolder("blue" + LibItemNames.DYE_SUFFIX) public static Item blueDye; + @ObjectHolder("brown" + LibItemNames.DYE_SUFFIX) public static Item brownDye; + @ObjectHolder("green" + LibItemNames.DYE_SUFFIX) public static Item greenDye; + @ObjectHolder("red" + LibItemNames.DYE_SUFFIX) public static Item redDye; + @ObjectHolder("black" + LibItemNames.DYE_SUFFIX) public static Item blackDye; - public static final Item pestleAndMortar = new ItemSelfReturning(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PESTLE_AND_MORTAR); - public static final Item twigWand = new ItemTwigWand(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TWIG_WAND); + @ObjectHolder(LibItemNames.PESTLE_AND_MORTAR) public static Item pestleAndMortar; + @ObjectHolder(LibItemNames.TWIG_WAND) public static Item twigWand; - public static final Item manaSteel = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[0]); - public static final Item manaPearl = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[1]); - public static final Item manaDiamond = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[2]); - public static final Item livingwoodTwig = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[3]); - public static final Item terrasteel = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[4]); - public static final Item lifeEssence = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[5]); - public static final Item redstoneRoot = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[6]); - public static final Item elementium = new ItemElven(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[7]); - public static final Item pixieDust = new ItemElven(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[8]); - public static final Item dragonstone = new ItemElven(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[9]); - public static final Item placeholder = new ItemSelfReturning(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[11]); - public static final Item redString = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[12]); - public static final Item dreamwoodTwig = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[13]); - public static final Item gaiaIngot = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[14]); - public static final Item enderAirBottle = new ItemEnderAir(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[15]); - public static final Item manaString = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[16]); - public static final Item manasteelNugget = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[17]); - public static final Item terrasteelNugget = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[18]); - public static final Item elementiumNugget = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[19]); - public static final Item livingroot = new ItemManaResource(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[20]); - public static final Item pebble = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[21]); - public static final Item manaweaveCloth = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[22]); - public static final Item manaPowder = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[23]); + @ObjectHolder(LibItemNames.MANASTEEL_INGOT) public static Item manaSteel; + @ObjectHolder(LibItemNames.MANA_PEARL) public static Item manaPearl; + @ObjectHolder(LibItemNames.MANA_DIAMOND) public static Item manaDiamond; + @ObjectHolder(LibItemNames.LIVINGWOOD_TWIG) public static Item livingwoodTwig; + @ObjectHolder(LibItemNames.TERRASTEEL_INGOT) public static Item terrasteel; + @ObjectHolder(LibItemNames.LIFE_ESSENCE) public static Item lifeEssence; + @ObjectHolder(LibItemNames.REDSTONE_ROOT) public static Item redstoneRoot; + @ObjectHolder(LibItemNames.ELEMENTIUM_INGOT) public static Item elementium; + @ObjectHolder(LibItemNames.PIXIE_DUST) public static Item pixieDust; + @ObjectHolder(LibItemNames.DRAGONSTONE) public static Item dragonstone; + @ObjectHolder(LibItemNames.PLACEHOLDER) public static Item placeholder; + @ObjectHolder(LibItemNames.RED_STRING) public static Item redString; + @ObjectHolder(LibItemNames.DREAMWOOD_TWIG) public static Item dreamwoodTwig; + @ObjectHolder(LibItemNames.GAIA_INGOT) public static Item gaiaIngot; + @ObjectHolder(LibItemNames.ENDER_AIR_BOTTLE) public static Item enderAirBottle; + @ObjectHolder(LibItemNames.MANA_STRING) public static Item manaString; + @ObjectHolder(LibItemNames.MANASTEEL_NUGGET) public static Item manasteelNugget; + @ObjectHolder(LibItemNames.TERRASTEEL_NUGGET) public static Item terrasteelNugget; + @ObjectHolder(LibItemNames.ELEMENTIUM_NUGGET) public static Item elementiumNugget; + @ObjectHolder(LibItemNames.LIVING_ROOT) public static Item livingroot; + @ObjectHolder(LibItemNames.PEBBLE) public static Item pebble; + @ObjectHolder(LibItemNames.MANAWEAVE_CLOTH) public static Item manaweaveCloth; + @ObjectHolder(LibItemNames.MANA_POWDER) public static Item manaPowder; - public static final Item lensNormal = new ItemLens(unstackable(), new Lens(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[0]); - public static final Item lensSpeed = new ItemLens(unstackable(), new LensSpeed(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[1]); - public static final Item lensPower = new ItemLens(unstackable(), new LensPower(), ItemLens.PROP_POWER).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[2]); - public static final Item lensTime = new ItemLens(unstackable(), new LensTime(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[3]); - public static final Item lensEfficiency = new ItemLens(unstackable(), new LensEfficiency(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[4]); - public static final Item lensBounce = new ItemLens(unstackable(), new LensBounce(), ItemLens.PROP_TOUCH).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[5]); - public static final Item lensGravity = new ItemLens(unstackable(), new LensGravity(), ItemLens.PROP_ORIENTATION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[6]); - public static final Item lensMine = new ItemLens(unstackable(), new LensMine(), ItemLens.PROP_TOUCH | ItemLens.PROP_ORIENTATION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[7]); - public static final Item lensDamage = new ItemLens(unstackable(), new LensDamage(), ItemLens.PROP_DAMAGE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[8]); - public static final Item lensPhantom = new ItemLens(unstackable(), new LensPhantom(), ItemLens.PROP_TOUCH).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[9]); - public static final Item lensMagnet = new ItemLens(unstackable(), new LensMagnet(), ItemLens.PROP_ORIENTATION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[10]); - public static final Item lensExplosive = new ItemLens(unstackable(), new LensExplosive(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[11]); - public static final Item lensInfluence = new ItemLens(unstackable(), new LensInfluence(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[12]); - public static final Item lensWeight = new ItemLens(unstackable(), new LensWeight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[13]); - public static final Item lensPaint = new ItemLens(unstackable(), new LensPaint(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[14]); - public static final Item lensFire = new ItemLens(unstackable(), new LensFire(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[15]); - public static final Item lensPiston = new ItemLens(unstackable(), new LensPiston(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[16]); - public static final Item lensLight = new ItemLens(unstackable(), new LensLight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[17]); - public static final Item lensWarp = new ItemLens(unstackable(), new LensWarp(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[18]); - public static final Item lensRedirect = new ItemLens(unstackable(), new LensRedirect(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[19]); - public static final Item lensFirework = new ItemLens(unstackable(), new LensFirework(), ItemLens.PROP_TOUCH).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[20]); - public static final Item lensFlare = new ItemLens(unstackable(), new LensFlare(), ItemLens.PROP_CONTROL).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[21]); - public static final Item lensMessenger = new ItemLens(unstackable(), new LensMessenger(), ItemLens.PROP_POWER).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[22]); - public static final Item lensTripwire = new ItemLens(unstackable(), new LensTripwire(), ItemLens.PROP_CONTROL).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[23]); - public static final Item lensStorm = new ItemLens(unstackable(), new LensStorm(), ItemLens.PROP_NONE).setRegistryName(LibMisc.MOD_ID, LibItemNames.LENS_NAMES[24]); + @ObjectHolder(LibItemNames.LENS_NORMAL) public static Item lensNormal; + @ObjectHolder(LibItemNames.LENS_SPEED) public static Item lensSpeed; + @ObjectHolder(LibItemNames.LENS_POWER) public static Item lensPower; + @ObjectHolder(LibItemNames.LENS_TIME) public static Item lensTime; + @ObjectHolder(LibItemNames.LENS_EFFICIENCY) public static Item lensEfficiency; + @ObjectHolder(LibItemNames.LENS_BOUNCE) public static Item lensBounce; + @ObjectHolder(LibItemNames.LENS_GRAVITY) public static Item lensGravity; + @ObjectHolder(LibItemNames.LENS_MINE) public static Item lensMine; + @ObjectHolder(LibItemNames.LENS_DAMAGE) public static Item lensDamage; + @ObjectHolder(LibItemNames.LENS_PHANTOM) public static Item lensPhantom; + @ObjectHolder(LibItemNames.LENS_MAGNET) public static Item lensMagnet; + @ObjectHolder(LibItemNames.LENS_EXPLOSIVE) public static Item lensExplosive; + @ObjectHolder(LibItemNames.LENS_INFLUENCE) public static Item lensInfluence; + @ObjectHolder(LibItemNames.LENS_WEIGHT) public static Item lensWeight; + @ObjectHolder(LibItemNames.LENS_PAINT) public static Item lensPaint; + @ObjectHolder(LibItemNames.LENS_FIRE) public static Item lensFire; + @ObjectHolder(LibItemNames.LENS_PISTON) public static Item lensPiston; + @ObjectHolder(LibItemNames.LENS_LIGHT) public static Item lensLight; + @ObjectHolder(LibItemNames.LENS_WARP) public static Item lensWarp; + @ObjectHolder(LibItemNames.LENS_REDIRECT) public static Item lensRedirect; + @ObjectHolder(LibItemNames.LENS_FIREWORK) public static Item lensFirework; + @ObjectHolder(LibItemNames.LENS_FLARE) public static Item lensFlare; + @ObjectHolder(LibItemNames.LENS_MESSENGER) public static Item lensMessenger; + @ObjectHolder(LibItemNames.LENS_TRIPWIRE) public static Item lensTripwire; + @ObjectHolder(LibItemNames.LENS_STORM) public static Item lensStorm; - public static final Item runeWater = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[0]); - public static final Item runeFire = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[1]); - public static final Item runeEarth = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[2]); - public static final Item runeAir = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[3]); - public static final Item runeSpring = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[4]); - public static final Item runeSummer = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[5]); - public static final Item runeAutumn = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[6]); - public static final Item runeWinter = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[7]); - public static final Item runeMana = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[8]); - public static final Item runeLust = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[9]); - public static final Item runeGluttony = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[10]); - public static final Item runeGreed = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[11]); - public static final Item runeSloth = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[12]); - public static final Item runeWrath = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[13]); - public static final Item runeEnvy = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[14]); - public static final Item runePride = new ItemRune(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RUNE_NAMES[15]); + @ObjectHolder(LibItemNames.RUNE_WATER) public static Item runeWater; + @ObjectHolder(LibItemNames.RUNE_FIRE) public static Item runeFire; + @ObjectHolder(LibItemNames.RUNE_EARTH) public static Item runeEarth; + @ObjectHolder(LibItemNames.RUNE_AIR) public static Item runeAir; + @ObjectHolder(LibItemNames.RUNE_SPRING) public static Item runeSpring; + @ObjectHolder(LibItemNames.RUNE_SUMMER) public static Item runeSummer; + @ObjectHolder(LibItemNames.RUNE_AUTUMN) public static Item runeAutumn; + @ObjectHolder(LibItemNames.RUNE_WINTER) public static Item runeWinter; + @ObjectHolder(LibItemNames.RUNE_MANA) public static Item runeMana; + @ObjectHolder(LibItemNames.RUNE_LUST) public static Item runeLust; + @ObjectHolder(LibItemNames.RUNE_GLUTTONY) public static Item runeGluttony; + @ObjectHolder(LibItemNames.RUNE_GREED) public static Item runeGreed; + @ObjectHolder(LibItemNames.RUNE_SLOTH) public static Item runeSloth; + @ObjectHolder(LibItemNames.RUNE_WRATH) public static Item runeWrath; + @ObjectHolder(LibItemNames.RUNE_ENVY) public static Item runeEnvy; + @ObjectHolder(LibItemNames.RUNE_PRIDE) public static Item runePride; - public static final Item manaTablet = new ItemManaTablet(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_TABLET); - public static final Item manaGun = new ItemManaGun(unstackable().setNoRepair()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_GUN); - public static final Item manaCookie = new ItemManaCookie(defaultBuilder().food(new Food.Builder().hunger(0).saturation(0.1F).effect(new EffectInstance(Effects.SATURATION, 20, 0), 1).build())).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE); - public static final Item fertilizer = new ItemFertilizer(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FERTILIZER); + @ObjectHolder(LibItemNames.MANA_TABLET) public static Item manaTablet; + @ObjectHolder(LibItemNames.MANA_GUN) public static Item manaGun; + @ObjectHolder(LibItemNames.MANA_COOKIE) public static Item manaCookie; + @ObjectHolder(LibItemNames.FERTILIZER) public static Item fertilizer; - public static final Item grassSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GRASS, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GRASS_SEEDS); - public static final Item podzolSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.PODZOL, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PODZOL_SEEDS); - public static final Item mycelSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MYCEL, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MYCEL_SEEDS); - public static final Item drySeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.DRY, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DRY_SEEDS); - public static final Item goldenSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GOLDEN, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GOLDEN_SEEDS); - public static final Item vividSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.VIVID, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.VIVID_SEEDS); - public static final Item scorchedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.SCORCHED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SCORCHED_SEEDS); - public static final Item infusedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.INFUSED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.INFUSED_SEEDS); - public static final Item mutatedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MUTATED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MUTATED_SEEDS); + @ObjectHolder(LibItemNames.GRASS_SEEDS) public static Item grassSeeds; + @ObjectHolder(LibItemNames.PODZOL_SEEDS) public static Item podzolSeeds; + @ObjectHolder(LibItemNames.MYCEL_SEEDS) public static Item mycelSeeds; + @ObjectHolder(LibItemNames.DRY_SEEDS) public static Item drySeeds; + @ObjectHolder(LibItemNames.GOLDEN_SEEDS) public static Item goldenSeeds; + @ObjectHolder(LibItemNames.VIVID_SEEDS) public static Item vividSeeds; + @ObjectHolder(LibItemNames.SCORCHED_SEEDS) public static Item scorchedSeeds; + @ObjectHolder(LibItemNames.INFUSED_SEEDS) public static Item infusedSeeds; + @ObjectHolder(LibItemNames.MUTATED_SEEDS) public static Item mutatedSeeds; - public static final Item dirtRod = new ItemDirtRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DIRT_ROD); - public static final Item terraformRod = new ItemTerraformRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRAFORM_ROD); - public static final Item grassHorn = new ItemHorn(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GRASS_HORN); - public static final Item leavesHorn = new ItemHorn(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.LEAVES_HORN); - public static final Item snowHorn = new ItemHorn(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SNOW_HORN); - public static final Item manaMirror = new ItemManaMirror(unstackable().defaultMaxDamage(1000).setNoRepair()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_MIRROR); - public static final Item manasteelHelm = new ItemManasteelHelm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_HELM); - public static final Item manasteelHelmRevealing = new ItemManasteelHelmRevealing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_HELM_R); - public static final Item manasteelChest = new ItemManasteelArmor(EquipmentSlotType.CHEST, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_CHEST); - public static final Item manasteelLegs = new ItemManasteelArmor(EquipmentSlotType.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_LEGS); - public static final Item manasteelBoots = new ItemManasteelArmor(EquipmentSlotType.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_BOOTS); - public static final Item manasteelPick = new ItemManasteelPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_PICK); - public static final Item manasteelShovel = new ItemManasteelShovel(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_SHOVEL); - public static final Item manasteelAxe = new ItemManasteelAxe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_AXE); - public static final Item manasteelSword = new ItemManasteelSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_SWORD); - public static final Item manasteelShears = new ItemManasteelShears(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_SHEARS); - public static final Item terrasteelHelm = new ItemTerrasteelHelm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_HELM); - public static final Item terrasteelHelmRevealing = new ItemTerrasteelHelmRevealing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_HELM_R); - public static final Item terrasteelChest = new ItemTerrasteelArmor(EquipmentSlotType.CHEST, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_CHEST); - public static final Item terrasteelLegs = new ItemTerrasteelArmor(EquipmentSlotType.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_LEGS); - public static final Item terrasteelBoots = new ItemTerrasteelArmor(EquipmentSlotType.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_BOOTS); - public static final Item terraSword = new ItemTerraSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_SWORD); - public static final Item tinyPlanet = new ItemTinyPlanet(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TINY_PLANET); - public static final Item manaRing = new ItemManaRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RING); - public static final Item auraRing = new ItemAuraRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AURA_RING); - public static final Item manaRingGreater = new ItemGreaterManaRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RING_GREATER); - public static final Item auraRingGreater = new ItemGreaterAuraRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AURA_RING_GREATER); - public static final Item travelBelt = new ItemTravelBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TRAVEL_BELT); - public static final Item knockbackBelt = new ItemKnockbackBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.KNOCKBACK_BELT); - public static final Item icePendant = new ItemIcePendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ICE_PENDANT); - public static final Item lavaPendant = new ItemLavaPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.LAVA_PENDANT); - public static final Item magnetRing = new ItemMagnetRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MAGNET_RING); - public static final Item waterRing = new ItemWaterRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.WATER_RING); - public static final Item miningRing = new ItemMiningRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MINING_RING); - public static final Item terraPick = new ItemTerraPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_PICK); - public static final Item divaCharm = new ItemDivaCharm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DIVA_CHARM); - public static final Item flightTiara = new ItemFlightTiara(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLIGHT_TIARA); - public static final Item enderDagger = new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ENDER_DAGGER); // What you looking at? - public static final Item darkQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[0]); - public static final Item manaQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[1]); - public static final Item blazeQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[2]); - public static final Item lavenderQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[3]); - public static final Item redQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[4]); - public static final Item elfQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[5]); - public static final Item sunnyQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[6]); - public static final Item waterRod = new ItemWaterRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.WATER_ROD); - public static final Item elementiumHelm = new ItemElementiumHelm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_HELM); - public static final Item elementiumHelmRevealing = new ItemElementiumHelmRevealing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_HELM_R); - public static final Item elementiumChest = new ItemElementiumChest(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_CHEST); - public static final Item elementiumLegs = new ItemElementiumLegs(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_LEGS); - public static final Item elementiumBoots = new ItemElementiumBoots(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_BOOTS); - public static final Item elementiumPick = new ItemElementiumPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_PICK); - public static final Item elementiumShovel = new ItemElementiumShovel(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_SHOVEL); - public static final Item elementiumAxe = new ItemElementiumAxe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_AXE); - public static final Item elementiumSword = new ItemElementiumSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_SWORD); - public static final Item elementiumShears = new ItemElementiumShears(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_SHEARS); - public static final Item openBucket = new ItemOpenBucket(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.OPEN_BUCKET); - public static final Item spawnerMover = new ItemSpawnerMover(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPAWNER_MOVER); - public static final Item pixieRing = new ItemPixieRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PIXIE_RING); - public static final Item superTravelBelt = new ItemSuperTravelBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SUPER_TRAVEL_BELT); - public static final Item rainbowRod = new ItemRainbowRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RAINBOW_ROD); - public static final Item tornadoRod = new ItemTornadoRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TORNADO_ROD); - public static final Item fireRod = new ItemFireRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FIRE_ROD); - public static final Item vineBall = new ItemVineBall(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.VINE_BALL); - public static final Item slingshot = new ItemSlingshot(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SLINGSHOT); - public static final Item manaBottle = new ItemBottledMana(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_BOTTLE); - public static final Item laputaShard = new ItemLaputaShard(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.LAPUTA_SHARD); - public static final Item necroVirus = new ItemVirus(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.NECRO_VIRUS); - public static final Item nullVirus = new ItemVirus(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.NULL_VIRUS); - public static final Item reachRing = new ItemReachRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.REACH_RING); - public static final Item skyDirtRod = new ItemSkyDirtRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SKY_DIRT_ROD); - public static final Item itemFinder = new ItemItemFinder(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ITEM_FINDER); - public static final Item superLavaPendant = new ItemSuperLavaPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SUPER_LAVA_PENDANT); - public static final Item enderHand = new ItemEnderHand(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ENDER_HAND); - public static final Item glassPick = new ItemGlassPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GLASS_PICK); - public static final Item spark = new ItemSpark(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK); - public static final Item sparkUpgradeDispersive = new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.DISPERSIVE).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.DISPERSIVE.name().toLowerCase(Locale.ROOT)); - public static final Item sparkUpgradeDominant = new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.DOMINANT).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.DOMINANT.name().toLowerCase(Locale.ROOT)); - public static final Item sparkUpgradeRecessive = new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.RECESSIVE).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.RECESSIVE.name().toLowerCase(Locale.ROOT)); - public static final Item sparkUpgradeIsolated = new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.ISOLATED).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.ISOLATED.name().toLowerCase(Locale.ROOT)); - public static final Item diviningRod = new ItemDiviningRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DIVINING_ROD); - public static final Item gravityRod = new ItemGravityRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GRAVITY_ROD); - public static final Item manaInkwell = new ItemManaInkwell(unstackable().setNoRepair()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_INKWELL); - public static final Item vial = new ItemVial(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.VIAL); - public static final Item flask = new ItemVial(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLASK); - public static final Item brewVial = new ItemBrewBase(unstackable(), 4, 32, new ItemStack(vial)).setRegistryName(LibMisc.MOD_ID, LibItemNames.BREW_VIAL); - public static final Item brewFlask = new ItemBrewBase(unstackable(), 6, 24, new ItemStack(flask)).setRegistryName(LibMisc.MOD_ID, LibItemNames.BREW_FLASK); - public static final Item bloodPendant = new ItemBloodPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BLOOD_PENDANT); - public static final Item missileRod = new ItemMissileRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MISSILE_ROD); - public static final Item holyCloak = new ItemHolyCloak(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.HOLY_CLOAK); - public static final Item unholyCloak = new ItemUnholyCloak(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.UNHOLY_CLOAK); - public static final Item balanceCloak = new ItemBalanceCloak(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BALANCE_CLOAK); - public static final Item craftingHalo = new ItemCraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFTING_HALO); - public static final Item blackLotus = new ItemBlackLotus(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BLACK_LOTUS); - public static final Item blackerLotus = new ItemBlackLotus(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BLACKER_LOTUS); - public static final Item monocle = new ItemMonocle(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MONOCLE); - public static final Item clip = new ItemMod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CLIP); - public static final Item cobbleRod = new ItemCobbleRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.COBBLE_ROD); - public static final Item smeltRod = new ItemSmeltRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SMELT_ROD); - public static final Item worldSeed = new ItemWorldSeed(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.WORLD_SEED); - public static final Item spellCloth = new ItemSpellCloth(unstackable().defaultMaxDamage(35).setNoRepair()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPELL_CLOTH); - public static final Item thornChakram = new ItemThornChakram(defaultBuilder().maxStackSize(6)).setRegistryName(LibMisc.MOD_ID, LibItemNames.THORN_CHAKRAM); - public static final Item flareChakram = new ItemThornChakram(defaultBuilder().maxStackSize(6)).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLARE_CHAKRAM); - public static final Item overgrowthSeed = new ItemOvergrowthSeed(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.OVERGROWTH_SEED); - public static final Item craftPattern1_1 = new ItemCraftPattern(CratePattern.CRAFTY_1_1, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "1_1"); - public static final Item craftPattern2_2 = new ItemCraftPattern(CratePattern.CRAFTY_2_2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "2_2"); - public static final Item craftPattern1_2 = new ItemCraftPattern(CratePattern.CRAFTY_1_2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "1_2"); - public static final Item craftPattern2_1 = new ItemCraftPattern(CratePattern.CRAFTY_2_1, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "2_1"); - public static final Item craftPattern1_3 = new ItemCraftPattern(CratePattern.CRAFTY_1_3, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "1_3"); - public static final Item craftPattern3_1 = new ItemCraftPattern(CratePattern.CRAFTY_3_1, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "3_1"); - public static final Item craftPattern2_3 = new ItemCraftPattern(CratePattern.CRAFTY_2_3, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "2_3"); - public static final Item craftPattern3_2 = new ItemCraftPattern(CratePattern.CRAFTY_3_2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "3_2"); - public static final Item craftPatternDonut = new ItemCraftPattern(CratePattern.CRAFTY_DONUT, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "donut"); - public static final Item ancientWillAhrim = new ItemAncientWill(IAncientWillContainer.AncientWillType.AHRIM, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ANCIENT_WILL_PREFIX + "ahrim"); - public static final Item ancientWillDharok = new ItemAncientWill(IAncientWillContainer.AncientWillType.DHAROK, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ANCIENT_WILL_PREFIX + "dharok"); - public static final Item ancientWillGuthan = new ItemAncientWill(IAncientWillContainer.AncientWillType.GUTHAN, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ANCIENT_WILL_PREFIX + "guthan"); - public static final Item ancientWillTorag = new ItemAncientWill(IAncientWillContainer.AncientWillType.TORAG, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ANCIENT_WILL_PREFIX + "torag"); - public static final Item ancientWillVerac = new ItemAncientWill(IAncientWillContainer.AncientWillType.VERAC, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ANCIENT_WILL_PREFIX + "verac"); - public static final Item ancientWillKaril = new ItemAncientWill(IAncientWillContainer.AncientWillType.KARIL, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ANCIENT_WILL_PREFIX + "karil"); - public static final Item corporeaSpark = new ItemCorporeaSpark(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CORPOREA_SPARK); - public static final Item corporeaSparkMaster = new ItemCorporeaSpark(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CORPOREA_SPARK_MASTER); - public static final Item livingwoodBow = new ItemLivingwoodBow(defaultBuilder().defaultMaxDamage(500)).setRegistryName(LibMisc.MOD_ID, LibItemNames.LIVINGWOOD_BOW); - public static final Item crystalBow = new ItemCrystalBow(defaultBuilder().defaultMaxDamage(500)).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRYSTAL_BOW); - public static final Map cosmetics = new EnumMap<>(ItemBaubleCosmetic.Variant.class); - static { - for(ItemBaubleCosmetic.Variant v : ItemBaubleCosmetic.Variant.values()) { - cosmetics.put(v, new ItemBaubleCosmetic(v, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.COSMETIC_PREFIX + v.name().toLowerCase(Locale.ROOT))); - } - } - public static final Item swapRing = new ItemSwapRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SWAP_RING); - public static final Item flowerBag = new ItemFlowerBag(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLOWER_BAG); - public static final Item phantomInk = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PHANTOM_INK); - public static final Item poolMinecart = new ItemPoolMinecart(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.POOL_MINECART); - public static final Item pinkinator = new ItemPinkinator(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PINKINATOR); - public static final Item infiniteFruit = new ItemInfiniteFruit(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.INFINITE_FRUIT); - public static final Item kingKey = new ItemKingKey(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.KING_KEY); - public static final Item flugelEye = new ItemFlugelEye(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLUGEL_EYE); - public static final Item thorRing = new ItemThorRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.THOR_RING); - public static final Item odinRing = new ItemOdinRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ODIN_RING); - public static final Item lokiRing = new ItemLokiRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.LOKI_RING); - public static final Item dice = new ItemDice(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DICE); - public static final Item keepIvy = new ItemKeepIvy(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.KEEP_IVY); - public static final Item blackHoleTalisman = new ItemBlackHoleTalisman(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BLACK_HOLE_TALISMAN); - public static final Item recordGaia1 = new ItemModRecord(1, ModSounds.gaiaMusic1, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RECORD_GAIA1); - public static final Item recordGaia2 = new ItemModRecord(1, ModSounds.gaiaMusic2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RECORD_GAIA2); - public static final Item temperanceStone = new ItemTemperanceStone(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TEMPERANCE_STONE); - public static final Item incenseStick = new ItemIncenseStick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.INCENSE_STICK); - public static final Item terraAxe = new ItemTerraAxe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_AXE); - public static final Item waterBowl = new ItemWaterBowl(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.WATER_BOWL); - public static final Item obedienceStick = new ItemObedienceStick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.OBEDIENCE_STICK); - public static final Item cacophonium = new ItemCacophonium(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CACOPHONIUM); - public static final Item slimeBottle = new ItemSlimeBottle(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SLIME_BOTTLE); - public static final Item starSword = new ItemStarSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.STAR_SWORD); - public static final Item exchangeRod = new ItemExchangeRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.EXCHANGE_ROD); - public static final Item magnetRingGreater = new ItemGreaterMagnetRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MAGNET_RING_GREATER); - public static final Item thunderSword = new ItemThunderSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.THUNDER_SWORD); - public static final Item manaweaveHelm = new ItemManaweaveHelm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_HELM); - public static final Item manaweaveChest = new ItemManaweaveArmor(EquipmentSlotType.CHEST, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_CHEST); - public static final Item manaweaveLegs = new ItemManaweaveArmor(EquipmentSlotType.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_LEGS); - public static final Item manaweaveBoots = new ItemManaweaveArmor(EquipmentSlotType.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_BOOTS); - public static final Item autocraftingHalo = new ItemAutocraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AUTOCRAFTING_HALO); - public static final Item sextant = new ItemSextant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SEXTANT); - public static final Item speedUpBelt = new ItemSpeedUpBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPEED_UP_BELT); - public static final Item baubleBox = new ItemBaubleBox(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BAUBLE_BOX); - public static final Item dodgeRing = new ItemDodgeRing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DODGE_RING); - public static final Item invisibilityCloak = new ItemInvisibilityCloak(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.INVISIBILITY_CLOAK); - public static final Item cloudPendant = new ItemCloudPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CLOUD_PENDANT); - public static final Item superCloudPendant = new ItemSuperCloudPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SUPER_CLOUD_PENDANT); - public static final Item thirdEye = new ItemThirdEye(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.THIRD_EYE); - @ObjectHolder("botania:" + LibItemNames.ASTROLABE) public static Item astrolabe; - @ObjectHolder("botania:" + LibItemNames.GODDESS_CHARM) public static Item goddessCharm; + @ObjectHolder(LibItemNames.DIRT_ROD) public static Item dirtRod; + @ObjectHolder(LibItemNames.TERRAFORM_ROD) public static Item terraformRod; + @ObjectHolder(LibItemNames.GRASS_HORN) public static Item grassHorn; + @ObjectHolder(LibItemNames.LEAVES_HORN) public static Item leavesHorn; + @ObjectHolder(LibItemNames.SNOW_HORN) public static Item snowHorn; + @ObjectHolder(LibItemNames.MANA_MIRROR) public static Item manaMirror; + @ObjectHolder(LibItemNames.MANASTEEL_HELM) public static Item manasteelHelm; + @ObjectHolder(LibItemNames.MANASTEEL_HELM_R) public static Item manasteelHelmRevealing; + @ObjectHolder(LibItemNames.MANASTEEL_CHEST) public static Item manasteelChest; + @ObjectHolder(LibItemNames.MANASTEEL_LEGS) public static Item manasteelLegs; + @ObjectHolder(LibItemNames.MANASTEEL_BOOTS) public static Item manasteelBoots; + @ObjectHolder(LibItemNames.MANASTEEL_PICK) public static Item manasteelPick; + @ObjectHolder(LibItemNames.MANASTEEL_SHOVEL) public static Item manasteelShovel; + @ObjectHolder(LibItemNames.MANASTEEL_AXE) public static Item manasteelAxe; + @ObjectHolder(LibItemNames.MANASTEEL_SWORD) public static Item manasteelSword; + @ObjectHolder(LibItemNames.MANASTEEL_SHEARS) public static Item manasteelShears; + @ObjectHolder(LibItemNames.TERRASTEEL_HELM) public static Item terrasteelHelm; + @ObjectHolder(LibItemNames.TERRASTEEL_HELM_R) public static Item terrasteelHelmRevealing; + @ObjectHolder(LibItemNames.TERRASTEEL_CHEST) public static Item terrasteelChest; + @ObjectHolder(LibItemNames.TERRASTEEL_LEGS) public static Item terrasteelLegs; + @ObjectHolder(LibItemNames.TERRASTEEL_BOOTS) public static Item terrasteelBoots; + @ObjectHolder(LibItemNames.TERRA_SWORD) public static Item terraSword; + @ObjectHolder(LibItemNames.TINY_PLANET) public static Item tinyPlanet; + @ObjectHolder(LibItemNames.MANA_RING) public static Item manaRing; + @ObjectHolder(LibItemNames.AURA_RING) public static Item auraRing; + @ObjectHolder(LibItemNames.MANA_RING_GREATER) public static Item manaRingGreater; + @ObjectHolder(LibItemNames.AURA_RING_GREATER) public static Item auraRingGreater; + @ObjectHolder(LibItemNames.TRAVEL_BELT) public static Item travelBelt; + @ObjectHolder(LibItemNames.KNOCKBACK_BELT) public static Item knockbackBelt; + @ObjectHolder(LibItemNames.ICE_PENDANT) public static Item icePendant; + @ObjectHolder(LibItemNames.LAVA_PENDANT) public static Item lavaPendant; + @ObjectHolder(LibItemNames.MAGNET_RING) public static Item magnetRing; + @ObjectHolder(LibItemNames.WATER_RING) public static Item waterRing; + @ObjectHolder(LibItemNames.MINING_RING) public static Item miningRing; + @ObjectHolder(LibItemNames.TERRA_PICK) public static Item terraPick; + @ObjectHolder(LibItemNames.DIVA_CHARM) public static Item divaCharm; + @ObjectHolder(LibItemNames.FLIGHT_TIARA) public static Item flightTiara; + @ObjectHolder(LibItemNames.ENDER_DAGGER) public static Item enderDagger; // What you looking at? + @ObjectHolder(LibItemNames.QUARTZ_DARK) public static Item darkQuartz; + @ObjectHolder(LibItemNames.QUARTZ_MANA) public static Item manaQuartz; + @ObjectHolder(LibItemNames.QUARTZ_BLAZE) public static Item blazeQuartz; + @ObjectHolder(LibItemNames.QUARTZ_LAVENDER) public static Item lavenderQuartz; + @ObjectHolder(LibItemNames.QUARTZ_RED) public static Item redQuartz; + @ObjectHolder(LibItemNames.QUARTZ_ELVEN) public static Item elfQuartz; + @ObjectHolder(LibItemNames.QUARTZ_SUNNY) public static Item sunnyQuartz; + @ObjectHolder(LibItemNames.WATER_ROD) public static Item waterRod; + @ObjectHolder(LibItemNames.ELEMENTIUM_HELM) public static Item elementiumHelm; + @ObjectHolder(LibItemNames.ELEMENTIUM_HELM_R) public static Item elementiumHelmRevealing; + @ObjectHolder(LibItemNames.ELEMENTIUM_CHEST) public static Item elementiumChest; + @ObjectHolder(LibItemNames.ELEMENTIUM_LEGS) public static Item elementiumLegs; + @ObjectHolder(LibItemNames.ELEMENTIUM_BOOTS) public static Item elementiumBoots; + @ObjectHolder(LibItemNames.ELEMENTIUM_PICK) public static Item elementiumPick; + @ObjectHolder(LibItemNames.ELEMENTIUM_SHOVEL) public static Item elementiumShovel; + @ObjectHolder(LibItemNames.ELEMENTIUM_AXE) public static Item elementiumAxe; + @ObjectHolder(LibItemNames.ELEMENTIUM_SWORD) public static Item elementiumSword; + @ObjectHolder(LibItemNames.ELEMENTIUM_SHEARS) public static Item elementiumShears; + @ObjectHolder(LibItemNames.OPEN_BUCKET) public static Item openBucket; + @ObjectHolder(LibItemNames.SPAWNER_MOVER) public static Item spawnerMover; + @ObjectHolder(LibItemNames.PIXIE_RING) public static Item pixieRing; + @ObjectHolder(LibItemNames.SUPER_TRAVEL_BELT) public static Item superTravelBelt; + @ObjectHolder(LibItemNames.RAINBOW_ROD) public static Item rainbowRod; + @ObjectHolder(LibItemNames.TORNADO_ROD) public static Item tornadoRod; + @ObjectHolder(LibItemNames.FIRE_ROD) public static Item fireRod; + @ObjectHolder(LibItemNames.VINE_BALL) public static Item vineBall; + @ObjectHolder(LibItemNames.SLINGSHOT) public static Item slingshot; + @ObjectHolder(LibItemNames.MANA_BOTTLE) public static Item manaBottle; + @ObjectHolder(LibItemNames.LAPUTA_SHARD) public static Item laputaShard; + @ObjectHolder(LibItemNames.NECRO_VIRUS) public static Item necroVirus; + @ObjectHolder(LibItemNames.NULL_VIRUS) public static Item nullVirus; + @ObjectHolder(LibItemNames.REACH_RING) public static Item reachRing; + @ObjectHolder(LibItemNames.SKY_DIRT_ROD) public static Item skyDirtRod; + @ObjectHolder(LibItemNames.ITEM_FINDER) public static Item itemFinder; + @ObjectHolder(LibItemNames.SUPER_LAVA_PENDANT) public static Item superLavaPendant; + @ObjectHolder(LibItemNames.ENDER_HAND) public static Item enderHand; + @ObjectHolder(LibItemNames.GLASS_PICK) public static Item glassPick; + @ObjectHolder(LibItemNames.SPARK) public static Item spark; + @ObjectHolder(LibItemNames.SPARK_UPGRADE + "_dispersive") public static Item sparkUpgradeDispersive; + @ObjectHolder(LibItemNames.SPARK_UPGRADE + "_dominant") public static Item sparkUpgradeDominant; + @ObjectHolder(LibItemNames.SPARK_UPGRADE + "_recessive") public static Item sparkUpgradeRecessive; + @ObjectHolder(LibItemNames.SPARK_UPGRADE + "_isolated") public static Item sparkUpgradeIsolated; + @ObjectHolder(LibItemNames.DIVINING_ROD) public static Item diviningRod; + @ObjectHolder(LibItemNames.GRAVITY_ROD) public static Item gravityRod; + @ObjectHolder(LibItemNames.MANA_INKWELL) public static Item manaInkwell; + @ObjectHolder(LibItemNames.VIAL) public static Item vial; + @ObjectHolder(LibItemNames.FLASK) public static Item flask; + @ObjectHolder(LibItemNames.BREW_VIAL) public static Item brewVial; + @ObjectHolder(LibItemNames.BREW_FLASK) public static Item brewFlask; + @ObjectHolder(LibItemNames.BLOOD_PENDANT) public static Item bloodPendant; + @ObjectHolder(LibItemNames.MISSILE_ROD) public static Item missileRod; + @ObjectHolder(LibItemNames.HOLY_CLOAK) public static Item holyCloak; + @ObjectHolder(LibItemNames.UNHOLY_CLOAK) public static Item unholyCloak; + @ObjectHolder(LibItemNames.BALANCE_CLOAK) public static Item balanceCloak; + @ObjectHolder(LibItemNames.CRAFTING_HALO) public static Item craftingHalo; + @ObjectHolder(LibItemNames.BLACK_LOTUS) public static Item blackLotus; + @ObjectHolder(LibItemNames.BLACKER_LOTUS) public static Item blackerLotus; + @ObjectHolder(LibItemNames.MONOCLE) public static Item monocle; + @ObjectHolder(LibItemNames.CLIP) public static Item clip; + @ObjectHolder(LibItemNames.COBBLE_ROD) public static Item cobbleRod; + @ObjectHolder(LibItemNames.SMELT_ROD) public static Item smeltRod; + @ObjectHolder(LibItemNames.WORLD_SEED) public static Item worldSeed; + @ObjectHolder(LibItemNames.SPELL_CLOTH) public static Item spellCloth; + @ObjectHolder(LibItemNames.THORN_CHAKRAM) public static Item thornChakram; + @ObjectHolder(LibItemNames.FLARE_CHAKRAM) public static Item flareChakram; + @ObjectHolder(LibItemNames.OVERGROWTH_SEED) public static Item overgrowthSeed; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "1_1") public static Item craftPattern1_1; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "2_2") public static Item craftPattern2_2; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "1_2") public static Item craftPattern1_2; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "2_1") public static Item craftPattern2_1; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "1_3") public static Item craftPattern1_3; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "3_1") public static Item craftPattern3_1; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "2_3") public static Item craftPattern2_3; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "3_2") public static Item craftPattern3_2; + @ObjectHolder(LibItemNames.CRAFT_PATTERN_PREFIX + "donut") public static Item craftPatternDonut; + @ObjectHolder(LibItemNames.ANCIENT_WILL_PREFIX + "ahrim") public static Item ancientWillAhrim; + @ObjectHolder(LibItemNames.ANCIENT_WILL_PREFIX + "dharok") public static Item ancientWillDharok; + @ObjectHolder(LibItemNames.ANCIENT_WILL_PREFIX + "guthan") public static Item ancientWillGuthan; + @ObjectHolder(LibItemNames.ANCIENT_WILL_PREFIX + "torag") public static Item ancientWillTorag; + @ObjectHolder(LibItemNames.ANCIENT_WILL_PREFIX + "verac") public static Item ancientWillVerac; + @ObjectHolder(LibItemNames.ANCIENT_WILL_PREFIX + "karil") public static Item ancientWillKaril; + @ObjectHolder(LibItemNames.CORPOREA_SPARK) public static Item corporeaSpark; + @ObjectHolder(LibItemNames.CORPOREA_SPARK_MASTER) public static Item corporeaSparkMaster; + @ObjectHolder(LibItemNames.LIVINGWOOD_BOW) public static Item livingwoodBow; + @ObjectHolder(LibItemNames.CRYSTAL_BOW) public static Item crystalBow; + + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "black_bowtie") public static Item blackBowtie; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "black_tie") public static Item blackTie; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "red_glasses") public static Item redGlasses; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "puffy_scarf") public static Item puffyScarf; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "engineer_goggles") public static Item engineerGoggles; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "eyepatch") public static Item eyepatch; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "wicked_eyepatch") public static Item wickedEyepatch; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "red_ribbons") public static Item redRibbons; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "pink_flower_bud") public static Item pinkFlowerBud; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "polka_dotted_bows") public static Item polkaDottedBows; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "blue_butterfly") public static Item blueButterfly; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "cat_ears") public static Item catEars; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "witch_pin") public static Item witchPin; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "devil_tail") public static Item devilTail; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "kamui_eye") public static Item kamuiEye; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "googly_eyes") public static Item googlyEyes; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "four_leaf_clover") public static Item fourLeafClover; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "clock_eye") public static Item clockEye; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "unicorn_horn") public static Item unicornHorn; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "devil_horns") public static Item devilHorns; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "hyper_plus") public static Item hyperPlus; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "botanist_emblem") public static Item botanistEmblem; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "ancient_mask") public static Item ancientMask; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "eerie_mask") public static Item eerieMask; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "alien_antenna") public static Item alienAntenna; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "anaglyph_glasses") public static Item anaglyphGlasses; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "orange_shades") public static Item orangeShades; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "groucho_glasses") public static Item grouchoGlasses; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "thick_eyebrows") public static Item thickEyebrows; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "lusitanic_shield") public static Item lusitanicShield; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "tiny_potato_mask") public static Item tinyPotatoMask; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "questgiver_mark") public static Item questgiverMark; + @ObjectHolder(LibItemNames.COSMETIC_PREFIX + "thinking_hand") public static Item thinkingHand; + + @ObjectHolder(LibItemNames.SWAP_RING) public static Item swapRing; + @ObjectHolder(LibItemNames.FLOWER_BAG) public static Item flowerBag; + @ObjectHolder(LibItemNames.PHANTOM_INK) public static Item phantomInk; + @ObjectHolder(LibItemNames.POOL_MINECART) public static Item poolMinecart; + @ObjectHolder(LibItemNames.PINKINATOR) public static Item pinkinator; + @ObjectHolder(LibItemNames.INFINITE_FRUIT) public static Item infiniteFruit; + @ObjectHolder(LibItemNames.KING_KEY) public static Item kingKey; + @ObjectHolder(LibItemNames.FLUGEL_EYE) public static Item flugelEye; + @ObjectHolder(LibItemNames.THOR_RING) public static Item thorRing; + @ObjectHolder(LibItemNames.ODIN_RING) public static Item odinRing; + @ObjectHolder(LibItemNames.LOKI_RING) public static Item lokiRing; + @ObjectHolder(LibItemNames.DICE) public static Item dice; + @ObjectHolder(LibItemNames.KEEP_IVY) public static Item keepIvy; + @ObjectHolder(LibItemNames.BLACK_HOLE_TALISMAN) public static Item blackHoleTalisman; + @ObjectHolder(LibItemNames.RECORD_GAIA1) public static Item recordGaia1; + @ObjectHolder(LibItemNames.RECORD_GAIA2) public static Item recordGaia2; + @ObjectHolder(LibItemNames.TEMPERANCE_STONE) public static Item temperanceStone; + @ObjectHolder(LibItemNames.INCENSE_STICK) public static Item incenseStick; + @ObjectHolder(LibItemNames.TERRA_AXE) public static Item terraAxe; + @ObjectHolder(LibItemNames.WATER_BOWL) public static Item waterBowl; + @ObjectHolder(LibItemNames.OBEDIENCE_STICK) public static Item obedienceStick; + @ObjectHolder(LibItemNames.CACOPHONIUM) public static Item cacophonium; + @ObjectHolder(LibItemNames.SLIME_BOTTLE) public static Item slimeBottle; + @ObjectHolder(LibItemNames.STAR_SWORD) public static Item starSword; + @ObjectHolder(LibItemNames.EXCHANGE_ROD) public static Item exchangeRod; + @ObjectHolder(LibItemNames.MAGNET_RING_GREATER) public static Item magnetRingGreater; + @ObjectHolder(LibItemNames.THUNDER_SWORD) public static Item thunderSword; + @ObjectHolder(LibItemNames.MANAWEAVE_HELM) public static Item manaweaveHelm; + @ObjectHolder(LibItemNames.MANAWEAVE_CHEST) public static Item manaweaveChest; + @ObjectHolder(LibItemNames.MANAWEAVE_LEGS) public static Item manaweaveLegs; + @ObjectHolder(LibItemNames.MANAWEAVE_BOOTS) public static Item manaweaveBoots; + @ObjectHolder(LibItemNames.AUTOCRAFTING_HALO) public static Item autocraftingHalo; + @ObjectHolder(LibItemNames.SEXTANT) public static Item sextant; + @ObjectHolder(LibItemNames.SPEED_UP_BELT) public static Item speedUpBelt; + @ObjectHolder(LibItemNames.BAUBLE_BOX) public static Item baubleBox; + @ObjectHolder(LibItemNames.DODGE_RING) public static Item dodgeRing; + @ObjectHolder(LibItemNames.INVISIBILITY_CLOAK) public static Item invisibilityCloak; + @ObjectHolder(LibItemNames.CLOUD_PENDANT) public static Item cloudPendant; + @ObjectHolder(LibItemNames.SUPER_CLOUD_PENDANT) public static Item superCloudPendant; + @ObjectHolder(LibItemNames.THIRD_EYE) public static Item thirdEye; + @ObjectHolder(LibItemNames.ASTROLABE) public static Item astrolabe; + @ObjectHolder(LibItemNames.GODDESS_CHARM) public static Item goddessCharm; public static Item.Properties defaultBuilder() { return new Item.Properties().group(BotaniaCreativeTab.INSTANCE); @@ -448,251 +467,255 @@ public final class ModItems { register(r, new ItemPetal(ModBlocks.getBuriedPetal(color), color, defaultBuilder()), color.getName() + LibItemNames.PETAL_SUFFIX); register(r, new ItemDye(color, defaultBuilder()), color.getName() + LibItemNames.DYE_SUFFIX); } - r.register(pestleAndMortar); - r.register(twigWand); - r.register(manaSteel); - r.register(manaPearl); - r.register(manaDiamond); - r.register(livingwoodTwig); - r.register(terrasteel); - r.register(lifeEssence); - r.register(redstoneRoot); - r.register(elementium); - r.register(pixieDust); - r.register(dragonstone); - r.register(placeholder); - r.register(redString); - r.register(dreamwoodTwig); - r.register(gaiaIngot); - r.register(enderAirBottle); - r.register(manaString); - r.register(manasteelNugget); - r.register(terrasteelNugget); - r.register(elementiumNugget); - r.register(livingroot); - r.register(pebble); - r.register(manaweaveCloth); - r.register(manaPowder); - r.register(lensNormal); - r.register(lensSpeed); - r.register(lensPower); - r.register(lensTime); - r.register(lensEfficiency); - r.register(lensBounce); - r.register(lensGravity); - r.register(lensMine); - r.register(lensDamage); - r.register(lensPhantom); - r.register(lensMagnet); - r.register(lensExplosive); - r.register(lensInfluence); - r.register(lensWeight); - r.register(lensPaint); - r.register(lensFire); - r.register(lensPiston); - r.register(lensLight); - r.register(lensWarp); - r.register(lensRedirect); - r.register(lensFirework); - r.register(lensFlare); - r.register(lensMessenger); - r.register(lensTripwire); - r.register(lensStorm); - r.register(runeWater); - r.register(runeFire); - r.register(runeEarth); - r.register(runeAir); - r.register(runeSpring); - r.register(runeSummer); - r.register(runeAutumn); - r.register(runeWinter); - r.register(runeMana); - r.register(runeLust); - r.register(runeGluttony); - r.register(runeGreed); - r.register(runeSloth); - r.register(runeWrath); - r.register(runeEnvy); - r.register(runePride); - r.register(manaTablet); - r.register(manaGun); - r.register(manaCookie); - r.register(fertilizer); - r.register(grassSeeds); - r.register(podzolSeeds); - r.register(mycelSeeds); - r.register(drySeeds); - r.register(goldenSeeds); - r.register(vividSeeds); - r.register(scorchedSeeds); - r.register(infusedSeeds); - r.register(mutatedSeeds); - r.register(dirtRod); - r.register(terraformRod); - r.register(grassHorn); - r.register(leavesHorn); - r.register(snowHorn); - r.register(manaMirror); - r.register(manasteelHelm); - r.register(manasteelHelmRevealing); - r.register(manasteelChest); - r.register(manasteelLegs); - r.register(manasteelBoots); - r.register(manasteelPick); - r.register(manasteelShovel); - r.register(manasteelAxe); - r.register(manasteelSword); - r.register(manasteelShears); - r.register(terrasteelHelm); - r.register(terrasteelHelmRevealing); - r.register(terrasteelChest); - r.register(terrasteelLegs); - r.register(terrasteelBoots); - r.register(terraSword); - r.register(tinyPlanet); - r.register(manaRing); - r.register(auraRing); - r.register(manaRingGreater); - r.register(auraRingGreater); - r.register(travelBelt); - r.register(knockbackBelt); - r.register(icePendant); - r.register(lavaPendant); - r.register(magnetRing); - r.register(waterRing); - r.register(miningRing); - r.register(terraPick); - r.register(divaCharm); - r.register(flightTiara); - r.register(enderDagger); - r.register(darkQuartz); - r.register(manaQuartz); - r.register(blazeQuartz); - r.register(lavenderQuartz); - r.register(redQuartz); - r.register(elfQuartz); - r.register(sunnyQuartz); - r.register(waterRod); - r.register(elementiumHelm); - r.register(elementiumHelmRevealing); - r.register(elementiumChest); - r.register(elementiumLegs); - r.register(elementiumBoots); - r.register(elementiumPick); - r.register(elementiumShovel); - r.register(elementiumAxe); - r.register(elementiumSword); - r.register(elementiumShears); - r.register(openBucket); - r.register(spawnerMover); - r.register(pixieRing); - r.register(superTravelBelt); - r.register(rainbowRod); - r.register(tornadoRod); - r.register(fireRod); - r.register(vineBall); - r.register(slingshot); - r.register(manaBottle); - r.register(laputaShard); - r.register(necroVirus); - r.register(nullVirus); - r.register(reachRing); - r.register(skyDirtRod); - r.register(itemFinder); - r.register(superLavaPendant); - r.register(enderHand); - r.register(glassPick); - r.register(spark); - r.register(sparkUpgradeDispersive); - r.register(sparkUpgradeDominant); - r.register(sparkUpgradeRecessive); - r.register(sparkUpgradeIsolated); - r.register(diviningRod); - r.register(gravityRod); - r.register(manaInkwell); - r.register(vial); - r.register(flask); - r.register(brewVial); - r.register(brewFlask); - r.register(bloodPendant); - r.register(missileRod); - r.register(holyCloak); - r.register(unholyCloak); - r.register(balanceCloak); - r.register(craftingHalo); - r.register(blackLotus); - r.register(blackerLotus); - r.register(monocle); - r.register(clip); - r.register(cobbleRod); - r.register(smeltRod); - r.register(worldSeed); - r.register(spellCloth); - r.register(thornChakram); - r.register(flareChakram); - r.register(overgrowthSeed); - r.register(craftPattern1_1); - r.register(craftPattern2_2); - r.register(craftPattern1_2); - r.register(craftPattern2_1); - r.register(craftPattern1_3); - r.register(craftPattern3_1); - r.register(craftPattern2_3); - r.register(craftPattern3_2); - r.register(craftPatternDonut); - r.register(ancientWillAhrim); - r.register(ancientWillDharok); - r.register(ancientWillGuthan); - r.register(ancientWillTorag); - r.register(ancientWillVerac); - r.register(ancientWillKaril); - r.register(corporeaSpark); - r.register(corporeaSparkMaster); - r.register(livingwoodBow); - r.register(crystalBow); - cosmetics.values().forEach(r::register); - r.register(swapRing); - r.register(flowerBag); - r.register(phantomInk); - r.register(poolMinecart); - r.register(pinkinator); - r.register(infiniteFruit); - r.register(kingKey); - r.register(flugelEye); - r.register(thorRing); - r.register(odinRing); - r.register(lokiRing); - r.register(dice); - r.register(keepIvy); - r.register(blackHoleTalisman); - r.register(recordGaia1); - r.register(recordGaia2); - r.register(temperanceStone); - r.register(incenseStick); - r.register(terraAxe); - r.register(waterBowl); - r.register(obedienceStick); - r.register(cacophonium); - r.register(slimeBottle); - r.register(starSword); - r.register(exchangeRod); - r.register(magnetRingGreater); - r.register(thunderSword); - r.register(manaweaveHelm); - r.register(manaweaveChest); - r.register(manaweaveLegs); - r.register(manaweaveBoots); - r.register(autocraftingHalo); + register(r, new ItemSelfReturning(unstackable()), LibItemNames.PESTLE_AND_MORTAR); + register(r, new ItemTwigWand(unstackable()), LibItemNames.TWIG_WAND); + register(r, new ItemMod(defaultBuilder()), LibItemNames.MANASTEEL_INGOT); + register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_PEARL); + register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_DIAMOND); + register(r, new ItemMod(defaultBuilder()), LibItemNames.LIVINGWOOD_TWIG); + register(r, new ItemManaResource(defaultBuilder()), LibItemNames.TERRASTEEL_INGOT); + register(r, new ItemMod(defaultBuilder()), LibItemNames.LIFE_ESSENCE); + register(r, new ItemMod(defaultBuilder()), LibItemNames.REDSTONE_ROOT); + register(r, new ItemElven(defaultBuilder()), LibItemNames.ELEMENTIUM_INGOT); + register(r, new ItemElven(defaultBuilder()), LibItemNames.PIXIE_DUST); + register(r, new ItemElven(defaultBuilder()), LibItemNames.DRAGONSTONE); + register(r, new ItemSelfReturning(defaultBuilder()), LibItemNames.PLACEHOLDER); + register(r, new ItemMod(defaultBuilder()), LibItemNames.RED_STRING); + register(r, new ItemMod(defaultBuilder()), LibItemNames.DREAMWOOD_TWIG); + register(r, new ItemManaResource(defaultBuilder()), LibItemNames.GAIA_INGOT); + register(r, new ItemEnderAir(defaultBuilder()), LibItemNames.ENDER_AIR_BOTTLE); + register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_STRING); + register(r, new ItemMod(defaultBuilder()), LibItemNames.MANASTEEL_NUGGET); + register(r, new ItemMod(defaultBuilder()), LibItemNames.TERRASTEEL_NUGGET); + register(r, new ItemMod(defaultBuilder()), LibItemNames.ELEMENTIUM_NUGGET); + register(r, new ItemManaResource(defaultBuilder()), LibItemNames.LIVING_ROOT); + register(r, new ItemMod(defaultBuilder()), LibItemNames.PEBBLE); + register(r, new ItemMod(defaultBuilder()), LibItemNames.MANAWEAVE_CLOTH); + register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_POWDER); + register(r, new ItemLens(unstackable(), new Lens(), ItemLens.PROP_NONE), LibItemNames.LENS_NORMAL); + register(r, new ItemLens(unstackable(), new LensSpeed(), ItemLens.PROP_NONE), LibItemNames.LENS_SPEED); + register(r, new ItemLens(unstackable(), new LensPower(), ItemLens.PROP_POWER), LibItemNames.LENS_POWER); + register(r, new ItemLens(unstackable(), new LensTime(), ItemLens.PROP_NONE), LibItemNames.LENS_TIME); + register(r, new ItemLens(unstackable(), new LensEfficiency(), ItemLens.PROP_NONE), LibItemNames.LENS_EFFICIENCY); + register(r, new ItemLens(unstackable(), new LensBounce(), ItemLens.PROP_TOUCH), LibItemNames.LENS_BOUNCE); + register(r, new ItemLens(unstackable(), new LensGravity(), ItemLens.PROP_ORIENTATION), LibItemNames.LENS_GRAVITY); + register(r, new ItemLens(unstackable(), new LensMine(), ItemLens.PROP_TOUCH | ItemLens.PROP_ORIENTATION), LibItemNames.LENS_MINE); + register(r, new ItemLens(unstackable(), new LensDamage(), ItemLens.PROP_DAMAGE), LibItemNames.LENS_DAMAGE); + register(r, new ItemLens(unstackable(), new LensPhantom(), ItemLens.PROP_TOUCH), LibItemNames.LENS_PHANTOM); + register(r, new ItemLens(unstackable(), new LensMagnet(), ItemLens.PROP_ORIENTATION), LibItemNames.LENS_MAGNET); + register(r, new ItemLens(unstackable(), new LensExplosive(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION), LibItemNames.LENS_EXPLOSIVE); + register(r, new ItemLens(unstackable(), new LensInfluence(), ItemLens.PROP_NONE), LibItemNames.LENS_INFLUENCE); + register(r, new ItemLens(unstackable(), new LensWeight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION), LibItemNames.LENS_WEIGHT); + register(r, new ItemLens(unstackable(), new LensPaint(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION), LibItemNames.LENS_PAINT); + register(r, new ItemLens(unstackable(), new LensFire(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION), LibItemNames.LENS_FIRE); + register(r, new ItemLens(unstackable(), new LensPiston(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION), LibItemNames.LENS_PISTON); + register(r, new ItemLens(unstackable(), new LensLight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION), LibItemNames.LENS_LIGHT); + register(r, new ItemLens(unstackable(), new LensWarp(), ItemLens.PROP_NONE), LibItemNames.LENS_WARP); + register(r, new ItemLens(unstackable(), new LensRedirect(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION), LibItemNames.LENS_REDIRECT); + register(r, new ItemLens(unstackable(), new LensFirework(), ItemLens.PROP_TOUCH), LibItemNames.LENS_FIREWORK); + register(r, new ItemLens(unstackable(), new LensFlare(), ItemLens.PROP_CONTROL), LibItemNames.LENS_FLARE); + register(r, new ItemLens(unstackable(), new LensMessenger(), ItemLens.PROP_POWER), LibItemNames.LENS_MESSENGER); + register(r, new ItemLens(unstackable(), new LensTripwire(), ItemLens.PROP_CONTROL), LibItemNames.LENS_TRIPWIRE); + register(r, new ItemLens(unstackable(), new LensStorm(), ItemLens.PROP_NONE), LibItemNames.LENS_STORM); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_WATER); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_FIRE); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_EARTH); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_AIR); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_SPRING); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_SUMMER); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_AUTUMN); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_WINTER); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_MANA); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_LUST); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_GLUTTONY); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_GREED); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_SLOTH); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_WRATH); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_ENVY); + register(r, new ItemRune(defaultBuilder()), LibItemNames.RUNE_PRIDE); + register(r, new ItemManaTablet(unstackable()), LibItemNames.MANA_TABLET); + register(r, new ItemManaGun(unstackable().setNoRepair()), LibItemNames.MANA_GUN); + register(r, new ItemManaCookie(defaultBuilder().food(new Food.Builder().hunger(0).saturation(0.1F).effect(new EffectInstance(Effects.SATURATION, 20, 0), 1).build())), LibItemNames.MANA_COOKIE); + register(r, new ItemFertilizer(defaultBuilder()), LibItemNames.FERTILIZER); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.GRASS, defaultBuilder()), LibItemNames.GRASS_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.PODZOL, defaultBuilder()), LibItemNames.PODZOL_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.MYCEL, defaultBuilder()), LibItemNames.MYCEL_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.DRY, defaultBuilder()), LibItemNames.DRY_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.GOLDEN, defaultBuilder()), LibItemNames.GOLDEN_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.VIVID, defaultBuilder()), LibItemNames.VIVID_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.SCORCHED, defaultBuilder()), LibItemNames.SCORCHED_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.INFUSED, defaultBuilder()), LibItemNames.INFUSED_SEEDS); + register(r, new ItemGrassSeeds(IFloatingFlower.IslandType.MUTATED, defaultBuilder()), LibItemNames.MUTATED_SEEDS); + register(r, new ItemDirtRod(unstackable()), LibItemNames.DIRT_ROD); + register(r, new ItemTerraformRod(unstackable()), LibItemNames.TERRAFORM_ROD); + register(r, new ItemHorn(unstackable()), LibItemNames.GRASS_HORN); + register(r, new ItemHorn(unstackable()), LibItemNames.LEAVES_HORN); + register(r, new ItemHorn(unstackable()), LibItemNames.SNOW_HORN); + register(r, new ItemManaMirror(unstackable().defaultMaxDamage(1000).setNoRepair()), LibItemNames.MANA_MIRROR); + register(r, new ItemManasteelHelm(unstackable()), LibItemNames.MANASTEEL_HELM); + register(r, new ItemManasteelHelmRevealing(unstackable()), LibItemNames.MANASTEEL_HELM_R); + register(r, new ItemManasteelArmor(EquipmentSlotType.CHEST, unstackable()), LibItemNames.MANASTEEL_CHEST); + register(r, new ItemManasteelArmor(EquipmentSlotType.LEGS, unstackable()), LibItemNames.MANASTEEL_LEGS); + register(r, new ItemManasteelArmor(EquipmentSlotType.FEET, unstackable()), LibItemNames.MANASTEEL_BOOTS); + register(r, new ItemManasteelPick(unstackable()), LibItemNames.MANASTEEL_PICK); + register(r, new ItemManasteelShovel(unstackable()), LibItemNames.MANASTEEL_SHOVEL); + register(r, new ItemManasteelAxe(unstackable()), LibItemNames.MANASTEEL_AXE); + register(r, new ItemManasteelSword(unstackable()), LibItemNames.MANASTEEL_SWORD); + register(r, new ItemManasteelShears(unstackable()), LibItemNames.MANASTEEL_SHEARS); + register(r, new ItemTerrasteelHelm(unstackable()), LibItemNames.TERRASTEEL_HELM); + register(r, new ItemTerrasteelHelmRevealing(unstackable()), LibItemNames.TERRASTEEL_HELM_R); + register(r, new ItemTerrasteelArmor(EquipmentSlotType.CHEST, unstackable()), LibItemNames.TERRASTEEL_CHEST); + register(r, new ItemTerrasteelArmor(EquipmentSlotType.LEGS, unstackable()), LibItemNames.TERRASTEEL_LEGS); + register(r, new ItemTerrasteelArmor(EquipmentSlotType.FEET, unstackable()), LibItemNames.TERRASTEEL_BOOTS); + register(r, new ItemTerraSword(unstackable()), LibItemNames.TERRA_SWORD); + register(r, new ItemTinyPlanet(unstackable()), LibItemNames.TINY_PLANET); + register(r, new ItemManaRing(unstackable()), LibItemNames.MANA_RING); + register(r, new ItemAuraRing(unstackable()), LibItemNames.AURA_RING); + register(r, new ItemGreaterManaRing(unstackable()), LibItemNames.MANA_RING_GREATER); + register(r, new ItemGreaterAuraRing(unstackable()), LibItemNames.AURA_RING_GREATER); + register(r, new ItemTravelBelt(unstackable()), LibItemNames.TRAVEL_BELT); + register(r, new ItemKnockbackBelt(unstackable()), LibItemNames.KNOCKBACK_BELT); + register(r, new ItemIcePendant(unstackable()), LibItemNames.ICE_PENDANT); + register(r, new ItemLavaPendant(unstackable()), LibItemNames.LAVA_PENDANT); + register(r, new ItemMagnetRing(unstackable()), LibItemNames.MAGNET_RING); + register(r, new ItemWaterRing(unstackable()), LibItemNames.WATER_RING); + register(r, new ItemMiningRing(unstackable()), LibItemNames.MINING_RING); + register(r, new ItemTerraPick(unstackable()), LibItemNames.TERRA_PICK); + register(r, new ItemDivaCharm(unstackable()), LibItemNames.DIVA_CHARM); + register(r, new ItemFlightTiara(unstackable()), LibItemNames.FLIGHT_TIARA); + register(r, new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()), LibItemNames.ENDER_DAGGER); + register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_DARK); + register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_MANA); + register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_BLAZE); + register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_LAVENDER); + register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_RED); + register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_ELVEN); + register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_SUNNY); + register(r, new ItemWaterRod(unstackable()), LibItemNames.WATER_ROD); + register(r, new ItemElementiumHelm(unstackable()), LibItemNames.ELEMENTIUM_HELM); + register(r, new ItemElementiumHelmRevealing(unstackable()), LibItemNames.ELEMENTIUM_HELM_R); + register(r, new ItemElementiumChest(unstackable()), LibItemNames.ELEMENTIUM_CHEST); + register(r, new ItemElementiumLegs(unstackable()), LibItemNames.ELEMENTIUM_LEGS); + register(r, new ItemElementiumBoots(unstackable()), LibItemNames.ELEMENTIUM_BOOTS); + register(r, new ItemElementiumPick(unstackable()), LibItemNames.ELEMENTIUM_PICK); + register(r, new ItemElementiumShovel(unstackable()), LibItemNames.ELEMENTIUM_SHOVEL); + register(r, new ItemElementiumAxe(unstackable()), LibItemNames.ELEMENTIUM_AXE); + register(r, new ItemElementiumSword(unstackable()), LibItemNames.ELEMENTIUM_SWORD); + register(r, new ItemElementiumShears(unstackable()), LibItemNames.ELEMENTIUM_SHEARS); + register(r, new ItemOpenBucket(unstackable()), LibItemNames.OPEN_BUCKET); + register(r, new ItemSpawnerMover(unstackable()), LibItemNames.SPAWNER_MOVER); + register(r, new ItemPixieRing(unstackable()), LibItemNames.PIXIE_RING); + register(r, new ItemSuperTravelBelt(unstackable()), LibItemNames.SUPER_TRAVEL_BELT); + register(r, new ItemRainbowRod(unstackable()), LibItemNames.RAINBOW_ROD); + register(r, new ItemTornadoRod(unstackable()), LibItemNames.TORNADO_ROD); + register(r, new ItemFireRod(unstackable()), LibItemNames.FIRE_ROD); + register(r, new ItemVineBall(defaultBuilder()), LibItemNames.VINE_BALL); + register(r, new ItemSlingshot(unstackable()), LibItemNames.SLINGSHOT); + register(r, new ItemBottledMana(unstackable()), LibItemNames.MANA_BOTTLE); + register(r, new ItemLaputaShard(unstackable()), LibItemNames.LAPUTA_SHARD); + register(r, new ItemVirus(defaultBuilder()), LibItemNames.NECRO_VIRUS); + register(r, new ItemVirus(defaultBuilder()), LibItemNames.NULL_VIRUS); + register(r, new ItemReachRing(unstackable()), LibItemNames.REACH_RING); + register(r, new ItemSkyDirtRod(unstackable()), LibItemNames.SKY_DIRT_ROD); + register(r, new ItemItemFinder(unstackable()), LibItemNames.ITEM_FINDER); + register(r, new ItemSuperLavaPendant(unstackable()), LibItemNames.SUPER_LAVA_PENDANT); + register(r, new ItemEnderHand(unstackable()), LibItemNames.ENDER_HAND); + register(r, new ItemGlassPick(unstackable()), LibItemNames.GLASS_PICK); + register(r, new ItemSpark(defaultBuilder()), LibItemNames.SPARK); + register(r, new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.DISPERSIVE), LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.DISPERSIVE.name().toLowerCase(Locale.ROOT)); + register(r, new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.DOMINANT), LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.DOMINANT.name().toLowerCase(Locale.ROOT)); + register(r, new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.RECESSIVE), LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.RECESSIVE.name().toLowerCase(Locale.ROOT)); + register(r, new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.ISOLATED), LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.ISOLATED.name().toLowerCase(Locale.ROOT)); + register(r, new ItemDiviningRod(unstackable()), LibItemNames.DIVINING_ROD); + register(r, new ItemGravityRod(unstackable()), LibItemNames.GRAVITY_ROD); + register(r, new ItemManaInkwell(unstackable().setNoRepair()), LibItemNames.MANA_INKWELL); + register(r, new ItemVial(defaultBuilder()), LibItemNames.VIAL); + register(r, new ItemVial(defaultBuilder()), LibItemNames.FLASK); + register(r, new ItemBrewBase(unstackable(), 4, 32, new ItemStack(vial)), LibItemNames.BREW_VIAL); + register(r, new ItemBrewBase(unstackable(), 6, 24, new ItemStack(flask)), LibItemNames.BREW_FLASK); + register(r, new ItemBloodPendant(unstackable()), LibItemNames.BLOOD_PENDANT); + register(r, new ItemMissileRod(unstackable()), LibItemNames.MISSILE_ROD); + register(r, new ItemHolyCloak(unstackable()), LibItemNames.HOLY_CLOAK); + register(r, new ItemUnholyCloak(unstackable()), LibItemNames.UNHOLY_CLOAK); + register(r, new ItemBalanceCloak(unstackable()), LibItemNames.BALANCE_CLOAK); + register(r, new ItemCraftingHalo(unstackable()), LibItemNames.CRAFTING_HALO); + register(r, new ItemBlackLotus(defaultBuilder()), LibItemNames.BLACK_LOTUS); + register(r, new ItemBlackLotus(defaultBuilder()), LibItemNames.BLACKER_LOTUS); + register(r, new ItemMonocle(unstackable()), LibItemNames.MONOCLE); + register(r, new ItemMod(unstackable()), LibItemNames.CLIP); + register(r, new ItemCobbleRod(unstackable()), LibItemNames.COBBLE_ROD); + register(r, new ItemSmeltRod(unstackable()), LibItemNames.SMELT_ROD); + register(r, new ItemWorldSeed(defaultBuilder()), LibItemNames.WORLD_SEED); + register(r, new ItemSpellCloth(unstackable().defaultMaxDamage(35).setNoRepair()), LibItemNames.SPELL_CLOTH); + register(r, new ItemThornChakram(defaultBuilder().maxStackSize(6)), LibItemNames.THORN_CHAKRAM); + register(r, new ItemThornChakram(defaultBuilder().maxStackSize(6)), LibItemNames.FLARE_CHAKRAM); + register(r, new ItemOvergrowthSeed(defaultBuilder()), LibItemNames.OVERGROWTH_SEED); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_1_1, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "1_1"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_2_2, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "2_2"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_1_2, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "1_2"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_2_1, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "2_1"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_1_3, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "1_3"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_3_1, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "3_1"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_2_3, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "2_3"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_3_2, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "3_2"); + register(r, new ItemCraftPattern(CratePattern.CRAFTY_DONUT, unstackable()), LibItemNames.CRAFT_PATTERN_PREFIX + "donut"); + register(r, new ItemAncientWill(IAncientWillContainer.AncientWillType.AHRIM, unstackable()), LibItemNames.ANCIENT_WILL_PREFIX + "ahrim"); + register(r, new ItemAncientWill(IAncientWillContainer.AncientWillType.DHAROK, unstackable()), LibItemNames.ANCIENT_WILL_PREFIX + "dharok"); + register(r, new ItemAncientWill(IAncientWillContainer.AncientWillType.GUTHAN, unstackable()), LibItemNames.ANCIENT_WILL_PREFIX + "guthan"); + register(r, new ItemAncientWill(IAncientWillContainer.AncientWillType.TORAG, unstackable()), LibItemNames.ANCIENT_WILL_PREFIX + "torag"); + register(r, new ItemAncientWill(IAncientWillContainer.AncientWillType.VERAC, unstackable()), LibItemNames.ANCIENT_WILL_PREFIX + "verac"); + register(r, new ItemAncientWill(IAncientWillContainer.AncientWillType.KARIL, unstackable()), LibItemNames.ANCIENT_WILL_PREFIX + "karil"); + register(r, new ItemCorporeaSpark(defaultBuilder()), LibItemNames.CORPOREA_SPARK); + register(r, new ItemCorporeaSpark(defaultBuilder()), LibItemNames.CORPOREA_SPARK_MASTER); + register(r, new ItemLivingwoodBow(defaultBuilder().defaultMaxDamage(500)), LibItemNames.LIVINGWOOD_BOW); + register(r, new ItemCrystalBow(defaultBuilder().defaultMaxDamage(500)), LibItemNames.CRYSTAL_BOW); + + for(ItemBaubleCosmetic.Variant v : ItemBaubleCosmetic.Variant.values()) { + register(r, new ItemBaubleCosmetic(v, unstackable()), LibItemNames.COSMETIC_PREFIX + v.name().toLowerCase(Locale.ROOT)); + } + + register(r, new ItemSwapRing(unstackable()), LibItemNames.SWAP_RING); + register(r, new ItemFlowerBag(unstackable()), LibItemNames.FLOWER_BAG); + register(r, new ItemMod(defaultBuilder()), LibItemNames.PHANTOM_INK); + register(r, new ItemPoolMinecart(unstackable()), LibItemNames.POOL_MINECART); + register(r, new ItemPinkinator(unstackable()), LibItemNames.PINKINATOR); + register(r, new ItemInfiniteFruit(unstackable()), LibItemNames.INFINITE_FRUIT); + register(r, new ItemKingKey(unstackable()), LibItemNames.KING_KEY); + register(r, new ItemFlugelEye(unstackable()), LibItemNames.FLUGEL_EYE); + register(r, new ItemThorRing(unstackable()), LibItemNames.THOR_RING); + register(r, new ItemOdinRing(unstackable()), LibItemNames.ODIN_RING); + register(r, new ItemLokiRing(unstackable()), LibItemNames.LOKI_RING); + register(r, new ItemDice(unstackable()), LibItemNames.DICE); + register(r, new ItemKeepIvy(defaultBuilder()), LibItemNames.KEEP_IVY); + register(r, new ItemBlackHoleTalisman(unstackable()), LibItemNames.BLACK_HOLE_TALISMAN); + register(r, new ItemModRecord(1, ModSounds.gaiaMusic1, unstackable()), LibItemNames.RECORD_GAIA1); + register(r, new ItemModRecord(1, ModSounds.gaiaMusic2, unstackable()), LibItemNames.RECORD_GAIA2); + register(r, new ItemTemperanceStone(unstackable()), LibItemNames.TEMPERANCE_STONE); + register(r, new ItemIncenseStick(unstackable()), LibItemNames.INCENSE_STICK); + register(r, new ItemTerraAxe(unstackable()), LibItemNames.TERRA_AXE); + register(r, new ItemWaterBowl(unstackable()), LibItemNames.WATER_BOWL); + register(r, new ItemObedienceStick(unstackable()), LibItemNames.OBEDIENCE_STICK); + register(r, new ItemCacophonium(unstackable()), LibItemNames.CACOPHONIUM); + register(r, new ItemSlimeBottle(unstackable()), LibItemNames.SLIME_BOTTLE); + register(r, new ItemStarSword(unstackable()), LibItemNames.STAR_SWORD); + register(r, new ItemExchangeRod(unstackable()), LibItemNames.EXCHANGE_ROD); + register(r, new ItemGreaterMagnetRing(unstackable()), LibItemNames.MAGNET_RING_GREATER); + register(r, new ItemThunderSword(unstackable()), LibItemNames.THUNDER_SWORD); + register(r, new ItemManaweaveHelm(unstackable()), LibItemNames.MANAWEAVE_HELM); + register(r, new ItemManaweaveArmor(EquipmentSlotType.CHEST, unstackable()), LibItemNames.MANAWEAVE_CHEST); + register(r, new ItemManaweaveArmor(EquipmentSlotType.LEGS, unstackable()), LibItemNames.MANAWEAVE_LEGS); + register(r, new ItemManaweaveArmor(EquipmentSlotType.FEET, unstackable()), LibItemNames.MANAWEAVE_BOOTS); + register(r, new ItemAutocraftingHalo(unstackable()), LibItemNames.AUTOCRAFTING_HALO); Item head = new ItemGaiaHead(ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall, defaultBuilder().setTEISR(() -> RenderTileGaiaHead.TEISR::new)); - r.register(head.setRegistryName(ModBlocks.gaiaHead.getRegistryName())); - r.register(sextant); - r.register(speedUpBelt); - r.register(baubleBox); - r.register(dodgeRing); - r.register(invisibilityCloak); - r.register(cloudPendant); - r.register(superCloudPendant); - r.register(thirdEye); + register(r, head, ModBlocks.gaiaHead.getRegistryName()); + register(r, new ItemSextant(unstackable()), LibItemNames.SEXTANT); + register(r, new ItemSpeedUpBelt(unstackable()), LibItemNames.SPEED_UP_BELT); + register(r, new ItemBaubleBox(unstackable()), LibItemNames.BAUBLE_BOX); + register(r, new ItemDodgeRing(unstackable()), LibItemNames.DODGE_RING); + register(r, new ItemInvisibilityCloak(unstackable()), LibItemNames.INVISIBILITY_CLOAK); + register(r, new ItemCloudPendant(unstackable()), LibItemNames.CLOUD_PENDANT); + register(r, new ItemSuperCloudPendant(unstackable()), LibItemNames.SUPER_CLOUD_PENDANT); + register(r, new ItemThirdEye(unstackable()), LibItemNames.THIRD_EYE); register(r, new ItemAstrolabe(unstackable()), LibItemNames.ASTROLABE); register(r, new ItemGoddessCharm(unstackable()), LibItemNames.GODDESS_CHARM); @@ -702,23 +725,23 @@ public final class ModItems { @SubscribeEvent public static void registerRecipeSerializers(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); - r.register(AncientWillRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "ancient_will_attach"))); - r.register(ArmorUpgradeRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "armor_upgrade"))); - r.register(BlackHoleTalismanExtractRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "black_hole_talisman_extract"))); - r.register(CompositeLensRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "composite_lens"))); - r.register(CosmeticAttachRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "cosmetic_attach"))); - r.register(CosmeticRemoveRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "cosmetic_remove"))); - r.register(HelmRevealingRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "helm_revealing"))); - r.register(KeepIvyRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "keep_ivy"))); - r.register(LensDyeingRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "lens_dye"))); - r.register(ManaGunClipRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_gun_add_clip"))); - r.register(ManaGunLensRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_gun_add_lens"))); - r.register(ManaGunRemoveLensRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_gun_remove_lens"))); - r.register(ManaUpgradeRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_upgrade"))); - r.register(ShapelessManaUpgradeRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "mana_upgrade_shapeless"))); - r.register(PhantomInkRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "phantom_ink_apply"))); - r.register(SpellClothRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "spell_cloth_apply"))); - r.register(TerraPickTippingRecipe.SERIALIZER.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "terra_pick_tipping"))); + register(r, AncientWillRecipe.SERIALIZER, "ancient_will_attach"); + register(r, ArmorUpgradeRecipe.SERIALIZER, "armor_upgrade"); + register(r, BlackHoleTalismanExtractRecipe.SERIALIZER, "black_hole_talisman_extract"); + register(r, CompositeLensRecipe.SERIALIZER, "composite_lens"); + register(r, CosmeticAttachRecipe.SERIALIZER, "cosmetic_attach"); + register(r, CosmeticRemoveRecipe.SERIALIZER, "cosmetic_remove"); + register(r, HelmRevealingRecipe.SERIALIZER, "helm_revealing"); + register(r, KeepIvyRecipe.SERIALIZER, "keep_ivy"); + register(r, LensDyeingRecipe.SERIALIZER, "lens_dye"); + register(r, ManaGunClipRecipe.SERIALIZER, "mana_gun_add_clip"); + register(r, ManaGunLensRecipe.SERIALIZER, "mana_gun_add_lens"); + register(r, ManaGunRemoveLensRecipe.SERIALIZER, "mana_gun_remove_lens"); + register(r, ManaUpgradeRecipe.SERIALIZER, "mana_upgrade"); + register(r, ShapelessManaUpgradeRecipe.SERIALIZER, "mana_upgrade_shapeless"); + register(r, PhantomInkRecipe.SERIALIZER, "phantom_ink_apply"); + register(r, SpellClothRecipe.SERIALIZER, "spell_cloth_apply"); + register(r, TerraPickTippingRecipe.SERIALIZER, "terra_pick_tipping"); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index b2226881b..303e685f0 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -134,8 +134,8 @@ public class ItemBrewBase extends ItemMod implements IBrewItem { @Nonnull @Override public ITextComponent getDisplayName(@Nonnull ItemStack stack) { - ITextComponent cmp = new TranslationTextComponent(getTranslationKey(), new TranslationTextComponent(getBrew(stack).getUnlocalizedName(stack))); - cmp.appendSibling(new StringTextComponent(Integer.toString(getSwigsLeft(stack))).applyTextStyle(TextFormatting.BOLD)); + ITextComponent cmp = new TranslationTextComponent(getTranslationKey(), new TranslationTextComponent(getBrew(stack).getUnlocalizedName(stack)), + new StringTextComponent(Integer.toString(getSwigsLeft(stack))).applyTextStyle(TextFormatting.BOLD)); return cmp; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 56ab59b32..92bb6061c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -97,6 +97,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { for(int i = 0; i < SUBTYPES + 1; i++) { ItemStack stack = new ItemStack(this); ItemNBTHelper.setInt(stack, TAG_VARIANT, i); + list.add(stack); } } } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 1242a845f..b77dd9578 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1389,7 +1389,7 @@ public final class LexiconData { challenges = new BasicLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); challenges.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")).setPriority() - .setIcon(new ItemStack(ModItems.cosmetics.get(ItemBaubleCosmetic.Variant.QUESTGIVER_MARK))); + .setIcon(new ItemStack(ModItems.questgiverMark)); cacophonium = new BasicLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); cacophonium.setLexiconPages(new PageText("0"), diff --git a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java index d73c935bd..28d454408 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java @@ -28,7 +28,7 @@ public class WelcomeLexiconEntry extends BasicLexiconEntry { public WelcomeLexiconEntry() { super(LibLexicon.BASICS_WELCOME, BotaniaAPI.categoryBasics); setPriority(); - setIcon(new ItemStack(ModItems.cosmetics.get(ItemBaubleCosmetic.Variant.QUESTGIVER_MARK))); + setIcon(new ItemStack(ModItems.questgiverMark)); LexiconPage[] pages = new LexiconPage[PAGES]; for(int i = 0; i < PAGES; i++) diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 6b9aeedfd..ae81cc331 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -19,12 +19,24 @@ public final class LibItemNames { public static final String DYE_SUFFIX = "_" + DYE; public static final String PESTLE_AND_MORTAR = "pestle_and_mortar"; public static final String TWIG_WAND = "twig_wand"; - public static final String[] RUNE_NAMES = { - "rune_water", "rune_fire", "rune_earth", "rune_air", - "rune_spring", "rune_summer", "rune_autumn", "rune_winter", - "rune_mana", - "rune_lust", "rune_gluttony", "rune_greed", "rune_sloth", "rune_wrath", "rune_envy", "rune_pride" - }; + + public static final String RUNE_WATER = "rune_water"; + public static final String RUNE_FIRE = "rune_fire"; + public static final String RUNE_EARTH = "rune_earth"; + public static final String RUNE_AIR = "rune_air"; + public static final String RUNE_SPRING = "rune_spring"; + public static final String RUNE_SUMMER = "rune_summer"; + public static final String RUNE_AUTUMN = "rune_autumn"; + public static final String RUNE_WINTER = "rune_winter"; + public static final String RUNE_MANA = "rune_mana"; + public static final String RUNE_LUST = "rune_lust"; + public static final String RUNE_GLUTTONY = "rune_gluttony"; + public static final String RUNE_GREED = "rune_greed"; + public static final String RUNE_SLOTH = "rune_sloth"; + public static final String RUNE_WRATH = "rune_wrath"; + public static final String RUNE_ENVY = "rune_envy"; + public static final String RUNE_PRIDE = "rune_pride"; + public static final String MANA_TABLET = "mana_tablet"; public static final String MANA_GUN = "mana_gun"; public static final String MANA_COOKIE = "mana_cookie"; @@ -74,15 +86,15 @@ public final class LibItemNames { public static final String DIVA_CHARM = "diva_charm"; public static final String FLIGHT_TIARA = "flight_tiara"; public static final String ENDER_DAGGER = "ender_dagger"; - public static final String[] QUARTZ_NAMES = { - "quartz_dark", - "quartz_mana", - "quartz_blaze", - "quartz_lavender", - "quartz_red", - "quartz_elven", - "quartz_sunny" - }; + + public static final String QUARTZ_DARK = "quartz_dark"; + public static final String QUARTZ_MANA = "quartz_mana"; + public static final String QUARTZ_BLAZE = "quartz_blaze"; + public static final String QUARTZ_LAVENDER = "quartz_lavender"; + public static final String QUARTZ_RED = "quartz_red"; + public static final String QUARTZ_ELVEN = "quartz_elven"; + public static final String QUARTZ_SUNNY = "quartz_sunny"; + public static final String WATER_ROD = "water_rod"; public static final String ELEMENTIUM_HELM = "elementium_helmet"; public static final String ELEMENTIUM_CHEST = "elementium_chestplate"; @@ -192,58 +204,54 @@ public final class LibItemNames { public static final String ASTROLABE = "astrolabe"; public static final String GODDESS_CHARM = "goddess_charm"; - public static final String[] LENS_NAMES = new String[] { - "lens_normal", - "lens_speed", - "lens_power", - "lens_time", - "lens_efficiency", - "lens_bounce", - "lens_gravity", - "lens_mine", - "lens_damage", - "lens_phantom", - "lens_magnet", - "lens_explosive", - "lens_influence", - "lens_weight", - "lens_paint", - "lens_fire", - "lens_piston", - "lens_light", - "lens_warp", - "lens_redirect", - "lens_firework", - "lens_flare", - "lens_messenger", - "lens_tripwire", - "lens_storm" - }; + public static final String LENS_NORMAL = "lens_normal"; + public static final String LENS_SPEED = "lens_speed"; + public static final String LENS_POWER = "lens_power"; + public static final String LENS_TIME = "lens_time"; + public static final String LENS_EFFICIENCY = "lens_efficiency"; + public static final String LENS_BOUNCE = "lens_bounce"; + public static final String LENS_GRAVITY = "lens_gravity"; + public static final String LENS_MINE = "lens_mine"; + public static final String LENS_DAMAGE = "lens_damage"; + public static final String LENS_PHANTOM = "lens_phantom"; + public static final String LENS_MAGNET = "lens_magnet"; + public static final String LENS_EXPLOSIVE = "lens_explosive"; + public static final String LENS_INFLUENCE = "lens_influence"; + public static final String LENS_WEIGHT = "lens_weight"; + public static final String LENS_PAINT = "lens_paint"; + public static final String LENS_FIRE = "lens_fire"; + public static final String LENS_PISTON = "lens_piston"; + public static final String LENS_LIGHT = "lens_light"; + public static final String LENS_WARP = "lens_warp"; + public static final String LENS_REDIRECT = "lens_redirect"; + public static final String LENS_FIREWORK = "lens_firework"; + public static final String LENS_FLARE = "lens_flare"; + public static final String LENS_MESSENGER = "lens_messenger"; + public static final String LENS_TRIPWIRE = "lens_tripwire"; + public static final String LENS_STORM = "lens_storm"; - public static final String[] MANA_RESOURCE_NAMES = new String[] { - "manasteel_ingot", - "mana_pearl", - "mana_diamond", - "livingwood_twig", - "terrasteel_ingot", - "life_essence", - "redstone_root", - "elementium_ingot", - "pixie_dust", - "dragonstone", - "UNUSED", - "placeholder", - "red_string", - "dreamwood_twig", - "gaia_ingot", - "ender_air_bottle", - "mana_string", - "manasteel_nugget", - "terrasteel_nugget", - "elementium_nugget", - "living_root", - "pebble", - "manaweave_cloth", - "mana_powder" - }; + public static final String MANASTEEL_INGOT = "manasteel_ingot"; + public static final String MANA_PEARL = "mana_pearl"; + public static final String MANA_DIAMOND = "mana_diamond"; + public static final String LIVINGWOOD_TWIG = "livingwood_twig"; + public static final String TERRASTEEL_INGOT = "terrasteel_ingot"; + public static final String LIFE_ESSENCE = "life_essence"; + public static final String REDSTONE_ROOT = "redstone_root"; + public static final String ELEMENTIUM_INGOT = "elementium_ingot"; + public static final String PIXIE_DUST = "pixie_dust"; + public static final String DRAGONSTONE = "dragonstone"; + public static final String PLACEHOLDER = "placeholder"; + public static final String RED_STRING = "red_string"; + public static final String DREAMWOOD_TWIG = "dreamwood_twig"; + public static final String GAIA_INGOT = "gaia_ingot"; + public static final String ENDER_AIR_BOTTLE = "ender_air_bottle"; + public static final String MANA_STRING = "mana_string"; + public static final String MANASTEEL_NUGGET = "manasteel_nugget"; + public static final String TERRASTEEL_NUGGET = "terrasteel_nugget"; + public static final String ELEMENTIUM_NUGGET = "elementium_nugget"; + public static final String LIVING_ROOT = "living_root"; + public static final String PEBBLE = "pebble"; + public static final String MANAWEAVE_CLOTH = "manaweave_cloth"; + public static final String MANA_POWDER = "mana_powder"; + } diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index b643ca3c4..0df4ac939 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -757,7 +757,7 @@ "item.botania.mining_ring": "Ring des Erdmantels", "item.botania.terra_pick": "Terra-Brecher", "item.botania.diva_charm": "Talisman der Diva", - "item.botania.flighttiara": "Flügel-Tiara", + "item.botania.flight_tiara": "Flügel-Tiara", "item.botania.lens_influence": "Manalinse: Einfluss", "item.botania.lens_influence.short": "Einfluss", "item.botania.lens_weight": "Manalinse: Gewichtung", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 4b9e839a6..798f0834c 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -235,15 +235,15 @@ "botania.animatedTorch.rotate": "Rotate", "botania.animatedTorch.random": "Random", - "botania.armorset.manasteel": "Mana Affinity", + "botania.armorset.manasteel.name": "Mana Affinity", "botania.armorset.manasteel.desc": "10%% less Mana cost on Mana Tools and Rods", - "botania.armorset.elementium": "Great Fairy's Blessing", + "botania.armorset.elementium.name": "Great Fairy's Blessing", "botania.armorset.elementium.desc": "Chance for pixies to apply potion effects", - "botania.armorset.terrasteel": "Will of the Ancients", + "botania.armorset.terrasteel.name": "Will of the Ancients", "botania.armorset.terrasteel.desc0": "20%% less Mana cost on Mana Tools and Rods", "botania.armorset.terrasteel.desc1": "Regen even if hunger isn't topped off", "botania.armorset.terrasteel.desc2": "Passive Mana generation on Mana Tablets", - "botania.armorset.manaweave": "Manatide Prowess", + "botania.armorset.manaweave.name": "Manatide Prowess", "botania.armorset.manaweave.desc0": "35%% less Mana cost on Mana Tools and Rods", "botania.armorset.manaweave.desc1": "Increased proficiency with Magical Rods", @@ -437,10 +437,10 @@ "botania.baubletype.belt": "Equippable in the \u00a7aBelt\u00a77 slot", "botania.baubletooltip": "Press \u00a7b%s\u00a77 to open the Baubles menu", - "item.dice.poem0": "He deals the cards to find the answer,", - "item.dice.poem1": "The sacred geometry of chance,", - "item.dice.poem2": "The hidden laws of a probable outcome,", - "item.dice.poem3": "The numbers lead a dance.", + "item.botania.dice.poem0": "He deals the cards to find the answer,", + "item.botania.dice.poem1": "The sacred geometry of chance,", + "item.botania.dice.poem2": "The hidden laws of a probable outcome,", + "item.botania.dice.poem3": "The numbers lead a dance.", "death.attack.botania-relic": "%s was punished for using a relic that isn't theirs", @@ -1343,7 +1343,7 @@ "item.botania.reach_ring": "Ring of Far Reach", "item.botania.terra_pick": "Terra Shatterer", "item.botania.diva_charm": "Charm of the Diva", - "item.botania.flighttiara": "Flügel Tiara", + "item.botania.flight_tiara": "Flügel Tiara", "item.botania.ender_dagger": "Soulscribe", "item.botania.quartz_dark": "Smokey Quartz", "item.botania.quartz_mana": "Mana Quartz", @@ -1552,12 +1552,12 @@ "botania.brew.warpWard": "Sane Thoughts", "botania.brew.clear": "Absolution", - "botania.potion.soulCross": "Soul Cross", - "botania.potion.featherFeet": "Feather Feet", - "botania.potion.emptiness": "Emptiness", - "botania.potion.bloodthirst": "Bloodthirst", - "botania.potion.allure": "Allure", - "botania.potion.clear": "Absolution", + "effect.botania.soul_cross": "Soul Cross", + "effect.botania.feather_feet": "Feather Feet", + "effect.botania.emptiness": "Emptiness", + "effect.botania.bloodthirst": "Bloodthirst", + "effect.botania.allure": "Allure", + "effect.botania.clear": "Absolution", "botania.gui.lexicon.header": "Lexica Botania, %s Edition Table of Contents", "botania.gui.lexicon.wip": "(This entry is a Work In Progress. It's not even its final form)", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index da824d743..6cf2e79c7 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -192,11 +192,11 @@ "botania.wings8": "Alas: Mega ultra pollo", "botania.wings9": "Alas: El único", - "botania.armorset.manasteel": "Afinidad por el maná", + "botania.armorset.manasteel.name": "Afinidad por el maná", "botania.armorset.manasteel.desc": "10% descuento del coste de maná en la herramientas de maná", - "botania.armorset.elementium": "Bendición de la gran hada", + "botania.armorset.elementium.name": "Bendición de la gran hada", "botania.armorset.elementium.desc": "Probabilidad de la hadas de otorgar efectos de poción", - "botania.armorset.terrasteel": "El legado de los antiguos", + "botania.armorset.terrasteel.name": "El legado de los antiguos", "botania.armorset.terrasteel.desc0": "20% descuento del coste de maná en la herramientas de maná", "botania.armorset.terrasteel.desc1": "Regenera incluso si el hambre no está saciada.", "botania.armorset.will_ahrim.desc": "Los golpes críticos infligen un fuerte efecto de debilidad (Legado de Ahrim)", @@ -317,10 +317,10 @@ "botania.baubletype.belt": "Equipable en la ranura para &acinturón&7", "botania.baubletooltip": "Oprime la &b%s&7 para abrir el menú de ornamentos", - "item.dice.poem0": "Echa las cartas para encontrar respuesta,", - "item.dice.poem1": "La sagrada geometría del azar,", - "item.dice.poem2": "Ocultas leyes de un resultado probable,", - "item.dice.poem3": "los números no dejan de danzar.", + "item.botania.dice.poem0": "Echa las cartas para encontrar respuesta,", + "item.botania.dice.poem1": "La sagrada geometría del azar,", + "item.botania.dice.poem2": "Ocultas leyes de un resultado probable,", + "item.botania.dice.poem3": "los números no dejan de danzar.", "death.attack.botania-relic": "%s ha sido castigado por usar una reliquia que no es suya", @@ -1120,7 +1120,7 @@ "item.botania.reach_ring": "Anillo de alcance lejano", "item.botania.terra_pick": "Destructor de Terra", "item.botania.diva_charm": "Amuleto de la diva", - "item.botania.flighttiara": "Tiara de los Flügel", + "item.botania.flight_tiara": "Tiara de los Flügel", "item.botania.ender_dagger": "Escribalma", "item.botania.quartz_dark": "Cuarzo ahumado", "item.botania.quartz_mana": "Cuarzo de maná", @@ -1303,12 +1303,12 @@ "botania.brew.warpWard": "pensamientos cuerdos", "botania.brew.clear": "absolución", - "botania.potion.soulCross": "Cruz de alma", - "botania.potion.featherFeet": "Pies de pluma", - "botania.potion.emptiness": "Vacio", - "botania.potion.bloodthirst": "Sed de sangre", - "botania.potion.allure": "Atracción", - "botania.potion.clear": "Absolución", + "effect.botania.soul_cross": "Cruz de alma", + "effect.botania.feather_feet": "Pies de pluma", + "effect.botania.emptiness": "Vacio", + "effect.botania.bloodthirst": "Sed de sangre", + "effect.botania.allure": "Atracción", + "effect.botania.clear": "Absolución", "botania.gui.lexicon.header": "Lexica Botania, %s edición tabla de contenidos", "botania.gui.lexicon.wip": "(Esta entrada es Trabajo en Curso. No está en su forma final)", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index 41709fd8b..4cea8545f 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -191,11 +191,11 @@ "botania.wings8": "Wings: Méga ultra poulet", "botania.wings9": "Wings: The One", - "botania.armorset.manasteel": "Affinité au mana", + "botania.armorset.manasteel.name": "Affinité au mana", "botania.armorset.manasteel.desc": "10% de mana en moins sur les outils à mana", - "botania.armorset.elementium": "La bénédiction de la grande fée", + "botania.armorset.elementium.name": "La bénédiction de la grande fée", "botania.armorset.elementium.desc": "Chance pour les elfes d'appliquer les effets de potion", - "botania.armorset.terrasteel": "Volonté des ancients", + "botania.armorset.terrasteel.name": "Volonté des ancients", "botania.armorset.terrasteel.desc0": "20% de mana en moins sur les outils à mana", "botania.armorset.terrasteel.desc1": "Régénère même si la faim n'est pas complète", "botania.armorset.will_ahrim.desc": "Les coups critiques appliquent un fort effet de faiblesse (Volonté d'Ahrim)", @@ -984,7 +984,7 @@ "item.botania.reach_ring": "Anneau de portée lointaine", "item.botania.terra_pick": "Voleur en éclat de terre", "item.botania.diva_charm": "Charme de la diva", - "item.botania.flighttiara": "Flügel Tiara", + "item.botania.flight_tiara": "Flügel Tiara", "item.botania.ender_dagger": "Scribe d'âme", "item.botania.quartz_dark": "Quartz fumé", "item.botania.quartz_mana": "Quartz de mana", @@ -1163,12 +1163,12 @@ "botania.brew.warpWard": "Pensées saines", "botania.brew.clear": "Absolution", - "botania.potion.soulCross": "Croisée d'âme", - "botania.potion.featherFeet": "Pied de plume", - "botania.potion.emptiness": "Vide", - "botania.potion.bloodthirst": "Sanguinaire", - "botania.potion.allure": "Charme", - "botania.potion.clear": "Absolution", + "effect.botania.soul_cross": "Croisée d'âme", + "effect.botania.feather_feet": "Pied de plume", + "effect.botania.emptiness": "Vide", + "effect.botania.bloodthirst": "Sanguinaire", + "effect.botania.allure": "Charme", + "effect.botania.clear": "Absolution", "botania.gui.lexicon.header": "Lexica Botania, Edition %s Table des matières", "botania.gui.lexicon.wip": "(Ce passage est un travail en cours. Ce n'est même pas sa forme finale)", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index b67829344..da12e3a3f 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -1087,7 +1087,7 @@ "item.botania.reach_ring": "広範の指輪", "item.botania.terra_pick": "テラシャッタラー", "item.botania.diva_charm": "歌姫のお守り", - "item.botania.flighttiara": "フリューゲルのティアラ", + "item.botania.flight_tiara": "フリューゲルのティアラ", "item.botania.ender_dagger": "ソウルスクライブ", "item.botania.quartz_dark": "煙がかったクォーツ", "item.botania.quartz_mana": "マナクォーツ", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index 05617f0ca..32f363831 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -196,14 +196,14 @@ "botania.wings8": "날개: 메가 울트라 치킨", "botania.wings9": "날개: 더 원", - "botania.armorset.manasteel": "마나의 친구", + "botania.armorset.manasteel.name": "마나의 친구", "botania.armorset.manasteel.desc": "마나를 사용하는 도구들의 마나 사용량이 10% 감소합니다.", - "botania.armorset.elementium": "위대한 요정의 축복", + "botania.armorset.elementium.name": "위대한 요정의 축복", "botania.armorset.elementium.desc": "픽시의 포션 효과가 변경됩니다.", - "botania.armorset.terrasteel": "고대의 의지", + "botania.armorset.terrasteel.name": "고대의 의지", "botania.armorset.terrasteel.desc0": "마나를 사용하는 도구들의 마나 사용량이 20% 감소합니다.", "botania.armorset.terrasteel.desc1": "포만도와 상관없이 채력이 차오릅니다.", - "botania.armorset.manaweave": "마나타이드의 솜씨", + "botania.armorset.manaweave.name": "마나타이드의 솜씨", "botania.armorset.manaweave.desc0": "마나를 사용하는 도구들의 마나 사용량이 35% 감소합니다.", "botania.armorset.manaweave.desc1": "마법막대들의 효율증가", @@ -321,10 +321,10 @@ "botania.baubletype.belt": "&a벨트&7 슬릇에 착용 가능", "botania.baubletooltip": "&b%s&7로 버블즈 인벤토리를 여세요", - "item.dice.poem0": "그는 카드를 명상을 하듯 다루지,", - "item.dice.poem1": "그 신성한 승산의 기하학,", - "item.dice.poem2": "그럴 듯한 결과의 숨겨진 규칙,", - "item.dice.poem3": "숫자들은 춤을 추는 군요.", + "item.botania.dice.poem0": "그는 카드를 명상을 하듯 다루지,", + "item.botania.dice.poem1": "그 신성한 승산의 기하학,", + "item.botania.dice.poem2": "그럴 듯한 결과의 숨겨진 규칙,", + "item.botania.dice.poem3": "숫자들은 춤을 추는 군요.", "death.attack.botania-relic": "%s은(는) 타인 소유의 유물에 욕심을 내 천벌이 내려졌습니다.", @@ -1079,7 +1079,7 @@ "item.botania.reach_ring": "장거리의 반지", "item.botania.terra_pick": "대지 파괴", "item.botania.diva_charm": "디바의 매력", - "item.botania.flighttiara": "플뤼겔 티아라", + "item.botania.flight_tiara": "플뤼겔 티아라", "item.botania.ender_dagger": "영혼 스크라이브", "item.botania.quartz_dark": "스모키 석영", "item.botania.quartz_mana": "마나석영", @@ -1269,12 +1269,12 @@ "botania.brew.warpWard": "온전한 정신", "botania.brew.clear": "면죄", - "botania.potion.soulCross": "소울 크로스", - "botania.potion.featherFeet": "가벼운 착지", - "botania.potion.emptiness": "공허", - "botania.potion.bloodthirst": "피의 열망", - "botania.potion.allure": "매력", - "botania.potion.clear": "면죄", + "effect.botania.soul_cross": "소울 크로스", + "effect.botania.feather_feet": "가벼운 착지", + "effect.botania.emptiness": "공허", + "effect.botania.bloodthirst": "피의 열망", + "effect.botania.allure": "매력", + "effect.botania.clear": "면죄", "botania.gui.lexicon.header": "보타니아 사전, %s 번째 제본판 목차 - 배우길 원하는 카테고리를 클릭하세요. :", "botania.gui.lexicon.wip": "(이 부분은 작성중입니다. 내용이 완전하지 않을수도 있습니다.)", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index 531536670..53c16724e 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -203,14 +203,14 @@ "botania.wings8": "Vleugels: Hele Grote Kip", "botania.wings9": "Vleugels: De Juiste", - "botania.armorset.manasteel": "Mana Affiniteit", + "botania.armorset.manasteel.name": "Mana Affiniteit", "botania.armorset.manasteel.desc": "10% minder Mana kosten voor Mana gereedschap en staven", - "botania.armorset.elementium": "Grote Elfjes Zegen", + "botania.armorset.elementium.name": "Grote Elfjes Zegen", "botania.armorset.elementium.desc": "Kans voor Elfjes om effect van Dranken te geven", - "botania.armorset.terrasteel": "Wil der Ouden", + "botania.armorset.terrasteel.name": "Wil der Ouden", "botania.armorset.terrasteel.desc0": "20% minder Mana kosten voor Mana gereedschap en staven", "botania.armorset.terrasteel.desc1": "Herstel ook als honger niet is afgevuld", - "botania.armorset.manaweave": "Manavloed Moed", + "botania.armorset.manaweave.name": "Manavloed Moed", "botania.armorset.manaweave.desc0": "35% minder Mana kosten voor Mana Gereedschappen en Staven", "botania.armorset.manaweave.desc1": "Betere bekwaamheid met Magische Staven", @@ -285,10 +285,10 @@ "botania.baubletype.belt": "Te gebruiken in het &aRiem&7 slot", "botania.baubletooltip": "Druk &b%s&7 om het Baubles menu te openen", - "item.dice.poem0": "Hij deelt de kaarten om het antwoord te vinden", - "item.dice.poem1": "De heilige geometrie van de kans", - "item.dice.poem2": "De verborgen wetten van waarschijnlijkheid", - "item.dice.poem3": "De nummers leiden de dans", + "item.botania.dice.poem0": "Hij deelt de kaarten om het antwoord te vinden", + "item.botania.dice.poem1": "De heilige geometrie van de kans", + "item.botania.dice.poem2": "De verborgen wetten van waarschijnlijkheid", + "item.botania.dice.poem3": "De nummers leiden de dans", "death.attack.botania-relic": "%s werd gestraft voor gebruik van een reliek van een ander", @@ -1168,7 +1168,7 @@ "item.botania.reach_ring": "Ring der Bereik", "item.botania.terra_pick": "Terrabreker", "item.botania.diva_charm": "Diva Talisman", - "item.botania.flighttiara": "Flügel Tiara", + "item.botania.flight_tiara": "Flügel Tiara", "item.botania.ender_dagger": "Zielschrijver", "item.botania.quartz_dark": "Donker Kwarts", "item.botania.quartz_mana": "Mana Kwarts", @@ -1361,12 +1361,12 @@ "botania.brew.warpWard": "Verstandige Gedachten", "botania.brew.clear": "Totaalheid", - "botania.potion.soulCross": "Gekruisde Zielen", - "botania.potion.featherFeet": "Lichtvoetig", - "botania.potion.emptiness": "Leegte", - "botania.potion.bloodthirst": "Bloeddorst", - "botania.potion.allure": "Verleiding", - "botania.potion.clear": "Totaalheid", + "effect.botania.soul_cross": "Gekruisde Zielen", + "effect.botania.feather_feet": "Lichtvoetig", + "effect.botania.emptiness": "Leegte", + "effect.botania.bloodthirst": "Bloeddorst", + "effect.botania.allure": "Verleiding", + "effect.botania.clear": "Totaalheid", "botania.gui.lexicon.header": "Lexica Botania, %s Editie Inhoudsopgave", "botania.gui.lexicon.wip": "(Hier wordt nog aan gewerkt.)", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 5833cad60..cdb7aa065 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -230,15 +230,15 @@ "botania.animatedTorch.rotate": "Rodar", "botania.animatedTorch.random": "Aleatório", - "botania.armorset.manasteel": "Afinidade com Mana", + "botania.armorset.manasteel.name": "Afinidade com Mana", "botania.armorset.manasteel.desc": "-10% no custo de Mana em ferramentas e varinhas", - "botania.armorset.elementium": "Benção da Grande Fada", + "botania.armorset.elementium.name": "Benção da Grande Fada", "botania.armorset.elementium.desc": "Chance de que fadas apliquem efeito de poções", - "botania.armorset.terrasteel": "Vontade dos Ancestrais", + "botania.armorset.terrasteel.name": "Vontade dos Ancestrais", "botania.armorset.terrasteel.desc0": "-20% no custo de Mana em ferramentas e varinhas", "botania.armorset.terrasteel.desc1": "Regeneração contínua mesmo com fome", "botania.armorset.terrasteel.desc2": "Geração passiva de Mana para Tabletes de Mana", - "botania.armorset.manaweave": "Proeza da Maré de Mana", + "botania.armorset.manaweave.name": "Proeza da Maré de Mana", "botania.armorset.manaweave.desc0": "-35% no custo de Mana em ferramentas e varinhas", "botania.armorset.manaweave.desc1": "Proeficiência aumentada com Varinhas", @@ -413,10 +413,10 @@ "botania.baubletype.belt": "&aCinto&7", "botania.baubletooltip": "Aperte &b%s&7 para abrir o menu do Baubles", - "item.dice.poem0": "Ele oferece as cartas para a resposta,", - "item.dice.poem1": "Sagrada geometria da chance,", - "item.dice.poem2": "Leis ocultas de um resultado provável,", - "item.dice.poem3": "Os números regem uma dança.", + "item.botania.dice.poem0": "Ele oferece as cartas para a resposta,", + "item.botania.dice.poem1": "Sagrada geometria da chance,", + "item.botania.dice.poem2": "Leis ocultas de um resultado provável,", + "item.botania.dice.poem3": "Os números regem uma dança.", "death.attack.botania-relic": "%s foi punido por usar uma relíquia que não lhe pertencia", @@ -1236,7 +1236,7 @@ "item.botania.reach_ring": "Anel do Longo Alcance", "item.botania.terra_pick": "Terra-Destruidor", "item.botania.diva_charm": "Encanto da Diva", - "item.botania.flighttiara": "Tiara de Flügel", + "item.botania.flight_tiara": "Tiara de Flügel", "item.botania.ender_dagger": "Soulscribe", "item.botania.quartz_dark": "Quartzo Escuro", "item.botania.quartz_mana": "Quartzo de Mana", @@ -1437,12 +1437,12 @@ "botania.brew.warpWard": "Mente Sã", "botania.brew.clear": "Absolução", - "botania.potion.soulCross": "Almas Cruzadas", - "botania.potion.featherFeet": "Peso Pena", - "botania.potion.emptiness": "Vazio", - "botania.potion.bloodthirst": "Sede de Sangue", - "botania.potion.allure": "Sedução", - "botania.potion.clear": "Absolução", + "effect.botania.soul_cross": "Almas Cruzadas", + "effect.botania.feather_feet": "Peso Pena", + "effect.botania.emptiness": "Vazio", + "effect.botania.bloodthirst": "Sede de Sangue", + "effect.botania.allure": "Sedução", + "effect.botania.clear": "Absolução", "botania.gui.lexicon.header": "Lexica Botania, Edição %s - Índice", "botania.gui.lexicon.wip": "(Esse tópico está em progresso. Nem ao menos está na forma final)", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index d9a166ca5..8ecfdf967 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -240,15 +240,15 @@ "botania.animatedTorch.rotate": "Поворот", "botania.animatedTorch.random": "Любой", - "botania.armorset.manasteel": "Сродство с маной", + "botania.armorset.manasteel.name": "Сродство с маной", "botania.armorset.manasteel.desc": "Уменьшение затрат Маны для инструментов: 10%%", - "botania.armorset.elementium": "Благословение Великой Феи", + "botania.armorset.elementium.name": "Благословение Великой Феи", "botania.armorset.elementium.desc": "Шанс для пикси для применения зелий", - "botania.armorset.terrasteel": "Воля древних", + "botania.armorset.terrasteel.name": "Воля древних", "botania.armorset.terrasteel.desc0": "Уменьшение затрат Маны для инструментов: 20%%", "botania.armorset.terrasteel.desc1": "Регенерирует здоровье даже если вы проголодались", "botania.armorset.terrasteel.desc2": "Пассивно генерирует ману для планшетов маны или кольца", - "botania.armorset.manaweave": "Прилив маны", + "botania.armorset.manaweave.name": "Прилив маны", "botania.armorset.manaweave.desc0": "Уменьшение затрат Маны для инструментов: 35%%", "botania.armorset.manaweave.desc1": "Повышает уровень владения жезлами", @@ -440,10 +440,10 @@ "botania.baubletype.belt": "Можно надеть в слот &aРемня&7", "botania.baubletooltip": "Нажмите &b%s&7, чтобы открыть меню Baubles", - "item.dice.poem0": "Сдаёт он карты из расчета", - "item.dice.poem1": "Найти удачи алгоритм,", - "item.dice.poem2": "Закон возможного исхода.", - "item.dice.poem3": "И числа отбивают ритм.", + "item.botania.dice.poem0": "Сдаёт он карты из расчета", + "item.botania.dice.poem1": "Найти удачи алгоритм,", + "item.botania.dice.poem2": "Закон возможного исхода.", + "item.botania.dice.poem3": "И числа отбивают ритм.", "death.attack.botania-relic": "%s был наказан за использование чужой реликвии", @@ -1326,7 +1326,7 @@ "item.botania.reach_ring": "Кольцо дальнего богатства", "item.botania.terra_pick": "Землекрушитель", "item.botania.diva_charm": "Шарм Дивы", - "item.botania.flightTiara": "Крылатая тиара", + "item.botania.flight_tiara": "Крылатая тиара", "item.botania.ender_dagger": "Бесплотный резчик", "item.botania.quartz0": "Дымной кварц", "item.botania.quartz1": "Манакварц", @@ -1534,12 +1534,12 @@ "botania.brew.warpWard": "Здравых мыслей", "botania.brew.clear": "Отпущения грехов", - "botania.potion.soulCross": "Скрещивания душ", - "botania.potion.featherFeet": "Парящих ног", - "botania.potion.emptiness": "Тщеславия пустоты", - "botania.potion.bloodthirst": "Багровой тени", - "botania.potion.allure": "Морского очарования", - "botania.potion.clear": "Отпущения грехов", + "effect.botania.soul_cross": "Скрещивания душ", + "effect.botania.feather_feet": "Парящих ног", + "effect.botania.emptiness": "Тщеславия пустоты", + "effect.botania.bloodthirst": "Багровой тени", + "effect.botania.allure": "Морского очарования", + "effect.botania.clear": "Отпущения грехов", "botania.gui.lexicon.header": "Лексика Botania, № %s Выберите категорию:", "botania.gui.lexicon.wip": "(Эта запись в разработке. Это даже не её конечная форма)", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index a357785ec..25971b06b 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -229,15 +229,15 @@ "botania.animatedTorch.rotate": "旋转", "botania.animatedTorch.random": "随机", - "botania.armorset.manasteel": "魔力亲和", + "botania.armorset.manasteel.name": "魔力亲和", "botania.armorset.manasteel.desc": "魔力工具消耗魔力减免10%", - "botania.armorset.elementium": "精灵祝福", + "botania.armorset.elementium.name": "精灵祝福", "botania.armorset.elementium.desc": "精灵攻击有几率附加特殊效果", - "botania.armorset.terrasteel": "远古意志", + "botania.armorset.terrasteel.name": "远古意志", "botania.armorset.terrasteel.desc0": "魔力工具消耗魔力减免20%", "botania.armorset.terrasteel.desc1": "生命回复(饥饿值未满时也能回复)", "botania.armorset.terrasteel.desc2": "魔力石板内被动产能", - "botania.armorset.manaweave": "魔力风箱", + "botania.armorset.manaweave.name": "魔力风箱", "botania.armorset.manaweave.desc0": "减少35%魔力损耗", "botania.armorset.manaweave.desc1": "提高魔力量传输效率", @@ -381,10 +381,10 @@ "botania.baubletype.belt": "装备在&a腰带&7栏", "botania.baubletooltip": "按&b%s&7键打开饰品菜单", - "item.dice.poem0": "他发牌,以寻找答案,", - "item.dice.poem1": "那神圣的数学概率,", - "item.dice.poem2": "可能的结果中暗藏着规则,", - "item.dice.poem3": "数字将引领一切起舞.", + "item.botania.dice.poem0": "他发牌,以寻找答案,", + "item.botania.dice.poem1": "那神圣的数学概率,", + "item.botania.dice.poem2": "可能的结果中暗藏着规则,", + "item.botania.dice.poem3": "数字将引领一切起舞.", "death.attack.botania-relic": "%s 因使用不属于他的遗物而被惩罚致死", @@ -1267,7 +1267,7 @@ "item.botania.reach_ring": "触物指环", "item.botania.terra_pick": "泰拉粉碎者", "item.botania.diva_charm": "女王之魅", - "item.botania.flighttiara": "天翼族之冠", + "item.botania.flight_tiara": "天翼族之冠", "item.botania.ender_dagger": "灵魂匕首", "item.botania.quartz_dark": "烟熏石英", "item.botania.quartz_mana": "魔力石英", @@ -1475,12 +1475,12 @@ "botania.brew.warpWard": "理智", "botania.brew.clear": "赦免", - "botania.potion.soulCross": "噬魂", - "botania.potion.featherFeet": "羽翼", - "botania.potion.emptiness": "空虚", - "botania.potion.bloodthirst": "嗜血", - "botania.potion.allure": "引诱", - "botania.potion.clear": "赦免", + "effect.botania.soul_cross": "噬魂", + "effect.botania.feather_feet": "羽翼", + "effect.botania.emptiness": "空虚", + "effect.botania.bloodthirst": "嗜血", + "effect.botania.allure": "引诱", + "effect.botania.clear": "赦免", "botania.gui.lexicon.header": "植物魔法辞典 第%s版 - 目录", "botania.gui.lexicon.wip": "(本条目的编纂工作仍在进行,其当前内容并非最终版)", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 2cb011069..84eeb9fd2 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -233,15 +233,15 @@ "botania.wings8": "翼:日神龍", "botania.wings9": "翼:唯一", - "botania.armorset.manasteel": "瑪那適性", + "botania.armorset.manasteel.name": "瑪那適性", "botania.armorset.manasteel.desc": "瑪那工具消耗瑪那減免10%", - "botania.armorset.elementium": "精靈祝福", + "botania.armorset.elementium.name": "精靈祝福", "botania.armorset.elementium.desc": "精靈攻擊有幾率附加特殊效果", - "botania.armorset.terrasteel": "遠古意志", + "botania.armorset.terrasteel.name": "遠古意志", "botania.armorset.terrasteel.desc0": "瑪那工具消耗瑪那減免20%", "botania.armorset.terrasteel.desc1": "生命回復(飢餓值未滿時也能回復)", "botania.armorset.terrasteel.desc2": "在瑪那石板上被動產生瑪那", - "botania.armorset.manaweave": "瑪那風箱", + "botania.armorset.manaweave.name": "瑪那風箱", "botania.armorset.manaweave.desc0": "減少35%瑪那損耗", "botania.armorset.manaweave.desc1": "提高瑪那量傳輸效率", @@ -383,10 +383,10 @@ "botania.baubletype.belt": "裝備在&a腰帶&7欄", "botania.baubletooltip": "按&b%s&7鍵打開飾品菜單", - "item.dice.poem0": "他發牌,以尋找答案,", - "item.dice.poem1": "那神聖的數學概率,", - "item.dice.poem2": "可能的結果中暗藏著規則,", - "item.dice.poem3": "數字將引領一切起舞.", + "item.botania.dice.poem0": "他發牌,以尋找答案,", + "item.botania.dice.poem1": "那神聖的數學概率,", + "item.botania.dice.poem2": "可能的結果中暗藏著規則,", + "item.botania.dice.poem3": "數字將引領一切起舞.", "death.attack.botania-relic": "%s 因使用不屬於他的遺物而受天譴致死", @@ -1276,7 +1276,7 @@ "item.botania.reach_ring": "觸物指環", "item.botania.terra_pick": "泰拉粉碎者", "item.botania.diva_charm": "女王之魅", - "item.botania.flighttiara": "天翼族之冠", + "item.botania.flight_tiara": "天翼族之冠", "item.botania.ender_dagger": "靈魂匕首", "item.botania.quartz_dark": "煙熏石英", "item.botania.quartz_mana": "瑪那石英", @@ -1476,12 +1476,12 @@ "botania.brew.warpWard": "理智", "botania.brew.clear": "赦免", - "botania.potion.soulCross": "噬魂", - "botania.potion.featherFeet": "羽翼", - "botania.potion.emptiness": "空虛", - "botania.potion.bloodthirst": "嗜血", - "botania.potion.allure": "引誘", - "botania.potion.clear": "赦免", + "effect.botania.soul_cross": "噬魂", + "effect.botania.feather_feet": "羽翼", + "effect.botania.emptiness": "空虛", + "effect.botania.bloodthirst": "嗜血", + "effect.botania.allure": "引誘", + "effect.botania.clear": "赦免", "botania.gui.lexicon.header": "植物魔法辭典 第%s版 - 目錄", "botania.gui.lexicon.wip": "(本條目的編纂工作仍在進行,其當前內容仍未完全定稿)", diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json index 2accf43fc..7d884ed1a 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json @@ -6,7 +6,7 @@ } ], "result": { - "item": "botania:blazeblock" + "item": "botania:blaze_block" }, "pattern": [ "BBB", diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json b/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json index 2d761b6d6..7148f540c 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json @@ -19,7 +19,7 @@ "item": "minecraft:string" }, "F": { - "item": "botania:felpumpkin" + "item": "botania:fel_pumpkin" }, "I": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json index e6749652c..e0e48ecf0 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json @@ -6,7 +6,7 @@ } ], "result": { - "tag": "minecraft:saplings" + "item": "minecraft:oak_sapling" }, "ingredients": [ {