From 0a98701c7b70ff1cdac96dacb3ea27b7451a7440 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Sat, 24 Jun 2017 16:55:14 +0200 Subject: [PATCH] Update to new Forge registry standards --- build.properties | 6 +- .../ShapelessMekanismRecipeWrapper.java | 50 ------- .../java/mekanism/common/CommonProxy.java | 2 - src/main/java/mekanism/common/Mekanism.java | 66 ++++++--- .../java/mekanism/common/MekanismBlocks.java | 97 +++++++------ .../java/mekanism/common/MekanismItems.java | 113 +++++++-------- .../java/mekanism/common/MekanismSounds.java | 26 ++-- .../generators/common/GeneratorsBlocks.java | 23 +-- .../generators/common/GeneratorsItems.java | 11 +- .../generators/common/MekanismGenerators.java | 31 +++- .../mekanism/tools/common/MekanismTools.java | 22 ++- .../mekanism/tools/common/ToolsItems.java | 136 +++++++++--------- 12 files changed, 307 insertions(+), 276 deletions(-) delete mode 100644 src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java diff --git a/build.properties b/build.properties index 76d5ade3f..637ec7e56 100644 --- a/build.properties +++ b/build.properties @@ -1,8 +1,8 @@ minecraft_version=1.12 mappings_version=snapshot_20170616 -forge_version=14.21.0.2331 -mcmp_version=2.1.0_27 -jei_version=4.6.0.61 +forge_version=14.21.0.2359 +mcmp_version=2.2.1_36 +jei_version=4.7.0.67 mod_version=9.3.3 tesla_version=1.0.59 invtweak_version=1.62+beta.89 diff --git a/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java deleted file mode 100644 index 490859224..000000000 --- a/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java +++ /dev/null @@ -1,50 +0,0 @@ -package mekanism.client.jei.crafting; - -import java.util.List; - -import mekanism.common.recipe.ShapelessMekanismRecipe; -import mezz.jei.api.IJeiHelpers; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import mezz.jei.api.recipe.IStackHelper; -import net.minecraft.item.ItemStack; - -public class ShapelessMekanismRecipeWrapper extends BlankRecipeWrapper -{ - private final IJeiHelpers jeiHelpers; - private final ShapelessMekanismRecipe recipe; - - public ShapelessMekanismRecipeWrapper(IJeiHelpers helpers, ShapelessMekanismRecipe r) - { - jeiHelpers = helpers; - recipe = r; - - for(Object input : recipe.getInput()) - { - if(input instanceof ItemStack) - { - ItemStack itemStack = (ItemStack)input; - - if(itemStack.getCount() != 1) - { - itemStack.setCount(1); - } - } - } - } - - @Override - public void getIngredients(IIngredients ingredients) - { - IStackHelper stackHelper = jeiHelpers.getStackHelper(); - ItemStack recipeOutput = recipe.getRecipeOutput(); - - List> inputs = stackHelper.expandRecipeItemStackInputs(recipe.getInput()); - ingredients.setInputLists(ItemStack.class, inputs); - - if(!recipeOutput.isEmpty()) - { - ingredients.setOutput(ItemStack.class, recipeOutput); - } - } -} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 88f562480..eebb43f2a 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -385,8 +385,6 @@ public class CommonProxy implements IGuiProvider public void init() { MinecraftForge.EVENT_BUS.register(Mekanism.worldTickHandler); - - MekanismSounds.register(); } /** diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 730f63959..437ff0e1d 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -97,20 +97,25 @@ import mekanism.common.transmitters.grid.GasNetwork.GasTransferEvent; import mekanism.common.util.MekanismUtils; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; +import net.minecraft.block.Block; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeProvider; +import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.fluids.FluidRegistry; @@ -155,6 +160,7 @@ import com.mojang.authlib.GameProfile; "after:computercraft;" + "after:galacticraft api;" + "after:metallurgycore") +@Mod.EventBusSubscriber() public class Mekanism { /** Mekanism Packet Pipeline */ @@ -188,33 +194,33 @@ public class Mekanism /** FrequencyManagers for various networks */ public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, Frequency.TELEPORTER); public static Map privateTeleporters = new HashMap(); - + public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER); public static Map privateEntangloporters = new HashMap(); - + public static FrequencyManager securityFrequencies = new FrequencyManager(SecurityFrequency.class, SecurityFrequency.SECURITY); - + /** Mekanism creative tab */ public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); - + /** List of Mekanism modules loaded */ public static List modulesLoaded = new ArrayList(); - + /** The latest version number which is received from the Mekanism server */ public static String latestVersionNumber; - + /** The recent news which is received from the Mekanism server */ public static String recentNews; - + /** The VoiceServer manager for walkie talkies */ public static VoiceServerManager voiceManager; - + /** A list of the usernames of players who have donated to Mekanism. */ public static List donators = new ArrayList(); - + /** The server's world tick handler. */ public static CommonWorldTickHandler worldTickHandler = new CommonWorldTickHandler(); - + /** The Mekanism world generation handler. */ public static GenHandler genHandler = new GenHandler(); @@ -236,6 +242,35 @@ public class Mekanism MekanismFluids.register(); } + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register event) + { + // Register blocks and tile entities + MekanismBlocks.registerBlocks(event.getRegistry()); + } + + @SubscribeEvent + public static void registerItems(RegistryEvent.Register event) + { + // Register items and itemBlocks + MekanismItems.registerItems(event.getRegistry()); + MekanismBlocks.registerItemBlocks(event.getRegistry()); + } + + @SubscribeEvent + public static void registerModels(ModelRegistryEvent event) + { + // Register models + proxy.registerBlockRenders(); + proxy.registerItemRenders(); + } + + @SubscribeEvent + public static void registerSound(RegistryEvent.Register event) + { + MekanismSounds.register(event.getRegistry()); + } + /** * Adds all in-game crafting, smelting and machine recipes. */ @@ -664,13 +699,9 @@ public class Mekanism { logger.info("Detected Tekkit in root directory - hello, fellow user!"); } - - //Register blocks and items - MekanismItems.register(); - MekanismBlocks.register(); - //Integrate certain OreDictionary recipes - registerOreDict(); + MinecraftForge.EVENT_BUS.register(MekanismItems.GasMask); + MinecraftForge.EVENT_BUS.register(MekanismItems.FreeRunners); if(Loader.isModLoaded("mcmultipart")) { @@ -748,6 +779,9 @@ public class Mekanism } } + //Integrate certain OreDictionary recipes + registerOreDict(); + //Load this module addRecipes(); addEntities(); diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index f9741741c..5c36f57bd 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -29,9 +29,10 @@ import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; import mekanism.common.item.ItemBlockTransmitter; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.registries.IForgeRegistry; @ObjectHolder("mekanism") public class MekanismBlocks @@ -59,52 +60,58 @@ public class MekanismBlocks /** * Adds and registers all blocks. + * @param registry IForgeRegistry for blocks. */ - public static void register() + public static void registerBlocks(IForgeRegistry registry) { - GameRegistry.register(init(BasicBlock, "BasicBlock")); - GameRegistry.register(init(BasicBlock2, "BasicBlock2")); - GameRegistry.register(init(MachineBlock, "MachineBlock")); - GameRegistry.register(init(MachineBlock2, "MachineBlock2")); - GameRegistry.register(init(MachineBlock3, "MachineBlock3")); - GameRegistry.register(init(OreBlock, "OreBlock")); - GameRegistry.register(init(EnergyCube, "EnergyCube")); - GameRegistry.register(init(Transmitter, "Transmitter")); - GameRegistry.register(init(ObsidianTNT, "ObsidianTNT")); - GameRegistry.register(init(BoundingBlock, "BoundingBlock")); - GameRegistry.register(init(GasTank, "GasTank")); - GameRegistry.register(init(CardboardBox, "CardboardBox")); - GameRegistry.register(init(GlowPanel, "GlowPanel")); - GameRegistry.register(init(PlasticBlock, "PlasticBlock")); - GameRegistry.register(init(SlickPlasticBlock, "SlickPlasticBlock")); - GameRegistry.register(init(GlowPlasticBlock, "GlowPlasticBlock")); - GameRegistry.register(init(ReinforcedPlasticBlock, "ReinforcedPlasticBlock")); - GameRegistry.register(init(RoadPlasticBlock, "RoadPlasticBlock")); - GameRegistry.register(init(PlasticFence, "PlasticFence")); - GameRegistry.register(init(SaltBlock, "SaltBlock")); - - GameRegistry.register(MekanismItems.init(new ItemBlockBasic(BasicBlock), "BasicBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockBasic(BasicBlock2), "BasicBlock2")); - GameRegistry.register(MekanismItems.init(new ItemBlockMachine(MachineBlock), "MachineBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockMachine(MachineBlock2), "MachineBlock2")); - GameRegistry.register(MekanismItems.init(new ItemBlockMachine(MachineBlock3), "MachineBlock3")); - GameRegistry.register(MekanismItems.init(new ItemBlockOre(OreBlock), "OreBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockEnergyCube(EnergyCube), "EnergyCube")); - GameRegistry.register(MekanismItems.init(new ItemBlockTransmitter(Transmitter), "Transmitter")); - GameRegistry.register(MekanismItems.init(new ItemBlock(ObsidianTNT), "ObsidianTNT")); - GameRegistry.register(MekanismItems.init(new ItemBlock(BoundingBlock), "BoundingBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockGasTank(GasTank), "GasTank")); - GameRegistry.register(MekanismItems.init(new ItemBlockCardboardBox(CardboardBox), "CardboardBox")); - GameRegistry.register(MekanismItems.init(new ItemBlockGlowPanel(GlowPanel), "GlowPanel")); - GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(PlasticBlock), "PlasticBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(SlickPlasticBlock), "SlickPlasticBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(GlowPlasticBlock), "GlowPlasticBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(ReinforcedPlasticBlock), "ReinforcedPlasticBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(RoadPlasticBlock), "RoadPlasticBlock")); - GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(PlasticFence), "PlasticFence")); - GameRegistry.register(MekanismItems.init(new ItemBlock(SaltBlock), "SaltBlock")); - - Mekanism.proxy.registerBlockRenders(); + registry.register(init(BasicBlock, "BasicBlock")); + registry.register(init(BasicBlock2, "BasicBlock2")); + registry.register(init(MachineBlock, "MachineBlock")); + registry.register(init(MachineBlock2, "MachineBlock2")); + registry.register(init(MachineBlock3, "MachineBlock3")); + registry.register(init(OreBlock, "OreBlock")); + registry.register(init(EnergyCube, "EnergyCube")); + registry.register(init(Transmitter, "Transmitter")); + registry.register(init(ObsidianTNT, "ObsidianTNT")); + registry.register(init(BoundingBlock, "BoundingBlock")); + registry.register(init(GasTank, "GasTank")); + registry.register(init(CardboardBox, "CardboardBox")); + registry.register(init(GlowPanel, "GlowPanel")); + registry.register(init(PlasticBlock, "PlasticBlock")); + registry.register(init(SlickPlasticBlock, "SlickPlasticBlock")); + registry.register(init(GlowPlasticBlock, "GlowPlasticBlock")); + registry.register(init(ReinforcedPlasticBlock, "ReinforcedPlasticBlock")); + registry.register(init(RoadPlasticBlock, "RoadPlasticBlock")); + registry.register(init(PlasticFence, "PlasticFence")); + registry.register(init(SaltBlock, "SaltBlock")); + } + + /** + * Adds and registers all itemBlocks. + * @param registry IForgeRegistry for items. + */ + public static void registerItemBlocks(IForgeRegistry registry) + { + registry.register(MekanismItems.init(new ItemBlockBasic(BasicBlock), "BasicBlock")); + registry.register(MekanismItems.init(new ItemBlockBasic(BasicBlock2), "BasicBlock2")); + registry.register(MekanismItems.init(new ItemBlockMachine(MachineBlock), "MachineBlock")); + registry.register(MekanismItems.init(new ItemBlockMachine(MachineBlock2), "MachineBlock2")); + registry.register(MekanismItems.init(new ItemBlockMachine(MachineBlock3), "MachineBlock3")); + registry.register(MekanismItems.init(new ItemBlockOre(OreBlock), "OreBlock")); + registry.register(MekanismItems.init(new ItemBlockEnergyCube(EnergyCube), "EnergyCube")); + registry.register(MekanismItems.init(new ItemBlockTransmitter(Transmitter), "Transmitter")); + registry.register(MekanismItems.init(new ItemBlock(ObsidianTNT), "ObsidianTNT")); + registry.register(MekanismItems.init(new ItemBlock(BoundingBlock), "BoundingBlock")); + registry.register(MekanismItems.init(new ItemBlockGasTank(GasTank), "GasTank")); + registry.register(MekanismItems.init(new ItemBlockCardboardBox(CardboardBox), "CardboardBox")); + registry.register(MekanismItems.init(new ItemBlockGlowPanel(GlowPanel), "GlowPanel")); + registry.register(MekanismItems.init(new ItemBlockPlastic(PlasticBlock), "PlasticBlock")); + registry.register(MekanismItems.init(new ItemBlockPlastic(SlickPlasticBlock), "SlickPlasticBlock")); + registry.register(MekanismItems.init(new ItemBlockPlastic(GlowPlasticBlock), "GlowPlasticBlock")); + registry.register(MekanismItems.init(new ItemBlockPlastic(ReinforcedPlasticBlock), "ReinforcedPlasticBlock")); + registry.register(MekanismItems.init(new ItemBlockPlastic(RoadPlasticBlock), "RoadPlasticBlock")); + registry.register(MekanismItems.init(new ItemBlockPlastic(PlasticFence), "PlasticFence")); + registry.register(MekanismItems.init(new ItemBlock(SaltBlock), "SaltBlock")); } public static Block init(Block block, String name) diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 964c1f187..bbd164c64 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -34,9 +34,8 @@ import mekanism.common.item.ItemTierInstaller; import mekanism.common.item.ItemUpgrade; import mekanism.common.item.ItemWalkieTalkie; import net.minecraft.item.Item; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.registries.IForgeRegistry; @ObjectHolder("mekanism") public class MekanismItems @@ -97,65 +96,61 @@ public class MekanismItems /** * Adds and registers all items. + * @param registry */ - public static void register() + public static void registerItems(IForgeRegistry registry) { - GameRegistry.register(init(ElectricBow, "ElectricBow")); - GameRegistry.register(init(Dust, "Dust")); - GameRegistry.register(init(Ingot, "Ingot")); - GameRegistry.register(init(EnergyTablet, "EnergyTablet")); - GameRegistry.register(init(SpeedUpgrade, "SpeedUpgrade")); - GameRegistry.register(init(EnergyUpgrade, "EnergyUpgrade")); - GameRegistry.register(init(FilterUpgrade, "FilterUpgrade")); - GameRegistry.register(init(MufflingUpgrade, "MufflingUpgrade")); - GameRegistry.register(init(GasUpgrade, "GasUpgrade")); - GameRegistry.register(init(AnchorUpgrade, "AnchorUpgrade")); - GameRegistry.register(init(Robit, "Robit")); - GameRegistry.register(init(AtomicDisassembler, "AtomicDisassembler")); - GameRegistry.register(init(EnrichedAlloy, "EnrichedAlloy")); - GameRegistry.register(init(ReinforcedAlloy, "ReinforcedAlloy")); - GameRegistry.register(init(AtomicAlloy, "AtomicAlloy")); - GameRegistry.register(init(ItemProxy, "ItemProxy")); - GameRegistry.register(init(ControlCircuit, "ControlCircuit")); - GameRegistry.register(init(EnrichedIron, "EnrichedIron")); - GameRegistry.register(init(CompressedCarbon, "CompressedCarbon")); - GameRegistry.register(init(CompressedRedstone, "CompressedRedstone")); - GameRegistry.register(init(CompressedDiamond, "CompressedDiamond")); - GameRegistry.register(init(CompressedObsidian, "CompressedObsidian")); - GameRegistry.register(init(PortableTeleporter, "PortableTeleporter")); - GameRegistry.register(init(TeleportationCore, "TeleportationCore")); - GameRegistry.register(init(Clump, "Clump")); - GameRegistry.register(init(DirtyDust, "DirtyDust")); - GameRegistry.register(init(Configurator, "Configurator")); - GameRegistry.register(init(NetworkReader, "NetworkReader")); - GameRegistry.register(init(WalkieTalkie, "WalkieTalkie")); - GameRegistry.register(init(Jetpack, "Jetpack")); - GameRegistry.register(init(Dictionary, "Dictionary")); - GameRegistry.register(init(GasMask, "GasMask")); - GameRegistry.register(init(ScubaTank, "ScubaTank")); - GameRegistry.register(init(Balloon, "Balloon")); - GameRegistry.register(init(Shard, "Shard")); - GameRegistry.register(init(ElectrolyticCore, "ElectrolyticCore")); - GameRegistry.register(init(Sawdust, "Sawdust")); - GameRegistry.register(init(Salt, "Salt")); - GameRegistry.register(init(Crystal, "Crystal")); - GameRegistry.register(init(FreeRunners, "FreeRunners")); - GameRegistry.register(init(ArmoredJetpack, "ArmoredJetpack")); - GameRegistry.register(init(ConfigurationCard, "ConfigurationCard")); - GameRegistry.register(init(CraftingFormula, "CraftingFormula")); - GameRegistry.register(init(SeismicReader, "SeismicReader")); - GameRegistry.register(init(Substrate, "Substrate")); - GameRegistry.register(init(Polyethene, "Polyethene")); - GameRegistry.register(init(BioFuel, "BioFuel")); - GameRegistry.register(init(Flamethrower, "Flamethrower")); - GameRegistry.register(init(GaugeDropper, "GaugeDropper")); - GameRegistry.register(init(TierInstaller, "TierInstaller")); - GameRegistry.register(init(OtherDust, "OtherDust")); - - MinecraftForge.EVENT_BUS.register(GasMask); - MinecraftForge.EVENT_BUS.register(FreeRunners); - - Mekanism.proxy.registerItemRenders(); + registry.register(init(ElectricBow, "ElectricBow")); + registry.register(init(Dust, "Dust")); + registry.register(init(Ingot, "Ingot")); + registry.register(init(EnergyTablet, "EnergyTablet")); + registry.register(init(SpeedUpgrade, "SpeedUpgrade")); + registry.register(init(EnergyUpgrade, "EnergyUpgrade")); + registry.register(init(FilterUpgrade, "FilterUpgrade")); + registry.register(init(MufflingUpgrade, "MufflingUpgrade")); + registry.register(init(GasUpgrade, "GasUpgrade")); + registry.register(init(AnchorUpgrade, "AnchorUpgrade")); + registry.register(init(Robit, "Robit")); + registry.register(init(AtomicDisassembler, "AtomicDisassembler")); + registry.register(init(EnrichedAlloy, "EnrichedAlloy")); + registry.register(init(ReinforcedAlloy, "ReinforcedAlloy")); + registry.register(init(AtomicAlloy, "AtomicAlloy")); + registry.register(init(ItemProxy, "ItemProxy")); + registry.register(init(ControlCircuit, "ControlCircuit")); + registry.register(init(EnrichedIron, "EnrichedIron")); + registry.register(init(CompressedCarbon, "CompressedCarbon")); + registry.register(init(CompressedRedstone, "CompressedRedstone")); + registry.register(init(CompressedDiamond, "CompressedDiamond")); + registry.register(init(CompressedObsidian, "CompressedObsidian")); + registry.register(init(PortableTeleporter, "PortableTeleporter")); + registry.register(init(TeleportationCore, "TeleportationCore")); + registry.register(init(Clump, "Clump")); + registry.register(init(DirtyDust, "DirtyDust")); + registry.register(init(Configurator, "Configurator")); + registry.register(init(NetworkReader, "NetworkReader")); + registry.register(init(WalkieTalkie, "WalkieTalkie")); + registry.register(init(Jetpack, "Jetpack")); + registry.register(init(Dictionary, "Dictionary")); + registry.register(init(GasMask, "GasMask")); + registry.register(init(ScubaTank, "ScubaTank")); + registry.register(init(Balloon, "Balloon")); + registry.register(init(Shard, "Shard")); + registry.register(init(ElectrolyticCore, "ElectrolyticCore")); + registry.register(init(Sawdust, "Sawdust")); + registry.register(init(Salt, "Salt")); + registry.register(init(Crystal, "Crystal")); + registry.register(init(FreeRunners, "FreeRunners")); + registry.register(init(ArmoredJetpack, "ArmoredJetpack")); + registry.register(init(ConfigurationCard, "ConfigurationCard")); + registry.register(init(CraftingFormula, "CraftingFormula")); + registry.register(init(SeismicReader, "SeismicReader")); + registry.register(init(Substrate, "Substrate")); + registry.register(init(Polyethene, "Polyethene")); + registry.register(init(BioFuel, "BioFuel")); + registry.register(init(Flamethrower, "Flamethrower")); + registry.register(init(GaugeDropper, "GaugeDropper")); + registry.register(init(TierInstaller, "TierInstaller")); + registry.register(init(OtherDust, "OtherDust")); } public static Item init(Item item, String name) diff --git a/src/main/java/mekanism/common/MekanismSounds.java b/src/main/java/mekanism/common/MekanismSounds.java index 89434b936..381dcb0f6 100644 --- a/src/main/java/mekanism/common/MekanismSounds.java +++ b/src/main/java/mekanism/common/MekanismSounds.java @@ -3,6 +3,7 @@ package mekanism.common; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.registries.IForgeRegistry; public final class MekanismSounds { @@ -16,23 +17,24 @@ public final class MekanismSounds public static SoundEvent SUCCESS; public static SoundEvent CJ_EASTER_EGG; - public static void register() + public static void register(IForgeRegistry registry) { - BEEP = registerSound("etc.Beep"); - CLICK = registerSound("etc.Click"); - DING = registerSound("etc.Ding"); - ERROR = registerSound("etc.Error"); - GAS_MASK = registerSound("etc.GasMask"); - HYDRAULIC = registerSound("etc.Hydraulic"); - POP = registerSound("etc.Pop"); - SUCCESS = registerSound("etc.Success"); - CJ_EASTER_EGG = registerSound("etc.cj"); + BEEP = registerSound(registry, "etc.Beep"); + CLICK = registerSound(registry, "etc.Click"); + DING = registerSound(registry, "etc.Ding"); + ERROR = registerSound(registry, "etc.Error"); + GAS_MASK = registerSound(registry, "etc.GasMask"); + HYDRAULIC = registerSound(registry, "etc.Hydraulic"); + POP = registerSound(registry, "etc.Pop"); + SUCCESS = registerSound(registry, "etc.Success"); + CJ_EASTER_EGG = registerSound(registry, "etc.cj"); } - public static SoundEvent registerSound(String soundName) + public static SoundEvent registerSound(IForgeRegistry registry, String soundName) { ResourceLocation soundID = new ResourceLocation("mekanism", soundName); SoundEvent event = new SoundEvent(soundID).setRegistryName(soundID); - return GameRegistry.register(event); + registry.register(event); + return event; } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java index b61857e0b..b77e67d45 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -8,8 +8,10 @@ import mekanism.generators.common.block.BlockReactor; import mekanism.generators.common.item.ItemBlockGenerator; import mekanism.generators.common.item.ItemBlockReactor; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.registries.IForgeRegistry; @ObjectHolder("mekanismgenerators") public class GeneratorsBlocks @@ -18,17 +20,18 @@ public class GeneratorsBlocks public static final Block Reactor = BlockReactor.getReactorBlock(REACTOR_BLOCK); public static final Block ReactorGlass = BlockReactor.getReactorBlock(REACTOR_GLASS); - public static void register() + public static void registerBlocks(IForgeRegistry registry) { - GameRegistry.register(init(Generator, "Generator")); - GameRegistry.register(init(Reactor, "Reactor")); - GameRegistry.register(init(ReactorGlass, "ReactorGlass")); - - GameRegistry.register(GeneratorsItems.init(new ItemBlockGenerator(Generator), "Generator")); - GameRegistry.register(GeneratorsItems.init(new ItemBlockReactor(Reactor), "Reactor")); - GameRegistry.register(GeneratorsItems.init(new ItemBlockReactor(ReactorGlass), "ReactorGlass")); - - MekanismGenerators.proxy.registerBlockRenders(); + registry.register(init(Generator, "Generator")); + registry.register(init(Reactor, "Reactor")); + registry.register(init(ReactorGlass, "ReactorGlass")); + } + + public static void registerItemBlocks(IForgeRegistry registry) + { + registry.register(GeneratorsItems.init(new ItemBlockGenerator(Generator), "Generator")); + registry.register(GeneratorsItems.init(new ItemBlockReactor(Reactor), "Reactor")); + registry.register(GeneratorsItems.init(new ItemBlockReactor(ReactorGlass), "ReactorGlass")); } public static Block init(Block block, String name) diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index af3d46d50..7adafa0a4 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -10,6 +10,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.registries.IForgeRegistry; @ObjectHolder("mekanismgenerators") public class GeneratorsItems @@ -24,13 +25,11 @@ public class GeneratorsItems } }; - public static void register() + public static void registerItems(IForgeRegistry registry) { - GameRegistry.register(init(SolarPanel, "SolarPanel")); - GameRegistry.register(init(Hohlraum, "Hohlraum")); - GameRegistry.register(init(TurbineBlade, "TurbineBlade")); - - MekanismGenerators.proxy.registerItemRenders(); + registry.register(init(SolarPanel, "SolarPanel")); + registry.register(init(Hohlraum, "Hohlraum")); + registry.register(init(TurbineBlade, "TurbineBlade")); } public static Item init(Item item, String name) diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 800056da9..c4d0a2c24 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -27,10 +27,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType; import mekanism.generators.common.block.states.BlockStateReactor.ReactorBlockType; import mekanism.generators.common.content.turbine.SynchronizedTurbineData; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import net.minecraftforge.fml.common.Mod; @@ -47,6 +51,7 @@ import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; @Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "9.3.3", dependencies = "required-after:mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod.EventBusSubscriber() public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") @@ -60,12 +65,32 @@ public class MekanismGenerators implements IModule public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register event) + { + // Register blocks and tile entities + GeneratorsBlocks.registerBlocks(event.getRegistry()); + } + + @SubscribeEvent + public static void registerItems(RegistryEvent.Register event) + { + // Register items and itemBlocks + GeneratorsItems.registerItems(event.getRegistry()); + GeneratorsBlocks.registerItemBlocks(event.getRegistry()); + } + + @SubscribeEvent + public static void registerModels(ModelRegistryEvent event) + { + // Register models + proxy.registerBlockRenders(); + proxy.registerItemRenders(); + } + @EventHandler public void preInit(FMLPreInitializationEvent event) { - GeneratorsBlocks.register(); - GeneratorsItems.register(); - proxy.preInit(); } diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 94cce0151..6b008c823 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -11,16 +11,22 @@ import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.config.MekanismConfig.tools; +import mekanism.generators.common.GeneratorsBlocks; +import mekanism.generators.common.GeneratorsItems; +import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import net.minecraftforge.fml.common.Mod; @@ -32,6 +38,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.3.3", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod.EventBusSubscriber() public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -68,6 +75,20 @@ public class MekanismTools implements IModule public static Map AXE_DAMAGE = new HashMap(); public static Map AXE_SPEED = new HashMap(); + @SubscribeEvent + public static void registerItems(RegistryEvent.Register event) + { + // Register items and itemBlocks + ToolsItems.registerItems(event.getRegistry()); + } + + @SubscribeEvent + public static void registerModels(ModelRegistryEvent event) + { + // Register models + proxy.registerItemRenders(); + } + @EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -283,7 +304,6 @@ public class MekanismTools implements IModule ToolsItems.initializeItems(); ToolsItems.setHarvestLevels(); - ToolsItems.register(); } @SubscribeEvent diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 6234c0c5a..764914de2 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -10,8 +10,8 @@ import mekanism.tools.item.ItemMekanismSword; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.registries.IForgeRegistry; @ObjectHolder("mekanismtools") public class ToolsItems @@ -210,88 +210,86 @@ public class ToolsItems item.setHarvestLevel("shovel", material.getHarvestLevel()); } - public static void register() + public static void registerItems(IForgeRegistry registry) { //Base - GameRegistry.register(WoodPaxel); - GameRegistry.register(StonePaxel); - GameRegistry.register(IronPaxel); - GameRegistry.register(DiamondPaxel); - GameRegistry.register(GoldPaxel); + registry.register(WoodPaxel); + registry.register(StonePaxel); + registry.register(IronPaxel); + registry.register(DiamondPaxel); + registry.register(GoldPaxel); //Obsidian - GameRegistry.register(ObsidianHelmet); - GameRegistry.register(ObsidianChestplate); - GameRegistry.register(ObsidianLeggings); - GameRegistry.register(ObsidianBoots); - GameRegistry.register(ObsidianPaxel); - GameRegistry.register(ObsidianPickaxe); - GameRegistry.register(ObsidianAxe); - GameRegistry.register(ObsidianShovel); - GameRegistry.register(ObsidianHoe); - GameRegistry.register(ObsidianSword); + registry.register(ObsidianHelmet); + registry.register(ObsidianChestplate); + registry.register(ObsidianLeggings); + registry.register(ObsidianBoots); + registry.register(ObsidianPaxel); + registry.register(ObsidianPickaxe); + registry.register(ObsidianAxe); + registry.register(ObsidianShovel); + registry.register(ObsidianHoe); + registry.register(ObsidianSword); //Lazuli - GameRegistry.register(LazuliHelmet); - GameRegistry.register(LazuliChestplate); - GameRegistry.register(LazuliLeggings); - GameRegistry.register(LazuliBoots); - GameRegistry.register(LazuliPaxel); - GameRegistry.register(LazuliPickaxe); - GameRegistry.register(LazuliAxe); - GameRegistry.register(LazuliShovel); - GameRegistry.register(LazuliHoe); - GameRegistry.register(LazuliSword); + registry.register(LazuliHelmet); + registry.register(LazuliChestplate); + registry.register(LazuliLeggings); + registry.register(LazuliBoots); + registry.register(LazuliPaxel); + registry.register(LazuliPickaxe); + registry.register(LazuliAxe); + registry.register(LazuliShovel); + registry.register(LazuliHoe); + registry.register(LazuliSword); //Osmium - GameRegistry.register(OsmiumHelmet); - GameRegistry.register(OsmiumChestplate); - GameRegistry.register(OsmiumLeggings); - GameRegistry.register(OsmiumBoots); - GameRegistry.register(OsmiumPaxel); - GameRegistry.register(OsmiumPickaxe); - GameRegistry.register(OsmiumAxe); - GameRegistry.register(OsmiumShovel); - GameRegistry.register(OsmiumHoe); - GameRegistry.register(OsmiumSword); + registry.register(OsmiumHelmet); + registry.register(OsmiumChestplate); + registry.register(OsmiumLeggings); + registry.register(OsmiumBoots); + registry.register(OsmiumPaxel); + registry.register(OsmiumPickaxe); + registry.register(OsmiumAxe); + registry.register(OsmiumShovel); + registry.register(OsmiumHoe); + registry.register(OsmiumSword); //Bronze - GameRegistry.register(BronzeHelmet); - GameRegistry.register(BronzeChestplate); - GameRegistry.register(BronzeLeggings); - GameRegistry.register(BronzeBoots); - GameRegistry.register(BronzePaxel); - GameRegistry.register(BronzePickaxe); - GameRegistry.register(BronzeAxe); - GameRegistry.register(BronzeShovel); - GameRegistry.register(BronzeHoe); - GameRegistry.register(BronzeSword); + registry.register(BronzeHelmet); + registry.register(BronzeChestplate); + registry.register(BronzeLeggings); + registry.register(BronzeBoots); + registry.register(BronzePaxel); + registry.register(BronzePickaxe); + registry.register(BronzeAxe); + registry.register(BronzeShovel); + registry.register(BronzeHoe); + registry.register(BronzeSword); //Glowstone - GameRegistry.register(GlowstonePaxel); - GameRegistry.register(GlowstonePickaxe); - GameRegistry.register(GlowstoneAxe); - GameRegistry.register(GlowstoneShovel); - GameRegistry.register(GlowstoneHoe); - GameRegistry.register(GlowstoneSword); - GameRegistry.register(GlowstoneHelmet); - GameRegistry.register(GlowstoneChestplate); - GameRegistry.register(GlowstoneLeggings); - GameRegistry.register(GlowstoneBoots); + registry.register(GlowstonePaxel); + registry.register(GlowstonePickaxe); + registry.register(GlowstoneAxe); + registry.register(GlowstoneShovel); + registry.register(GlowstoneHoe); + registry.register(GlowstoneSword); + registry.register(GlowstoneHelmet); + registry.register(GlowstoneChestplate); + registry.register(GlowstoneLeggings); + registry.register(GlowstoneBoots); //Steel - GameRegistry.register(SteelPaxel); - GameRegistry.register(SteelPickaxe); - GameRegistry.register(SteelAxe); - GameRegistry.register(SteelShovel); - GameRegistry.register(SteelHoe); - GameRegistry.register(SteelSword); - GameRegistry.register(SteelHelmet); - GameRegistry.register(SteelChestplate); - GameRegistry.register(SteelLeggings); - GameRegistry.register(SteelBoots); - - MekanismTools.proxy.registerItemRenders(); + registry.register(SteelPaxel); + registry.register(SteelPickaxe); + registry.register(SteelAxe); + registry.register(SteelShovel); + registry.register(SteelHoe); + registry.register(SteelSword); + registry.register(SteelHelmet); + registry.register(SteelChestplate); + registry.register(SteelLeggings); + registry.register(SteelBoots); } public static Item init(Item item, String name)