diff --git a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java index e2c4066a..68eaa813 100644 --- a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java +++ b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java @@ -72,6 +72,94 @@ public final class EnergyValueRegistryProxy { return Collections.EMPTY_LIST; } + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPreAssignedEnergyValue(Object object, float energyValue) { + setEnergyValue(object, energyValue, Phase.PRE_CALCULATION); + } + + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPreAssignedEnergyValue(Object object, EnergyValue energyValue) { + setEnergyValue(object, energyValue, Phase.PRE_CALCULATION); + } + + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPreCalculationEnergyValue(Object object, float energyValue) { + setEnergyValue(object, energyValue, Phase.PRE_CALCULATION); + } + + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPreCalculationEnergyValue(Object object, EnergyValue energyValue) { + setEnergyValue(object, energyValue, Phase.PRE_CALCULATION); + } + + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPostAssignedEnergyValue(Object object, float energyValue) { + setEnergyValue(object, energyValue); + } + + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPostAssignedEnergyValue(Object object, EnergyValue energyValue) { + setEnergyValue(object, energyValue); + } + + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPostCalculationEnergyValue(Object object, float energyValue) { + setEnergyValue(object, energyValue); + } + + /** + * + * @deprecated + * @param object + * @param energyValue + */ + @Deprecated + public static void addPostCalculationEnergyValue(Object object, EnergyValue energyValue) { + setEnergyValue(object, energyValue); + } + public static void setEnergyValue(Object object, Number energyValue) { setEnergyValue(object, new EnergyValue(energyValue), Phase.POST_CALCULATION); } @@ -106,7 +194,11 @@ public final class EnergyValueRegistryProxy { } public enum Phase { + @Deprecated PRE_ASSIGNMENT, PRE_CALCULATION, - POST_CALCULATION + @Deprecated POST_ASSIGNMENT, + POST_CALCULATION, + @Deprecated RUNTIME, + @Deprecated ALL } } diff --git a/src/main/java/com/pahimar/ee3/init/ModItems.java b/src/main/java/com/pahimar/ee3/init/ModItems.java index 3f71d909..f447f315 100644 --- a/src/main/java/com/pahimar/ee3/init/ModItems.java +++ b/src/main/java/com/pahimar/ee3/init/ModItems.java @@ -48,13 +48,13 @@ public class ModItems GameRegistry.registerItem(stonePhilosophers, Names.Items.PHILOSOPHERS_STONE); GameRegistry.registerItem(chalk, Names.Items.CHALK); GameRegistry.registerItem(alchemicalUpgrade, Names.Items.ALCHEMICAL_UPGRADE); - GameRegistry.registerItem(diviningRod, Names.Items.DIVINING_ROD); +// GameRegistry.registerItem(diviningRod, Names.Items.DIVINING_ROD); GameRegistry.registerItem(alchenomicon, Names.Items.ALCHENOMICON, Names.Items.ALCHEMICAL_TOME); - GameRegistry.registerItem(matter, Names.Items.MATTER); - GameRegistry.registerItem(gem, Names.Items.GEM); - GameRegistry.registerItem(lootBall, Names.Items.LOOT_BALL); - GameRegistry.registerItem(knowledgeScroll, Names.Items.KNOWLEDGE_SCROLL); - GameRegistry.registerItem(potionLethe, Names.Items.POTION_LETHE); +// GameRegistry.registerItem(matter, Names.Items.MATTER); +// GameRegistry.registerItem(gem, Names.Items.GEM); +// GameRegistry.registerItem(lootBall, Names.Items.LOOT_BALL); +// GameRegistry.registerItem(knowledgeScroll, Names.Items.KNOWLEDGE_SCROLL); +// GameRegistry.registerItem(potionLethe, Names.Items.POTION_LETHE); // GameRegistry.registerItem(shovelDarkMatter, Names.Tools.DARK_MATTER_SHOVEL); // GameRegistry.registerItem(pickAxeDarkMatter, Names.Tools.DARK_MATTER_PICKAXE); diff --git a/src/main/java/com/pahimar/ee3/init/Recipes.java b/src/main/java/com/pahimar/ee3/init/Recipes.java index c86980e8..5975f405 100644 --- a/src/main/java/com/pahimar/ee3/init/Recipes.java +++ b/src/main/java/com/pahimar/ee3/init/Recipes.java @@ -29,8 +29,7 @@ public class Recipes GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.ashInfusedStoneSlab, 6), "sss", 's', new ItemStack(ModBlocks.ashInfusedStone)); GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.ashInfusedStone, 1), "s", "s", 's', new ItemStack(ModBlocks.ashInfusedStoneSlab)); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.chalkBlock), "bcb", "cbc", "bcb", 'b', new ItemStack(Items.dye, 1, 15), 'c', new ItemStack(Items.clay_ball)); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.chalkBlock), "cc", "cc", 'c', new ItemStack(ModItems.chalk)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.chalk), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.clay_ball)); GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.glassBell), "ggg", "g g", "g g", 'g', Blocks.glass); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.calcinator), "i i", "sis", "s s", 'i', "ingotIron", 's', Blocks.stone));