diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 4c6d0238a..e2a73ef4f 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -93,7 +93,7 @@ public final class BotaniaAPI { public static final List miniFlowerRecipes = new ArrayList<>(); public static final ResourceLocation DUMMY_SUBTILE_NAME = new ResourceLocation("botania", "dummy"); - private static final RegistryNamespacedDefaultedByKey> subTiles = new RegistryNamespacedDefaultedByKey<>(DUMMY_SUBTILE_NAME); + private static final RegistryNamespacedDefaultedByKey> subTiles = new RegistryNamespacedDefaultedByKey<>(DUMMY_SUBTILE_NAME); private static final Map, SubTileSignature> subTileSignatures = new HashMap<>(); public static final Set subtilesForCreativeMenu = new LinkedHashSet<>(); public static final BiMap miniFlowers = HashBiMap.create(); @@ -665,7 +665,7 @@ public final class BotaniaAPI { * Call this during {@code RegistryEvent.Register}, and don't forget to register a model in BotaniaAPIClient. */ public static void registerSubTile(ResourceLocation id, Class subtileClass) { - subTiles.putObject(id, subtileClass); + subTiles.put(id, subtileClass); } /** @@ -696,7 +696,7 @@ public final class BotaniaAPI { */ public static SubTileSignature getSignatureForClass(Class subtileClass) { if(!subTileSignatures.containsKey(subtileClass)) - registerSubTileSignature(subtileClass, new BasicSignature(subTiles.getNameForObject(subtileClass))); + registerSubTileSignature(subtileClass, new BasicSignature(subTiles.getKey(subtileClass))); return subTileSignatures.get(subtileClass); } @@ -706,7 +706,7 @@ public final class BotaniaAPI { * before the call. */ public static SubTileSignature getSignatureForName(ResourceLocation name) { - Class subtileClass = subTiles.getObject(name); + Class subtileClass = subTiles.get(name); return getSignatureForClass(subtileClass); } @@ -794,15 +794,15 @@ public final class BotaniaAPI { } public static Class getSubTileMapping(ResourceLocation key) { - return subTiles.getObject(key); + return subTiles.get(key); } public static ResourceLocation getSubTileStringMapping(Class clazz) { - return subTiles.getNameForObject(clazz); + return subTiles.getKey(clazz); } public static Set getAllSubTiles() { - return subTiles.getKeys(); + return subTiles.keySet(); } } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 568b2c4cd..c58ae92f2 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -580,184 +580,217 @@ public final class ModBlocks { @SubscribeEvent public static void registerItemBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); - r.register(new ItemBlockMod(whiteFlower).setRegistryName(whiteFlower.getRegistryName())); - r.register(new ItemBlockMod(orangeFlower).setRegistryName(orangeFlower.getRegistryName())); - r.register(new ItemBlockMod(magentaFlower).setRegistryName(magentaFlower.getRegistryName())); - r.register(new ItemBlockMod(lightBlueFlower).setRegistryName(lightBlueFlower.getRegistryName())); - r.register(new ItemBlockMod(yellowFlower).setRegistryName(yellowFlower.getRegistryName())); - r.register(new ItemBlockMod(limeFlower).setRegistryName(limeFlower.getRegistryName())); - r.register(new ItemBlockMod(pinkFlower).setRegistryName(pinkFlower.getRegistryName())); - r.register(new ItemBlockMod(grayFlower).setRegistryName(grayFlower.getRegistryName())); - r.register(new ItemBlockMod(lightGrayFlower).setRegistryName(lightGrayFlower.getRegistryName())); - r.register(new ItemBlockMod(cyanFlower).setRegistryName(cyanFlower.getRegistryName())); - r.register(new ItemBlockMod(purpleFlower).setRegistryName(purpleFlower.getRegistryName())); - r.register(new ItemBlockMod(blueFlower).setRegistryName(blueFlower.getRegistryName())); - r.register(new ItemBlockMod(brownFlower).setRegistryName(brownFlower.getRegistryName())); - r.register(new ItemBlockMod(greenFlower).setRegistryName(greenFlower.getRegistryName())); - r.register(new ItemBlockMod(redFlower).setRegistryName(redFlower.getRegistryName())); - r.register(new ItemBlockMod(blackFlower).setRegistryName(blackFlower.getRegistryName())); - r.register(new ItemBlockMod(defaultAltar).setRegistryName(defaultAltar.getRegistryName())); - r.register(new ItemBlockMod(forestAltar).setRegistryName(forestAltar.getRegistryName())); - r.register(new ItemBlockMod(plainsAltar).setRegistryName(plainsAltar.getRegistryName())); - r.register(new ItemBlockMod(mountainAltar).setRegistryName(mountainAltar.getRegistryName())); - r.register(new ItemBlockMod(fungalAltar).setRegistryName(fungalAltar.getRegistryName())); - r.register(new ItemBlockMod(swampAltar).setRegistryName(swampAltar.getRegistryName())); - r.register(new ItemBlockMod(desertAltar).setRegistryName(desertAltar.getRegistryName())); - r.register(new ItemBlockMod(taigaAltar).setRegistryName(taigaAltar.getRegistryName())); - r.register(new ItemBlockMod(mesaAltar).setRegistryName(mesaAltar.getRegistryName())); - r.register(new ItemBlockMod(mossyAltar).setRegistryName(mossyAltar.getRegistryName())); - r.register(new ItemBlockMod(livingrock).setRegistryName(livingrock.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrick).setRegistryName(livingrockBrick.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickChiseled).setRegistryName(livingrockBrickChiseled.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickCracked).setRegistryName(livingrockBrickCracked.getRegistryName())); - r.register(new ItemBlockMod(livingrockBrickMossy).setRegistryName(livingrockBrickMossy.getRegistryName())); - r.register(new ItemBlockMod(livingwood).setRegistryName(livingwood.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPlanks).setRegistryName(livingwoodPlanks.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPlanksMossy).setRegistryName(livingwoodPlanksMossy.getRegistryName())); - r.register(new ItemBlockMod(livingwoodFramed).setRegistryName(livingwoodFramed.getRegistryName())); - r.register(new ItemBlockMod(livingwoodPatternFramed).setRegistryName(livingwoodPatternFramed.getRegistryName())); - r.register(new ItemBlockMod(livingwoodGlimmering).setRegistryName(livingwoodGlimmering.getRegistryName())); + 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 ItemBlockSpecialFlower(specialFlower).setRegistryName(specialFlower.getRegistryName())); - r.register(new ItemBlockMod(manaSpreader).setRegistryName(manaSpreader.getRegistryName())); - r.register(new ItemBlockMod(redstoneSpreader).setRegistryName(redstoneSpreader.getRegistryName())); - r.register(new ItemBlockMod(elvenSpreader).setRegistryName(elvenSpreader.getRegistryName())); - r.register(new ItemBlockMod(gaiaSpreader).setRegistryName(gaiaSpreader.getRegistryName())); - r.register(new ItemBlockPool(manaPool).setRegistryName(manaPool.getRegistryName())); - r.register(new ItemBlockPool(creativePool).setRegistryName(creativePool.getRegistryName())); - r.register(new ItemBlockPool(dilutedPool).setRegistryName(dilutedPool.getRegistryName())); - r.register(new ItemBlockPool(fabulousPool).setRegistryName(fabulousPool.getRegistryName())); - r.register(new ItemBlockMod(runeAltar).setRegistryName(runeAltar.getRegistryName())); - r.register(new ItemBlockMod(manaPylon).setRegistryName(manaPylon.getRegistryName())); - r.register(new ItemBlockMod(naturaPylon).setRegistryName(naturaPylon.getRegistryName())); - r.register(new ItemBlockMod(gaiaPylon).setRegistryName(gaiaPylon.getRegistryName())); - r.register(new ItemBlockMod(pistonRelay).setRegistryName(pistonRelay.getRegistryName())); - r.register(new ItemBlockMod(distributor).setRegistryName(distributor.getRegistryName())); - r.register(new ItemBlockMod(manaVoid).setRegistryName(manaVoid.getRegistryName())); - r.register(new ItemBlockMod(manaDetector).setRegistryName(manaDetector.getRegistryName())); - r.register(new ItemBlockMod(enchanter).setRegistryName(enchanter.getRegistryName())); - r.register(new ItemBlockMod(turntable).setRegistryName(turntable.getRegistryName())); - r.register(new ItemBlockMod(tinyPlanet).setRegistryName(tinyPlanet.getRegistryName())); - r.register(new ItemBlockMod(alchemyCatalyst).setRegistryName(alchemyCatalyst.getRegistryName())); - r.register(new ItemBlockMod(openCrate).setRegistryName(openCrate.getRegistryName())); - r.register(new ItemBlockMod(craftCrate).setRegistryName(craftCrate.getRegistryName())); - r.register(new ItemBlockMod(forestEye).setRegistryName(forestEye.getRegistryName())); - r.register(new ItemBlockMod(manasteelBlock).setRegistryName(manasteelBlock.getRegistryName())); - r.register(new ItemBlockMod(terrasteelBlock).setRegistryName(terrasteelBlock.getRegistryName())); - r.register(new ItemBlockElven(elementiumBlock).setRegistryName(elementiumBlock.getRegistryName())); - r.register(new ItemBlockMod(manaDiamondBlock).setRegistryName(manaDiamondBlock.getRegistryName())); - r.register(new ItemBlockMod(dragonstoneBlock).setRegistryName(dragonstoneBlock.getRegistryName())); - r.register(new ItemBlockMod(wildDrum).setRegistryName(wildDrum.getRegistryName())); - r.register(new ItemBlockMod(gatheringDrum).setRegistryName(gatheringDrum.getRegistryName())); - r.register(new ItemBlockMod(canopyDrum).setRegistryName(canopyDrum.getRegistryName())); - r.register(new ItemBlockMod(whiteShinyFlower).setRegistryName(whiteShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(orangeShinyFlower).setRegistryName(orangeShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(magentaShinyFlower).setRegistryName(magentaShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(lightBlueShinyFlower).setRegistryName(lightBlueShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(yellowShinyFlower).setRegistryName(yellowShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(limeShinyFlower).setRegistryName(limeShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(pinkShinyFlower).setRegistryName(pinkShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(grayShinyFlower).setRegistryName(grayShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(lightGrayShinyFlower).setRegistryName(lightGrayShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(cyanShinyFlower).setRegistryName(cyanShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(purpleShinyFlower).setRegistryName(purpleShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(blueShinyFlower).setRegistryName(blueShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(brownShinyFlower).setRegistryName(brownShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(greenShinyFlower).setRegistryName(greenShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(redShinyFlower).setRegistryName(redShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(blackShinyFlower).setRegistryName(blackShinyFlower.getRegistryName())); - r.register(new ItemBlockMod(abstrusePlatform).setRegistryName(abstrusePlatform.getRegistryName())); - r.register(new ItemBlockMod(spectralPlatform).setRegistryName(spectralPlatform.getRegistryName())); - r.register(new ItemBlockMod(infrangiblePlatform).setRegistryName(infrangiblePlatform.getRegistryName())); - r.register(new ItemBlockMod(alfPortal).setRegistryName(alfPortal.getRegistryName())); - r.register(new ItemBlockDreamwood(dreamwood).setRegistryName(dreamwood.getRegistryName())); - r.register(new ItemBlockMod(conjurationCatalyst).setRegistryName(conjurationCatalyst.getRegistryName())); - r.register(new ItemBlockMod(bifrost).setRegistryName(bifrost.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())); + r.register(new ItemBlockMod(manaPylon, props).setRegistryName(manaPylon.getRegistryName())); + r.register(new ItemBlockMod(naturaPylon, props).setRegistryName(naturaPylon.getRegistryName())); + r.register(new ItemBlockMod(gaiaPylon, props).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 ItemBlockMod(conjurationCatalyst, props).setRegistryName(conjurationCatalyst.getRegistryName())); + r.register(new ItemBlockMod(bifrost, props).setRegistryName(bifrost.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(floatingFlower).setRegistryName(floatingFlower.getRegistryName())); - r.register(new ItemBlockTinyPotato(tinyPotato).setRegistryName(tinyPotato.getRegistryName())); - r.register(new ItemBlockMod(spawnerClaw).setRegistryName(spawnerClaw.getRegistryName())); - r.register(new ItemBlockMod(azulejo0).setRegistryName(azulejo0.getRegistryName())); - r.register(new ItemBlockMod(azulejo1).setRegistryName(azulejo1.getRegistryName())); - r.register(new ItemBlockMod(azulejo2).setRegistryName(azulejo2.getRegistryName())); - r.register(new ItemBlockMod(azulejo3).setRegistryName(azulejo3.getRegistryName())); - r.register(new ItemBlockMod(azulejo4).setRegistryName(azulejo4.getRegistryName())); - r.register(new ItemBlockMod(azulejo5).setRegistryName(azulejo5.getRegistryName())); - r.register(new ItemBlockMod(azulejo6).setRegistryName(azulejo6.getRegistryName())); - r.register(new ItemBlockMod(azulejo7).setRegistryName(azulejo7.getRegistryName())); - r.register(new ItemBlockMod(azulejo8).setRegistryName(azulejo8.getRegistryName())); - r.register(new ItemBlockMod(azulejo9).setRegistryName(azulejo9.getRegistryName())); - r.register(new ItemBlockMod(azulejo10).setRegistryName(azulejo10.getRegistryName())); - r.register(new ItemBlockMod(azulejo11).setRegistryName(azulejo11.getRegistryName())); - r.register(new ItemBlockMod(azulejo12).setRegistryName(azulejo12.getRegistryName())); - r.register(new ItemBlockMod(azulejo13).setRegistryName(azulejo13.getRegistryName())); - r.register(new ItemBlockMod(azulejo14).setRegistryName(azulejo14.getRegistryName())); - r.register(new ItemBlockMod(azulejo15).setRegistryName(azulejo15.getRegistryName())); - r.register(new ItemBlockMod(enderEye).setRegistryName(enderEye.getRegistryName())); - r.register(new ItemBlockMod(starfield).setRegistryName(starfield.getRegistryName())); - r.register(new ItemBlockMod(rfGenerator).setRegistryName(rfGenerator.getRegistryName())); - r.register(new ItemBlockElven(elfGlass).setRegistryName(elfGlass.getRegistryName())); - r.register(new ItemBlockMod(brewery).setRegistryName(brewery.getRegistryName())); - r.register(new ItemBlockMod(manaGlass).setRegistryName(manaGlass.getRegistryName())); - r.register(new ItemBlockMod(terraPlate).setRegistryName(terraPlate.getRegistryName())); - r.register(new ItemBlockMod(redStringContainer).setRegistryName(redStringContainer.getRegistryName())); - r.register(new ItemBlockMod(redStringDispenser).setRegistryName(redStringDispenser.getRegistryName())); - r.register(new ItemBlockMod(redStringFertilizer).setRegistryName(redStringFertilizer.getRegistryName())); - r.register(new ItemBlockMod(redStringComparator).setRegistryName(redStringComparator.getRegistryName())); - r.register(new ItemBlockMod(redStringRelay).setRegistryName(redStringRelay.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, props).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 ItemBlockFloatingSpecialFlower(floatingSpecialFlower).setRegistryName(floatingSpecialFlower.getRegistryName())); - r.register(new ItemBlockMod(prism).setRegistryName(prism.getRegistryName())); - r.register(new ItemBlockMod(enchantedSoil).setRegistryName(enchantedSoil.getRegistryName())); - r.register(new ItemBlockMod(petalBlockWhite).setRegistryName(petalBlockWhite.getRegistryName())); - r.register(new ItemBlockMod(petalBlockOrange).setRegistryName(petalBlockOrange.getRegistryName())); - r.register(new ItemBlockMod(petalBlockMagenta).setRegistryName(petalBlockMagenta.getRegistryName())); - r.register(new ItemBlockMod(petalBlockLightBlue).setRegistryName(petalBlockLightBlue.getRegistryName())); - r.register(new ItemBlockMod(petalBlockYellow).setRegistryName(petalBlockYellow.getRegistryName())); - r.register(new ItemBlockMod(petalBlockLime).setRegistryName(petalBlockLime.getRegistryName())); - r.register(new ItemBlockMod(petalBlockPink).setRegistryName(petalBlockPink.getRegistryName())); - r.register(new ItemBlockMod(petalBlockGray).setRegistryName(petalBlockGray.getRegistryName())); - r.register(new ItemBlockMod(petalBlockSilver).setRegistryName(petalBlockSilver.getRegistryName())); - r.register(new ItemBlockMod(petalBlockCyan).setRegistryName(petalBlockCyan.getRegistryName())); - r.register(new ItemBlockMod(petalBlockPurple).setRegistryName(petalBlockPurple.getRegistryName())); - r.register(new ItemBlockMod(petalBlockBlue).setRegistryName(petalBlockBlue.getRegistryName())); - r.register(new ItemBlockMod(petalBlockBrown).setRegistryName(petalBlockBrown.getRegistryName())); - r.register(new ItemBlockMod(petalBlockGreen).setRegistryName(petalBlockGreen.getRegistryName())); - r.register(new ItemBlockMod(petalBlockRed).setRegistryName(petalBlockRed.getRegistryName())); - r.register(new ItemBlockMod(petalBlockBlack).setRegistryName(petalBlockBlack.getRegistryName())); - r.register(new ItemBlockMod(corporeaIndex).setRegistryName(corporeaIndex.getRegistryName())); - r.register(new ItemBlockMod(corporeaFunnel).setRegistryName(corporeaFunnel.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(mushroom).setRegistryName(mushroom.getRegistryName())); - r.register(new ItemBlockMod(pump).setRegistryName(pump.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(doubleFlower1).setRegistryName(doubleFlower1.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(doubleFlower2).setRegistryName(doubleFlower2.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, props).setRegistryName(corporeaIndex.getRegistryName())); + r.register(new ItemBlockMod(corporeaFunnel, props).setRegistryName(corporeaFunnel.getRegistryName())); + r.register(new ItemBlockMod(mushroomWhite, props).setRegistryName(mushroomWhite.getRegistryName())); + r.register(new ItemBlockMod(mushroomOrange, props).setRegistryName(mushroomOrange.getRegistryName())); + r.register(new ItemBlockMod(mushroomMagenta, props).setRegistryName(mushroomMagenta.getRegistryName())); + r.register(new ItemBlockMod(mushroomLightBlue, props).setRegistryName(mushroomLightBlue.getRegistryName())); + r.register(new ItemBlockMod(mushroomYellow, props).setRegistryName(mushroomYellow.getRegistryName())); + r.register(new ItemBlockMod(mushroomLime, props).setRegistryName(mushroomLime.getRegistryName())); + r.register(new ItemBlockMod(mushroomPink, props).setRegistryName(mushroomPink.getRegistryName())); + r.register(new ItemBlockMod(mushroomGray, props).setRegistryName(mushroomGray.getRegistryName())); + r.register(new ItemBlockMod(mushroomSilver, props).setRegistryName(mushroomSilver.getRegistryName())); + r.register(new ItemBlockMod(mushroomCyan, props).setRegistryName(mushroomCyan.getRegistryName())); + r.register(new ItemBlockMod(mushroomPurple, props).setRegistryName(mushroomPurple.getRegistryName())); + r.register(new ItemBlockMod(mushroomBlue, props).setRegistryName(mushroomBlue.getRegistryName())); + r.register(new ItemBlockMod(mushroomBrown, props).setRegistryName(mushroomBrown.getRegistryName())); + r.register(new ItemBlockMod(mushroomGreen, props).setRegistryName(mushroomGreen.getRegistryName())); + r.register(new ItemBlockMod(mushroomRed, props).setRegistryName(mushroomRed.getRegistryName())); + r.register(new ItemBlockMod(mushroomBlack, props).setRegistryName(mushroomBlack.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(doubleFlowerSilver, props).setRegistryName(doubleFlowerSilver.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).setRegistryName(blazeBlock.getRegistryName())); - r.register(new ItemBlockMod(corporeaInterceptor).setRegistryName(corporeaInterceptor.getRegistryName())); - r.register(new ItemBlockMod(corporeaCrystalCube).setRegistryName(corporeaCrystalCube.getRegistryName())); - r.register(new ItemBlockMod(incensePlate).setRegistryName(incensePlate.getRegistryName())); - r.register(new ItemBlockMod(hourglass).setRegistryName(hourglass.getRegistryName())); - r.register(new ItemBlockMod(ghostRail).setRegistryName(ghostRail.getRegistryName())); - r.register(new ItemBlockMod(sparkChanger).setRegistryName(sparkChanger.getRegistryName())); - r.register(new ItemBlockMod(root).setRegistryName(root.getRegistryName())); - r.register(new ItemBlockMod(felPumpkin).setRegistryName(felPumpkin.getRegistryName())); - r.register(new ItemBlockMod(cocoon).setRegistryName(cocoon.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(lightRelay).setRegistryName(lightRelay.getRegistryName())); - r.register(new ItemBlockMod(lightLauncher).setRegistryName(lightLauncher.getRegistryName())); - r.register(new ItemBlockMod(manaBomb).setRegistryName(manaBomb.getRegistryName())); - r.register(new ItemBlockMod(cacophonium).setRegistryName(cacophonium.getRegistryName())); - r.register(new ItemBlockMod(bellows).setRegistryName(bellows.getRegistryName())); - r.register(new ItemBlockMod(bifrostPerm).setRegistryName(bifrostPerm.getRegistryName())); - r.register(new ItemBlockMod(cellBlock).setRegistryName(cellBlock.getRegistryName())); - r.register(new ItemBlockMod(redStringInterceptor).setRegistryName(redStringInterceptor.getRegistryName())); - r.register(new ItemBlockMod(corporeaRetainer).setRegistryName(corporeaRetainer.getRegistryName())); - r.register(new ItemBlockMod(teruTeruBozu).setRegistryName(teruTeruBozu.getRegistryName())); - r.register(new ItemBlockMod(shimmerrock).setRegistryName(shimmerrock.getRegistryName())); - r.register(new ItemBlockMod(shimmerwoodPlanks).setRegistryName(shimmerwoodPlanks.getRegistryName())); - r.register(new ItemBlockMod(avatar).setRegistryName(avatar.getRegistryName())); - r.register(new ItemBlockMod(dryGrass).setRegistryName(dryGrass.getRegistryName())); - r.register(new ItemBlockMod(goldenGrass).setRegistryName(goldenGrass.getRegistryName())); - r.register(new ItemBlockMod(vividGrass).setRegistryName(vividGrass.getRegistryName())); - r.register(new ItemBlockMod(scorchedGrass).setRegistryName(scorchedGrass.getRegistryName())); - r.register(new ItemBlockMod(infusedGrass).setRegistryName(infusedGrass.getRegistryName())); - r.register(new ItemBlockMod(mutatedGrass).setRegistryName(mutatedGrass.getRegistryName())); - r.register(new ItemBlockMod(animatedTorch).setRegistryName(animatedTorch.getRegistryName())); + r.register(new ItemBlockMod(corporeaInterceptor, props).setRegistryName(corporeaInterceptor.getRegistryName())); + r.register(new ItemBlockMod(corporeaCrystalCube, props).setRegistryName(corporeaCrystalCube.getRegistryName())); + r.register(new ItemBlockMod(incensePlate, props).setRegistryName(incensePlate.getRegistryName())); + r.register(new ItemBlockMod(hourglass, props).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(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, props).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, props).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, props).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())); initOreDict(); } diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 838ef49d2..4f2b07fb1 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -34,7 +34,7 @@ import vazkii.botania.common.block.decor.stairs.BlockModStairs; import vazkii.botania.common.block.decor.stairs.BlockPavementStairs; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; import vazkii.botania.common.block.decor.walls.BlockModWall; -import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -349,7 +349,7 @@ public final class ModFluffBlocks { @SubscribeEvent public static void registerItemBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); - Item.Properties props = new Item.Properties().group(BotaniaCreativeTab.INSTANCE); + Item.Properties props = ModItems.defaultBuilder(); r.register(new ItemBlockMod(livingwoodStairs, props).setRegistryName(livingwoodStairs.getRegistryName())); r.register(new ItemBlockMod(livingwoodSlab, props).setRegistryName(livingwoodSlab.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 8de0f7ceb..f2366eef6 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -377,7 +377,7 @@ public final class ModItems { public static final Item astrolabe = new ItemAstrolabe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ASTROLABE); public static final Item goddessCharm = new ItemGoddessCharm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GODDESS_CHARM); - private static Item.Properties defaultBuilder() { + public static Item.Properties defaultBuilder() { return new Item.Properties().group(BotaniaCreativeTab.INSTANCE); } 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 eec1ada5e..6d33668be 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java @@ -4,10 +4,10 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -public class ItemBlockDreamwood extends ItemBlockWithMetadataAndName implements IElvenItem { +public class ItemBlockDreamwood extends ItemBlockMod implements IElvenItem { - public ItemBlockDreamwood(Block block) { - super(block); + public ItemBlockDreamwood(Block block, Properties props) { + super(block, props); } @Override 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 cf3c3eeb5..2acaa77f5 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java @@ -16,13 +16,13 @@ import vazkii.botania.api.recipe.IElvenItem; public class ItemBlockElven extends ItemBlockMod implements IElvenItem { - public ItemBlockElven(Block block) { - super(block); + public ItemBlockElven(Block block, Properties props) { + super(block, props); } @Override public boolean isElvenItem(ItemStack stack) { - return ((IElvenItem) block).isElvenItem(stack); + return ((IElvenItem) getBlock()).isElvenItem(stack); } } 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 799b2733d..7a796f163 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -11,10 +11,11 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -26,20 +27,20 @@ import java.util.List; public class ItemBlockPool extends ItemBlockMod { - public ItemBlockPool(Block block) { - super(block); + public ItemBlockPool(Block block, Properties props) { + super(block, props); addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), (stack, worldIn, entityIn) -> { - boolean renderFull = ((BlockPool) block).variant == BlockPool.Variant.CREATIVE || stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull"); + boolean renderFull = ((BlockPool) block).variant == BlockPool.Variant.CREATIVE || stack.hasTag() && stack.getTag().getBoolean("RenderFull"); return renderFull ? 1F : 0F; }); } @OnlyIn(Dist.CLIENT) @Override - public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { - if(((BlockPool) block).variant == BlockPool.Variant.CREATIVE) + public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { + if(((BlockPool) getBlock()).variant == BlockPool.Variant.CREATIVE) for(int i = 0; i < 2; i++) - stacks.add(I18n.format("botaniamisc.creativePool" + i)); + stacks.add(new TextComponentTranslation("botaniamisc.creativePool" + i)); } } 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 4ae772616..619531526 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -48,13 +48,13 @@ public class ItemBlockTinyPotato extends ItemBlockMod { private static final String TAG_TICKS = "notMyNameTicks"; - public ItemBlockTinyPotato(Block block) { - super(block); + public ItemBlockTinyPotato(Block block, Properties props) { + super(block, props); } @Override - public void onUpdate(ItemStack stack, World world, Entity e, int t, boolean idunno) { - if(!world.isRemote && e instanceof EntityPlayer && e.ticksExisted % 30 == 0 && TYPOS.contains(stack.getDisplayName().toLowerCase())) { + public void inventoryTick(ItemStack stack, World world, Entity e, int t, boolean idunno) { + if(!world.isRemote && e instanceof EntityPlayer && e.ticksExisted % 30 == 0 && TYPOS.contains(stack.getDisplayName().getString().toLowerCase())) { EntityPlayer player = (EntityPlayer) e; int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0); if(ticks < NOT_MY_NAME.length) {