diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index ab3936cfb..3e6d3475d 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -21,6 +21,8 @@ import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.item.EntityPainting; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; @@ -36,12 +38,15 @@ import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.advancements.*; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; @@ -59,6 +64,7 @@ import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.loot.LootHandler; import vazkii.botania.common.core.proxy.IProxy; +import vazkii.botania.common.core.proxy.ServerProxy; import vazkii.botania.common.crafting.ModBrewRecipes; import vazkii.botania.common.crafting.ModCraftingRecipes; import vazkii.botania.common.crafting.ModElvenTradeRecipes; @@ -87,7 +93,7 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; -@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) +@Mod(LibMisc.MOD_ID) public class Botania { public static boolean gardenOfGlassLoaded = false; @@ -98,30 +104,31 @@ public class Botania { public static boolean coloredLightsLoaded = false; public static boolean etFuturumLoaded = false; - @Instance(LibMisc.MOD_ID) public static Botania instance; - - @SidedProxy(serverSide = LibMisc.PROXY_SERVER, clientSide = LibMisc.PROXY_CLIENT) public static IProxy proxy; public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); - @EventHandler - public void preInit(FMLPreInitializationEvent event) { - gardenOfGlassLoaded = Loader.isModLoaded("gardenofglass"); + public Botania() { + instance = this; + proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new); + FMLModLoadingContext.get().getModEventBus().addListener(this::commonSetup); + } - thaumcraftLoaded = Loader.isModLoaded("thaumcraft"); - bcApiLoaded = Loader.isModLoaded("buildcraftlib"); - bloodMagicLoaded = Loader.isModLoaded("bloodmagic"); // Psh, noob - coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); - etFuturumLoaded = Loader.isModLoaded("etfuturum"); + private void commonSetup(FMLCommonSetupEvent event) { + gardenOfGlassLoaded = ModList.get().isLoaded("gardenofglass"); + + thaumcraftLoaded = ModList.get().isLoaded("thaumcraft"); + bcApiLoaded = ModList.get().isLoaded("buildcraftlib"); + bloodMagicLoaded = ModList.get().isLoaded("bloodmagic"); // Psh, noob + coloredLightsLoaded = ModList.get().isLoaded("easycoloredlights"); + etFuturumLoaded = ModList.get().isLoaded("etfuturum"); BotaniaAPI.internalHandler = new InternalMethodHandler(); ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); PacketHandler.init(); - ModEntities.init(); ModBrews.init(); ModMultiblocks.init(); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 7f8201a9d..3edce3642 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -17,10 +17,11 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; @@ -113,7 +114,7 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModBlocks { public static final Block flower = new BlockModFlower(); public static final Block defaultAltar = new BlockAltar(BlockAltar.Variant.DEFAULT); @@ -213,7 +214,7 @@ public final class ModBlocks { public static final Block petalBlockLime = new BlockPetalBlock(EnumDyeColor.LIME); public static final Block petalBlockPink = new BlockPetalBlock(EnumDyeColor.PINK); public static final Block petalBlockGray = new BlockPetalBlock(EnumDyeColor.GRAY); - public static final Block petalBlockSilver = new BlockPetalBlock(EnumDyeColor.SILVER); + public static final Block petalBlockSilver = new BlockPetalBlock(EnumDyeColor.LIGHT_GRAY); public static final Block petalBlockCyan = new BlockPetalBlock(EnumDyeColor.CYAN); public static final Block petalBlockPurple = new BlockPetalBlock(EnumDyeColor.PURPLE); public static final Block petalBlockBlue = new BlockPetalBlock(EnumDyeColor.BLUE); @@ -556,14 +557,12 @@ public final class ModBlocks { r.register(new ItemBlockMod(mutatedGrass).setRegistryName(mutatedGrass.getRegistryName())); r.register(new ItemBlockMod(animatedTorch).setRegistryName(animatedTorch.getRegistryName())); initOreDict(); - - initTileEntities(); } public static void addDispenserBehaviours() { - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.twigWand, new BehaviourWand()); - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); + BlockDispenser.registerDispenseBehavior(ModItems.twigWand, new BehaviourWand()); + BlockDispenser.registerDispenseBehavior(ModItems.poolMinecart, new BehaviourPoolMinecart()); + BlockDispenser.registerDispenseBehavior(ModBlocks.felPumpkin, new BehaviourFelPumpkin()); SeedBehaviours.init(); } @@ -595,61 +594,62 @@ public final class ModBlocks { OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.STONE_SLAB, 1, 3)); } - private static void initTileEntities() { - registerTile(TileAltar.class, LibBlockNames.ALTAR); - registerTile(TileSpecialFlower.class, LibBlockNames.SPECIAL_FLOWER); - registerTile(TileSpreader.class, LibBlockNames.SPREADER); - registerTile(TilePool.class, LibBlockNames.POOL); - registerTile(TileRuneAltar.class, LibBlockNames.RUNE_ALTAR); - registerTile(TilePylon.class, LibBlockNames.PYLON); - registerTile(TileDistributor.class, LibBlockNames.DISTRIBUTOR); - registerTile(TileManaVoid.class, LibBlockNames.MANA_VOID); - registerTile(TileManaDetector.class, LibBlockNames.MANA_DETECTOR); - registerTile(TileEnchanter.class, LibBlockNames.ENCHANTER); - registerTile(TileTurntable.class, LibBlockNames.TURNTABLE); - registerTile(TileTinyPlanet.class, LibBlockNames.TINY_PLANET); - registerTile(TileOpenCrate.class, LibBlockNames.OPEN_CRATE); - registerTile(TileCraftCrate.class, LibBlockNames.CRAFT_CRATE); - registerTile(TileForestEye.class, LibBlockNames.FOREST_EYE); - registerTile(TilePlatform.class, LibBlockNames.PLATFORM); - registerTile(TileAlfPortal.class, LibBlockNames.ALF_PORTAL); - registerTile(TileBifrost.class, LibBlockNames.BIFROST); - registerTile(TileFloatingFlower.class, LibBlockNames.MINI_ISLAND); - registerTile(TileTinyPotato.class, LibBlockNames.TINY_POTATO); - registerTile(TileSpawnerClaw.class, LibBlockNames.SPAWNER_CLAW); - registerTile(TileEnderEye.class, LibBlockNames.ENDER_EYE_BLOCK); - registerTile(TileStarfield.class, LibBlockNames.STARFIELD); - registerTile(TileRFGenerator.class, LibBlockNames.RF_GENERATOR); - registerTile(TileBrewery.class, LibBlockNames.BREWERY); - registerTile(TileTerraPlate.class, LibBlockNames.TERRA_PLATE); - registerTile(TileRedStringContainer.class, LibBlockNames.RED_STRING_CONTAINER); - registerTile(TileRedStringDispenser.class, LibBlockNames.RED_STRING_DISPENSER); - registerTile(TileRedStringFertilizer.class, LibBlockNames.RED_STRING_FERTILIZER); - registerTile(TileRedStringComparator.class, LibBlockNames.RED_STRING_COMPARATOR); - registerTile(TileRedStringRelay.class, LibBlockNames.RED_STRING_RELAY); - registerTile(TileFloatingSpecialFlower.class, LibBlockNames.FLOATING_SPECIAL_FLOWER); - registerTile(TileManaFlame.class, LibBlockNames.MANA_FLAME); - registerTile(TilePrism.class, LibBlockNames.PRISM); - registerTile(TileCorporeaIndex.class, LibBlockNames.CORPOREA_INDEX); - registerTile(TileCorporeaFunnel.class, LibBlockNames.CORPOREA_FUNNEL); - registerTile(TilePump.class, LibBlockNames.PUMP); - registerTile(TileFakeAir.class, LibBlockNames.FAKE_AIR); - registerTile(TileCorporeaInterceptor.class, LibBlockNames.CORPOREA_INTERCEPTOR); - registerTile(TileCorporeaCrystalCube.class, LibBlockNames.CORPOREA_CRYSTAL_CUBE); - registerTile(TileIncensePlate.class, LibBlockNames.INCENSE_PLATE); - registerTile(TileHourglass.class, LibBlockNames.HOURGLASS); - registerTile(TileSparkChanger.class, LibBlockNames.SPARK_CHANGER); - registerTile(TileCocoon.class, LibBlockNames.COCOON); - registerTile(TileLightRelay.class, LibBlockNames.LIGHT_RELAY); - registerTile(TileCacophonium.class, LibBlockNames.CACOPHONIUM); - registerTile(TileBellows.class, LibBlockNames.BELLOWS); - registerTile(TileCell.class, LibBlockNames.CELL_BLOCK); - registerTile(TileRedStringInterceptor.class, LibBlockNames.RED_STRING_INTERCEPTOR); - registerTile(TileGaiaHead.class, LibBlockNames.GAIA_HEAD); - registerTile(TileCorporeaRetainer.class, LibBlockNames.CORPOREA_RETAINER); - registerTile(TileTeruTeruBozu.class, LibBlockNames.TERU_TERU_BOZU); - registerTile(TileAvatar.class, LibBlockNames.AVATAR); - registerTile(TileAnimatedTorch.class, LibBlockNames.ANIMATED_TORCH); + @SubscribeEvent + public static void initTileEntities(RegistryEvent.Register> evt) { + TileEntityType.Builder.create(TileAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALTAR); + TileEntityType.Builder.create(TileSpecialFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER); + TileEntityType.Builder.create(TileSpreader::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPREADER); + TileEntityType.Builder.create(TilePool::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.POOL); + TileEntityType.Builder.create(TileRuneAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RUNE_ALTAR); + TileEntityType.Builder.create(TilePylon::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PYLON); + TileEntityType.Builder.create(TileDistributor::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DISTRIBUTOR); + TileEntityType.Builder.create(TileManaVoid::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_VOID); + TileEntityType.Builder.create(TileManaDetector::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_DETECTOR); + TileEntityType.Builder.create(TileEnchanter::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENCHANTER); + TileEntityType.Builder.create(TileTurntable::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TURNTABLE); + TileEntityType.Builder.create(TileTinyPlanet::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_PLANET); + TileEntityType.Builder.create(TileOpenCrate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.OPEN_CRATE); + TileEntityType.Builder.create(TileCraftCrate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CRAFT_CRATE); + TileEntityType.Builder.create(TileForestEye::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FOREST_EYE); + TileEntityType.Builder.create(TilePlatform::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PLATFORM); + TileEntityType.Builder.create(TileAlfPortal::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALF_PORTAL); + TileEntityType.Builder.create(TileBifrost::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BIFROST); + TileEntityType.Builder.create(TileFloatingFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MINI_ISLAND); + TileEntityType.Builder.create(TileTinyPotato::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_POTATO); + TileEntityType.Builder.create(TileSpawnerClaw::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPAWNER_CLAW); + TileEntityType.Builder.create(TileEnderEye::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENDER_EYE_BLOCK); + TileEntityType.Builder.create(TileStarfield::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.STARFIELD); + TileEntityType.Builder.create(TileRFGenerator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RF_GENERATOR); + TileEntityType.Builder.create(TileBrewery::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BREWERY); + TileEntityType.Builder.create(TileTerraPlate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERRA_PLATE); + TileEntityType.Builder.create(TileRedStringContainer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_CONTAINER); + TileEntityType.Builder.create(TileRedStringDispenser::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_DISPENSER); + TileEntityType.Builder.create(TileRedStringFertilizer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_FERTILIZER); + TileEntityType.Builder.create(TileRedStringComparator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_COMPARATOR); + TileEntityType.Builder.create(TileRedStringRelay::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_RELAY); + TileEntityType.Builder.create(TileFloatingSpecialFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FLOATING_SPECIAL_FLOWER); + TileEntityType.Builder.create(TileManaFlame::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_FLAME); + TileEntityType.Builder.create(TilePrism::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PRISM); + TileEntityType.Builder.create(TileCorporeaIndex::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX); + TileEntityType.Builder.create(TileCorporeaFunnel::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_FUNNEL); + TileEntityType.Builder.create(TilePump::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PUMP); + TileEntityType.Builder.create(TileFakeAir::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FAKE_AIR); + TileEntityType.Builder.create(TileCorporeaInterceptor::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INTERCEPTOR); + TileEntityType.Builder.create(TileCorporeaCrystalCube::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_CRYSTAL_CUBE); + TileEntityType.Builder.create(TileIncensePlate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.INCENSE_PLATE); + TileEntityType.Builder.create(TileHourglass::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.HOURGLASS); + TileEntityType.Builder.create(TileSparkChanger::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPARK_CHANGER); + TileEntityType.Builder.create(TileCocoon::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.COCOON); + TileEntityType.Builder.create(TileLightRelay::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIGHT_RELAY); + TileEntityType.Builder.create(TileCacophonium::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CACOPHONIUM); + TileEntityType.Builder.create(TileBellows::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BELLOWS); + TileEntityType.Builder.create(TileCell::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CELL_BLOCK); + TileEntityType.Builder.create(TileRedStringInterceptor::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_INTERCEPTOR); + TileEntityType.Builder.create(TileGaiaHead::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD); + TileEntityType.Builder.create(TileCorporeaRetainer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_RETAINER); + TileEntityType.Builder.create(TileTeruTeruBozu::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERU_TERU_BOZU); + TileEntityType.Builder.create(TileAvatar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.AVATAR); + TileEntityType.Builder.create(TileAnimatedTorch::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ANIMATED_TORCH); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); @@ -704,8 +704,4 @@ public final class ModBlocks { BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "Chibi"), innerClazz, key); } - private static void registerTile(Class clazz, String key) { - GameRegistry.registerTileEntity(clazz, LibResources.PREFIX_MOD + key); - } - } diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 720697ee7..415e37ef4 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -15,8 +15,8 @@ import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; @@ -56,7 +56,7 @@ import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockMod; -import vazkii.botania.common.item.block.ItemBlockModSlab; +import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @@ -66,7 +66,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModFluffBlocks { public static List slabsToRegister = new ArrayList<>(); @@ -271,52 +271,52 @@ public final class ModFluffBlocks { public static void registerItemBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); r.register(new ItemBlockMod(livingwoodStairs).setRegistryName(livingwoodStairs.getRegistryName())); - r.register(new ItemBlockModSlab(livingwoodSlab).setRegistryName(livingwoodSlab.getRegistryName())); + r.register(new ItemBlockMod(livingwoodSlab).setRegistryName(livingwoodSlab.getRegistryName())); r.register(new ItemBlockMod(livingwoodWall).setRegistryName(livingwoodWall.getRegistryName())); r.register(new ItemBlockMod(livingwoodPlankStairs).setRegistryName(livingwoodPlankStairs.getRegistryName())); - r.register(new ItemBlockModSlab(livingwoodPlankSlab).setRegistryName(livingwoodPlankSlab.getRegistryName())); + r.register(new ItemBlockMod(livingwoodPlankSlab).setRegistryName(livingwoodPlankSlab.getRegistryName())); r.register(new ItemBlockMod(livingrockStairs).setRegistryName(livingrockStairs.getRegistryName())); - r.register(new ItemBlockModSlab(livingrockSlab).setRegistryName(livingrockSlab.getRegistryName())); + r.register(new ItemBlockMod(livingrockSlab).setRegistryName(livingrockSlab.getRegistryName())); r.register(new ItemBlockMod(livingrockWall).setRegistryName(livingrockWall.getRegistryName())); r.register(new ItemBlockMod(livingrockBrickStairs).setRegistryName(livingrockBrickStairs.getRegistryName())); - r.register(new ItemBlockModSlab(livingrockBrickSlab).setRegistryName(livingrockBrickSlab.getRegistryName())); + r.register(new ItemBlockMod(livingrockBrickSlab).setRegistryName(livingrockBrickSlab.getRegistryName())); r.register(new ItemBlockMod(dreamwoodStairs).setRegistryName(dreamwoodStairs.getRegistryName())); - r.register(new ItemBlockModSlab(dreamwoodSlab).setRegistryName(dreamwoodSlab.getRegistryName())); + r.register(new ItemBlockMod(dreamwoodSlab).setRegistryName(dreamwoodSlab.getRegistryName())); r.register(new ItemBlockMod(dreamwoodWall).setRegistryName(dreamwoodWall.getRegistryName())); r.register(new ItemBlockMod(dreamwoodPlankStairs).setRegistryName(dreamwoodPlankStairs.getRegistryName())); - r.register(new ItemBlockModSlab(dreamwoodPlankSlab).setRegistryName(dreamwoodPlankSlab.getRegistryName())); + r.register(new ItemBlockMod(dreamwoodPlankSlab).setRegistryName(dreamwoodPlankSlab.getRegistryName())); r.register(new ItemBlockSpecialQuartz(darkQuartz).setRegistryName(darkQuartz.getRegistryName())); - r.register(new ItemBlockModSlab(darkQuartzSlab).setRegistryName(darkQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(darkQuartzSlab).setRegistryName(darkQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(darkQuartzStairs).setRegistryName(darkQuartzStairs.getRegistryName())); r.register(new ItemBlockSpecialQuartz(manaQuartz).setRegistryName(manaQuartz.getRegistryName())); - r.register(new ItemBlockModSlab(manaQuartzSlab).setRegistryName(manaQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(manaQuartzSlab).setRegistryName(manaQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(manaQuartzStairs).setRegistryName(manaQuartzStairs.getRegistryName())); r.register(new ItemBlockSpecialQuartz(blazeQuartz).setRegistryName(blazeQuartz.getRegistryName())); - r.register(new ItemBlockModSlab(blazeQuartzSlab).setRegistryName(blazeQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(blazeQuartzSlab).setRegistryName(blazeQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(blazeQuartzStairs).setRegistryName(blazeQuartzStairs.getRegistryName())); r.register(new ItemBlockSpecialQuartz(lavenderQuartz).setRegistryName(lavenderQuartz.getRegistryName())); - r.register(new ItemBlockModSlab(lavenderQuartzSlab).setRegistryName(lavenderQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(lavenderQuartzSlab).setRegistryName(lavenderQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(lavenderQuartzStairs).setRegistryName(lavenderQuartzStairs.getRegistryName())); r.register(new ItemBlockSpecialQuartz(redQuartz).setRegistryName(redQuartz.getRegistryName())); - r.register(new ItemBlockModSlab(redQuartzSlab).setRegistryName(redQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(redQuartzSlab).setRegistryName(redQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(redQuartzStairs).setRegistryName(redQuartzStairs.getRegistryName())); r.register(new ItemBlockSpecialQuartz(elfQuartz).setRegistryName(elfQuartz.getRegistryName())); - r.register(new ItemBlockModSlab(elfQuartzSlab).setRegistryName(elfQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(elfQuartzSlab).setRegistryName(elfQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(elfQuartzStairs).setRegistryName(elfQuartzStairs.getRegistryName())); r.register(new ItemBlockSpecialQuartz(sunnyQuartz).setRegistryName(sunnyQuartz.getRegistryName())); - r.register(new ItemBlockModSlab(sunnyQuartzSlab).setRegistryName(sunnyQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(sunnyQuartzSlab).setRegistryName(sunnyQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(sunnyQuartzStairs).setRegistryName(sunnyQuartzStairs.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(biomeStoneA).setRegistryName(biomeStoneA.getRegistryName())); @@ -325,20 +325,20 @@ public final class ModFluffBlocks { for (int i = 0; i < 24; i++) { r.register(new ItemBlockMod(biomeStoneStairs[i]).setRegistryName(biomeStoneStairs[i].getRegistryName())); - r.register(new ItemBlockModSlab(biomeStoneSlabs[i]).setRegistryName(biomeStoneSlabs[i].getRegistryName())); + r.register(new ItemBlockMod(biomeStoneSlabs[i]).setRegistryName(biomeStoneSlabs[i].getRegistryName())); } r.register(new ItemBlockWithMetadataAndName(biomeStoneWall).setRegistryName(biomeStoneWall.getRegistryName())); for (int i = 0; i < BlockPavement.TYPES; i++) { r.register(new ItemBlockMod(pavementStairs[i]).setRegistryName(pavementStairs[i].getRegistryName())); - r.register(new ItemBlockModSlab(pavementSlabs[i]).setRegistryName(pavementSlabs[i].getRegistryName())); + r.register(new ItemBlockMod(pavementSlabs[i]).setRegistryName(pavementSlabs[i].getRegistryName())); } - r.register(new ItemBlockModSlab(shimmerrockSlab).setRegistryName(shimmerrockSlab.getRegistryName())); + r.register(new ItemBlockMod(shimmerrockSlab).setRegistryName(shimmerrockSlab.getRegistryName())); r.register(new ItemBlockMod(shimmerrockStairs).setRegistryName(shimmerrockStairs.getRegistryName())); - r.register(new ItemBlockModSlab(shimmerwoodPlankSlab).setRegistryName(shimmerwoodPlankSlab.getRegistryName())); + r.register(new ItemBlockMod(shimmerwoodPlankSlab).setRegistryName(shimmerwoodPlankSlab.getRegistryName())); r.register(new ItemBlockMod(shimmerwoodPlankStairs).setRegistryName(shimmerwoodPlankStairs.getRegistryName())); r.register(new ItemBlockMod(managlassPane).setRegistryName(managlassPane.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 05d706fa2..b08b656dd 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -12,8 +12,8 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Potion; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.brew.potion.PotionAllure; import vazkii.botania.common.brew.potion.PotionBloodthirst; import vazkii.botania.common.brew.potion.PotionClear; @@ -22,7 +22,7 @@ import vazkii.botania.common.brew.potion.PotionFeatherfeet; import vazkii.botania.common.brew.potion.PotionSoulCross; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class ModPotions { public static final Potion soulCross = new PotionSoulCross(); diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 452f55a49..fe72bc0a3 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -3,12 +3,12 @@ package vazkii.botania.common.core.handler; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModSounds { public static final SoundEvent airRod = makeSoundEvent("airrod"); public static final SoundEvent agricarnation = makeSoundEvent("agricarnation"); diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index 1415147aa..ff60e8841 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -10,35 +10,75 @@ */ package vazkii.botania.common.entity; -import net.minecraftforge.fml.common.registry.EntityRegistry; -import vazkii.botania.common.Botania; +import net.minecraft.entity.EntityType; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.lib.LibEntityNames; +import vazkii.botania.common.lib.LibMisc; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModEntities { - - public static void init() { - int id = 0; - - EntityRegistry.registerModEntity(LibEntityNames.MANA_BURST_REGISTRY, EntityManaBurst.class, LibEntityNames.MANA_BURST, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(LibEntityNames.SIGNAL_FLARE_REGISTRY, EntitySignalFlare.class, LibEntityNames.SIGNAL_FLARE, id++, Botania.instance, 2048, 10, false); - EntityRegistry.registerModEntity(LibEntityNames.PIXIE_REGISTRY, EntityPixie.class, LibEntityNames.PIXIE, id++, Botania.instance, 16, 3, true); - EntityRegistry.registerModEntity(LibEntityNames.FLAME_RING_REGISTRY, EntityFlameRing.class, LibEntityNames.FLAME_RING, id++, Botania.instance, 32, 40, false); - EntityRegistry.registerModEntity(LibEntityNames.VINE_BALL_REGISTRY, EntityVineBall.class, LibEntityNames.VINE_BALL, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(LibEntityNames.DOPPLEGANGER_REGISTRY, EntityDoppleganger.class, LibEntityNames.DOPPLEGANGER, id++, Botania.instance, 128, 3, true); - EntityRegistry.registerModEntity(LibEntityNames.MAGIC_LANDMINE_REGISTRY, EntityMagicLandmine.class, LibEntityNames.MAGIC_LANDMINE, id++, Botania.instance, 128, 40, false); - EntityRegistry.registerModEntity(LibEntityNames.SPARK_REGISTRY, EntitySpark.class, LibEntityNames.SPARK, id++, Botania.instance, 64, 10, false); - EntityRegistry.registerModEntity(LibEntityNames.THROWN_ITEM_REGISTRY, EntityThrownItem.class, LibEntityNames.THROWN_ITEM, id++, Botania.instance, 64, 20, true); - EntityRegistry.registerModEntity(LibEntityNames.MAGIC_MISSILE_REGISTRY, EntityMagicMissile.class, LibEntityNames.MAGIC_MISSILE, id++, Botania.instance, 64, 2, true); - EntityRegistry.registerModEntity(LibEntityNames.THORN_CHAKRAM_REGISTRY, EntityThornChakram.class, LibEntityNames.THORN_CHAKRAM, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(LibEntityNames.CORPOREA_SPARK_REGISTRY, EntityCorporeaSpark.class, LibEntityNames.CORPOREA_SPARK, id++, Botania.instance, 64, 10, false); - EntityRegistry.registerModEntity(LibEntityNames.ENDER_AIR_BOTTLE_REGISTRY, EntityEnderAirBottle.class, LibEntityNames.ENDER_AIR_BOTTLE, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(LibEntityNames.POOL_MINECART_REGISTRY, EntityPoolMinecart.class, LibEntityNames.POOL_MINECART, id++, Botania.instance, 80, 3, true); - EntityRegistry.registerModEntity(LibEntityNames.PINK_WITHER_REGISTRY, EntityPinkWither.class, LibEntityNames.PINK_WITHER, id++, Botania.instance, 80, 3, false); - EntityRegistry.registerModEntity(LibEntityNames.PLAYER_MOVER_REGISTRY, EntityPlayerMover.class, LibEntityNames.PLAYER_MOVER, id++, Botania.instance, 40, 3, true); - EntityRegistry.registerModEntity(LibEntityNames.MANA_STORM_REGISTRY, EntityManaStorm.class, LibEntityNames.MANA_STORM, id++, Botania.instance, 64, 10, false); - EntityRegistry.registerModEntity(LibEntityNames.BABYLON_WEAPON_REGISTRY, EntityBabylonWeapon.class, LibEntityNames.BABYLON_WEAPON, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(LibEntityNames.FALLING_STAR_REGISTRY, EntityFallingStar.class, LibEntityNames.FALLING_STAR, id++, Botania.instance, 64, 10, true); + @SubscribeEvent + public static void registerEntities(RegistryEvent.Register> evt) { + evt.getRegistry().register(EntityType.Builder.create(EntityManaBurst.class, EntityManaBurst::new) + .tracker(64, 10, true).build("") + .setRegistryName(LibEntityNames.MANA_BURST)); + evt.getRegistry().register(EntityType.Builder.create(EntitySignalFlare.class, EntitySignalFlare::new) + .tracker(2048, 10, false).build("") + .setRegistryName(LibEntityNames.SIGNAL_FLARE)); + evt.getRegistry().register(EntityType.Builder.create(EntityPixie.class, EntityPixie::new) + .tracker(16, 3, true).build("") + .setRegistryName(LibEntityNames.PIXIE)); + evt.getRegistry().register(EntityType.Builder.create(EntityFlameRing.class, EntityFlameRing::new) + .tracker(32, 40, false).build("") + .setRegistryName(LibEntityNames.FLAME_RING)); + evt.getRegistry().register(EntityType.Builder.create(EntityVineBall.class, EntityVineBall::new) + .tracker(64, 10, true).build("") + .setRegistryName(LibEntityNames.VINE_BALL)); + evt.getRegistry().register(EntityType.Builder.create(EntityDoppleganger.class, EntityDoppleganger::new) + .tracker(128, 10, true).build("") + .setRegistryName(LibEntityNames.DOPPLEGANGER)); + evt.getRegistry().register(EntityType.Builder.create(EntityMagicLandmine.class, EntityMagicLandmine::new) + .tracker(128, 40, false).build("") + .setRegistryName(LibEntityNames.MAGIC_LANDMINE)); + evt.getRegistry().register(EntityType.Builder.create(EntitySpark.class, EntitySpark::new) + .tracker(64, 10, false).build("") + .setRegistryName(LibEntityNames.SPARK)); + evt.getRegistry().register(EntityType.Builder.create(EntityThrownItem.class, EntityThrownItem::new) + .tracker(64, 20, true).build("") + .setRegistryName(LibEntityNames.THROWN_ITEM)); + evt.getRegistry().register(EntityType.Builder.create(EntityMagicMissile.class, EntityMagicMissile::new) + .tracker(64, 2, true).build("") + .setRegistryName(LibEntityNames.MAGIC_MISSILE)); + evt.getRegistry().register(EntityType.Builder.create(EntityThornChakram.class, EntityThornChakram::new) + .tracker(64, 10, true).build("") + .setRegistryName(LibEntityNames.THORN_CHAKRAM)); + evt.getRegistry().register(EntityType.Builder.create(EntityCorporeaSpark.class, EntityCorporeaSpark::new) + .tracker(64, 10, false).build("") + .setRegistryName(LibEntityNames.CORPOREA_SPARK)); + evt.getRegistry().register(EntityType.Builder.create(EntityEnderAirBottle.class, EntityEnderAirBottle::new) + .tracker(64, 10, true).build("") + .setRegistryName(LibEntityNames.ENDER_AIR_BOTTLE)); + evt.getRegistry().register(EntityType.Builder.create(EntityPoolMinecart.class, EntityPoolMinecart::new) + .tracker(80, 3, true).build("") + .setRegistryName(LibEntityNames.POOL_MINECART)); + evt.getRegistry().register(EntityType.Builder.create(EntityPinkWither.class, EntityPinkWither::new) + .tracker(80, 3, false).build("") + .setRegistryName(LibEntityNames.PINK_WITHER)); + evt.getRegistry().register(EntityType.Builder.create(EntityPlayerMover.class, EntityPlayerMover::new) + .tracker(40, 3, true).build("") + .setRegistryName(LibEntityNames.PLAYER_MOVER)); + evt.getRegistry().register(EntityType.Builder.create(EntityManaStorm.class, EntityManaStorm::new) + .tracker(64, 10, false).build("") + .setRegistryName(LibEntityNames.MANA_STORM)); + evt.getRegistry().register(EntityType.Builder.create(EntityBabylonWeapon.class, EntityBabylonWeapon::new) + .tracker(64, 10, true).build("") + .setRegistryName(LibEntityNames.BABYLON_WEAPON)); + evt.getRegistry().register(EntityType.Builder.create(EntityFallingStar.class, EntityFallingStar::new) + .tracker(64, 10, true).build("") + .setRegistryName(LibEntityNames.FALLING_STAR)); } } diff --git a/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java b/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java index cc7930de0..9d650d24a 100644 --- a/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java +++ b/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java @@ -9,6 +9,7 @@ * File Created @ [Jun 19, 2018, 8:25:10 PM (GMT)] */ +/* package vazkii.botania.common.integration.thaumcraft; import net.minecraft.block.Block; @@ -508,3 +509,4 @@ public class TCAspects { ThaumcraftApi.registerEntityTag(entityName, aspects); //Not in the event (as of TC beta 21) } } +*/ diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index e07037279..eff3dba6b 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -16,8 +16,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.BotaniaAPI; @@ -107,7 +107,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModItems { public static final Item lexicon = new ItemLexicon(); public static final Map petals = new EnumMap<>(EnumDyeColor.class); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java deleted file mode 100644 index b08bfb519..000000000 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jun 11, 2014, 1:16:59 AM (GMT)] - */ -package vazkii.botania.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemSlab; -import net.minecraft.item.ItemStack; -import vazkii.botania.common.block.decor.slabs.BlockModSlab; - -import javax.annotation.Nonnull; - -public class ItemBlockModSlab extends ItemSlab { - - public ItemBlockModSlab(Block par1) { - super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock()); - } - - @Nonnull - @Override - public String getTranslationKey(ItemStack stack) { - return block.getTranslationKey().replaceAll("tile.", "tile.botania:"); - } - -} diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index dd08dc2e6..919def5dc 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -17,7 +17,7 @@ public final class LibBlockNames { public static final String FLOWER = "flower"; public static final String ALTAR = "altar"; public static final String APOTHECARY_PREFIX = "apothecary_"; - public static final String SPECIAL_FLOWER = "specialFlower"; + public static final String SPECIAL_FLOWER = "special_flower"; public static final String LIVING_ROCK = "livingrock"; public static final String LIVING_WOOD = "livingwood"; public static final String SPREADER = "spreader"; @@ -27,90 +27,86 @@ public final class LibBlockNames { public static final String RUNE_ALTAR = "runeAltar"; public static final String PYLON = "pylon"; public static final String PYLON_PREFIX = PYLON + "_"; - public static final String PISTON_RELAY = "pistonRelay"; + public static final String PISTON_RELAY = "piston_relay"; public static final String DISTRIBUTOR = "distributor"; - public static final String MANA_VOID = "manaVoid"; - public static final String MANA_DETECTOR = "manaDetector"; + public static final String MANA_VOID = "mana_void"; + public static final String MANA_DETECTOR = "mana_detector"; public static final String ENCHANTER = "enchanter"; public static final String TURNTABLE = "turntable"; - public static final String TINY_PLANET = "tinyPlanetBlock"; - public static final String ALCHEMY_CATALYST = "alchemyCatalyst"; - public static final String OPEN_CRATE = "openCrate"; - public static final String CRAFT_CRATE = "craftCrate"; - public static final String FOREST_EYE = "forestEye"; + public static final String TINY_PLANET = "tiny_planet_block"; + public static final String ALCHEMY_CATALYST = "alchemy_catalyst"; + public static final String OPEN_CRATE = "open_crate"; + public static final String CRAFT_CRATE = "crafty_crate"; + public static final String FOREST_EYE = "forest_eye"; public static final String STORAGE_SUFFIX = "_block"; public static final String DRUM_PREFIX = "drum_"; - public static final String SHINY_FLOWER = "shinyFlower"; + public static final String SHINY_FLOWER = "shiny_flower"; public static final String PLATFORM = "platform"; public static final String PLATFORM_SUFFIX = "_" + PLATFORM; - public static final String ALF_PORTAL = "alfheimPortal"; + public static final String ALF_PORTAL = "alfheim_portal"; public static final String DREAM_WOOD = "dreamwood"; - public static final String CONJURATION_CATALYST = "conjurationCatalyst"; + public static final String CONJURATION_CATALYST = "conjuration_catalyst"; public static final String BIFROST = "bifrost"; - public static final String SOLID_VINE = "solidVine"; - public static final String BURIED_PETALS = "buriedPetals"; + public static final String SOLID_VINE = "solid_vine"; + public static final String BURIED_PETALS = "buried_petals"; public static final String PRISMARINE = "prismarine"; - public static final String SEA_LAMP = "seaLamp"; - public static final String MINI_ISLAND = "miniIsland"; - public static final String TINY_POTATO = "tinyPotato"; - public static final String SPAWNER_CLAW = "spawnerClaw"; - public static final String REED_BLOCK = "reedBlock"; - public static final String THATCH = "thatch"; + public static final String MINI_ISLAND = "mini_island"; + public static final String TINY_POTATO = "tiny_potato"; + public static final String SPAWNER_CLAW = "spawner_claw"; public static final String AZULEJO_PREFIX = "azulejo_"; - public static final String ENDER_EYE_BLOCK = "enderEyeBlock"; + public static final String ENDER_EYE_BLOCK = "ender_eye_block"; public static final String STARFIELD = "starfield"; - public static final String RF_GENERATOR = "rfGenerator"; - public static final String ELF_GLASS = "elfGlass"; + public static final String RF_GENERATOR = "rf_generator"; + public static final String ELF_GLASS = "elf_glass"; public static final String BREWERY = "brewery"; - public static final String MANA_GLASS = "manaGlass"; - public static final String TERRA_PLATE = "terraPlate"; - public static final String RED_STRING_CONTAINER = "redStringContainer"; - public static final String RED_STRING_DISPENSER = "redStringDispenser"; - public static final String RED_STRING_FERTILIZER = "redStringFertilizer"; - public static final String RED_STRING_COMPARATOR = "redStringComparator"; - public static final String RED_STRING_RELAY = "redStringRelay"; - public static final String RED_STRING_INTERCEPTOR = "redStringInterceptor"; - public static final String FLOATING_SPECIAL_FLOWER = "floatingSpecialFlower"; - public static final String MANA_FLAME = "manaFlame"; + public static final String MANA_GLASS = "mana_glass"; + public static final String TERRA_PLATE = "terra_plate"; + public static final String RED_STRING_CONTAINER = "red_string_container"; + public static final String RED_STRING_DISPENSER = "red_string_dispenser"; + public static final String RED_STRING_FERTILIZER = "red_string_fertilizer"; + public static final String RED_STRING_COMPARATOR = "red_string_comparator"; + public static final String RED_STRING_RELAY = "red_string_relay"; + public static final String RED_STRING_INTERCEPTOR = "red_string_interceptor"; + public static final String FLOATING_SPECIAL_FLOWER = "floating_special_flower"; + public static final String MANA_FLAME = "mana_flame"; public static final String PRISM = "prism"; - public static final String ENCHANTED_SOIL = "enchantedSoil"; + public static final String ENCHANTED_SOIL = "enchanted_soil"; public static final String BIOME_STONE_A = "biomeStoneA"; public static final String BIOME_STONE_B = "biomeStoneB"; public static final String PETAL_BLOCK_SUFFIX = "_petal_block"; - public static final String CORPOREA_INDEX = "corporeaIndex"; - public static final String CORPOREA_FUNNEL = "corporeaFunnel"; - public static final String END_STONE_BRICK = "endStoneBrick"; + public static final String CORPOREA_INDEX = "corporea_index"; + public static final String CORPOREA_FUNNEL = "corporea_funnel"; public static final String MUSHROOM = "mushroom"; public static final String PUMP = "pump"; - public static final String DOUBLE_FLOWER = "doubleFlower"; + public static final String DOUBLE_FLOWER = "double_flower"; public static final String STONE = "stone"; - public static final String FAKE_AIR = "fakeAir"; - public static final String BLAZE_BLOCK = "blazeBlock"; - public static final String CORPOREA_INTERCEPTOR = "corporeaInterceptor"; - public static final String CORPOREA_CRYSTAL_CUBE = "corporeaCrystalCube"; - public static final String INCENSE_PLATE = "incensePlate"; + public static final String FAKE_AIR = "fake_air"; + public static final String BLAZE_BLOCK = "blaze_block"; + public static final String CORPOREA_INTERCEPTOR = "corporea_interceptor"; + public static final String CORPOREA_CRYSTAL_CUBE = "corporea_crystal_cube"; + public static final String INCENSE_PLATE = "incense_plate"; public static final String HOURGLASS = "hourglass"; - public static final String GHOST_RAIL = "ghostRail"; - public static final String SPARK_CHANGER = "sparkChanger"; + public static final String GHOST_RAIL = "ghost_rail"; + public static final String SPARK_CHANGER = "spark_changer"; public static final String ROOT = "root"; - public static final String FEL_PUMPKIN = "felPumpkin"; + public static final String FEL_PUMPKIN = "fel_pumpkin"; public static final String COCOON = "cocoon"; - public static final String LIGHT_RELAY = "lightRelay"; - public static final String LIGHT_LAUNCHER = "lightLauncher"; - public static final String MANA_BOMB = "manaBomb"; - public static final String CACOPHONIUM = "cacophoniumBlock"; + public static final String LIGHT_RELAY = "light_relay"; + public static final String LIGHT_LAUNCHER = "light_launcher"; + public static final String MANA_BOMB = "mana_bomb"; + public static final String CACOPHONIUM = "cacophonium_block"; public static final String BELLOWS = "bellows"; - public static final String BIFROST_PERM = "bifrostPerm"; + public static final String BIFROST_PERM = "bifrost_perm"; public static final String PAVEMENT = "pavement"; - public static final String CELL_BLOCK = "cellBlock"; - public static final String GAIA_HEAD = "gaiaHeadBlock"; - public static final String CORPOREA_RETAINER = "corporeaRetainer"; - public static final String TERU_TERU_BOZU = "teruTeruBozu"; + public static final String CELL_BLOCK = "cell_block"; + public static final String GAIA_HEAD = "gaia_head"; + public static final String CORPOREA_RETAINER = "corporea_retainer"; + public static final String TERU_TERU_BOZU = "teru_teru_bozu"; public static final String SHIMMERROCK = "shimmerrock"; - public static final String SHIMMERWOOD_PLANKS = "shimmerwoodPlanks"; + public static final String SHIMMERWOOD_PLANKS = "shimmerwood_planks"; public static final String AVATAR = "avatar"; public static final String ALT_GRASS_SUFFIX = "_grass"; - public static final String ANIMATED_TORCH = "animatedTorch"; + public static final String ANIMATED_TORCH = "animated_torch"; public static final ResourceLocation SUBTILE_PUREDAISY = prefix("puredaisy"); public static final ResourceLocation SUBTILE_MANASTAR = prefix("manastar"); diff --git a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java index 27ee01e0a..5912c0f8b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java @@ -14,46 +14,25 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; public final class LibEntityNames { - - public static final String MANA_BURST = LibResources.PREFIX_MOD + "manaBurst"; - public static final String SIGNAL_FLARE = LibResources.PREFIX_MOD + "signalFlare"; - public static final String PIXIE = LibResources.PREFIX_MOD + "pixie"; - public static final String FLAME_RING = LibResources.PREFIX_MOD + "flameRing"; - public static final String VINE_BALL = LibResources.PREFIX_MOD + "vineBall"; - public static final String DOPPLEGANGER = LibResources.PREFIX_MOD + "doppleganger"; - public static final String MAGIC_LANDMINE = LibResources.PREFIX_MOD + "magicLandmine"; - public static final String SPARK = LibResources.PREFIX_MOD + "spark"; - public static final String THROWN_ITEM = LibResources.PREFIX_MOD + "thrownItem"; - public static final String MAGIC_MISSILE = LibResources.PREFIX_MOD + "magicMissile"; - public static final String THORN_CHAKRAM = LibResources.PREFIX_MOD + "thornChakram"; - public static final String CORPOREA_SPARK = LibResources.PREFIX_MOD + "corporeaSpark"; - public static final String ENDER_AIR_BOTTLE = LibResources.PREFIX_MOD + "enderAirBottle"; - public static final String POOL_MINECART = LibResources.PREFIX_MOD + "poolMinecart"; - public static final String PINK_WITHER = LibResources.PREFIX_MOD + "pinkWither"; - public static final String PLAYER_MOVER = LibResources.PREFIX_MOD + "playerMover"; - public static final String MANA_STORM = LibResources.PREFIX_MOD + "manaStorm"; - public static final String BABYLON_WEAPON = LibResources.PREFIX_MOD + "babylonWeapon"; - public static final String FALLING_STAR = LibResources.PREFIX_MOD + "fallingStar"; - - public static final ResourceLocation MANA_BURST_REGISTRY = makeName("mana_burst"); - public static final ResourceLocation SIGNAL_FLARE_REGISTRY = makeName("signal_flare"); - public static final ResourceLocation PIXIE_REGISTRY = makeName("pixie"); - public static final ResourceLocation FLAME_RING_REGISTRY = makeName("flame_ring"); - public static final ResourceLocation VINE_BALL_REGISTRY = makeName("vine_ball"); - public static final ResourceLocation DOPPLEGANGER_REGISTRY = makeName("doppleganger"); - public static final ResourceLocation MAGIC_LANDMINE_REGISTRY = makeName("magic_landmine"); - public static final ResourceLocation SPARK_REGISTRY = makeName("spark"); - public static final ResourceLocation THROWN_ITEM_REGISTRY = makeName("thrown_item"); - public static final ResourceLocation MAGIC_MISSILE_REGISTRY = makeName("magic_missile"); - public static final ResourceLocation THORN_CHAKRAM_REGISTRY = makeName("thorn_chakram"); - public static final ResourceLocation CORPOREA_SPARK_REGISTRY = makeName("corporea_spark"); - public static final ResourceLocation ENDER_AIR_BOTTLE_REGISTRY = makeName("ender_air_bottle"); - public static final ResourceLocation POOL_MINECART_REGISTRY = makeName("pool_minecart"); - public static final ResourceLocation PINK_WITHER_REGISTRY = makeName("pink_wither"); - public static final ResourceLocation PLAYER_MOVER_REGISTRY = makeName("player_mover"); - public static final ResourceLocation MANA_STORM_REGISTRY = makeName("mana_storm"); - public static final ResourceLocation BABYLON_WEAPON_REGISTRY = makeName("babylon_weapon"); - public static final ResourceLocation FALLING_STAR_REGISTRY = makeName("falling_star"); + public static final ResourceLocation MANA_BURST = makeName("mana_burst"); + public static final ResourceLocation SIGNAL_FLARE = makeName("signal_flare"); + public static final ResourceLocation PIXIE = makeName("pixie"); + public static final ResourceLocation FLAME_RING = makeName("flame_ring"); + public static final ResourceLocation VINE_BALL = makeName("vine_ball"); + public static final ResourceLocation DOPPLEGANGER = makeName("doppleganger"); + public static final ResourceLocation MAGIC_LANDMINE = makeName("magic_landmine"); + public static final ResourceLocation SPARK = makeName("spark"); + public static final ResourceLocation THROWN_ITEM = makeName("thrown_item"); + public static final ResourceLocation MAGIC_MISSILE = makeName("magic_missile"); + public static final ResourceLocation THORN_CHAKRAM = makeName("thorn_chakram"); + public static final ResourceLocation CORPOREA_SPARK = makeName("corporea_spark"); + public static final ResourceLocation ENDER_AIR_BOTTLE = makeName("ender_air_bottle"); + public static final ResourceLocation POOL_MINECART = makeName("pool_minecart"); + public static final ResourceLocation PINK_WITHER = makeName("pink_wither"); + public static final ResourceLocation PLAYER_MOVER = makeName("player_mover"); + public static final ResourceLocation MANA_STORM = makeName("mana_storm"); + public static final ResourceLocation BABYLON_WEAPON = makeName("babylon_weapon"); + public static final ResourceLocation FALLING_STAR = makeName("falling_star"); private static ResourceLocation makeName(String s) { return new ResourceLocation(LibMisc.MOD_ID, s);