From 8d0c8e13c416ae1075eccdabda23f8256bffcbec Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jan 2020 15:11:29 -0600 Subject: [PATCH] Also delete ItemBlockMod --- .../botania/common/block/ModBlocks.java | 448 +++++++++--------- .../botania/common/block/ModFluffBlocks.java | 336 ++++++------- .../common/block/decor/ItemBlockBlaze.java | 4 +- .../common/item/block/ItemBlockDreamwood.java | 3 +- .../common/item/block/ItemBlockElven.java | 3 +- .../common/item/block/ItemBlockMod.java | 22 - .../common/item/block/ItemBlockPool.java | 3 +- .../item/block/ItemBlockSpecialFlower.java | 3 +- .../item/block/ItemBlockTinyPotato.java | 5 +- .../common/item/material/ItemPetal.java | 4 +- 10 files changed, 407 insertions(+), 424 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 160d4d6f5..e848aafde 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -16,6 +16,7 @@ import net.minecraft.block.DispenserBlock; import net.minecraft.block.GlassBlock; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.item.BlockItem; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; import net.minecraft.item.Rarity; @@ -102,7 +103,6 @@ import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockDreamwood; import vazkii.botania.common.item.block.ItemBlockElven; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lib.LibBlockNames; @@ -583,225 +583,225 @@ public final class ModBlocks { IForgeRegistry r = evt.getRegistry(); Item.Properties props = ModItems.defaultBuilder(); - 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 BlockItem(whiteFlower, props), whiteFlower.getRegistryName()); + register(r, new BlockItem(orangeFlower, props), orangeFlower.getRegistryName()); + register(r, new BlockItem(magentaFlower, props), magentaFlower.getRegistryName()); + register(r, new BlockItem(lightBlueFlower, props), lightBlueFlower.getRegistryName()); + register(r, new BlockItem(yellowFlower, props), yellowFlower.getRegistryName()); + register(r, new BlockItem(limeFlower, props), limeFlower.getRegistryName()); + register(r, new BlockItem(pinkFlower, props), pinkFlower.getRegistryName()); + register(r, new BlockItem(grayFlower, props), grayFlower.getRegistryName()); + register(r, new BlockItem(lightGrayFlower, props), lightGrayFlower.getRegistryName()); + register(r, new BlockItem(cyanFlower, props), cyanFlower.getRegistryName()); + register(r, new BlockItem(purpleFlower, props), purpleFlower.getRegistryName()); + register(r, new BlockItem(blueFlower, props), blueFlower.getRegistryName()); + register(r, new BlockItem(brownFlower, props), brownFlower.getRegistryName()); + register(r, new BlockItem(greenFlower, props), greenFlower.getRegistryName()); + register(r, new BlockItem(redFlower, props), redFlower.getRegistryName()); + register(r, new BlockItem(blackFlower, props), blackFlower.getRegistryName()); + register(r, new BlockItem(defaultAltar, props), defaultAltar.getRegistryName()); + register(r, new BlockItem(forestAltar, props), forestAltar.getRegistryName()); + register(r, new BlockItem(plainsAltar, props), plainsAltar.getRegistryName()); + register(r, new BlockItem(mountainAltar, props), mountainAltar.getRegistryName()); + register(r, new BlockItem(fungalAltar, props), fungalAltar.getRegistryName()); + register(r, new BlockItem(swampAltar, props), swampAltar.getRegistryName()); + register(r, new BlockItem(desertAltar, props), desertAltar.getRegistryName()); + register(r, new BlockItem(taigaAltar, props), taigaAltar.getRegistryName()); + register(r, new BlockItem(mesaAltar, props), mesaAltar.getRegistryName()); + register(r, new BlockItem(mossyAltar, props), mossyAltar.getRegistryName()); + register(r, new BlockItem(livingrock, props), livingrock.getRegistryName()); + register(r, new BlockItem(livingrockBrick, props), livingrockBrick.getRegistryName()); + register(r, new BlockItem(livingrockBrickChiseled, props), livingrockBrickChiseled.getRegistryName()); + register(r, new BlockItem(livingrockBrickCracked, props), livingrockBrickCracked.getRegistryName()); + register(r, new BlockItem(livingrockBrickMossy, props), livingrockBrickMossy.getRegistryName()); + register(r, new BlockItem(livingwood, props), livingwood.getRegistryName()); + register(r, new BlockItem(livingwoodPlanks, props), livingwoodPlanks.getRegistryName()); + register(r, new BlockItem(livingwoodPlanksMossy, props), livingwoodPlanksMossy.getRegistryName()); + register(r, new BlockItem(livingwoodFramed, props), livingwoodFramed.getRegistryName()); + register(r, new BlockItem(livingwoodPatternFramed, props), livingwoodPatternFramed.getRegistryName()); + register(r, new BlockItem(livingwoodGlimmering, props), livingwoodGlimmering.getRegistryName()); + register(r, new BlockItem(manaSpreader, props), manaSpreader.getRegistryName()); + register(r, new BlockItem(redstoneSpreader, props), redstoneSpreader.getRegistryName()); + register(r, new BlockItem(elvenSpreader, props), elvenSpreader.getRegistryName()); + register(r, new BlockItem(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()); - 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 BlockItem(runeAltar, props), runeAltar.getRegistryName()); + register(r, new BlockItem(pistonRelay, props), pistonRelay.getRegistryName()); + register(r, new BlockItem(distributor, props), distributor.getRegistryName()); + register(r, new BlockItem(manaVoid, props), manaVoid.getRegistryName()); + register(r, new BlockItem(manaDetector, props), manaDetector.getRegistryName()); + register(r, new BlockItem(enchanter, props), enchanter.getRegistryName()); + register(r, new BlockItem(turntable, props), turntable.getRegistryName()); + register(r, new BlockItem(tinyPlanet, props), tinyPlanet.getRegistryName()); + register(r, new BlockItem(alchemyCatalyst, props), alchemyCatalyst.getRegistryName()); + register(r, new BlockItem(openCrate, props), openCrate.getRegistryName()); + register(r, new BlockItem(craftCrate, props), craftCrate.getRegistryName()); + register(r, new BlockItem(forestEye, props), forestEye.getRegistryName()); + register(r, new BlockItem(manasteelBlock, props), manasteelBlock.getRegistryName()); + register(r, new BlockItem(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 BlockItem(manaDiamondBlock, props), manaDiamondBlock.getRegistryName()); + register(r, new BlockItem(dragonstoneBlock, props), dragonstoneBlock.getRegistryName()); + register(r, new BlockItem(wildDrum, props), wildDrum.getRegistryName()); + register(r, new BlockItem(gatheringDrum, props), gatheringDrum.getRegistryName()); + register(r, new BlockItem(canopyDrum, props), canopyDrum.getRegistryName()); + register(r, new BlockItem(whiteShinyFlower, props), whiteShinyFlower.getRegistryName()); + register(r, new BlockItem(orangeShinyFlower, props), orangeShinyFlower.getRegistryName()); + register(r, new BlockItem(magentaShinyFlower, props), magentaShinyFlower.getRegistryName()); + register(r, new BlockItem(lightBlueShinyFlower, props), lightBlueShinyFlower.getRegistryName()); + register(r, new BlockItem(yellowShinyFlower, props), yellowShinyFlower.getRegistryName()); + register(r, new BlockItem(limeShinyFlower, props), limeShinyFlower.getRegistryName()); + register(r, new BlockItem(pinkShinyFlower, props), pinkShinyFlower.getRegistryName()); + register(r, new BlockItem(grayShinyFlower, props), grayShinyFlower.getRegistryName()); + register(r, new BlockItem(lightGrayShinyFlower, props), lightGrayShinyFlower.getRegistryName()); + register(r, new BlockItem(cyanShinyFlower, props), cyanShinyFlower.getRegistryName()); + register(r, new BlockItem(purpleShinyFlower, props), purpleShinyFlower.getRegistryName()); + register(r, new BlockItem(blueShinyFlower, props), blueShinyFlower.getRegistryName()); + register(r, new BlockItem(brownShinyFlower, props), brownShinyFlower.getRegistryName()); + register(r, new BlockItem(greenShinyFlower, props), greenShinyFlower.getRegistryName()); + register(r, new BlockItem(redShinyFlower, props), redShinyFlower.getRegistryName()); + register(r, new BlockItem(blackShinyFlower, props), blackShinyFlower.getRegistryName()); + register(r, new BlockItem(abstrusePlatform, props), abstrusePlatform.getRegistryName()); + register(r, new BlockItem(spectralPlatform, props), spectralPlatform.getRegistryName()); + register(r, new BlockItem(infrangiblePlatform, props), infrangiblePlatform.getRegistryName()); + register(r, new BlockItem(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 BlockItem(conjurationCatalyst, props), conjurationCatalyst.getRegistryName()); + register(r, new BlockItem(bifrost, props), bifrost.getRegistryName()); + register(r, new BlockItem(whiteFloatingFlower, props), whiteFloatingFlower.getRegistryName()); + register(r, new BlockItem(orangeFloatingFlower, props), orangeFloatingFlower.getRegistryName()); + register(r, new BlockItem(magentaFloatingFlower, props), magentaFloatingFlower.getRegistryName()); + register(r, new BlockItem(lightBlueFloatingFlower, props), lightBlueFloatingFlower.getRegistryName()); + register(r, new BlockItem(yellowFloatingFlower, props), yellowFloatingFlower.getRegistryName()); + register(r, new BlockItem(limeFloatingFlower, props), limeFloatingFlower.getRegistryName()); + register(r, new BlockItem(pinkFloatingFlower, props), pinkFloatingFlower.getRegistryName()); + register(r, new BlockItem(grayFloatingFlower, props), grayFloatingFlower.getRegistryName()); + register(r, new BlockItem(lightGrayFloatingFlower, props), lightGrayFloatingFlower.getRegistryName()); + register(r, new BlockItem(cyanFloatingFlower, props), cyanFloatingFlower.getRegistryName()); + register(r, new BlockItem(purpleFloatingFlower, props), purpleFloatingFlower.getRegistryName()); + register(r, new BlockItem(blueFloatingFlower, props), blueFloatingFlower.getRegistryName()); + register(r, new BlockItem(brownFloatingFlower, props), brownFloatingFlower.getRegistryName()); + register(r, new BlockItem(greenFloatingFlower, props), greenFloatingFlower.getRegistryName()); + register(r, new BlockItem(redFloatingFlower, props), redFloatingFlower.getRegistryName()); + register(r, new BlockItem(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 BlockItem(spawnerClaw, props), spawnerClaw.getRegistryName()); + register(r, new BlockItem(azulejo0, props), azulejo0.getRegistryName()); + register(r, new BlockItem(azulejo1, props), azulejo1.getRegistryName()); + register(r, new BlockItem(azulejo2, props), azulejo2.getRegistryName()); + register(r, new BlockItem(azulejo3, props), azulejo3.getRegistryName()); + register(r, new BlockItem(azulejo4, props), azulejo4.getRegistryName()); + register(r, new BlockItem(azulejo5, props), azulejo5.getRegistryName()); + register(r, new BlockItem(azulejo6, props), azulejo6.getRegistryName()); + register(r, new BlockItem(azulejo7, props), azulejo7.getRegistryName()); + register(r, new BlockItem(azulejo8, props), azulejo8.getRegistryName()); + register(r, new BlockItem(azulejo9, props), azulejo9.getRegistryName()); + register(r, new BlockItem(azulejo10, props), azulejo10.getRegistryName()); + register(r, new BlockItem(azulejo11, props), azulejo11.getRegistryName()); + register(r, new BlockItem(azulejo12, props), azulejo12.getRegistryName()); + register(r, new BlockItem(azulejo13, props), azulejo13.getRegistryName()); + register(r, new BlockItem(azulejo14, props), azulejo14.getRegistryName()); + register(r, new BlockItem(azulejo15, props), azulejo15.getRegistryName()); + register(r, new BlockItem(enderEye, props), enderEye.getRegistryName()); + register(r, new BlockItem(starfield, props), starfield.getRegistryName()); + register(r, new BlockItem(rfGenerator, props), rfGenerator.getRegistryName()); register(r, new ItemBlockElven(elfGlass, props), elfGlass.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(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 BlockItem(manaGlass, props), manaGlass.getRegistryName()); + register(r, new BlockItem(terraPlate, props), terraPlate.getRegistryName()); + register(r, new BlockItem(redStringContainer, props), redStringContainer.getRegistryName()); + register(r, new BlockItem(redStringDispenser, props), redStringDispenser.getRegistryName()); + register(r, new BlockItem(redStringFertilizer, props), redStringFertilizer.getRegistryName()); + register(r, new BlockItem(redStringComparator, props), redStringComparator.getRegistryName()); + register(r, new BlockItem(redStringRelay, props), redStringRelay.getRegistryName()); + register(r, new BlockItem(prism, props), prism.getRegistryName()); + register(r, new BlockItem(enchantedSoil, props), enchantedSoil.getRegistryName()); + register(r, new BlockItem(petalBlockWhite, props), petalBlockWhite.getRegistryName()); + register(r, new BlockItem(petalBlockOrange, props), petalBlockOrange.getRegistryName()); + register(r, new BlockItem(petalBlockMagenta, props), petalBlockMagenta.getRegistryName()); + register(r, new BlockItem(petalBlockLightBlue, props), petalBlockLightBlue.getRegistryName()); + register(r, new BlockItem(petalBlockYellow, props), petalBlockYellow.getRegistryName()); + register(r, new BlockItem(petalBlockLime, props), petalBlockLime.getRegistryName()); + register(r, new BlockItem(petalBlockPink, props), petalBlockPink.getRegistryName()); + register(r, new BlockItem(petalBlockGray, props), petalBlockGray.getRegistryName()); + register(r, new BlockItem(petalBlockSilver, props), petalBlockSilver.getRegistryName()); + register(r, new BlockItem(petalBlockCyan, props), petalBlockCyan.getRegistryName()); + register(r, new BlockItem(petalBlockPurple, props), petalBlockPurple.getRegistryName()); + register(r, new BlockItem(petalBlockBlue, props), petalBlockBlue.getRegistryName()); + register(r, new BlockItem(petalBlockBrown, props), petalBlockBrown.getRegistryName()); + register(r, new BlockItem(petalBlockGreen, props), petalBlockGreen.getRegistryName()); + register(r, new BlockItem(petalBlockRed, props), petalBlockRed.getRegistryName()); + register(r, new BlockItem(petalBlockBlack, props), petalBlockBlack.getRegistryName()); + register(r, new BlockItem(corporeaFunnel, props), corporeaFunnel.getRegistryName()); + register(r, new BlockItem(whiteMushroom, props), whiteMushroom.getRegistryName()); + register(r, new BlockItem(orangeMushroom, props), orangeMushroom.getRegistryName()); + register(r, new BlockItem(magentaMushroom, props), magentaMushroom.getRegistryName()); + register(r, new BlockItem(lightBlueMushroom, props), lightBlueMushroom.getRegistryName()); + register(r, new BlockItem(yellowMushroom, props), yellowMushroom.getRegistryName()); + register(r, new BlockItem(limeMushroom, props), limeMushroom.getRegistryName()); + register(r, new BlockItem(pinkMushroom, props), pinkMushroom.getRegistryName()); + register(r, new BlockItem(grayMushroom, props), grayMushroom.getRegistryName()); + register(r, new BlockItem(lightGrayMushroom, props), lightGrayMushroom.getRegistryName()); + register(r, new BlockItem(cyanMushroom, props), cyanMushroom.getRegistryName()); + register(r, new BlockItem(purpleMushroom, props), purpleMushroom.getRegistryName()); + register(r, new BlockItem(blueMushroom, props), blueMushroom.getRegistryName()); + register(r, new BlockItem(brownMushroom, props), brownMushroom.getRegistryName()); + register(r, new BlockItem(greenMushroom, props), greenMushroom.getRegistryName()); + register(r, new BlockItem(redMushroom, props), redMushroom.getRegistryName()); + register(r, new BlockItem(blackMushroom, props), blackMushroom.getRegistryName()); + register(r, new BlockItem(pump, props), pump.getRegistryName()); + register(r, new BlockItem(doubleFlowerWhite, props), doubleFlowerWhite.getRegistryName()); + register(r, new BlockItem(doubleFlowerOrange, props), doubleFlowerOrange.getRegistryName()); + register(r, new BlockItem(doubleFlowerMagenta, props), doubleFlowerMagenta.getRegistryName()); + register(r, new BlockItem(doubleFlowerLightBlue, props), doubleFlowerLightBlue.getRegistryName()); + register(r, new BlockItem(doubleFlowerYellow, props), doubleFlowerYellow.getRegistryName()); + register(r, new BlockItem(doubleFlowerLime, props), doubleFlowerLime.getRegistryName()); + register(r, new BlockItem(doubleFlowerPink, props), doubleFlowerPink.getRegistryName()); + register(r, new BlockItem(doubleFlowerGray, props), doubleFlowerGray.getRegistryName()); + register(r, new BlockItem(doubleFlowerLightGray, props), doubleFlowerLightGray.getRegistryName()); + register(r, new BlockItem(doubleFlowerCyan, props), doubleFlowerCyan.getRegistryName()); + register(r, new BlockItem(doubleFlowerPurple, props), doubleFlowerPurple.getRegistryName()); + register(r, new BlockItem(doubleFlowerBlue, props), doubleFlowerBlue.getRegistryName()); + register(r, new BlockItem(doubleFlowerBrown, props), doubleFlowerBrown.getRegistryName()); + register(r, new BlockItem(doubleFlowerGreen, props), doubleFlowerGreen.getRegistryName()); + register(r, new BlockItem(doubleFlowerRed, props), doubleFlowerRed.getRegistryName()); + register(r, new BlockItem(doubleFlowerBlack, props), doubleFlowerBlack.getRegistryName()); register(r, new ItemBlockBlaze(blazeBlock, props), blazeBlock.getRegistryName()); - register(r, new ItemBlockMod(corporeaInterceptor, props), corporeaInterceptor.getRegistryName()); - register(r, new ItemBlockMod(incensePlate, props), incensePlate.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(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(shimmerrock, props), shimmerrock.getRegistryName()); - register(r, new ItemBlockMod(shimmerwoodPlanks, props), shimmerwoodPlanks.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()); - register(r, new ItemBlockMod(corporeaCrystalCube, props), corporeaCrystalCube.getRegistryName()); + register(r, new BlockItem(corporeaInterceptor, props), corporeaInterceptor.getRegistryName()); + register(r, new BlockItem(incensePlate, props), incensePlate.getRegistryName()); + register(r, new BlockItem(ghostRail, props), ghostRail.getRegistryName()); + register(r, new BlockItem(sparkChanger, props), sparkChanger.getRegistryName()); + register(r, new BlockItem(root, props), root.getRegistryName()); + register(r, new BlockItem(felPumpkin, props), felPumpkin.getRegistryName()); + register(r, new BlockItem(cocoon, props), cocoon.getRegistryName()); + register(r, new BlockItem(lightRelayDefault, props), lightRelayDefault.getRegistryName()); + register(r, new BlockItem(lightRelayDetector, props), lightRelayDetector.getRegistryName()); + register(r, new BlockItem(lightRelayFork, props), lightRelayFork.getRegistryName()); + register(r, new BlockItem(lightRelayToggle, props), lightRelayToggle.getRegistryName()); + register(r, new BlockItem(lightLauncher, props), lightLauncher.getRegistryName()); + register(r, new BlockItem(manaBomb, props), manaBomb.getRegistryName()); + register(r, new BlockItem(cacophonium, props), cacophonium.getRegistryName()); + register(r, new BlockItem(bifrostPerm, props), bifrostPerm.getRegistryName()); + register(r, new BlockItem(cellBlock, props), cellBlock.getRegistryName()); + register(r, new BlockItem(redStringInterceptor, props), redStringInterceptor.getRegistryName()); + register(r, new BlockItem(corporeaRetainer, props), corporeaRetainer.getRegistryName()); + register(r, new BlockItem(shimmerrock, props), shimmerrock.getRegistryName()); + register(r, new BlockItem(shimmerwoodPlanks, props), shimmerwoodPlanks.getRegistryName()); + register(r, new BlockItem(dryGrass, props), dryGrass.getRegistryName()); + register(r, new BlockItem(goldenGrass, props), goldenGrass.getRegistryName()); + register(r, new BlockItem(vividGrass, props), vividGrass.getRegistryName()); + register(r, new BlockItem(scorchedGrass, props), scorchedGrass.getRegistryName()); + register(r, new BlockItem(infusedGrass, props), infusedGrass.getRegistryName()); + register(r, new BlockItem(mutatedGrass, props), mutatedGrass.getRegistryName()); + register(r, new BlockItem(animatedTorch, props), animatedTorch.getRegistryName()); + register(r, new BlockItem(corporeaCrystalCube, props), corporeaCrystalCube.getRegistryName()); DistExecutor.runForDist(() -> () -> registerWithTEISRS(r), () -> () -> registerWithoutTEISRS(r)); } @@ -811,16 +811,16 @@ public final class ModBlocks { @OnlyIn(Dist.DEDICATED_SERVER) private static Void registerWithoutTEISRS(IForgeRegistry r) { Item.Properties props = ModItems.defaultBuilder(); - register(r, new ItemBlockMod(manaPylon, props), manaPylon.getRegistryName()); - register(r, new ItemBlockMod(naturaPylon, props), naturaPylon.getRegistryName()); - register(r, new ItemBlockMod(gaiaPylon, props), gaiaPylon.getRegistryName()); + register(r, new BlockItem(manaPylon, props), manaPylon.getRegistryName()); + register(r, new BlockItem(naturaPylon, props), naturaPylon.getRegistryName()); + register(r, new BlockItem(gaiaPylon, props), gaiaPylon.getRegistryName()); - register(r, new ItemBlockMod(teruTeruBozu, props), teruTeruBozu.getRegistryName()); - register(r, new ItemBlockMod(avatar, props), avatar.getRegistryName()); - register(r, new ItemBlockMod(bellows, props), bellows.getRegistryName()); - register(r, new ItemBlockMod(brewery, props), brewery.getRegistryName()); - register(r, new ItemBlockMod(corporeaIndex, props), corporeaIndex.getRegistryName()); - register(r, new ItemBlockMod(hourglass, props), hourglass.getRegistryName()); + register(r, new BlockItem(teruTeruBozu, props), teruTeruBozu.getRegistryName()); + register(r, new BlockItem(avatar, props), avatar.getRegistryName()); + register(r, new BlockItem(bellows, props), bellows.getRegistryName()); + register(r, new BlockItem(brewery, props), brewery.getRegistryName()); + register(r, new BlockItem(corporeaIndex, props), corporeaIndex.getRegistryName()); + register(r, new BlockItem(hourglass, props), hourglass.getRegistryName()); Item head = new ItemGaiaHead(gaiaHead, gaiaHeadWall, ModItems.defaultBuilder().rarity(Rarity.UNCOMMON)); register(r, head, gaiaHead.getRegistryName()); return null; @@ -829,16 +829,16 @@ public final class ModBlocks { @OnlyIn(Dist.CLIENT) private static Void registerWithTEISRS(IForgeRegistry r) { Item.Properties pylonProps = ModItems.defaultBuilder().setTEISR(() -> () -> new RenderTilePylon.TEISR()); - 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 BlockItem(manaPylon, pylonProps), manaPylon.getRegistryName()); + register(r, new BlockItem(naturaPylon, pylonProps), naturaPylon.getRegistryName()); + register(r, new BlockItem(gaiaPylon, pylonProps), gaiaPylon.getRegistryName()); - register(r, new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(teruTeruBozu))), teruTeruBozu.getRegistryName()); - register(r, new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(avatar))), avatar.getRegistryName()); - register(r, new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(bellows))), bellows.getRegistryName()); - register(r, new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(brewery))), brewery.getRegistryName()); - register(r, new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(corporeaIndex))), corporeaIndex.getRegistryName()); - register(r, new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(hourglass))), hourglass.getRegistryName()); + register(r, new BlockItem(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(teruTeruBozu))), teruTeruBozu.getRegistryName()); + register(r, new BlockItem(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(avatar))), avatar.getRegistryName()); + register(r, new BlockItem(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(bellows))), bellows.getRegistryName()); + register(r, new BlockItem(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(brewery))), brewery.getRegistryName()); + register(r, new BlockItem(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(corporeaIndex))), corporeaIndex.getRegistryName()); + register(r, new BlockItem(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(hourglass))), hourglass.getRegistryName()); Item head = new ItemGaiaHead(gaiaHead, gaiaHeadWall, ModItems.defaultBuilder().rarity(Rarity.UNCOMMON).setTEISR(() -> () -> new TEISR(gaiaHead))); register(r, head, gaiaHead.getRegistryName()); return null; diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 25b0c9b7d..11ca55d13 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -19,6 +19,7 @@ import net.minecraft.block.SlabBlock; import net.minecraft.block.SoundType; import net.minecraft.block.WallBlock; import net.minecraft.block.material.Material; +import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.EventPriority; @@ -29,7 +30,6 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.decor.panes.BlockModPane; import vazkii.botania.common.block.decor.stairs.BlockModStairs; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -330,199 +330,199 @@ public final class ModFluffBlocks { IForgeRegistry r = evt.getRegistry(); Item.Properties props = ModItems.defaultBuilder(); - r.register(new ItemBlockMod(livingwoodStairs, props).setRegistryName(livingwoodStairs.getRegistryName())); - r.register(new ItemBlockMod(livingwoodSlab, props).setRegistryName(livingwoodSlab.getRegistryName())); - r.register(new ItemBlockMod(livingwoodWall, props).setRegistryName(livingwoodWall.getRegistryName())); - r.register(new ItemBlockMod(livingwoodFence, props).setRegistryName(livingwoodFence.getRegistryName())); - r.register(new ItemBlockMod(livingwoodFenceGate, props).setRegistryName(livingwoodFenceGate.getRegistryName())); + r.register(new BlockItem(livingwoodStairs, props).setRegistryName(livingwoodStairs.getRegistryName())); + r.register(new BlockItem(livingwoodSlab, props).setRegistryName(livingwoodSlab.getRegistryName())); + r.register(new BlockItem(livingwoodWall, props).setRegistryName(livingwoodWall.getRegistryName())); + r.register(new BlockItem(livingwoodFence, props).setRegistryName(livingwoodFence.getRegistryName())); + r.register(new BlockItem(livingwoodFenceGate, props).setRegistryName(livingwoodFenceGate.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPlankStairs, props).setRegistryName(livingwoodPlankStairs.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPlankSlab, props).setRegistryName(livingwoodPlankSlab.getRegistryName())); + r.register(new BlockItem(livingwoodPlankStairs, props).setRegistryName(livingwoodPlankStairs.getRegistryName())); + r.register(new BlockItem(livingwoodPlankSlab, props).setRegistryName(livingwoodPlankSlab.getRegistryName())); - r.register(new ItemBlockMod(livingrockStairs, props).setRegistryName(livingrockStairs.getRegistryName())); - r.register(new ItemBlockMod(livingrockSlab, props).setRegistryName(livingrockSlab.getRegistryName())); - r.register(new ItemBlockMod(livingrockWall, props).setRegistryName(livingrockWall.getRegistryName())); + r.register(new BlockItem(livingrockStairs, props).setRegistryName(livingrockStairs.getRegistryName())); + r.register(new BlockItem(livingrockSlab, props).setRegistryName(livingrockSlab.getRegistryName())); + r.register(new BlockItem(livingrockWall, props).setRegistryName(livingrockWall.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickStairs, props).setRegistryName(livingrockBrickStairs.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickSlab, props).setRegistryName(livingrockBrickSlab.getRegistryName())); + r.register(new BlockItem(livingrockBrickStairs, props).setRegistryName(livingrockBrickStairs.getRegistryName())); + r.register(new BlockItem(livingrockBrickSlab, props).setRegistryName(livingrockBrickSlab.getRegistryName())); - r.register(new ItemBlockMod(dreamwoodStairs, props).setRegistryName(dreamwoodStairs.getRegistryName())); - r.register(new ItemBlockMod(dreamwoodSlab, props).setRegistryName(dreamwoodSlab.getRegistryName())); - r.register(new ItemBlockMod(dreamwoodWall, props).setRegistryName(dreamwoodWall.getRegistryName())); - r.register(new ItemBlockMod(dreamwoodFence, props).setRegistryName(dreamwoodFence.getRegistryName())); - r.register(new ItemBlockMod(dreamwoodFenceGate, props).setRegistryName(dreamwoodFenceGate.getRegistryName())); + r.register(new BlockItem(dreamwoodStairs, props).setRegistryName(dreamwoodStairs.getRegistryName())); + r.register(new BlockItem(dreamwoodSlab, props).setRegistryName(dreamwoodSlab.getRegistryName())); + r.register(new BlockItem(dreamwoodWall, props).setRegistryName(dreamwoodWall.getRegistryName())); + r.register(new BlockItem(dreamwoodFence, props).setRegistryName(dreamwoodFence.getRegistryName())); + r.register(new BlockItem(dreamwoodFenceGate, props).setRegistryName(dreamwoodFenceGate.getRegistryName())); - r.register(new ItemBlockMod(dreamwoodPlankStairs, props).setRegistryName(dreamwoodPlankStairs.getRegistryName())); - r.register(new ItemBlockMod(dreamwoodPlankSlab, props).setRegistryName(dreamwoodPlankSlab.getRegistryName())); + r.register(new BlockItem(dreamwoodPlankStairs, props).setRegistryName(dreamwoodPlankStairs.getRegistryName())); + r.register(new BlockItem(dreamwoodPlankSlab, props).setRegistryName(dreamwoodPlankSlab.getRegistryName())); - r.register(new ItemBlockMod(darkQuartz, props).setRegistryName(darkQuartz.getRegistryName())); - r.register(new ItemBlockMod(darkQuartzPillar, props).setRegistryName(darkQuartzPillar.getRegistryName())); - r.register(new ItemBlockMod(darkQuartzChiseled, props).setRegistryName(darkQuartzChiseled.getRegistryName())); - r.register(new ItemBlockMod(darkQuartzSlab, props).setRegistryName(darkQuartzSlab.getRegistryName())); - r.register(new ItemBlockMod(darkQuartzStairs, props).setRegistryName(darkQuartzStairs.getRegistryName())); + r.register(new BlockItem(darkQuartz, props).setRegistryName(darkQuartz.getRegistryName())); + r.register(new BlockItem(darkQuartzPillar, props).setRegistryName(darkQuartzPillar.getRegistryName())); + r.register(new BlockItem(darkQuartzChiseled, props).setRegistryName(darkQuartzChiseled.getRegistryName())); + r.register(new BlockItem(darkQuartzSlab, props).setRegistryName(darkQuartzSlab.getRegistryName())); + r.register(new BlockItem(darkQuartzStairs, props).setRegistryName(darkQuartzStairs.getRegistryName())); - r.register(new ItemBlockMod(manaQuartz, props).setRegistryName(manaQuartz.getRegistryName())); - r.register(new ItemBlockMod(manaQuartzPillar, props).setRegistryName(manaQuartzPillar.getRegistryName())); - r.register(new ItemBlockMod(manaQuartzChiseled, props).setRegistryName(manaQuartzChiseled.getRegistryName())); - r.register(new ItemBlockMod(manaQuartzSlab, props).setRegistryName(manaQuartzSlab.getRegistryName())); - r.register(new ItemBlockMod(manaQuartzStairs, props).setRegistryName(manaQuartzStairs.getRegistryName())); + r.register(new BlockItem(manaQuartz, props).setRegistryName(manaQuartz.getRegistryName())); + r.register(new BlockItem(manaQuartzPillar, props).setRegistryName(manaQuartzPillar.getRegistryName())); + r.register(new BlockItem(manaQuartzChiseled, props).setRegistryName(manaQuartzChiseled.getRegistryName())); + r.register(new BlockItem(manaQuartzSlab, props).setRegistryName(manaQuartzSlab.getRegistryName())); + r.register(new BlockItem(manaQuartzStairs, props).setRegistryName(manaQuartzStairs.getRegistryName())); - r.register(new ItemBlockMod(blazeQuartz, props).setRegistryName(blazeQuartz.getRegistryName())); - r.register(new ItemBlockMod(blazeQuartzPillar, props).setRegistryName(blazeQuartzPillar.getRegistryName())); - r.register(new ItemBlockMod(blazeQuartzChiseled, props).setRegistryName(blazeQuartzChiseled.getRegistryName())); - r.register(new ItemBlockMod(blazeQuartzSlab, props).setRegistryName(blazeQuartzSlab.getRegistryName())); - r.register(new ItemBlockMod(blazeQuartzStairs, props).setRegistryName(blazeQuartzStairs.getRegistryName())); + r.register(new BlockItem(blazeQuartz, props).setRegistryName(blazeQuartz.getRegistryName())); + r.register(new BlockItem(blazeQuartzPillar, props).setRegistryName(blazeQuartzPillar.getRegistryName())); + r.register(new BlockItem(blazeQuartzChiseled, props).setRegistryName(blazeQuartzChiseled.getRegistryName())); + r.register(new BlockItem(blazeQuartzSlab, props).setRegistryName(blazeQuartzSlab.getRegistryName())); + r.register(new BlockItem(blazeQuartzStairs, props).setRegistryName(blazeQuartzStairs.getRegistryName())); - r.register(new ItemBlockMod(lavenderQuartz, props).setRegistryName(lavenderQuartz.getRegistryName())); - r.register(new ItemBlockMod(lavenderQuartzPillar, props).setRegistryName(lavenderQuartzPillar.getRegistryName())); - r.register(new ItemBlockMod(lavenderQuartzChiseled, props).setRegistryName(lavenderQuartzChiseled.getRegistryName())); - r.register(new ItemBlockMod(lavenderQuartzSlab, props).setRegistryName(lavenderQuartzSlab.getRegistryName())); - r.register(new ItemBlockMod(lavenderQuartzStairs, props).setRegistryName(lavenderQuartzStairs.getRegistryName())); + r.register(new BlockItem(lavenderQuartz, props).setRegistryName(lavenderQuartz.getRegistryName())); + r.register(new BlockItem(lavenderQuartzPillar, props).setRegistryName(lavenderQuartzPillar.getRegistryName())); + r.register(new BlockItem(lavenderQuartzChiseled, props).setRegistryName(lavenderQuartzChiseled.getRegistryName())); + r.register(new BlockItem(lavenderQuartzSlab, props).setRegistryName(lavenderQuartzSlab.getRegistryName())); + r.register(new BlockItem(lavenderQuartzStairs, props).setRegistryName(lavenderQuartzStairs.getRegistryName())); - r.register(new ItemBlockMod(redQuartz, props).setRegistryName(redQuartz.getRegistryName())); - r.register(new ItemBlockMod(redQuartzPillar, props).setRegistryName(redQuartzPillar.getRegistryName())); - r.register(new ItemBlockMod(redQuartzChiseled, props).setRegistryName(redQuartzChiseled.getRegistryName())); - r.register(new ItemBlockMod(redQuartzSlab, props).setRegistryName(redQuartzSlab.getRegistryName())); - r.register(new ItemBlockMod(redQuartzStairs, props).setRegistryName(redQuartzStairs.getRegistryName())); + r.register(new BlockItem(redQuartz, props).setRegistryName(redQuartz.getRegistryName())); + r.register(new BlockItem(redQuartzPillar, props).setRegistryName(redQuartzPillar.getRegistryName())); + r.register(new BlockItem(redQuartzChiseled, props).setRegistryName(redQuartzChiseled.getRegistryName())); + r.register(new BlockItem(redQuartzSlab, props).setRegistryName(redQuartzSlab.getRegistryName())); + r.register(new BlockItem(redQuartzStairs, props).setRegistryName(redQuartzStairs.getRegistryName())); - r.register(new ItemBlockMod(elfQuartz, props).setRegistryName(elfQuartz.getRegistryName())); - r.register(new ItemBlockMod(elfQuartzPillar, props).setRegistryName(elfQuartzPillar.getRegistryName())); - r.register(new ItemBlockMod(elfQuartzChiseled, props).setRegistryName(elfQuartzChiseled.getRegistryName())); - r.register(new ItemBlockMod(elfQuartzSlab, props).setRegistryName(elfQuartzSlab.getRegistryName())); - r.register(new ItemBlockMod(elfQuartzStairs, props).setRegistryName(elfQuartzStairs.getRegistryName())); + r.register(new BlockItem(elfQuartz, props).setRegistryName(elfQuartz.getRegistryName())); + r.register(new BlockItem(elfQuartzPillar, props).setRegistryName(elfQuartzPillar.getRegistryName())); + r.register(new BlockItem(elfQuartzChiseled, props).setRegistryName(elfQuartzChiseled.getRegistryName())); + r.register(new BlockItem(elfQuartzSlab, props).setRegistryName(elfQuartzSlab.getRegistryName())); + r.register(new BlockItem(elfQuartzStairs, props).setRegistryName(elfQuartzStairs.getRegistryName())); - r.register(new ItemBlockMod(sunnyQuartz, props).setRegistryName(sunnyQuartz.getRegistryName())); - r.register(new ItemBlockMod(sunnyQuartzPillar, props).setRegistryName(sunnyQuartzPillar.getRegistryName())); - r.register(new ItemBlockMod(sunnyQuartzChiseled, props).setRegistryName(sunnyQuartzChiseled.getRegistryName())); - r.register(new ItemBlockMod(sunnyQuartzSlab, props).setRegistryName(sunnyQuartzSlab.getRegistryName())); - r.register(new ItemBlockMod(sunnyQuartzStairs, props).setRegistryName(sunnyQuartzStairs.getRegistryName())); + r.register(new BlockItem(sunnyQuartz, props).setRegistryName(sunnyQuartz.getRegistryName())); + r.register(new BlockItem(sunnyQuartzPillar, props).setRegistryName(sunnyQuartzPillar.getRegistryName())); + r.register(new BlockItem(sunnyQuartzChiseled, props).setRegistryName(sunnyQuartzChiseled.getRegistryName())); + r.register(new BlockItem(sunnyQuartzSlab, props).setRegistryName(sunnyQuartzSlab.getRegistryName())); + r.register(new BlockItem(sunnyQuartzStairs, props).setRegistryName(sunnyQuartzStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneForest, props).setRegistryName(biomeStoneForest.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneForestSlab, props).setRegistryName(biomeStoneForestSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneForestStairs, props).setRegistryName(biomeStoneForestStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickForest, props).setRegistryName(biomeBrickForest.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickForestSlab, props).setRegistryName(biomeBrickForestSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickForestStairs, props).setRegistryName(biomeBrickForestStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneForest, props).setRegistryName(biomeCobblestoneForest.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneForestSlab, props).setRegistryName(biomeCobblestoneForestSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneForestStairs, props).setRegistryName(biomeCobblestoneForestStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallForest, props).setRegistryName(biomeWallForest.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickForest, props).setRegistryName(biomeChiseledBrickForest.getRegistryName())); + r.register(new BlockItem(biomeStoneForest, props).setRegistryName(biomeStoneForest.getRegistryName())); + r.register(new BlockItem(biomeStoneForestSlab, props).setRegistryName(biomeStoneForestSlab.getRegistryName())); + r.register(new BlockItem(biomeStoneForestStairs, props).setRegistryName(biomeStoneForestStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickForest, props).setRegistryName(biomeBrickForest.getRegistryName())); + r.register(new BlockItem(biomeBrickForestSlab, props).setRegistryName(biomeBrickForestSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickForestStairs, props).setRegistryName(biomeBrickForestStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneForest, props).setRegistryName(biomeCobblestoneForest.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneForestSlab, props).setRegistryName(biomeCobblestoneForestSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneForestStairs, props).setRegistryName(biomeCobblestoneForestStairs.getRegistryName())); + r.register(new BlockItem(biomeWallForest, props).setRegistryName(biomeWallForest.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickForest, props).setRegistryName(biomeChiseledBrickForest.getRegistryName())); - r.register(new ItemBlockMod(biomeStonePlains, props).setRegistryName(biomeStonePlains.getRegistryName())); - r.register(new ItemBlockMod(biomeStonePlainsSlab, props).setRegistryName(biomeStonePlainsSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStonePlainsStairs, props).setRegistryName(biomeStonePlainsStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickPlains, props).setRegistryName(biomeBrickPlains.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickPlainsSlab, props).setRegistryName(biomeBrickPlainsSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickPlainsStairs, props).setRegistryName(biomeBrickPlainsStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestonePlains, props).setRegistryName(biomeCobblestonePlains.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestonePlainsSlab, props).setRegistryName(biomeCobblestonePlainsSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestonePlainsStairs, props).setRegistryName(biomeCobblestonePlainsStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallPlains, props).setRegistryName(biomeWallPlains.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickPlains, props).setRegistryName(biomeChiseledBrickPlains.getRegistryName())); + r.register(new BlockItem(biomeStonePlains, props).setRegistryName(biomeStonePlains.getRegistryName())); + r.register(new BlockItem(biomeStonePlainsSlab, props).setRegistryName(biomeStonePlainsSlab.getRegistryName())); + r.register(new BlockItem(biomeStonePlainsStairs, props).setRegistryName(biomeStonePlainsStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickPlains, props).setRegistryName(biomeBrickPlains.getRegistryName())); + r.register(new BlockItem(biomeBrickPlainsSlab, props).setRegistryName(biomeBrickPlainsSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickPlainsStairs, props).setRegistryName(biomeBrickPlainsStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestonePlains, props).setRegistryName(biomeCobblestonePlains.getRegistryName())); + r.register(new BlockItem(biomeCobblestonePlainsSlab, props).setRegistryName(biomeCobblestonePlainsSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestonePlainsStairs, props).setRegistryName(biomeCobblestonePlainsStairs.getRegistryName())); + r.register(new BlockItem(biomeWallPlains, props).setRegistryName(biomeWallPlains.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickPlains, props).setRegistryName(biomeChiseledBrickPlains.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneMountain, props).setRegistryName(biomeStoneMountain.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneMountainSlab, props).setRegistryName(biomeStoneMountainSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneMountainStairs, props).setRegistryName(biomeStoneMountainStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickMountain, props).setRegistryName(biomeBrickMountain.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickMountainSlab, props).setRegistryName(biomeBrickMountainSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickMountainStairs, props).setRegistryName(biomeBrickMountainStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneMountain, props).setRegistryName(biomeCobblestoneMountain.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneMountainSlab, props).setRegistryName(biomeCobblestoneMountainSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneMountainStairs, props).setRegistryName(biomeCobblestoneMountainStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallMountain, props).setRegistryName(biomeWallMountain.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickMountain, props).setRegistryName(biomeChiseledBrickMountain.getRegistryName())); + r.register(new BlockItem(biomeStoneMountain, props).setRegistryName(biomeStoneMountain.getRegistryName())); + r.register(new BlockItem(biomeStoneMountainSlab, props).setRegistryName(biomeStoneMountainSlab.getRegistryName())); + r.register(new BlockItem(biomeStoneMountainStairs, props).setRegistryName(biomeStoneMountainStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickMountain, props).setRegistryName(biomeBrickMountain.getRegistryName())); + r.register(new BlockItem(biomeBrickMountainSlab, props).setRegistryName(biomeBrickMountainSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickMountainStairs, props).setRegistryName(biomeBrickMountainStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneMountain, props).setRegistryName(biomeCobblestoneMountain.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneMountainSlab, props).setRegistryName(biomeCobblestoneMountainSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneMountainStairs, props).setRegistryName(biomeCobblestoneMountainStairs.getRegistryName())); + r.register(new BlockItem(biomeWallMountain, props).setRegistryName(biomeWallMountain.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickMountain, props).setRegistryName(biomeChiseledBrickMountain.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneFungal, props).setRegistryName(biomeStoneFungal.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneFungalSlab, props).setRegistryName(biomeStoneFungalSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneFungalStairs, props).setRegistryName(biomeStoneFungalStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickFungal, props).setRegistryName(biomeBrickFungal.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickFungalSlab, props).setRegistryName(biomeBrickFungalSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickFungalStairs, props).setRegistryName(biomeBrickFungalStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneFungal, props).setRegistryName(biomeCobblestoneFungal.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneFungalSlab, props).setRegistryName(biomeCobblestoneFungalSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneFungalStairs, props).setRegistryName(biomeCobblestoneFungalStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallFungal, props).setRegistryName(biomeWallFungal.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickFungal, props).setRegistryName(biomeChiseledBrickFungal.getRegistryName())); + r.register(new BlockItem(biomeStoneFungal, props).setRegistryName(biomeStoneFungal.getRegistryName())); + r.register(new BlockItem(biomeStoneFungalSlab, props).setRegistryName(biomeStoneFungalSlab.getRegistryName())); + r.register(new BlockItem(biomeStoneFungalStairs, props).setRegistryName(biomeStoneFungalStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickFungal, props).setRegistryName(biomeBrickFungal.getRegistryName())); + r.register(new BlockItem(biomeBrickFungalSlab, props).setRegistryName(biomeBrickFungalSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickFungalStairs, props).setRegistryName(biomeBrickFungalStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneFungal, props).setRegistryName(biomeCobblestoneFungal.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneFungalSlab, props).setRegistryName(biomeCobblestoneFungalSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneFungalStairs, props).setRegistryName(biomeCobblestoneFungalStairs.getRegistryName())); + r.register(new BlockItem(biomeWallFungal, props).setRegistryName(biomeWallFungal.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickFungal, props).setRegistryName(biomeChiseledBrickFungal.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneSwamp, props).setRegistryName(biomeStoneSwamp.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneSwampSlab, props).setRegistryName(biomeStoneSwampSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneSwampStairs, props).setRegistryName(biomeStoneSwampStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickSwamp, props).setRegistryName(biomeBrickSwamp.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickSwampSlab, props).setRegistryName(biomeBrickSwampSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickSwampStairs, props).setRegistryName(biomeBrickSwampStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneSwamp, props).setRegistryName(biomeCobblestoneSwamp.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneSwampSlab, props).setRegistryName(biomeCobblestoneSwampSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneSwampStairs, props).setRegistryName(biomeCobblestoneSwampStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallSwamp, props).setRegistryName(biomeWallSwamp.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickSwamp, props).setRegistryName(biomeChiseledBrickSwamp.getRegistryName())); + r.register(new BlockItem(biomeStoneSwamp, props).setRegistryName(biomeStoneSwamp.getRegistryName())); + r.register(new BlockItem(biomeStoneSwampSlab, props).setRegistryName(biomeStoneSwampSlab.getRegistryName())); + r.register(new BlockItem(biomeStoneSwampStairs, props).setRegistryName(biomeStoneSwampStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickSwamp, props).setRegistryName(biomeBrickSwamp.getRegistryName())); + r.register(new BlockItem(biomeBrickSwampSlab, props).setRegistryName(biomeBrickSwampSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickSwampStairs, props).setRegistryName(biomeBrickSwampStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneSwamp, props).setRegistryName(biomeCobblestoneSwamp.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneSwampSlab, props).setRegistryName(biomeCobblestoneSwampSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneSwampStairs, props).setRegistryName(biomeCobblestoneSwampStairs.getRegistryName())); + r.register(new BlockItem(biomeWallSwamp, props).setRegistryName(biomeWallSwamp.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickSwamp, props).setRegistryName(biomeChiseledBrickSwamp.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneDesert, props).setRegistryName(biomeStoneDesert.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneDesertSlab, props).setRegistryName(biomeStoneDesertSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneDesertStairs, props).setRegistryName(biomeStoneDesertStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickDesert, props).setRegistryName(biomeBrickDesert.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickDesertSlab, props).setRegistryName(biomeBrickDesertSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickDesertStairs, props).setRegistryName(biomeBrickDesertStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneDesert, props).setRegistryName(biomeCobblestoneDesert.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneDesertSlab, props).setRegistryName(biomeCobblestoneDesertSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneDesertStairs, props).setRegistryName(biomeCobblestoneDesertStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallDesert, props).setRegistryName(biomeWallDesert.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickDesert, props).setRegistryName(biomeChiseledBrickDesert.getRegistryName())); + r.register(new BlockItem(biomeStoneDesert, props).setRegistryName(biomeStoneDesert.getRegistryName())); + r.register(new BlockItem(biomeStoneDesertSlab, props).setRegistryName(biomeStoneDesertSlab.getRegistryName())); + r.register(new BlockItem(biomeStoneDesertStairs, props).setRegistryName(biomeStoneDesertStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickDesert, props).setRegistryName(biomeBrickDesert.getRegistryName())); + r.register(new BlockItem(biomeBrickDesertSlab, props).setRegistryName(biomeBrickDesertSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickDesertStairs, props).setRegistryName(biomeBrickDesertStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneDesert, props).setRegistryName(biomeCobblestoneDesert.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneDesertSlab, props).setRegistryName(biomeCobblestoneDesertSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneDesertStairs, props).setRegistryName(biomeCobblestoneDesertStairs.getRegistryName())); + r.register(new BlockItem(biomeWallDesert, props).setRegistryName(biomeWallDesert.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickDesert, props).setRegistryName(biomeChiseledBrickDesert.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneTaiga, props).setRegistryName(biomeStoneTaiga.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneTaigaSlab, props).setRegistryName(biomeStoneTaigaSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneTaigaStairs, props).setRegistryName(biomeStoneTaigaStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickTaiga, props).setRegistryName(biomeBrickTaiga.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickTaigaSlab, props).setRegistryName(biomeBrickTaigaSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickTaigaStairs, props).setRegistryName(biomeBrickTaigaStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneTaiga, props).setRegistryName(biomeCobblestoneTaiga.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneTaigaSlab, props).setRegistryName(biomeCobblestoneTaigaSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneTaigaStairs, props).setRegistryName(biomeCobblestoneTaigaStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallTaiga, props).setRegistryName(biomeWallTaiga.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickTaiga, props).setRegistryName(biomeChiseledBrickTaiga.getRegistryName())); + r.register(new BlockItem(biomeStoneTaiga, props).setRegistryName(biomeStoneTaiga.getRegistryName())); + r.register(new BlockItem(biomeStoneTaigaSlab, props).setRegistryName(biomeStoneTaigaSlab.getRegistryName())); + r.register(new BlockItem(biomeStoneTaigaStairs, props).setRegistryName(biomeStoneTaigaStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickTaiga, props).setRegistryName(biomeBrickTaiga.getRegistryName())); + r.register(new BlockItem(biomeBrickTaigaSlab, props).setRegistryName(biomeBrickTaigaSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickTaigaStairs, props).setRegistryName(biomeBrickTaigaStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneTaiga, props).setRegistryName(biomeCobblestoneTaiga.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneTaigaSlab, props).setRegistryName(biomeCobblestoneTaigaSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneTaigaStairs, props).setRegistryName(biomeCobblestoneTaigaStairs.getRegistryName())); + r.register(new BlockItem(biomeWallTaiga, props).setRegistryName(biomeWallTaiga.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickTaiga, props).setRegistryName(biomeChiseledBrickTaiga.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneMesa, props).setRegistryName(biomeStoneMesa.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneMesaSlab, props).setRegistryName(biomeStoneMesaSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeStoneMesaStairs, props).setRegistryName(biomeStoneMesaStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickMesa, props).setRegistryName(biomeBrickMesa.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickMesaSlab, props).setRegistryName(biomeBrickMesaSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeBrickMesaStairs, props).setRegistryName(biomeBrickMesaStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneMesa, props).setRegistryName(biomeCobblestoneMesa.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneMesaSlab, props).setRegistryName(biomeCobblestoneMesaSlab.getRegistryName())); - r.register(new ItemBlockMod(biomeCobblestoneMesaStairs, props).setRegistryName(biomeCobblestoneMesaStairs.getRegistryName())); - r.register(new ItemBlockMod(biomeWallMesa, props).setRegistryName(biomeWallMesa.getRegistryName())); - r.register(new ItemBlockMod(biomeChiseledBrickMesa, props).setRegistryName(biomeChiseledBrickMesa.getRegistryName())); + r.register(new BlockItem(biomeStoneMesa, props).setRegistryName(biomeStoneMesa.getRegistryName())); + r.register(new BlockItem(biomeStoneMesaSlab, props).setRegistryName(biomeStoneMesaSlab.getRegistryName())); + r.register(new BlockItem(biomeStoneMesaStairs, props).setRegistryName(biomeStoneMesaStairs.getRegistryName())); + r.register(new BlockItem(biomeBrickMesa, props).setRegistryName(biomeBrickMesa.getRegistryName())); + r.register(new BlockItem(biomeBrickMesaSlab, props).setRegistryName(biomeBrickMesaSlab.getRegistryName())); + r.register(new BlockItem(biomeBrickMesaStairs, props).setRegistryName(biomeBrickMesaStairs.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneMesa, props).setRegistryName(biomeCobblestoneMesa.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneMesaSlab, props).setRegistryName(biomeCobblestoneMesaSlab.getRegistryName())); + r.register(new BlockItem(biomeCobblestoneMesaStairs, props).setRegistryName(biomeCobblestoneMesaStairs.getRegistryName())); + r.register(new BlockItem(biomeWallMesa, props).setRegistryName(biomeWallMesa.getRegistryName())); + r.register(new BlockItem(biomeChiseledBrickMesa, props).setRegistryName(biomeChiseledBrickMesa.getRegistryName())); - r.register(new ItemBlockMod(whitePavement, props).setRegistryName(whitePavement.getRegistryName())); - r.register(new ItemBlockMod(blackPavement, props).setRegistryName(blackPavement.getRegistryName())); - r.register(new ItemBlockMod(bluePavement, props).setRegistryName(bluePavement.getRegistryName())); - r.register(new ItemBlockMod(yellowPavement, props).setRegistryName(yellowPavement.getRegistryName())); - r.register(new ItemBlockMod(redPavement, props).setRegistryName(redPavement.getRegistryName())); - r.register(new ItemBlockMod(greenPavement, props).setRegistryName(greenPavement.getRegistryName())); + r.register(new BlockItem(whitePavement, props).setRegistryName(whitePavement.getRegistryName())); + r.register(new BlockItem(blackPavement, props).setRegistryName(blackPavement.getRegistryName())); + r.register(new BlockItem(bluePavement, props).setRegistryName(bluePavement.getRegistryName())); + r.register(new BlockItem(yellowPavement, props).setRegistryName(yellowPavement.getRegistryName())); + r.register(new BlockItem(redPavement, props).setRegistryName(redPavement.getRegistryName())); + r.register(new BlockItem(greenPavement, props).setRegistryName(greenPavement.getRegistryName())); - r.register(new ItemBlockMod(whitePavementSlab, props).setRegistryName(whitePavementSlab.getRegistryName())); - r.register(new ItemBlockMod(blackPavementSlab, props).setRegistryName(blackPavementSlab.getRegistryName())); - r.register(new ItemBlockMod(bluePavementSlab, props).setRegistryName(bluePavementSlab.getRegistryName())); - r.register(new ItemBlockMod(yellowPavementSlab, props).setRegistryName(yellowPavementSlab.getRegistryName())); - r.register(new ItemBlockMod(redPavementSlab, props).setRegistryName(redPavementSlab.getRegistryName())); - r.register(new ItemBlockMod(greenPavementSlab, props).setRegistryName(greenPavementSlab.getRegistryName())); + r.register(new BlockItem(whitePavementSlab, props).setRegistryName(whitePavementSlab.getRegistryName())); + r.register(new BlockItem(blackPavementSlab, props).setRegistryName(blackPavementSlab.getRegistryName())); + r.register(new BlockItem(bluePavementSlab, props).setRegistryName(bluePavementSlab.getRegistryName())); + r.register(new BlockItem(yellowPavementSlab, props).setRegistryName(yellowPavementSlab.getRegistryName())); + r.register(new BlockItem(redPavementSlab, props).setRegistryName(redPavementSlab.getRegistryName())); + r.register(new BlockItem(greenPavementSlab, props).setRegistryName(greenPavementSlab.getRegistryName())); - r.register(new ItemBlockMod(whitePavementStair, props).setRegistryName(whitePavementStair.getRegistryName())); - r.register(new ItemBlockMod(blackPavementStair, props).setRegistryName(blackPavementStair.getRegistryName())); - r.register(new ItemBlockMod(bluePavementStair, props).setRegistryName(bluePavementStair.getRegistryName())); - r.register(new ItemBlockMod(yellowPavementStair, props).setRegistryName(yellowPavementStair.getRegistryName())); - r.register(new ItemBlockMod(redPavementStair, props).setRegistryName(redPavementStair.getRegistryName())); - r.register(new ItemBlockMod(greenPavementStair, props).setRegistryName(greenPavementStair.getRegistryName())); + r.register(new BlockItem(whitePavementStair, props).setRegistryName(whitePavementStair.getRegistryName())); + r.register(new BlockItem(blackPavementStair, props).setRegistryName(blackPavementStair.getRegistryName())); + r.register(new BlockItem(bluePavementStair, props).setRegistryName(bluePavementStair.getRegistryName())); + r.register(new BlockItem(yellowPavementStair, props).setRegistryName(yellowPavementStair.getRegistryName())); + r.register(new BlockItem(redPavementStair, props).setRegistryName(redPavementStair.getRegistryName())); + r.register(new BlockItem(greenPavementStair, props).setRegistryName(greenPavementStair.getRegistryName())); - r.register(new ItemBlockMod(shimmerrockSlab, props).setRegistryName(shimmerrockSlab.getRegistryName())); - r.register(new ItemBlockMod(shimmerrockStairs, props).setRegistryName(shimmerrockStairs.getRegistryName())); + r.register(new BlockItem(shimmerrockSlab, props).setRegistryName(shimmerrockSlab.getRegistryName())); + r.register(new BlockItem(shimmerrockStairs, props).setRegistryName(shimmerrockStairs.getRegistryName())); - r.register(new ItemBlockMod(shimmerwoodPlankSlab, props).setRegistryName(shimmerwoodPlankSlab.getRegistryName())); - r.register(new ItemBlockMod(shimmerwoodPlankStairs, props).setRegistryName(shimmerwoodPlankStairs.getRegistryName())); + r.register(new BlockItem(shimmerwoodPlankSlab, props).setRegistryName(shimmerwoodPlankSlab.getRegistryName())); + r.register(new BlockItem(shimmerwoodPlankStairs, props).setRegistryName(shimmerwoodPlankStairs.getRegistryName())); - r.register(new ItemBlockMod(managlassPane, props).setRegistryName(managlassPane.getRegistryName())); - r.register(new ItemBlockMod(alfglassPane, props).setRegistryName(alfglassPane.getRegistryName())); - r.register(new ItemBlockMod(bifrostPane, props).setRegistryName(bifrostPane.getRegistryName())); + r.register(new BlockItem(managlassPane, props).setRegistryName(managlassPane.getRegistryName())); + r.register(new BlockItem(alfglassPane, props).setRegistryName(alfglassPane.getRegistryName())); + r.register(new BlockItem(bifrostPane, props).setRegistryName(bifrostPane.getRegistryName())); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/ItemBlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/ItemBlockBlaze.java index d35c67e69..7fd032c7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/ItemBlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/ItemBlockBlaze.java @@ -1,13 +1,13 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.Botania; -import vazkii.botania.common.item.block.ItemBlockMod; -public class ItemBlockBlaze extends ItemBlockMod { +public class ItemBlockBlaze extends BlockItem { public ItemBlockBlaze(Block block, Properties props) { super(block, props); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java index 6d33668be..c223aa01e 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java @@ -1,10 +1,11 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -public class ItemBlockDreamwood extends ItemBlockMod implements IElvenItem { +public class ItemBlockDreamwood extends BlockItem implements IElvenItem { public ItemBlockDreamwood(Block block, Properties props) { super(block, props); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java index 2acaa77f5..4efb95cbf 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java @@ -11,10 +11,11 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -public class ItemBlockElven extends ItemBlockMod implements IElvenItem { +public class ItemBlockElven extends BlockItem implements IElvenItem { public ItemBlockElven(Block block, Properties props) { super(block, props); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java deleted file mode 100644 index 7527b180a..000000000 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 16, 2014, 7:00:36 PM (GMT)] - */ -package vazkii.botania.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; - -// todo 1.13 reevaluate if necessary -public class ItemBlockMod extends BlockItem { - - public ItemBlockMod(Block block, Properties props) { - super(block, props); - } -} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 02159aba6..8f5d15661 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; @@ -26,7 +27,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public class ItemBlockPool extends ItemBlockMod { +public class ItemBlockPool extends BlockItem { public ItemBlockPool(Block block, Properties props) { super(block, props); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 75a31e1b5..d0116fbbc 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tags.Tag; @@ -31,7 +32,7 @@ import javax.annotation.Nonnull; import java.util.List; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class ItemBlockSpecialFlower extends ItemBlockMod { +public class ItemBlockSpecialFlower extends BlockItem { private static final Tag GENERATING = ModTags.Items.GENERATING_SPECIAL_FLOWERS; private static final Tag FUNCTIONAL = ModTags.Items.FUNCTIONAL_SPECIAL_FLOWERS; private static final Tag MISC = ModTags.Items.MISC_SPECIAL_FLOWERS; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index 07f38e70b..e68eb0c79 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @@ -22,11 +23,11 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import java.util.Arrays; import java.util.List; -public class ItemBlockTinyPotato extends ItemBlockMod { +public class ItemBlockTinyPotato extends BlockItem { private static final List TYPOS = Arrays.asList("vaskii", "vazki", "voskii", "vazkkii", "vazkki", "vazzki", "vaskki", "vozkii", "vazkil", "vaskil", "vazkill", "vaskill", "vaski"); - private static final String NOT_MY_NAME[] = { + private static final String[] NOT_MY_NAME = { "Six letter word just to get me along", "It's a intricacy and I'm coding on my mod and I,", "I keep fixin', and keepin' it together", diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 1b21f3d3b..30c9e6f4f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -11,14 +11,14 @@ package vazkii.botania.common.item.material; import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.ICustomApothecaryColor; -import vazkii.botania.common.item.block.ItemBlockMod; import javax.annotation.Nonnull; -public class ItemPetal extends ItemBlockMod implements ICustomApothecaryColor { +public class ItemPetal extends BlockItem implements ICustomApothecaryColor { public final DyeColor color; public ItemPetal(Block buriedPetals, DyeColor color, Properties props) {