diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 3e83b402f..1f2ee1785 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -66,7 +66,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile private final IFloatingFlower floatingData = new FloatingFlowerImpl() { @Override public ItemStack getDisplayStack() { - ResourceLocation id = getType().getRegistryName(); + ResourceLocation id = Registry.BLOCK_ENTITY_TYPE.getKey(getType()); return Registry.ITEM.getValue(id).map(ItemStack::new).orElse(super.getDisplayStack()); } }; diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 7f7807d6e..a9e9ed9cb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -27,6 +27,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.DefaultUncaughtExceptionHandler; +import net.minecraft.util.registry.Registry; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; @@ -110,7 +111,7 @@ public final class ContributorFancinessHandler extends LayerRenderer flower.getRegistryName().getPath().equals(flowerName)) + .filter(flower -> Registry.ITEM.getKey(flower).getPath().equals(flowerName)) .findFirst().orElse(Items.POPPY); m.put(key, new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index b7176e0c9..be87c198a 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -170,7 +170,7 @@ public class ClientProxy implements IProxy { RenderTypeLookup.setRenderLayer(ModBlocks.infrangiblePlatform, t -> true); RenderTypeLookup.setRenderLayer(ModBlocks.spectralPlatform, t -> true); - Registry.BLOCK.stream().filter(b -> b.getRegistryName().getNamespace().equals(LibMisc.MOD_ID)) + Registry.BLOCK.stream().filter(b -> Registry.BLOCK.getKey(b).getNamespace().equals(LibMisc.MOD_ID)) .forEach(b -> { if (b instanceof BlockFloatingFlower || b instanceof FlowerBlock || b instanceof TallFlowerBlock || b instanceof BlockModMushroom) { diff --git a/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java b/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java index 6969041d2..c10da22ea 100644 --- a/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java +++ b/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java @@ -14,6 +14,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.network.PacketBuffer; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; +import net.minecraft.util.registry.Registry; import javax.annotation.Nonnull; @@ -76,7 +77,7 @@ public class SparkleParticleData implements IParticleData { @Override public String getParameters() { return String.format(Locale.ROOT, "%s %.2f %.2f %.2f %.2f %d %s %s %s", - this.getType().getRegistryName(), this.size, this.r, this.g, this.b, this.m, this.noClip, this.fake, this.corrupt); + Registry.PARTICLE_TYPE.getKey(this.getType()), this.size, this.r, this.g, this.b, this.m, this.noClip, this.fake, this.corrupt); } public static final IDeserializer DESERIALIZER = new IDeserializer() { diff --git a/src/main/java/vazkii/botania/client/fx/WispParticleData.java b/src/main/java/vazkii/botania/client/fx/WispParticleData.java index aff08c858..a72913b38 100644 --- a/src/main/java/vazkii/botania/client/fx/WispParticleData.java +++ b/src/main/java/vazkii/botania/client/fx/WispParticleData.java @@ -14,6 +14,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.network.PacketBuffer; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; +import net.minecraft.util.registry.Registry; import javax.annotation.Nonnull; @@ -81,7 +82,7 @@ public class WispParticleData implements IParticleData { @Override public String getParameters() { return String.format(Locale.ROOT, "%s %.2f %.2f %.2f %.2f %.2f %s", - this.getType().getRegistryName(), this.size, this.r, this.g, this.b, this.maxAgeMul, this.depthTest); + Registry.PARTICLE_TYPE.getKey(getType()), this.size, this.r, this.g, this.b, this.maxAgeMul, this.depthTest); } public static final IDeserializer DESERIALIZER = new IDeserializer() { diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index de16db363..f4c4a2df2 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -22,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.ModelLoader; @@ -132,9 +133,10 @@ public class GunModel implements IBakedModel { CompositeBakedModel(ModelBakery bakery, ItemStack lens, IBakedModel gun) { super(gun); - IUnbakedModel lensUnbaked = bakery.getUnbakedModel(new ModelResourceLocation(lens.getItem().getRegistryName(), "inventory")); + ResourceLocation lensId = Registry.ITEM.getKey(lens.getItem()); + IUnbakedModel lensUnbaked = bakery.getUnbakedModel(new ModelResourceLocation(lensId, "inventory")); IModelTransform transform = new SimpleModelTransform(new TransformationMatrix(new Vector3f(-0.4F, 0.2F, 0.0F), Vector3f.YP.rotation((float) Math.PI / 2), new Vector3f(0.625F, 0.625F, 0.625F), null)); - ResourceLocation name = prefix("gun_with_" + lens.getItem().getRegistryName().toString().replace(':', '_')); + ResourceLocation name = prefix("gun_with_" + lensId.toString().replace(':', '_')); IBakedModel lensBaked; if (lensUnbaked instanceof BlockModel && ((BlockModel) lensUnbaked).getRootModel() == MODEL_GENERATED) { diff --git a/src/main/java/vazkii/botania/client/render/tile/TEISR.java b/src/main/java/vazkii/botania/client/render/tile/TEISR.java index 1b958275e..077d68564 100644 --- a/src/main/java/vazkii/botania/client/render/tile/TEISR.java +++ b/src/main/java/vazkii/botania/client/render/tile/TEISR.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.LazyValue; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; public class TEISR extends ItemStackTileEntityRenderer { @@ -28,7 +29,7 @@ public class TEISR extends ItemStackTileEntityRenderer { public TEISR(Block block) { this.block = Preconditions.checkNotNull(block); this.dummy = new LazyValue<>(() -> { - TileEntityType type = Registry.BLOCK_ENTITY_TYPE.getValue(block.getRegistryName()).get(); + TileEntityType type = Registry.BLOCK_ENTITY_TYPE.getValue(Registry.BLOCK.getKey(block)).get(); return type.create(); }); } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 4e712f0f4..216675df9 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; +import net.minecraft.util.registry.Registry; import net.minecraft.world.gen.ChunkGeneratorType; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.storage.loot.conditions.LootConditionManager; @@ -224,9 +225,9 @@ public class Botania { ModBanners.init(); ColorHelper.init(); - PatchouliAPI.instance.registerMultiblock(ModBlocks.alfPortal.getRegistryName(), TileAlfPortal.MULTIBLOCK.getValue()); - PatchouliAPI.instance.registerMultiblock(ModBlocks.terraPlate.getRegistryName(), TileTerraPlate.MULTIBLOCK.getValue()); - PatchouliAPI.instance.registerMultiblock(ModBlocks.enchanter.getRegistryName(), TileEnchanter.MULTIBLOCK.getValue()); + PatchouliAPI.instance.registerMultiblock(Registry.BLOCK.getKey(ModBlocks.alfPortal), TileAlfPortal.MULTIBLOCK.getValue()); + PatchouliAPI.instance.registerMultiblock(Registry.BLOCK.getKey(ModBlocks.terraPlate), TileTerraPlate.MULTIBLOCK.getValue()); + PatchouliAPI.instance.registerMultiblock(Registry.BLOCK.getKey(ModBlocks.enchanter), TileEnchanter.MULTIBLOCK.getValue()); String[][] pat = new String[][] { { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index ac76731c8..17706b370 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -19,6 +19,7 @@ import net.minecraft.item.Item; import net.minecraft.item.Rarity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.RegistryEvent; @@ -523,225 +524,225 @@ public final class ModBlocks { IForgeRegistry r = evt.getRegistry(); Item.Properties props = ModItems.defaultBuilder(); - register(r, whiteFlower.getRegistryName(), new BlockItem(whiteFlower, props)); - register(r, orangeFlower.getRegistryName(), new BlockItem(orangeFlower, props)); - register(r, magentaFlower.getRegistryName(), new BlockItem(magentaFlower, props)); - register(r, lightBlueFlower.getRegistryName(), new BlockItem(lightBlueFlower, props)); - register(r, yellowFlower.getRegistryName(), new BlockItem(yellowFlower, props)); - register(r, limeFlower.getRegistryName(), new BlockItem(limeFlower, props)); - register(r, pinkFlower.getRegistryName(), new BlockItem(pinkFlower, props)); - register(r, grayFlower.getRegistryName(), new BlockItem(grayFlower, props)); - register(r, lightGrayFlower.getRegistryName(), new BlockItem(lightGrayFlower, props)); - register(r, cyanFlower.getRegistryName(), new BlockItem(cyanFlower, props)); - register(r, purpleFlower.getRegistryName(), new BlockItem(purpleFlower, props)); - register(r, blueFlower.getRegistryName(), new BlockItem(blueFlower, props)); - register(r, brownFlower.getRegistryName(), new BlockItem(brownFlower, props)); - register(r, greenFlower.getRegistryName(), new BlockItem(greenFlower, props)); - register(r, redFlower.getRegistryName(), new BlockItem(redFlower, props)); - register(r, blackFlower.getRegistryName(), new BlockItem(blackFlower, props)); - register(r, defaultAltar.getRegistryName(), new BlockItem(defaultAltar, props)); - register(r, forestAltar.getRegistryName(), new BlockItem(forestAltar, props)); - register(r, plainsAltar.getRegistryName(), new BlockItem(plainsAltar, props)); - register(r, mountainAltar.getRegistryName(), new BlockItem(mountainAltar, props)); - register(r, fungalAltar.getRegistryName(), new BlockItem(fungalAltar, props)); - register(r, swampAltar.getRegistryName(), new BlockItem(swampAltar, props)); - register(r, desertAltar.getRegistryName(), new BlockItem(desertAltar, props)); - register(r, taigaAltar.getRegistryName(), new BlockItem(taigaAltar, props)); - register(r, mesaAltar.getRegistryName(), new BlockItem(mesaAltar, props)); - register(r, mossyAltar.getRegistryName(), new BlockItem(mossyAltar, props)); - register(r, livingrock.getRegistryName(), new BlockItem(livingrock, props)); - register(r, livingrockBrick.getRegistryName(), new BlockItem(livingrockBrick, props)); - register(r, livingrockBrickChiseled.getRegistryName(), new BlockItem(livingrockBrickChiseled, props)); - register(r, livingrockBrickCracked.getRegistryName(), new BlockItem(livingrockBrickCracked, props)); - register(r, livingrockBrickMossy.getRegistryName(), new BlockItem(livingrockBrickMossy, props)); - register(r, livingwood.getRegistryName(), new BlockItem(livingwood, props)); - register(r, livingwoodPlanks.getRegistryName(), new BlockItem(livingwoodPlanks, props)); - register(r, livingwoodPlanksMossy.getRegistryName(), new BlockItem(livingwoodPlanksMossy, props)); - register(r, livingwoodFramed.getRegistryName(), new BlockItem(livingwoodFramed, props)); - register(r, livingwoodPatternFramed.getRegistryName(), new BlockItem(livingwoodPatternFramed, props)); - register(r, livingwoodGlimmering.getRegistryName(), new BlockItem(livingwoodGlimmering, props)); - register(r, manaSpreader.getRegistryName(), new BlockItem(manaSpreader, props)); - register(r, redstoneSpreader.getRegistryName(), new BlockItem(redstoneSpreader, props)); - register(r, elvenSpreader.getRegistryName(), new BlockItem(elvenSpreader, props)); - register(r, gaiaSpreader.getRegistryName(), new BlockItem(gaiaSpreader, props)); - register(r, manaPool.getRegistryName(), new ItemBlockPool(manaPool, props)); - register(r, creativePool.getRegistryName(), new ItemBlockPool(creativePool, props)); - register(r, dilutedPool.getRegistryName(), new ItemBlockPool(dilutedPool, props)); - register(r, fabulousPool.getRegistryName(), new ItemBlockPool(fabulousPool, props)); - register(r, runeAltar.getRegistryName(), new BlockItem(runeAltar, props)); - register(r, pistonRelay.getRegistryName(), new BlockItem(pistonRelay, props)); - register(r, distributor.getRegistryName(), new BlockItem(distributor, props)); - register(r, manaVoid.getRegistryName(), new BlockItem(manaVoid, props)); - register(r, manaDetector.getRegistryName(), new BlockItem(manaDetector, props)); - register(r, enchanter.getRegistryName(), new BlockItem(enchanter, props)); - register(r, turntable.getRegistryName(), new BlockItem(turntable, props)); - register(r, tinyPlanet.getRegistryName(), new BlockItem(tinyPlanet, props)); - register(r, alchemyCatalyst.getRegistryName(), new BlockItem(alchemyCatalyst, props)); - register(r, openCrate.getRegistryName(), new BlockItem(openCrate, props)); - register(r, craftCrate.getRegistryName(), new BlockItem(craftCrate, props)); - register(r, forestEye.getRegistryName(), new BlockItem(forestEye, props)); - register(r, manasteelBlock.getRegistryName(), new BlockItem(manasteelBlock, props)); - register(r, terrasteelBlock.getRegistryName(), new BlockItem(terrasteelBlock, props)); - register(r, elementiumBlock.getRegistryName(), new ItemBlockElven(elementiumBlock, props)); - register(r, manaDiamondBlock.getRegistryName(), new BlockItem(manaDiamondBlock, props)); - register(r, dragonstoneBlock.getRegistryName(), new BlockItem(dragonstoneBlock, props)); - register(r, wildDrum.getRegistryName(), new BlockItem(wildDrum, props)); - register(r, gatheringDrum.getRegistryName(), new BlockItem(gatheringDrum, props)); - register(r, canopyDrum.getRegistryName(), new BlockItem(canopyDrum, props)); - register(r, whiteShinyFlower.getRegistryName(), new BlockItem(whiteShinyFlower, props)); - register(r, orangeShinyFlower.getRegistryName(), new BlockItem(orangeShinyFlower, props)); - register(r, magentaShinyFlower.getRegistryName(), new BlockItem(magentaShinyFlower, props)); - register(r, lightBlueShinyFlower.getRegistryName(), new BlockItem(lightBlueShinyFlower, props)); - register(r, yellowShinyFlower.getRegistryName(), new BlockItem(yellowShinyFlower, props)); - register(r, limeShinyFlower.getRegistryName(), new BlockItem(limeShinyFlower, props)); - register(r, pinkShinyFlower.getRegistryName(), new BlockItem(pinkShinyFlower, props)); - register(r, grayShinyFlower.getRegistryName(), new BlockItem(grayShinyFlower, props)); - register(r, lightGrayShinyFlower.getRegistryName(), new BlockItem(lightGrayShinyFlower, props)); - register(r, cyanShinyFlower.getRegistryName(), new BlockItem(cyanShinyFlower, props)); - register(r, purpleShinyFlower.getRegistryName(), new BlockItem(purpleShinyFlower, props)); - register(r, blueShinyFlower.getRegistryName(), new BlockItem(blueShinyFlower, props)); - register(r, brownShinyFlower.getRegistryName(), new BlockItem(brownShinyFlower, props)); - register(r, greenShinyFlower.getRegistryName(), new BlockItem(greenShinyFlower, props)); - register(r, redShinyFlower.getRegistryName(), new BlockItem(redShinyFlower, props)); - register(r, blackShinyFlower.getRegistryName(), new BlockItem(blackShinyFlower, props)); - register(r, abstrusePlatform.getRegistryName(), new BlockItem(abstrusePlatform, props)); - register(r, spectralPlatform.getRegistryName(), new BlockItem(spectralPlatform, props)); - register(r, infrangiblePlatform.getRegistryName(), new BlockItem(infrangiblePlatform, props)); - register(r, alfPortal.getRegistryName(), new BlockItem(alfPortal, props)); - register(r, dreamwood.getRegistryName(), new ItemBlockDreamwood(dreamwood, props)); - register(r, dreamwoodPlanks.getRegistryName(), new ItemBlockDreamwood(dreamwoodPlanks, props)); - register(r, dreamwoodPlanksMossy.getRegistryName(), new ItemBlockDreamwood(dreamwoodPlanksMossy, props)); - register(r, dreamwoodFramed.getRegistryName(), new ItemBlockDreamwood(dreamwoodFramed, props)); - register(r, dreamwoodPatternFramed.getRegistryName(), new ItemBlockDreamwood(dreamwoodPatternFramed, props)); - register(r, dreamwoodGlimmering.getRegistryName(), new ItemBlockDreamwood(dreamwoodGlimmering, props)); - register(r, conjurationCatalyst.getRegistryName(), new BlockItem(conjurationCatalyst, props)); - register(r, bifrost.getRegistryName(), new BlockItem(bifrost, props)); - register(r, whiteFloatingFlower.getRegistryName(), new BlockItem(whiteFloatingFlower, props)); - register(r, orangeFloatingFlower.getRegistryName(), new BlockItem(orangeFloatingFlower, props)); - register(r, magentaFloatingFlower.getRegistryName(), new BlockItem(magentaFloatingFlower, props)); - register(r, lightBlueFloatingFlower.getRegistryName(), new BlockItem(lightBlueFloatingFlower, props)); - register(r, yellowFloatingFlower.getRegistryName(), new BlockItem(yellowFloatingFlower, props)); - register(r, limeFloatingFlower.getRegistryName(), new BlockItem(limeFloatingFlower, props)); - register(r, pinkFloatingFlower.getRegistryName(), new BlockItem(pinkFloatingFlower, props)); - register(r, grayFloatingFlower.getRegistryName(), new BlockItem(grayFloatingFlower, props)); - register(r, lightGrayFloatingFlower.getRegistryName(), new BlockItem(lightGrayFloatingFlower, props)); - register(r, cyanFloatingFlower.getRegistryName(), new BlockItem(cyanFloatingFlower, props)); - register(r, purpleFloatingFlower.getRegistryName(), new BlockItem(purpleFloatingFlower, props)); - register(r, blueFloatingFlower.getRegistryName(), new BlockItem(blueFloatingFlower, props)); - register(r, brownFloatingFlower.getRegistryName(), new BlockItem(brownFloatingFlower, props)); - register(r, greenFloatingFlower.getRegistryName(), new BlockItem(greenFloatingFlower, props)); - register(r, redFloatingFlower.getRegistryName(), new BlockItem(redFloatingFlower, props)); - register(r, blackFloatingFlower.getRegistryName(), new BlockItem(blackFloatingFlower, props)); - register(r, tinyPotato.getRegistryName(), new ItemBlockTinyPotato(tinyPotato, props)); - register(r, spawnerClaw.getRegistryName(), new BlockItem(spawnerClaw, props)); - register(r, azulejo0.getRegistryName(), new BlockItem(azulejo0, props)); - register(r, azulejo1.getRegistryName(), new BlockItem(azulejo1, props)); - register(r, azulejo2.getRegistryName(), new BlockItem(azulejo2, props)); - register(r, azulejo3.getRegistryName(), new BlockItem(azulejo3, props)); - register(r, azulejo4.getRegistryName(), new BlockItem(azulejo4, props)); - register(r, azulejo5.getRegistryName(), new BlockItem(azulejo5, props)); - register(r, azulejo6.getRegistryName(), new BlockItem(azulejo6, props)); - register(r, azulejo7.getRegistryName(), new BlockItem(azulejo7, props)); - register(r, azulejo8.getRegistryName(), new BlockItem(azulejo8, props)); - register(r, azulejo9.getRegistryName(), new BlockItem(azulejo9, props)); - register(r, azulejo10.getRegistryName(), new BlockItem(azulejo10, props)); - register(r, azulejo11.getRegistryName(), new BlockItem(azulejo11, props)); - register(r, azulejo12.getRegistryName(), new BlockItem(azulejo12, props)); - register(r, azulejo13.getRegistryName(), new BlockItem(azulejo13, props)); - register(r, azulejo14.getRegistryName(), new BlockItem(azulejo14, props)); - register(r, azulejo15.getRegistryName(), new BlockItem(azulejo15, props)); - register(r, enderEye.getRegistryName(), new BlockItem(enderEye, props)); - register(r, starfield.getRegistryName(), new BlockItem(starfield, props)); - register(r, rfGenerator.getRegistryName(), new BlockItem(rfGenerator, props)); - register(r, elfGlass.getRegistryName(), new ItemBlockElven(elfGlass, props)); - register(r, manaGlass.getRegistryName(), new BlockItem(manaGlass, props)); - register(r, terraPlate.getRegistryName(), new BlockItem(terraPlate, props)); - register(r, redStringContainer.getRegistryName(), new BlockItem(redStringContainer, props)); - register(r, redStringDispenser.getRegistryName(), new BlockItem(redStringDispenser, props)); - register(r, redStringFertilizer.getRegistryName(), new BlockItem(redStringFertilizer, props)); - register(r, redStringComparator.getRegistryName(), new BlockItem(redStringComparator, props)); - register(r, redStringRelay.getRegistryName(), new BlockItem(redStringRelay, props)); - register(r, prism.getRegistryName(), new BlockItem(prism, props)); - register(r, enchantedSoil.getRegistryName(), new BlockItem(enchantedSoil, props)); - register(r, petalBlockWhite.getRegistryName(), new BlockItem(petalBlockWhite, props)); - register(r, petalBlockOrange.getRegistryName(), new BlockItem(petalBlockOrange, props)); - register(r, petalBlockMagenta.getRegistryName(), new BlockItem(petalBlockMagenta, props)); - register(r, petalBlockLightBlue.getRegistryName(), new BlockItem(petalBlockLightBlue, props)); - register(r, petalBlockYellow.getRegistryName(), new BlockItem(petalBlockYellow, props)); - register(r, petalBlockLime.getRegistryName(), new BlockItem(petalBlockLime, props)); - register(r, petalBlockPink.getRegistryName(), new BlockItem(petalBlockPink, props)); - register(r, petalBlockGray.getRegistryName(), new BlockItem(petalBlockGray, props)); - register(r, petalBlockSilver.getRegistryName(), new BlockItem(petalBlockSilver, props)); - register(r, petalBlockCyan.getRegistryName(), new BlockItem(petalBlockCyan, props)); - register(r, petalBlockPurple.getRegistryName(), new BlockItem(petalBlockPurple, props)); - register(r, petalBlockBlue.getRegistryName(), new BlockItem(petalBlockBlue, props)); - register(r, petalBlockBrown.getRegistryName(), new BlockItem(petalBlockBrown, props)); - register(r, petalBlockGreen.getRegistryName(), new BlockItem(petalBlockGreen, props)); - register(r, petalBlockRed.getRegistryName(), new BlockItem(petalBlockRed, props)); - register(r, petalBlockBlack.getRegistryName(), new BlockItem(petalBlockBlack, props)); - register(r, corporeaFunnel.getRegistryName(), new BlockItem(corporeaFunnel, props)); - register(r, whiteMushroom.getRegistryName(), new BlockItem(whiteMushroom, props)); - register(r, orangeMushroom.getRegistryName(), new BlockItem(orangeMushroom, props)); - register(r, magentaMushroom.getRegistryName(), new BlockItem(magentaMushroom, props)); - register(r, lightBlueMushroom.getRegistryName(), new BlockItem(lightBlueMushroom, props)); - register(r, yellowMushroom.getRegistryName(), new BlockItem(yellowMushroom, props)); - register(r, limeMushroom.getRegistryName(), new BlockItem(limeMushroom, props)); - register(r, pinkMushroom.getRegistryName(), new BlockItem(pinkMushroom, props)); - register(r, grayMushroom.getRegistryName(), new BlockItem(grayMushroom, props)); - register(r, lightGrayMushroom.getRegistryName(), new BlockItem(lightGrayMushroom, props)); - register(r, cyanMushroom.getRegistryName(), new BlockItem(cyanMushroom, props)); - register(r, purpleMushroom.getRegistryName(), new BlockItem(purpleMushroom, props)); - register(r, blueMushroom.getRegistryName(), new BlockItem(blueMushroom, props)); - register(r, brownMushroom.getRegistryName(), new BlockItem(brownMushroom, props)); - register(r, greenMushroom.getRegistryName(), new BlockItem(greenMushroom, props)); - register(r, redMushroom.getRegistryName(), new BlockItem(redMushroom, props)); - register(r, blackMushroom.getRegistryName(), new BlockItem(blackMushroom, props)); - register(r, pump.getRegistryName(), new BlockItem(pump, props)); - register(r, doubleFlowerWhite.getRegistryName(), new BlockItem(doubleFlowerWhite, props)); - register(r, doubleFlowerOrange.getRegistryName(), new BlockItem(doubleFlowerOrange, props)); - register(r, doubleFlowerMagenta.getRegistryName(), new BlockItem(doubleFlowerMagenta, props)); - register(r, doubleFlowerLightBlue.getRegistryName(), new BlockItem(doubleFlowerLightBlue, props)); - register(r, doubleFlowerYellow.getRegistryName(), new BlockItem(doubleFlowerYellow, props)); - register(r, doubleFlowerLime.getRegistryName(), new BlockItem(doubleFlowerLime, props)); - register(r, doubleFlowerPink.getRegistryName(), new BlockItem(doubleFlowerPink, props)); - register(r, doubleFlowerGray.getRegistryName(), new BlockItem(doubleFlowerGray, props)); - register(r, doubleFlowerLightGray.getRegistryName(), new BlockItem(doubleFlowerLightGray, props)); - register(r, doubleFlowerCyan.getRegistryName(), new BlockItem(doubleFlowerCyan, props)); - register(r, doubleFlowerPurple.getRegistryName(), new BlockItem(doubleFlowerPurple, props)); - register(r, doubleFlowerBlue.getRegistryName(), new BlockItem(doubleFlowerBlue, props)); - register(r, doubleFlowerBrown.getRegistryName(), new BlockItem(doubleFlowerBrown, props)); - register(r, doubleFlowerGreen.getRegistryName(), new BlockItem(doubleFlowerGreen, props)); - register(r, doubleFlowerRed.getRegistryName(), new BlockItem(doubleFlowerRed, props)); - register(r, doubleFlowerBlack.getRegistryName(), new BlockItem(doubleFlowerBlack, props)); - register(r, blazeBlock.getRegistryName(), new ItemBlockBlaze(blazeBlock, props)); - register(r, corporeaInterceptor.getRegistryName(), new BlockItem(corporeaInterceptor, props)); - register(r, incensePlate.getRegistryName(), new BlockItem(incensePlate, props)); - register(r, ghostRail.getRegistryName(), new BlockItem(ghostRail, props)); - register(r, sparkChanger.getRegistryName(), new BlockItem(sparkChanger, props)); - register(r, root.getRegistryName(), new BlockItem(root, props)); - register(r, felPumpkin.getRegistryName(), new BlockItem(felPumpkin, props)); - register(r, cocoon.getRegistryName(), new BlockItem(cocoon, props)); - register(r, lightRelayDefault.getRegistryName(), new BlockItem(lightRelayDefault, props)); - register(r, lightRelayDetector.getRegistryName(), new BlockItem(lightRelayDetector, props)); - register(r, lightRelayFork.getRegistryName(), new BlockItem(lightRelayFork, props)); - register(r, lightRelayToggle.getRegistryName(), new BlockItem(lightRelayToggle, props)); - register(r, lightLauncher.getRegistryName(), new BlockItem(lightLauncher, props)); - register(r, manaBomb.getRegistryName(), new BlockItem(manaBomb, props)); - register(r, cacophonium.getRegistryName(), new BlockItem(cacophonium, props)); - register(r, bifrostPerm.getRegistryName(), new BlockItem(bifrostPerm, props)); - register(r, cellBlock.getRegistryName(), new BlockItem(cellBlock, props)); - register(r, redStringInterceptor.getRegistryName(), new BlockItem(redStringInterceptor, props)); - register(r, corporeaRetainer.getRegistryName(), new BlockItem(corporeaRetainer, props)); - register(r, shimmerrock.getRegistryName(), new BlockItem(shimmerrock, props)); - register(r, shimmerwoodPlanks.getRegistryName(), new BlockItem(shimmerwoodPlanks, props)); - register(r, dryGrass.getRegistryName(), new BlockItem(dryGrass, props)); - register(r, goldenGrass.getRegistryName(), new BlockItem(goldenGrass, props)); - register(r, vividGrass.getRegistryName(), new BlockItem(vividGrass, props)); - register(r, scorchedGrass.getRegistryName(), new BlockItem(scorchedGrass, props)); - register(r, infusedGrass.getRegistryName(), new BlockItem(infusedGrass, props)); - register(r, mutatedGrass.getRegistryName(), new BlockItem(mutatedGrass, props)); - register(r, animatedTorch.getRegistryName(), new BlockItem(animatedTorch, props)); - register(r, corporeaCrystalCube.getRegistryName(), new BlockItem(corporeaCrystalCube, props)); + register(r, Registry.BLOCK.getKey(whiteFlower), new BlockItem(whiteFlower, props)); + register(r, Registry.BLOCK.getKey(orangeFlower), new BlockItem(orangeFlower, props)); + register(r, Registry.BLOCK.getKey(magentaFlower), new BlockItem(magentaFlower, props)); + register(r, Registry.BLOCK.getKey(lightBlueFlower), new BlockItem(lightBlueFlower, props)); + register(r, Registry.BLOCK.getKey(yellowFlower), new BlockItem(yellowFlower, props)); + register(r, Registry.BLOCK.getKey(limeFlower), new BlockItem(limeFlower, props)); + register(r, Registry.BLOCK.getKey(pinkFlower), new BlockItem(pinkFlower, props)); + register(r, Registry.BLOCK.getKey(grayFlower), new BlockItem(grayFlower, props)); + register(r, Registry.BLOCK.getKey(lightGrayFlower), new BlockItem(lightGrayFlower, props)); + register(r, Registry.BLOCK.getKey(cyanFlower), new BlockItem(cyanFlower, props)); + register(r, Registry.BLOCK.getKey(purpleFlower), new BlockItem(purpleFlower, props)); + register(r, Registry.BLOCK.getKey(blueFlower), new BlockItem(blueFlower, props)); + register(r, Registry.BLOCK.getKey(brownFlower), new BlockItem(brownFlower, props)); + register(r, Registry.BLOCK.getKey(greenFlower), new BlockItem(greenFlower, props)); + register(r, Registry.BLOCK.getKey(redFlower), new BlockItem(redFlower, props)); + register(r, Registry.BLOCK.getKey(blackFlower), new BlockItem(blackFlower, props)); + register(r, Registry.BLOCK.getKey(defaultAltar), new BlockItem(defaultAltar, props)); + register(r, Registry.BLOCK.getKey(forestAltar), new BlockItem(forestAltar, props)); + register(r, Registry.BLOCK.getKey(plainsAltar), new BlockItem(plainsAltar, props)); + register(r, Registry.BLOCK.getKey(mountainAltar), new BlockItem(mountainAltar, props)); + register(r, Registry.BLOCK.getKey(fungalAltar), new BlockItem(fungalAltar, props)); + register(r, Registry.BLOCK.getKey(swampAltar), new BlockItem(swampAltar, props)); + register(r, Registry.BLOCK.getKey(desertAltar), new BlockItem(desertAltar, props)); + register(r, Registry.BLOCK.getKey(taigaAltar), new BlockItem(taigaAltar, props)); + register(r, Registry.BLOCK.getKey(mesaAltar), new BlockItem(mesaAltar, props)); + register(r, Registry.BLOCK.getKey(mossyAltar), new BlockItem(mossyAltar, props)); + register(r, Registry.BLOCK.getKey(livingrock), new BlockItem(livingrock, props)); + register(r, Registry.BLOCK.getKey(livingrockBrick), new BlockItem(livingrockBrick, props)); + register(r, Registry.BLOCK.getKey(livingrockBrickChiseled), new BlockItem(livingrockBrickChiseled, props)); + register(r, Registry.BLOCK.getKey(livingrockBrickCracked), new BlockItem(livingrockBrickCracked, props)); + register(r, Registry.BLOCK.getKey(livingrockBrickMossy), new BlockItem(livingrockBrickMossy, props)); + register(r, Registry.BLOCK.getKey(livingwood), new BlockItem(livingwood, props)); + register(r, Registry.BLOCK.getKey(livingwoodPlanks), new BlockItem(livingwoodPlanks, props)); + register(r, Registry.BLOCK.getKey(livingwoodPlanksMossy), new BlockItem(livingwoodPlanksMossy, props)); + register(r, Registry.BLOCK.getKey(livingwoodFramed), new BlockItem(livingwoodFramed, props)); + register(r, Registry.BLOCK.getKey(livingwoodPatternFramed), new BlockItem(livingwoodPatternFramed, props)); + register(r, Registry.BLOCK.getKey(livingwoodGlimmering), new BlockItem(livingwoodGlimmering, props)); + register(r, Registry.BLOCK.getKey(manaSpreader), new BlockItem(manaSpreader, props)); + register(r, Registry.BLOCK.getKey(redstoneSpreader), new BlockItem(redstoneSpreader, props)); + register(r, Registry.BLOCK.getKey(elvenSpreader), new BlockItem(elvenSpreader, props)); + register(r, Registry.BLOCK.getKey(gaiaSpreader), new BlockItem(gaiaSpreader, props)); + register(r, Registry.BLOCK.getKey(manaPool), new ItemBlockPool(manaPool, props)); + register(r, Registry.BLOCK.getKey(creativePool), new ItemBlockPool(creativePool, props)); + register(r, Registry.BLOCK.getKey(dilutedPool), new ItemBlockPool(dilutedPool, props)); + register(r, Registry.BLOCK.getKey(fabulousPool), new ItemBlockPool(fabulousPool, props)); + register(r, Registry.BLOCK.getKey(runeAltar), new BlockItem(runeAltar, props)); + register(r, Registry.BLOCK.getKey(pistonRelay), new BlockItem(pistonRelay, props)); + register(r, Registry.BLOCK.getKey(distributor), new BlockItem(distributor, props)); + register(r, Registry.BLOCK.getKey(manaVoid), new BlockItem(manaVoid, props)); + register(r, Registry.BLOCK.getKey(manaDetector), new BlockItem(manaDetector, props)); + register(r, Registry.BLOCK.getKey(enchanter), new BlockItem(enchanter, props)); + register(r, Registry.BLOCK.getKey(turntable), new BlockItem(turntable, props)); + register(r, Registry.BLOCK.getKey(tinyPlanet), new BlockItem(tinyPlanet, props)); + register(r, Registry.BLOCK.getKey(alchemyCatalyst), new BlockItem(alchemyCatalyst, props)); + register(r, Registry.BLOCK.getKey(openCrate), new BlockItem(openCrate, props)); + register(r, Registry.BLOCK.getKey(craftCrate), new BlockItem(craftCrate, props)); + register(r, Registry.BLOCK.getKey(forestEye), new BlockItem(forestEye, props)); + register(r, Registry.BLOCK.getKey(manasteelBlock), new BlockItem(manasteelBlock, props)); + register(r, Registry.BLOCK.getKey(terrasteelBlock), new BlockItem(terrasteelBlock, props)); + register(r, Registry.BLOCK.getKey(elementiumBlock), new ItemBlockElven(elementiumBlock, props)); + register(r, Registry.BLOCK.getKey(manaDiamondBlock), new BlockItem(manaDiamondBlock, props)); + register(r, Registry.BLOCK.getKey(dragonstoneBlock), new BlockItem(dragonstoneBlock, props)); + register(r, Registry.BLOCK.getKey(wildDrum), new BlockItem(wildDrum, props)); + register(r, Registry.BLOCK.getKey(gatheringDrum), new BlockItem(gatheringDrum, props)); + register(r, Registry.BLOCK.getKey(canopyDrum), new BlockItem(canopyDrum, props)); + register(r, Registry.BLOCK.getKey(whiteShinyFlower), new BlockItem(whiteShinyFlower, props)); + register(r, Registry.BLOCK.getKey(orangeShinyFlower), new BlockItem(orangeShinyFlower, props)); + register(r, Registry.BLOCK.getKey(magentaShinyFlower), new BlockItem(magentaShinyFlower, props)); + register(r, Registry.BLOCK.getKey(lightBlueShinyFlower), new BlockItem(lightBlueShinyFlower, props)); + register(r, Registry.BLOCK.getKey(yellowShinyFlower), new BlockItem(yellowShinyFlower, props)); + register(r, Registry.BLOCK.getKey(limeShinyFlower), new BlockItem(limeShinyFlower, props)); + register(r, Registry.BLOCK.getKey(pinkShinyFlower), new BlockItem(pinkShinyFlower, props)); + register(r, Registry.BLOCK.getKey(grayShinyFlower), new BlockItem(grayShinyFlower, props)); + register(r, Registry.BLOCK.getKey(lightGrayShinyFlower), new BlockItem(lightGrayShinyFlower, props)); + register(r, Registry.BLOCK.getKey(cyanShinyFlower), new BlockItem(cyanShinyFlower, props)); + register(r, Registry.BLOCK.getKey(purpleShinyFlower), new BlockItem(purpleShinyFlower, props)); + register(r, Registry.BLOCK.getKey(blueShinyFlower), new BlockItem(blueShinyFlower, props)); + register(r, Registry.BLOCK.getKey(brownShinyFlower), new BlockItem(brownShinyFlower, props)); + register(r, Registry.BLOCK.getKey(greenShinyFlower), new BlockItem(greenShinyFlower, props)); + register(r, Registry.BLOCK.getKey(redShinyFlower), new BlockItem(redShinyFlower, props)); + register(r, Registry.BLOCK.getKey(blackShinyFlower), new BlockItem(blackShinyFlower, props)); + register(r, Registry.BLOCK.getKey(abstrusePlatform), new BlockItem(abstrusePlatform, props)); + register(r, Registry.BLOCK.getKey(spectralPlatform), new BlockItem(spectralPlatform, props)); + register(r, Registry.BLOCK.getKey(infrangiblePlatform), new BlockItem(infrangiblePlatform, props)); + register(r, Registry.BLOCK.getKey(alfPortal), new BlockItem(alfPortal, props)); + register(r, Registry.BLOCK.getKey(dreamwood), new ItemBlockDreamwood(dreamwood, props)); + register(r, Registry.BLOCK.getKey(dreamwoodPlanks), new ItemBlockDreamwood(dreamwoodPlanks, props)); + register(r, Registry.BLOCK.getKey(dreamwoodPlanksMossy), new ItemBlockDreamwood(dreamwoodPlanksMossy, props)); + register(r, Registry.BLOCK.getKey(dreamwoodFramed), new ItemBlockDreamwood(dreamwoodFramed, props)); + register(r, Registry.BLOCK.getKey(dreamwoodPatternFramed), new ItemBlockDreamwood(dreamwoodPatternFramed, props)); + register(r, Registry.BLOCK.getKey(dreamwoodGlimmering), new ItemBlockDreamwood(dreamwoodGlimmering, props)); + register(r, Registry.BLOCK.getKey(conjurationCatalyst), new BlockItem(conjurationCatalyst, props)); + register(r, Registry.BLOCK.getKey(bifrost), new BlockItem(bifrost, props)); + register(r, Registry.BLOCK.getKey(whiteFloatingFlower), new BlockItem(whiteFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(orangeFloatingFlower), new BlockItem(orangeFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(magentaFloatingFlower), new BlockItem(magentaFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(lightBlueFloatingFlower), new BlockItem(lightBlueFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(yellowFloatingFlower), new BlockItem(yellowFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(limeFloatingFlower), new BlockItem(limeFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(pinkFloatingFlower), new BlockItem(pinkFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(grayFloatingFlower), new BlockItem(grayFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(lightGrayFloatingFlower), new BlockItem(lightGrayFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(cyanFloatingFlower), new BlockItem(cyanFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(purpleFloatingFlower), new BlockItem(purpleFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(blueFloatingFlower), new BlockItem(blueFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(brownFloatingFlower), new BlockItem(brownFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(greenFloatingFlower), new BlockItem(greenFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(redFloatingFlower), new BlockItem(redFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(blackFloatingFlower), new BlockItem(blackFloatingFlower, props)); + register(r, Registry.BLOCK.getKey(tinyPotato), new ItemBlockTinyPotato(tinyPotato, props)); + register(r, Registry.BLOCK.getKey(spawnerClaw), new BlockItem(spawnerClaw, props)); + register(r, Registry.BLOCK.getKey(azulejo0), new BlockItem(azulejo0, props)); + register(r, Registry.BLOCK.getKey(azulejo1), new BlockItem(azulejo1, props)); + register(r, Registry.BLOCK.getKey(azulejo2), new BlockItem(azulejo2, props)); + register(r, Registry.BLOCK.getKey(azulejo3), new BlockItem(azulejo3, props)); + register(r, Registry.BLOCK.getKey(azulejo4), new BlockItem(azulejo4, props)); + register(r, Registry.BLOCK.getKey(azulejo5), new BlockItem(azulejo5, props)); + register(r, Registry.BLOCK.getKey(azulejo6), new BlockItem(azulejo6, props)); + register(r, Registry.BLOCK.getKey(azulejo7), new BlockItem(azulejo7, props)); + register(r, Registry.BLOCK.getKey(azulejo8), new BlockItem(azulejo8, props)); + register(r, Registry.BLOCK.getKey(azulejo9), new BlockItem(azulejo9, props)); + register(r, Registry.BLOCK.getKey(azulejo10), new BlockItem(azulejo10, props)); + register(r, Registry.BLOCK.getKey(azulejo11), new BlockItem(azulejo11, props)); + register(r, Registry.BLOCK.getKey(azulejo12), new BlockItem(azulejo12, props)); + register(r, Registry.BLOCK.getKey(azulejo13), new BlockItem(azulejo13, props)); + register(r, Registry.BLOCK.getKey(azulejo14), new BlockItem(azulejo14, props)); + register(r, Registry.BLOCK.getKey(azulejo15), new BlockItem(azulejo15, props)); + register(r, Registry.BLOCK.getKey(enderEye), new BlockItem(enderEye, props)); + register(r, Registry.BLOCK.getKey(starfield), new BlockItem(starfield, props)); + register(r, Registry.BLOCK.getKey(rfGenerator), new BlockItem(rfGenerator, props)); + register(r, Registry.BLOCK.getKey(elfGlass), new ItemBlockElven(elfGlass, props)); + register(r, Registry.BLOCK.getKey(manaGlass), new BlockItem(manaGlass, props)); + register(r, Registry.BLOCK.getKey(terraPlate), new BlockItem(terraPlate, props)); + register(r, Registry.BLOCK.getKey(redStringContainer), new BlockItem(redStringContainer, props)); + register(r, Registry.BLOCK.getKey(redStringDispenser), new BlockItem(redStringDispenser, props)); + register(r, Registry.BLOCK.getKey(redStringFertilizer), new BlockItem(redStringFertilizer, props)); + register(r, Registry.BLOCK.getKey(redStringComparator), new BlockItem(redStringComparator, props)); + register(r, Registry.BLOCK.getKey(redStringRelay), new BlockItem(redStringRelay, props)); + register(r, Registry.BLOCK.getKey(prism), new BlockItem(prism, props)); + register(r, Registry.BLOCK.getKey(enchantedSoil), new BlockItem(enchantedSoil, props)); + register(r, Registry.BLOCK.getKey(petalBlockWhite), new BlockItem(petalBlockWhite, props)); + register(r, Registry.BLOCK.getKey(petalBlockOrange), new BlockItem(petalBlockOrange, props)); + register(r, Registry.BLOCK.getKey(petalBlockMagenta), new BlockItem(petalBlockMagenta, props)); + register(r, Registry.BLOCK.getKey(petalBlockLightBlue), new BlockItem(petalBlockLightBlue, props)); + register(r, Registry.BLOCK.getKey(petalBlockYellow), new BlockItem(petalBlockYellow, props)); + register(r, Registry.BLOCK.getKey(petalBlockLime), new BlockItem(petalBlockLime, props)); + register(r, Registry.BLOCK.getKey(petalBlockPink), new BlockItem(petalBlockPink, props)); + register(r, Registry.BLOCK.getKey(petalBlockGray), new BlockItem(petalBlockGray, props)); + register(r, Registry.BLOCK.getKey(petalBlockSilver), new BlockItem(petalBlockSilver, props)); + register(r, Registry.BLOCK.getKey(petalBlockCyan), new BlockItem(petalBlockCyan, props)); + register(r, Registry.BLOCK.getKey(petalBlockPurple), new BlockItem(petalBlockPurple, props)); + register(r, Registry.BLOCK.getKey(petalBlockBlue), new BlockItem(petalBlockBlue, props)); + register(r, Registry.BLOCK.getKey(petalBlockBrown), new BlockItem(petalBlockBrown, props)); + register(r, Registry.BLOCK.getKey(petalBlockGreen), new BlockItem(petalBlockGreen, props)); + register(r, Registry.BLOCK.getKey(petalBlockRed), new BlockItem(petalBlockRed, props)); + register(r, Registry.BLOCK.getKey(petalBlockBlack), new BlockItem(petalBlockBlack, props)); + register(r, Registry.BLOCK.getKey(corporeaFunnel), new BlockItem(corporeaFunnel, props)); + register(r, Registry.BLOCK.getKey(whiteMushroom), new BlockItem(whiteMushroom, props)); + register(r, Registry.BLOCK.getKey(orangeMushroom), new BlockItem(orangeMushroom, props)); + register(r, Registry.BLOCK.getKey(magentaMushroom), new BlockItem(magentaMushroom, props)); + register(r, Registry.BLOCK.getKey(lightBlueMushroom), new BlockItem(lightBlueMushroom, props)); + register(r, Registry.BLOCK.getKey(yellowMushroom), new BlockItem(yellowMushroom, props)); + register(r, Registry.BLOCK.getKey(limeMushroom), new BlockItem(limeMushroom, props)); + register(r, Registry.BLOCK.getKey(pinkMushroom), new BlockItem(pinkMushroom, props)); + register(r, Registry.BLOCK.getKey(grayMushroom), new BlockItem(grayMushroom, props)); + register(r, Registry.BLOCK.getKey(lightGrayMushroom), new BlockItem(lightGrayMushroom, props)); + register(r, Registry.BLOCK.getKey(cyanMushroom), new BlockItem(cyanMushroom, props)); + register(r, Registry.BLOCK.getKey(purpleMushroom), new BlockItem(purpleMushroom, props)); + register(r, Registry.BLOCK.getKey(blueMushroom), new BlockItem(blueMushroom, props)); + register(r, Registry.BLOCK.getKey(brownMushroom), new BlockItem(brownMushroom, props)); + register(r, Registry.BLOCK.getKey(greenMushroom), new BlockItem(greenMushroom, props)); + register(r, Registry.BLOCK.getKey(redMushroom), new BlockItem(redMushroom, props)); + register(r, Registry.BLOCK.getKey(blackMushroom), new BlockItem(blackMushroom, props)); + register(r, Registry.BLOCK.getKey(pump), new BlockItem(pump, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerWhite), new BlockItem(doubleFlowerWhite, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerOrange), new BlockItem(doubleFlowerOrange, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerMagenta), new BlockItem(doubleFlowerMagenta, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerLightBlue), new BlockItem(doubleFlowerLightBlue, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerYellow), new BlockItem(doubleFlowerYellow, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerLime), new BlockItem(doubleFlowerLime, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerPink), new BlockItem(doubleFlowerPink, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerGray), new BlockItem(doubleFlowerGray, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerLightGray), new BlockItem(doubleFlowerLightGray, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerCyan), new BlockItem(doubleFlowerCyan, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerPurple), new BlockItem(doubleFlowerPurple, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerBlue), new BlockItem(doubleFlowerBlue, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerBrown), new BlockItem(doubleFlowerBrown, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerGreen), new BlockItem(doubleFlowerGreen, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerRed), new BlockItem(doubleFlowerRed, props)); + register(r, Registry.BLOCK.getKey(doubleFlowerBlack), new BlockItem(doubleFlowerBlack, props)); + register(r, Registry.BLOCK.getKey(blazeBlock), new ItemBlockBlaze(blazeBlock, props)); + register(r, Registry.BLOCK.getKey(corporeaInterceptor), new BlockItem(corporeaInterceptor, props)); + register(r, Registry.BLOCK.getKey(incensePlate), new BlockItem(incensePlate, props)); + register(r, Registry.BLOCK.getKey(ghostRail), new BlockItem(ghostRail, props)); + register(r, Registry.BLOCK.getKey(sparkChanger), new BlockItem(sparkChanger, props)); + register(r, Registry.BLOCK.getKey(root), new BlockItem(root, props)); + register(r, Registry.BLOCK.getKey(felPumpkin), new BlockItem(felPumpkin, props)); + register(r, Registry.BLOCK.getKey(cocoon), new BlockItem(cocoon, props)); + register(r, Registry.BLOCK.getKey(lightRelayDefault), new BlockItem(lightRelayDefault, props)); + register(r, Registry.BLOCK.getKey(lightRelayDetector), new BlockItem(lightRelayDetector, props)); + register(r, Registry.BLOCK.getKey(lightRelayFork), new BlockItem(lightRelayFork, props)); + register(r, Registry.BLOCK.getKey(lightRelayToggle), new BlockItem(lightRelayToggle, props)); + register(r, Registry.BLOCK.getKey(lightLauncher), new BlockItem(lightLauncher, props)); + register(r, Registry.BLOCK.getKey(manaBomb), new BlockItem(manaBomb, props)); + register(r, Registry.BLOCK.getKey(cacophonium), new BlockItem(cacophonium, props)); + register(r, Registry.BLOCK.getKey(bifrostPerm), new BlockItem(bifrostPerm, props)); + register(r, Registry.BLOCK.getKey(cellBlock), new BlockItem(cellBlock, props)); + register(r, Registry.BLOCK.getKey(redStringInterceptor), new BlockItem(redStringInterceptor, props)); + register(r, Registry.BLOCK.getKey(corporeaRetainer), new BlockItem(corporeaRetainer, props)); + register(r, Registry.BLOCK.getKey(shimmerrock), new BlockItem(shimmerrock, props)); + register(r, Registry.BLOCK.getKey(shimmerwoodPlanks), new BlockItem(shimmerwoodPlanks, props)); + register(r, Registry.BLOCK.getKey(dryGrass), new BlockItem(dryGrass, props)); + register(r, Registry.BLOCK.getKey(goldenGrass), new BlockItem(goldenGrass, props)); + register(r, Registry.BLOCK.getKey(vividGrass), new BlockItem(vividGrass, props)); + register(r, Registry.BLOCK.getKey(scorchedGrass), new BlockItem(scorchedGrass, props)); + register(r, Registry.BLOCK.getKey(infusedGrass), new BlockItem(infusedGrass, props)); + register(r, Registry.BLOCK.getKey(mutatedGrass), new BlockItem(mutatedGrass, props)); + register(r, Registry.BLOCK.getKey(animatedTorch), new BlockItem(animatedTorch, props)); + register(r, Registry.BLOCK.getKey(corporeaCrystalCube), new BlockItem(corporeaCrystalCube, props)); DistExecutor.runForDist(() -> () -> registerWithTEISRS(r), () -> () -> registerWithoutTEISRS(r)); } @@ -751,36 +752,36 @@ public final class ModBlocks { @OnlyIn(Dist.DEDICATED_SERVER) private static Void registerWithoutTEISRS(IForgeRegistry r) { Item.Properties props = ModItems.defaultBuilder(); - register(r, manaPylon.getRegistryName(), new BlockItem(manaPylon, props)); - register(r, naturaPylon.getRegistryName(), new BlockItem(naturaPylon, props)); - register(r, gaiaPylon.getRegistryName(), new BlockItem(gaiaPylon, props)); + register(r, Registry.BLOCK.getKey(manaPylon), new BlockItem(manaPylon, props)); + register(r, Registry.BLOCK.getKey(naturaPylon), new BlockItem(naturaPylon, props)); + register(r, Registry.BLOCK.getKey(gaiaPylon), new BlockItem(gaiaPylon, props)); - register(r, teruTeruBozu.getRegistryName(), new BlockItem(teruTeruBozu, props)); - register(r, avatar.getRegistryName(), new BlockItem(avatar, props)); - register(r, bellows.getRegistryName(), new BlockItem(bellows, props)); - register(r, brewery.getRegistryName(), new BlockItem(brewery, props)); - register(r, corporeaIndex.getRegistryName(), new BlockItem(corporeaIndex, props)); - register(r, hourglass.getRegistryName(), new BlockItem(hourglass, props)); + register(r, Registry.BLOCK.getKey(teruTeruBozu), new BlockItem(teruTeruBozu, props)); + register(r, Registry.BLOCK.getKey(avatar), new BlockItem(avatar, props)); + register(r, Registry.BLOCK.getKey(bellows), new BlockItem(bellows, props)); + register(r, Registry.BLOCK.getKey(brewery), new BlockItem(brewery, props)); + register(r, Registry.BLOCK.getKey(corporeaIndex), new BlockItem(corporeaIndex, props)); + register(r, Registry.BLOCK.getKey(hourglass), new BlockItem(hourglass, props)); Item head = new ItemGaiaHead(gaiaHead, gaiaHeadWall, ModItems.defaultBuilder().rarity(Rarity.UNCOMMON)); - register(r, gaiaHead.getRegistryName(), head); + register(r, Registry.BLOCK.getKey(gaiaHead), head); return null; } @OnlyIn(Dist.CLIENT) private static Void registerWithTEISRS(IForgeRegistry r) { Item.Properties pylonProps = ModItems.defaultBuilder().setISTER(() -> () -> new RenderTilePylon.TEISR()); - register(r, manaPylon.getRegistryName(), new BlockItem(manaPylon, pylonProps)); - register(r, naturaPylon.getRegistryName(), new BlockItem(naturaPylon, pylonProps)); - register(r, gaiaPylon.getRegistryName(), new BlockItem(gaiaPylon, pylonProps)); + register(r, Registry.BLOCK.getKey(manaPylon), new BlockItem(manaPylon, pylonProps)); + register(r, Registry.BLOCK.getKey(naturaPylon), new BlockItem(naturaPylon, pylonProps)); + register(r, Registry.BLOCK.getKey(gaiaPylon), new BlockItem(gaiaPylon, pylonProps)); - register(r, teruTeruBozu.getRegistryName(), new BlockItem(teruTeruBozu, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(teruTeruBozu)))); - register(r, avatar.getRegistryName(), new BlockItem(avatar, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(avatar)))); - register(r, bellows.getRegistryName(), new BlockItem(bellows, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(bellows)))); - register(r, brewery.getRegistryName(), new BlockItem(brewery, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(brewery)))); - register(r, corporeaIndex.getRegistryName(), new BlockItem(corporeaIndex, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(corporeaIndex)))); - register(r, hourglass.getRegistryName(), new BlockItem(hourglass, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(hourglass)))); + register(r, Registry.BLOCK.getKey(teruTeruBozu), new BlockItem(teruTeruBozu, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(teruTeruBozu)))); + register(r, Registry.BLOCK.getKey(avatar), new BlockItem(avatar, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(avatar)))); + register(r, Registry.BLOCK.getKey(bellows), new BlockItem(bellows, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(bellows)))); + register(r, Registry.BLOCK.getKey(brewery), new BlockItem(brewery, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(brewery)))); + register(r, Registry.BLOCK.getKey(corporeaIndex), new BlockItem(corporeaIndex, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(corporeaIndex)))); + register(r, Registry.BLOCK.getKey(hourglass), new BlockItem(hourglass, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(hourglass)))); Item head = new ItemGaiaHead(gaiaHead, gaiaHeadWall, ModItems.defaultBuilder().rarity(Rarity.UNCOMMON).setISTER(() -> () -> new TEISR(gaiaHead))); - register(r, gaiaHead.getRegistryName(), head); + register(r, Registry.BLOCK.getKey(gaiaHead), head); 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 ac6dec64e..dd0a2372d 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -12,6 +12,7 @@ import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; @@ -274,19 +275,19 @@ public final class ModFluffBlocks { for (String variant : LibBlockNames.METAMORPHIC_VARIANTS) { base = new BlockMod(props); register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_stone", base); - register(r, base.getRegistryName().getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props)); - register(r, base.getRegistryName().getPath() + SLAB_SUFFIX, new SlabBlock(props)); + register(r, Registry.BLOCK.getKey(base).getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props)); + register(r, Registry.BLOCK.getKey(base).getPath() + SLAB_SUFFIX, new SlabBlock(props)); base = new BlockMod(props); register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone", base); - register(r, base.getRegistryName().getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props)); - register(r, base.getRegistryName().getPath() + SLAB_SUFFIX, new SlabBlock(props)); + register(r, Registry.BLOCK.getKey(base).getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props)); + register(r, Registry.BLOCK.getKey(base).getPath() + SLAB_SUFFIX, new SlabBlock(props)); register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone" + WALL_SUFFIX, new WallBlock(props)); base = new BlockMod(props); register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_bricks", base); - register(r, base.getRegistryName().getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props)); - register(r, base.getRegistryName().getPath() + SLAB_SUFFIX, new SlabBlock(props)); + register(r, Registry.BLOCK.getKey(base).getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props)); + register(r, Registry.BLOCK.getKey(base).getPath() + SLAB_SUFFIX, new SlabBlock(props)); register(r, "chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + variant + "_bricks", new BlockMod(props)); } @@ -312,199 +313,199 @@ public final class ModFluffBlocks { IForgeRegistry r = evt.getRegistry(); Item.Properties props = ModItems.defaultBuilder(); - 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())); + register(r, Registry.BLOCK.getKey(livingwoodStairs), new BlockItem(livingwoodStairs, props)); + register(r, Registry.BLOCK.getKey(livingwoodSlab), new BlockItem(livingwoodSlab, props)); + register(r, Registry.BLOCK.getKey(livingwoodWall), new BlockItem(livingwoodWall, props)); + register(r, Registry.BLOCK.getKey(livingwoodFence), new BlockItem(livingwoodFence, props)); + register(r, Registry.BLOCK.getKey(livingwoodFenceGate), new BlockItem(livingwoodFenceGate, props)); - r.register(new BlockItem(livingwoodPlankStairs, props).setRegistryName(livingwoodPlankStairs.getRegistryName())); - r.register(new BlockItem(livingwoodPlankSlab, props).setRegistryName(livingwoodPlankSlab.getRegistryName())); + register(r, Registry.BLOCK.getKey(livingwoodPlankStairs), new BlockItem(livingwoodPlankStairs, props)); + register(r, Registry.BLOCK.getKey(livingwoodPlankSlab), new BlockItem(livingwoodPlankSlab, props)); - 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())); + register(r, Registry.BLOCK.getKey(livingrockStairs), new BlockItem(livingrockStairs, props)); + register(r, Registry.BLOCK.getKey(livingrockSlab), new BlockItem(livingrockSlab, props)); + register(r, Registry.BLOCK.getKey(livingrockWall), new BlockItem(livingrockWall, props)); - r.register(new BlockItem(livingrockBrickStairs, props).setRegistryName(livingrockBrickStairs.getRegistryName())); - r.register(new BlockItem(livingrockBrickSlab, props).setRegistryName(livingrockBrickSlab.getRegistryName())); + register(r, Registry.BLOCK.getKey(livingrockBrickStairs), new BlockItem(livingrockBrickStairs, props)); + register(r, Registry.BLOCK.getKey(livingrockBrickSlab), new BlockItem(livingrockBrickSlab, props)); - 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())); + register(r, Registry.BLOCK.getKey(dreamwoodStairs), new BlockItem(dreamwoodStairs, props)); + register(r, Registry.BLOCK.getKey(dreamwoodSlab), new BlockItem(dreamwoodSlab, props)); + register(r, Registry.BLOCK.getKey(dreamwoodWall), new BlockItem(dreamwoodWall, props)); + register(r, Registry.BLOCK.getKey(dreamwoodFence), new BlockItem(dreamwoodFence, props)); + register(r, Registry.BLOCK.getKey(dreamwoodFenceGate), new BlockItem(dreamwoodFenceGate, props)); - r.register(new BlockItem(dreamwoodPlankStairs, props).setRegistryName(dreamwoodPlankStairs.getRegistryName())); - r.register(new BlockItem(dreamwoodPlankSlab, props).setRegistryName(dreamwoodPlankSlab.getRegistryName())); + register(r, Registry.BLOCK.getKey(dreamwoodPlankStairs), new BlockItem(dreamwoodPlankStairs, props)); + register(r, Registry.BLOCK.getKey(dreamwoodPlankSlab), new BlockItem(dreamwoodPlankSlab, props)); - 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())); + register(r, Registry.BLOCK.getKey(darkQuartz), new BlockItem(darkQuartz, props)); + register(r, Registry.BLOCK.getKey(darkQuartzPillar), new BlockItem(darkQuartzPillar, props)); + register(r, Registry.BLOCK.getKey(darkQuartzChiseled), new BlockItem(darkQuartzChiseled, props)); + register(r, Registry.BLOCK.getKey(darkQuartzSlab), new BlockItem(darkQuartzSlab, props)); + register(r, Registry.BLOCK.getKey(darkQuartzStairs), new BlockItem(darkQuartzStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(manaQuartz), new BlockItem(manaQuartz, props)); + register(r, Registry.BLOCK.getKey(manaQuartzPillar), new BlockItem(manaQuartzPillar, props)); + register(r, Registry.BLOCK.getKey(manaQuartzChiseled), new BlockItem(manaQuartzChiseled, props)); + register(r, Registry.BLOCK.getKey(manaQuartzSlab), new BlockItem(manaQuartzSlab, props)); + register(r, Registry.BLOCK.getKey(manaQuartzStairs), new BlockItem(manaQuartzStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(blazeQuartz), new BlockItem(blazeQuartz, props)); + register(r, Registry.BLOCK.getKey(blazeQuartzPillar), new BlockItem(blazeQuartzPillar, props)); + register(r, Registry.BLOCK.getKey(blazeQuartzChiseled), new BlockItem(blazeQuartzChiseled, props)); + register(r, Registry.BLOCK.getKey(blazeQuartzSlab), new BlockItem(blazeQuartzSlab, props)); + register(r, Registry.BLOCK.getKey(blazeQuartzStairs), new BlockItem(blazeQuartzStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(lavenderQuartz), new BlockItem(lavenderQuartz, props)); + register(r, Registry.BLOCK.getKey(lavenderQuartzPillar), new BlockItem(lavenderQuartzPillar, props)); + register(r, Registry.BLOCK.getKey(lavenderQuartzChiseled), new BlockItem(lavenderQuartzChiseled, props)); + register(r, Registry.BLOCK.getKey(lavenderQuartzSlab), new BlockItem(lavenderQuartzSlab, props)); + register(r, Registry.BLOCK.getKey(lavenderQuartzStairs), new BlockItem(lavenderQuartzStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(redQuartz), new BlockItem(redQuartz, props)); + register(r, Registry.BLOCK.getKey(redQuartzPillar), new BlockItem(redQuartzPillar, props)); + register(r, Registry.BLOCK.getKey(redQuartzChiseled), new BlockItem(redQuartzChiseled, props)); + register(r, Registry.BLOCK.getKey(redQuartzSlab), new BlockItem(redQuartzSlab, props)); + register(r, Registry.BLOCK.getKey(redQuartzStairs), new BlockItem(redQuartzStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(elfQuartz), new BlockItem(elfQuartz, props)); + register(r, Registry.BLOCK.getKey(elfQuartzPillar), new BlockItem(elfQuartzPillar, props)); + register(r, Registry.BLOCK.getKey(elfQuartzChiseled), new BlockItem(elfQuartzChiseled, props)); + register(r, Registry.BLOCK.getKey(elfQuartzSlab), new BlockItem(elfQuartzSlab, props)); + register(r, Registry.BLOCK.getKey(elfQuartzStairs), new BlockItem(elfQuartzStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(sunnyQuartz), new BlockItem(sunnyQuartz, props)); + register(r, Registry.BLOCK.getKey(sunnyQuartzPillar), new BlockItem(sunnyQuartzPillar, props)); + register(r, Registry.BLOCK.getKey(sunnyQuartzChiseled), new BlockItem(sunnyQuartzChiseled, props)); + register(r, Registry.BLOCK.getKey(sunnyQuartzSlab), new BlockItem(sunnyQuartzSlab, props)); + register(r, Registry.BLOCK.getKey(sunnyQuartzStairs), new BlockItem(sunnyQuartzStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStoneForest), new BlockItem(biomeStoneForest, props)); + register(r, Registry.BLOCK.getKey(biomeStoneForestSlab), new BlockItem(biomeStoneForestSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStoneForestStairs), new BlockItem(biomeStoneForestStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickForest), new BlockItem(biomeBrickForest, props)); + register(r, Registry.BLOCK.getKey(biomeBrickForestSlab), new BlockItem(biomeBrickForestSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickForestStairs), new BlockItem(biomeBrickForestStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneForest), new BlockItem(biomeCobblestoneForest, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneForestSlab), new BlockItem(biomeCobblestoneForestSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneForestStairs), new BlockItem(biomeCobblestoneForestStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallForest), new BlockItem(biomeWallForest, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickForest), new BlockItem(biomeChiseledBrickForest, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStonePlains), new BlockItem(biomeStonePlains, props)); + register(r, Registry.BLOCK.getKey(biomeStonePlainsSlab), new BlockItem(biomeStonePlainsSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStonePlainsStairs), new BlockItem(biomeStonePlainsStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickPlains), new BlockItem(biomeBrickPlains, props)); + register(r, Registry.BLOCK.getKey(biomeBrickPlainsSlab), new BlockItem(biomeBrickPlainsSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickPlainsStairs), new BlockItem(biomeBrickPlainsStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestonePlains), new BlockItem(biomeCobblestonePlains, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestonePlainsSlab), new BlockItem(biomeCobblestonePlainsSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestonePlainsStairs), new BlockItem(biomeCobblestonePlainsStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallPlains), new BlockItem(biomeWallPlains, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickPlains), new BlockItem(biomeChiseledBrickPlains, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStoneMountain), new BlockItem(biomeStoneMountain, props)); + register(r, Registry.BLOCK.getKey(biomeStoneMountainSlab), new BlockItem(biomeStoneMountainSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStoneMountainStairs), new BlockItem(biomeStoneMountainStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickMountain), new BlockItem(biomeBrickMountain, props)); + register(r, Registry.BLOCK.getKey(biomeBrickMountainSlab), new BlockItem(biomeBrickMountainSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickMountainStairs), new BlockItem(biomeBrickMountainStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneMountain), new BlockItem(biomeCobblestoneMountain, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneMountainSlab), new BlockItem(biomeCobblestoneMountainSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneMountainStairs), new BlockItem(biomeCobblestoneMountainStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallMountain), new BlockItem(biomeWallMountain, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickMountain), new BlockItem(biomeChiseledBrickMountain, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStoneFungal), new BlockItem(biomeStoneFungal, props)); + register(r, Registry.BLOCK.getKey(biomeStoneFungalSlab), new BlockItem(biomeStoneFungalSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStoneFungalStairs), new BlockItem(biomeStoneFungalStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickFungal), new BlockItem(biomeBrickFungal, props)); + register(r, Registry.BLOCK.getKey(biomeBrickFungalSlab), new BlockItem(biomeBrickFungalSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickFungalStairs), new BlockItem(biomeBrickFungalStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneFungal), new BlockItem(biomeCobblestoneFungal, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneFungalSlab), new BlockItem(biomeCobblestoneFungalSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneFungalStairs), new BlockItem(biomeCobblestoneFungalStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallFungal), new BlockItem(biomeWallFungal, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickFungal), new BlockItem(biomeChiseledBrickFungal, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStoneSwamp), new BlockItem(biomeStoneSwamp, props)); + register(r, Registry.BLOCK.getKey(biomeStoneSwampSlab), new BlockItem(biomeStoneSwampSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStoneSwampStairs), new BlockItem(biomeStoneSwampStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickSwamp), new BlockItem(biomeBrickSwamp, props)); + register(r, Registry.BLOCK.getKey(biomeBrickSwampSlab), new BlockItem(biomeBrickSwampSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickSwampStairs), new BlockItem(biomeBrickSwampStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneSwamp), new BlockItem(biomeCobblestoneSwamp, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneSwampSlab), new BlockItem(biomeCobblestoneSwampSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneSwampStairs), new BlockItem(biomeCobblestoneSwampStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallSwamp), new BlockItem(biomeWallSwamp, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickSwamp), new BlockItem(biomeChiseledBrickSwamp, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStoneDesert), new BlockItem(biomeStoneDesert, props)); + register(r, Registry.BLOCK.getKey(biomeStoneDesertSlab), new BlockItem(biomeStoneDesertSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStoneDesertStairs), new BlockItem(biomeStoneDesertStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickDesert), new BlockItem(biomeBrickDesert, props)); + register(r, Registry.BLOCK.getKey(biomeBrickDesertSlab), new BlockItem(biomeBrickDesertSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickDesertStairs), new BlockItem(biomeBrickDesertStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneDesert), new BlockItem(biomeCobblestoneDesert, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneDesertSlab), new BlockItem(biomeCobblestoneDesertSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneDesertStairs), new BlockItem(biomeCobblestoneDesertStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallDesert), new BlockItem(biomeWallDesert, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickDesert), new BlockItem(biomeChiseledBrickDesert, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStoneTaiga), new BlockItem(biomeStoneTaiga, props)); + register(r, Registry.BLOCK.getKey(biomeStoneTaigaSlab), new BlockItem(biomeStoneTaigaSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStoneTaigaStairs), new BlockItem(biomeStoneTaigaStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickTaiga), new BlockItem(biomeBrickTaiga, props)); + register(r, Registry.BLOCK.getKey(biomeBrickTaigaSlab), new BlockItem(biomeBrickTaigaSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickTaigaStairs), new BlockItem(biomeBrickTaigaStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneTaiga), new BlockItem(biomeCobblestoneTaiga, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneTaigaSlab), new BlockItem(biomeCobblestoneTaigaSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneTaigaStairs), new BlockItem(biomeCobblestoneTaigaStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallTaiga), new BlockItem(biomeWallTaiga, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickTaiga), new BlockItem(biomeChiseledBrickTaiga, props)); - 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())); + register(r, Registry.BLOCK.getKey(biomeStoneMesa), new BlockItem(biomeStoneMesa, props)); + register(r, Registry.BLOCK.getKey(biomeStoneMesaSlab), new BlockItem(biomeStoneMesaSlab, props)); + register(r, Registry.BLOCK.getKey(biomeStoneMesaStairs), new BlockItem(biomeStoneMesaStairs, props)); + register(r, Registry.BLOCK.getKey(biomeBrickMesa), new BlockItem(biomeBrickMesa, props)); + register(r, Registry.BLOCK.getKey(biomeBrickMesaSlab), new BlockItem(biomeBrickMesaSlab, props)); + register(r, Registry.BLOCK.getKey(biomeBrickMesaStairs), new BlockItem(biomeBrickMesaStairs, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneMesa), new BlockItem(biomeCobblestoneMesa, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneMesaSlab), new BlockItem(biomeCobblestoneMesaSlab, props)); + register(r, Registry.BLOCK.getKey(biomeCobblestoneMesaStairs), new BlockItem(biomeCobblestoneMesaStairs, props)); + register(r, Registry.BLOCK.getKey(biomeWallMesa), new BlockItem(biomeWallMesa, props)); + register(r, Registry.BLOCK.getKey(biomeChiseledBrickMesa), new BlockItem(biomeChiseledBrickMesa, props)); - 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())); + register(r, Registry.BLOCK.getKey(whitePavement), new BlockItem(whitePavement, props)); + register(r, Registry.BLOCK.getKey(blackPavement), new BlockItem(blackPavement, props)); + register(r, Registry.BLOCK.getKey(bluePavement), new BlockItem(bluePavement, props)); + register(r, Registry.BLOCK.getKey(yellowPavement), new BlockItem(yellowPavement, props)); + register(r, Registry.BLOCK.getKey(redPavement), new BlockItem(redPavement, props)); + register(r, Registry.BLOCK.getKey(greenPavement), new BlockItem(greenPavement, props)); - 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())); + register(r, Registry.BLOCK.getKey(whitePavementSlab), new BlockItem(whitePavementSlab, props)); + register(r, Registry.BLOCK.getKey(blackPavementSlab), new BlockItem(blackPavementSlab, props)); + register(r, Registry.BLOCK.getKey(bluePavementSlab), new BlockItem(bluePavementSlab, props)); + register(r, Registry.BLOCK.getKey(yellowPavementSlab), new BlockItem(yellowPavementSlab, props)); + register(r, Registry.BLOCK.getKey(redPavementSlab), new BlockItem(redPavementSlab, props)); + register(r, Registry.BLOCK.getKey(greenPavementSlab), new BlockItem(greenPavementSlab, props)); - 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())); + register(r, Registry.BLOCK.getKey(whitePavementStair), new BlockItem(whitePavementStair, props)); + register(r, Registry.BLOCK.getKey(blackPavementStair), new BlockItem(blackPavementStair, props)); + register(r, Registry.BLOCK.getKey(bluePavementStair), new BlockItem(bluePavementStair, props)); + register(r, Registry.BLOCK.getKey(yellowPavementStair), new BlockItem(yellowPavementStair, props)); + register(r, Registry.BLOCK.getKey(redPavementStair), new BlockItem(redPavementStair, props)); + register(r, Registry.BLOCK.getKey(greenPavementStair), new BlockItem(greenPavementStair, props)); - r.register(new BlockItem(shimmerrockSlab, props).setRegistryName(shimmerrockSlab.getRegistryName())); - r.register(new BlockItem(shimmerrockStairs, props).setRegistryName(shimmerrockStairs.getRegistryName())); + register(r, Registry.BLOCK.getKey(shimmerrockSlab), new BlockItem(shimmerrockSlab, props)); + register(r, Registry.BLOCK.getKey(shimmerrockStairs), new BlockItem(shimmerrockStairs, props)); - r.register(new BlockItem(shimmerwoodPlankSlab, props).setRegistryName(shimmerwoodPlankSlab.getRegistryName())); - r.register(new BlockItem(shimmerwoodPlankStairs, props).setRegistryName(shimmerwoodPlankStairs.getRegistryName())); + register(r, Registry.BLOCK.getKey(shimmerwoodPlankSlab), new BlockItem(shimmerwoodPlankSlab, props)); + register(r, Registry.BLOCK.getKey(shimmerwoodPlankStairs), new BlockItem(shimmerwoodPlankStairs, props)); - 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())); + register(r, Registry.BLOCK.getKey(managlassPane), new BlockItem(managlassPane, props)); + register(r, Registry.BLOCK.getKey(alfglassPane), new BlockItem(alfglassPane, props)); + register(r, Registry.BLOCK.getKey(bifrostPane), new BlockItem(bifrostPane, props)); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index 2dae7a72a..321239f2e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -79,7 +79,7 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower { super.writeToPacketNBT(cmp); if (lastFlower != null) { - cmp.putString(TAG_LAST_FLOWER, lastFlower.getRegistryName().toString()); + cmp.putString(TAG_LAST_FLOWER, Registry.BLOCK.getKey(lastFlower).toString()); } cmp.putInt(TAG_LAST_FLOWER_TIMES, lastFlowerTimes); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 6f4d184d6..be69f91a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -305,7 +305,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, public void writePacketNBT(CompoundNBT cmp) { super.writePacketNBT(cmp); - cmp.putString(TAG_FLUID, fluid.getRegistryName().toString()); + cmp.putString(TAG_FLUID, Registry.FLUID.getKey(fluid).toString()); } @Override diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index a976d96f0..5d8901e6e 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -15,6 +15,7 @@ import net.minecraft.tags.ItemTags; import net.minecraft.util.IItemProvider; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.client.lib.LibResources; @@ -709,7 +710,7 @@ public final class BotaniaCreativeTab extends ItemGroup { private void addTag(ResourceLocation tagId) { ItemTags.getCollection().getOrCreate(tagId).getAllElements().stream() - .sorted(Comparator.comparing(ForgeRegistryEntry::getRegistryName)) + .sorted(Comparator.comparing(Registry.ITEM::getKey)) .forEach(this::addItem); } diff --git a/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java b/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java index 849a0da57..82d459b73 100644 --- a/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java +++ b/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java @@ -17,6 +17,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; import net.minecraft.network.PacketBuffer; import net.minecraft.util.JSONUtils; +import net.minecraft.util.registry.Registry; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.IIngredientSerializer; @@ -89,7 +90,7 @@ public class FuzzyNBTIngredient extends Ingredient { public JsonElement serialize() { JsonObject json = new JsonObject(); json.addProperty("type", CraftingHelper.getID(SERIALIZER).toString()); - json.addProperty("item", stack.getItem().getRegistryName().toString()); + json.addProperty("item", Registry.ITEM.getKey(stack.getItem()).toString()); json.addProperty("count", stack.getCount()); json.addProperty("nbt", stack.getTag().toString()); json.addProperty(ACCEPTS_EMPTY_TAG, acceptsEmptyTag); diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlock.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlock.java index 86a7e0572..be63f4964 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlock.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlock.java @@ -12,6 +12,7 @@ import com.google.gson.JsonObject; import net.minecraft.block.BlockState; import net.minecraft.network.PacketBuffer; +import net.minecraft.util.registry.Registry; import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.recipe.StateIngredient; @@ -35,7 +36,7 @@ public class StateIngredientBlock implements StateIngredient { public JsonObject serialize() { JsonObject object = new JsonObject(); object.addProperty("type", "block"); - object.addProperty("block", block.getRegistryName().toString()); + object.addProperty("block", Registry.BLOCK.getKey(block).toString()); return object; } diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java index edff41dcf..8309d6944 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java @@ -14,6 +14,7 @@ import com.google.gson.JsonObject; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.network.PacketBuffer; +import net.minecraft.util.registry.Registry; import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.recipe.StateIngredient; @@ -40,7 +41,7 @@ public class StateIngredientBlocks implements StateIngredient { object.addProperty("type", "blocks"); JsonArray array = new JsonArray(); for (Block block : blocks) { - array.add(block.getRegistryName().toString()); + array.add(Registry.BLOCK.getKey(block).toString()); } object.add("blocks", array); return object; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 1f1feaea5..65eae3b0c 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -20,6 +20,7 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.network.PacketBuffer; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.registries.ForgeRegistryEntry; @@ -47,7 +48,7 @@ public class HelmRevealingRecipe implements ICraftingRecipe { for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if (!stack.isEmpty() && stack.getItem().getRegistryName().getNamespace().equals(LibMisc.MOD_ID)) { + if (!stack.isEmpty() && Registry.ITEM.getKey(stack.getItem()).getNamespace().equals(LibMisc.MOD_ID)) { helm = stack; } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index a53c1ecf3..4c2369461 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -48,6 +48,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -565,7 +566,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp continue; } - if (CHEATY_BLOCKS.contains(block.getRegistryName())) { + if (CHEATY_BLOCKS.contains(Registry.BLOCK.getKey(block))) { world.destroyBlock(pos, true); } else { //don't break blacklisted blocks diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index bdd997a8e..6b6c49386 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -215,7 +215,7 @@ public class ItemBlackHoleTalisman extends Item implements IBlockProvider { private boolean setBlock(ItemStack stack, Block block) { if (block.asItem() != Items.AIR && (getBlock(stack) == null || getBlockCount(stack) == 0)) { - ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, block.getRegistryName().toString()); + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Registry.BLOCK.getKey(block).toString()); return true; } return false; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 289047ea5..8cb958968 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -71,7 +71,7 @@ public class ItemCacophonium extends Item { } if (sound != null) { - ItemNBTHelper.setString(stack, TAG_SOUND, sound.getRegistryName().toString()); + ItemNBTHelper.setString(stack, TAG_SOUND, Registry.SOUND_EVENT.getKey(sound).toString()); ItemNBTHelper.setString(stack, TAG_SOUND_NAME, entity.getType().getTranslationKey()); player.setHeldItem(hand, stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 124c7babc..bf8a0c5c6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.*; +import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @@ -43,7 +44,7 @@ public class ItemLexicon extends Item implements IElvenItem { } public static boolean isOpen() { - return ModItems.lexicon.getRegistryName().equals(PatchouliAPI.instance.getOpenBookGui()); + return Registry.ITEM.getKey(ModItems.lexicon).equals(PatchouliAPI.instance.getOpenBookGui()); } @Override @@ -74,7 +75,7 @@ public class ItemLexicon extends Item implements IElvenItem { if (playerIn instanceof ServerPlayerEntity) { ServerPlayerEntity player = (ServerPlayerEntity) playerIn; UseItemSuccessTrigger.INSTANCE.trigger(player, stack, player.getServerWorld(), player.getPosX(), player.getPosY(), player.getPosZ()); - PatchouliAPI.instance.openBookGUI((ServerPlayerEntity) playerIn, getRegistryName()); + PatchouliAPI.instance.openBookGUI((ServerPlayerEntity) playerIn, Registry.ITEM.getKey(this)); playerIn.playSound(ModSounds.lexiconOpen, 1F, (float) (0.7 + Math.random() * 0.4)); } @@ -82,7 +83,7 @@ public class ItemLexicon extends Item implements IElvenItem { } public static ITextComponent getEdition() { - return PatchouliAPI.instance.getSubtitle(ModItems.lexicon.getRegistryName()); + return PatchouliAPI.instance.getSubtitle(Registry.ITEM.getKey(ModItems.lexicon)); } public static ITextComponent getTitle(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index da2ac421e..2740b13f0 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -18,6 +18,7 @@ import net.minecraft.item.Rarity; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; +import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.extensions.IForgeContainerType; @@ -702,10 +703,10 @@ public final class ModItems { IForgeRegistry> r = evt.getRegistry(); ContainerType bag = IForgeContainerType.create(ContainerFlowerBag::fromNetwork); - register(r, flowerBag.getRegistryName(), bag); + register(r, Registry.ITEM.getKey(flowerBag), bag); ContainerType box = IForgeContainerType.create(ContainerBaubleBox::fromNetwork); - register(r, baubleBox.getRegistryName(), box); + register(r, Registry.ITEM.getKey(baubleBox), box); DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> { ScreenManager.registerFactory(bag, GuiFlowerBag::new); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index bf3bab6df..9463ba1b3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -19,6 +19,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.common.Tags; @@ -71,7 +72,7 @@ public class ItemDiviningRod extends Item implements IManaUsingItem, IAvatarWiel Block block = state.getBlock(); if (Tags.Blocks.ORES.contains(block)) { - Random rand = new Random(block.getRegistryName().hashCode() ^ seedxor); + Random rand = new Random(Registry.BLOCK.getKey(block).hashCode() ^ seedxor); WispParticleData data = WispParticleData.wisp(0.25F, rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 8, false); world.addParticle(data, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index b03732d05..2df1f21a9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -364,7 +364,7 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC } private void setTarget(ItemStack stack, Block block) { - ItemNBTHelper.setString(stack, TAG_TARGET_BLOCK_NAME, block.getRegistryName().toString()); + ItemNBTHelper.setString(stack, TAG_TARGET_BLOCK_NAME, Registry.BLOCK.getKey(block).toString()); } public static Block getTargetState(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java index 5b7dcc0e9..2a90af2da 100644 --- a/src/main/java/vazkii/botania/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -64,7 +64,8 @@ public class BlockLootProvider implements IDataProvider { this.generator = generator; for (Block b : Registry.BLOCK) { - if (!LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) { + ResourceLocation id = Registry.BLOCK.getKey(b); + if (!LibMisc.MOD_ID.equals(id.getNamespace())) { continue; } if (b instanceof SlabBlock) { @@ -73,7 +74,7 @@ public class BlockLootProvider implements IDataProvider { functionTable.put(b, BlockLootProvider::genDoubleFlower); } else if (b instanceof BlockAltGrass) { functionTable.put(b, BlockLootProvider::genAltGrass); - } else if (b.getRegistryName().getPath().matches(LibBlockNames.METAMORPHIC_PREFIX + "\\w+" + "_stone")) { + } else if (id.getPath().matches(LibBlockNames.METAMORPHIC_PREFIX + "\\w+" + "_stone")) { functionTable.put(b, BlockLootProvider::genMetamorphicStone); } } @@ -117,11 +118,12 @@ public class BlockLootProvider implements IDataProvider { Map tables = new HashMap<>(); for (Block b : Registry.BLOCK) { - if (!LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) { + ResourceLocation id = Registry.BLOCK.getKey(b); + if (!LibMisc.MOD_ID.equals(id.getNamespace())) { continue; } Function func = functionTable.getOrDefault(b, BlockLootProvider::genRegular); - tables.put(b.getRegistryName(), func.apply(b)); + tables.put(id, func.apply(b)); } for (Map.Entry e : tables.entrySet()) { @@ -167,7 +169,7 @@ public class BlockLootProvider implements IDataProvider { } private static LootTable.Builder genMetamorphicStone(Block b) { - String cobbleName = b.getRegistryName().getPath().replaceAll("_stone", "_cobblestone"); + String cobbleName = Registry.BLOCK.getKey(b).getPath().replaceAll("_stone", "_cobblestone"); Block cobble = Registry.BLOCK.getValue(new ResourceLocation(LibMisc.MOD_ID, cobbleName)).get(); return genRegular(cobble); } diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 1197d611a..4cd28aa82 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -13,6 +13,7 @@ import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraft.item.DyeColor; import net.minecraft.tags.BlockTags; +import net.minecraft.util.registry.Registry; import vazkii.botania.common.block.BlockFloatingSpecialFlower; import vazkii.botania.common.block.ModBlocks; @@ -32,40 +33,40 @@ public class BlockTagProvider extends BlockTagsProvider { @Override protected void registerTags() { - Predicate botania = b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()); + Predicate botania = b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace()); getBuilder(BlockTags.RAILS).add(ModBlocks.ghostRail); getBuilder(BlockTags.SLABS).add(registry.stream().filter(botania) .filter(b -> b instanceof SlabBlock) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new)); getBuilder(BlockTags.STAIRS).add(registry.stream().filter(botania) .filter(b -> b instanceof StairsBlock) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new)); getBuilder(BlockTags.WALLS).add(registry.stream().filter(botania) .filter(b -> b instanceof WallBlock) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new)); getBuilder(BlockTags.FENCES).add(registry.stream().filter(botania) .filter(b -> b instanceof FenceBlock) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new)); getBuilder(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS).add( Arrays.stream(DyeColor.values()) .map(ModBlocks::getFloatingFlower) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new) ); getBuilder(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS).add(registry.stream().filter(botania) .filter(b -> b instanceof BlockFloatingSpecialFlower) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new) ); @@ -74,14 +75,14 @@ public class BlockTagProvider extends BlockTagsProvider { getBuilder(ModTags.Blocks.MYSTICAL_FLOWERS).add( Arrays.stream(DyeColor.values()) .map(ModBlocks::getFlower) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new) ); getBuilder(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS).add( Arrays.stream(DyeColor.values()) .map(ModBlocks::getDoubleFlower) - .sorted(Comparator.comparing(Block::getRegistryName)) + .sorted(Comparator.comparing(Registry.BLOCK::getKey)) .toArray(Block[]::new) ); diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 52757b096..fc110a8c7 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -47,14 +47,14 @@ public class BlockstateProvider extends BlockStateProvider { @Override protected void registerStatesAndModels() { - Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) + Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace())) .forEach(b -> { if (b == ModBlocks.craftCrate || b == ModBlocks.ghostRail || b == ModBlocks.solidVines) { return; } - String name = b.getRegistryName().getPath(); + String name = Registry.BLOCK.getKey(b).getPath(); if (name.contains("quartz") && b instanceof RotatedPillarBlock) { ModelFile file = models().getExistingFile(prefix("block/" + name)); getVariantBuilder(b) @@ -137,7 +137,7 @@ public class BlockstateProvider extends BlockStateProvider { } private void redStringBlock(Block b) { - ModelFile file = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath())); + ModelFile file = models().getExistingFile(prefix("block/" + Registry.BLOCK.getKey(b).getPath())); getVariantBuilder(b) .partialState().with(BlockStateProperties.FACING, Direction.NORTH).setModels(new ConfiguredModel(file)) .partialState().with(BlockStateProperties.FACING, Direction.SOUTH).setModels(new ConfiguredModel(file, 0, 180, false)) diff --git a/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java b/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java index 05bbc87b4..a708b0dea 100644 --- a/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java +++ b/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java @@ -30,8 +30,9 @@ public class FloatingFlowerModelProvider extends ModelProvider LibMisc.MOD_ID.equals(i.getRegistryName().getNamespace())) + Registry.ITEM.stream().filter(i -> LibMisc.MOD_ID.equals(Registry.ITEM.getKey(i).getNamespace())) .forEach(i -> { // todo 1.15 expand to all item models that simply reference their parent if (i instanceof BlockItem && ((BlockItem) i).getBlock() instanceof BlockFloatingFlower) { - String name = i.getRegistryName().getPath(); + String name = Registry.ITEM.getKey(i).getPath(); withExistingParent(name, prefix("block/" + name)); } }); diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index 07c1f0b54..474c70f6d 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -16,6 +16,7 @@ import net.minecraft.item.Items; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; +import net.minecraft.util.registry.Registry; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.ModTags; @@ -51,7 +52,7 @@ public class ItemTagProvider extends ItemTagsProvider { this.getBuilder(ItemTags.FLOWERS).add(ModTags.Items.SPECIAL_FLOWERS); Tag.Builder builder = getBuilder(ModTags.Items.DYES); - Arrays.stream(DyeColor.values()).map(ModItems::getDye).sorted(Comparator.comparing(Item::getRegistryName)).forEach(builder::add); + Arrays.stream(DyeColor.values()).map(ModItems::getDye).sorted(Comparator.comparing(Registry.ITEM::getKey)).forEach(builder::add); } @Nonnull diff --git a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index ff7b88ed0..115c820d1 100644 --- a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -25,6 +25,7 @@ import net.minecraft.state.IProperty; import net.minecraft.tags.ItemTags; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import net.minecraftforge.common.Tags; import vazkii.botania.common.block.ModBlocks; @@ -184,13 +185,13 @@ public class ManaInfusionProvider extends RecipeProvider { for (int i = 0; i < items.length; i++) { Ingredient in = ingr(items[i]); ItemStack out = new ItemStack(i == items.length - 1 ? items[0] : items[i + 1]); - String id = String.format("%s_to_%s", items[i].asItem().getRegistryName().getPath(), out.getItem().getRegistryName().getPath()); + String id = String.format("%s_to_%s", Registry.ITEM.getKey(items[i].asItem()).getPath(), Registry.ITEM.getKey(out.getItem()).getPath()); consumer.accept(FinishedRecipe.alchemy(id(id), out, in, cost, group)); } } private static FinishedRecipe mini(IItemProvider mini, IItemProvider full) { - return FinishedRecipe.alchemy(id(mini.asItem().getRegistryName().getPath()), new ItemStack(mini), ingr(full), 2500, "botania:flower_shrinking"); + return FinishedRecipe.alchemy(id(Registry.ITEM.getKey(mini.asItem()).getPath()), new ItemStack(mini), ingr(full), 2500, "botania:flower_shrinking"); } private static ResourceLocation id(String s) { diff --git a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java index 6ea4895c1..5f694f5c7 100644 --- a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java @@ -21,6 +21,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ItemTags; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -142,7 +143,7 @@ public class PetalProvider extends RecipeProvider { } private static FinishedRecipe make(IItemProvider item, Ingredient... ingredients) { - return new FinishedRecipe(idFor(item.asItem().getRegistryName()), new ItemStack(item), ingredients); + return new FinishedRecipe(idFor(Registry.ITEM.getKey(item.asItem())), new ItemStack(item), ingredients); } private static ResourceLocation idFor(ResourceLocation name) { diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 5a3cf0c0b..6f4318438 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -990,7 +990,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .addCriterion("has_item", hasItem(ModTags.Items.GEMS_MANA_DIAMOND)) .build(consumer); - ResourceLocation cacophoniumId = ModItems.cacophonium.getRegistryName(); + ResourceLocation cacophoniumId = Registry.ITEM.getKey(ModItems.cacophonium); Supplier cacophoniumBase = () -> ShapedRecipeBuilder.shapedRecipe(ModItems.cacophonium) .key('N', Items.NOTE_BLOCK) .patternLine(" G ") @@ -2425,7 +2425,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { } private void createFloatingFlowerRecipe(Consumer consumer, IItemProvider input) { - ResourceLocation inputName = input.asItem().getRegistryName(); + ResourceLocation inputName = Registry.ITEM.getKey(input.asItem()); Item output = Registry.ITEM.getValue(new ResourceLocation(inputName.getNamespace(), "floating_" + inputName.getPath())).get(); ShapelessRecipeBuilder.shapelessRecipe(output) .addIngredient(ModTags.Items.FLOATING_FLOWERS) @@ -2452,7 +2452,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { ShapelessRecipeBuilder.shapelessRecipe(output, 9) .addCriterion("has_item", hasItem(output)) .addIngredient(input).setGroup("botania:petal_block_deconstruct") - .build(consumer, prefix("conversions/" + input.asItem().getRegistryName().getPath() + "_deconstruct")); + .build(consumer, prefix("conversions/" + Registry.ITEM.getKey(input.asItem()).getPath() + "_deconstruct")); } private void recombineSlab(Consumer consumer, IItemProvider fullBlock, IItemProvider slab) { @@ -2461,7 +2461,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .patternLine("Q") .patternLine("Q") .addCriterion("has_item", hasItem(fullBlock)) - .build(consumer, prefix("slab_recombine/" + fullBlock.asItem().getRegistryName().getPath())); + .build(consumer, prefix("slab_recombine/" + Registry.ITEM.getKey(fullBlock.asItem())).getPath()); } private void registerForQuartz(Consumer consumer, String variant, IItemProvider baseItem) { @@ -2655,7 +2655,8 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { } private void specialRecipe(Consumer consumer, SpecialRecipeSerializer serializer) { - CustomRecipeBuilder.customRecipe(serializer).build(consumer, prefix("dynamic/" + serializer.getRegistryName().getPath()).toString()); + ResourceLocation name = Registry.RECIPE_SERIALIZER.getKey(serializer); + CustomRecipeBuilder.customRecipe(serializer).build(consumer, prefix("dynamic/" + name.getPath()).toString()); } @Override diff --git a/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java b/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java index b58aee186..10cba48e0 100644 --- a/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java @@ -136,7 +136,9 @@ public class StonecuttingProvider extends RecipeProvider { } private static ResourceLocation idFor(IItemProvider a, IItemProvider b) { - return prefix("stonecutting/" + a.asItem().getRegistryName().getPath() + "_to_" + b.asItem().getRegistryName().getPath()); + ResourceLocation aId = Registry.ITEM.getKey(a.asItem()); + ResourceLocation bId = Registry.ITEM.getKey(b.asItem()); + return prefix("stonecutting/" + aId.getPath() + "_to_" + bId.getPath()); } private static IFinishedRecipe stonecutting(IItemProvider input, IItemProvider output) { @@ -149,7 +151,7 @@ public class StonecuttingProvider extends RecipeProvider { private static IFinishedRecipe azulejoStonecutting(List inputs, IItemProvider output) { Ingredient input = Ingredient.fromItems(inputs.stream().filter(obj -> output != obj).toArray(IItemProvider[]::new)); - return new Result(prefix("stonecutting/" + output.asItem().getRegistryName().getPath()), IRecipeSerializer.STONECUTTING, input, output.asItem(), 1); + return new Result(prefix("stonecutting/" + Registry.ITEM.getKey(output.asItem()).getPath()), IRecipeSerializer.STONECUTTING, input, output.asItem(), 1); } // Wrapper without advancements diff --git a/src/main/java/vazkii/botania/data/recipes/WrapperResult.java b/src/main/java/vazkii/botania/data/recipes/WrapperResult.java index 80c6c8eaa..4e995c852 100644 --- a/src/main/java/vazkii/botania/data/recipes/WrapperResult.java +++ b/src/main/java/vazkii/botania/data/recipes/WrapperResult.java @@ -13,6 +13,7 @@ import com.google.gson.JsonObject; import net.minecraft.data.IFinishedRecipe; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import javax.annotation.Nullable; @@ -57,7 +58,7 @@ public class WrapperResult implements IFinishedRecipe { return IFinishedRecipe.super.getRecipeJson(); } JsonObject jsonobject = new JsonObject(); - jsonobject.addProperty("type", this.type.getRegistryName().toString()); + jsonobject.addProperty("type", Registry.RECIPE_SERIALIZER.getKey(this.type).toString()); this.serialize(jsonobject); return jsonobject; }