mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 13:09:47 +00:00
Fix #264 Move recipe registration from postInit to init
This commit is contained in:
1 parent
53aa5fc6d6
commit
7d88eb7ebb
21 files changed
+120
-224
No files matched your search
@@ -25,7 +25,7 @@ import binnie.genetics.api.acclimatiser.IAcclimatiserManager;
|
||||
@Mod(
|
||||
modid = Constants.BOTANY_MOD_ID,
|
||||
name = "Binnie's Botany",
|
||||
dependencies = "required-after:" + Constants.CORE_MOD_ID
|
||||
dependencies = "required-after:" + Constants.CORE_MOD_ID + ";"
|
||||
+ "after:" + Constants.GENETICS_MOD_ID
|
||||
)
|
||||
public class Botany extends BlankModuleContainer {
|
||||
@@ -45,9 +45,11 @@ public class Botany extends BlankModuleContainer {
|
||||
GeneticsApi.registerAnalystPagePlugin(new FlowerAnalystPagePlugin());
|
||||
|
||||
IAcclimatiserManager acclimatiserManager = GeneticsApi.acclimatiserManager;
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.HUMIDITY_TOLERANCE, acclimatiserManager.getHumidityToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.TEMPERATURE_TOLERANCE, acclimatiserManager.getTemperatureToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.PH_TOLERANCE, new TolerancePh());
|
||||
if(acclimatiserManager != null) {
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.HUMIDITY_TOLERANCE, acclimatiserManager.getHumidityToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.TEMPERATURE_TOLERANCE, acclimatiserManager.getTemperatureToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.PH_TOLERANCE, new TolerancePh());
|
||||
}
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package binnie.botany.modules;
|
||||
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -10,14 +9,13 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.fml.common.registry.ForgeRegistries;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import binnie.core.Constants;
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.CreativeTabBotany;
|
||||
import binnie.botany.api.genetics.EnumFlowerColor;
|
||||
import binnie.botany.blocks.BlockCeramic;
|
||||
import binnie.botany.blocks.BlockCeramicBrick;
|
||||
import binnie.botany.blocks.BlockCeramicPatterned;
|
||||
import binnie.botany.blocks.BlockStainedGlass;
|
||||
import binnie.botany.api.genetics.EnumFlowerColor;
|
||||
import binnie.botany.items.BotanyItems;
|
||||
import binnie.botany.items.CeramicItems;
|
||||
import binnie.botany.items.ItemCeramic;
|
||||
@@ -27,13 +25,15 @@ import binnie.botany.items.ItemPigment;
|
||||
import binnie.botany.items.ItemStainedGlass;
|
||||
import binnie.botany.recipes.CeramicTileRecipe;
|
||||
import binnie.botany.recipes.PigmentRecipe;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.api.block.TileEntityMetadata;
|
||||
import binnie.core.item.ItemMisc;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import binnie.extratrees.items.ItemDesign;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import binnie.core.modules.Module;
|
||||
import binnie.core.modules.ModuleManager;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import binnie.extratrees.items.ItemDesign;
|
||||
|
||||
@BinnieModule(moduleID = BotanyModuleUIDs.CERAMIC, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Ceramic", unlocalizedDescription = "botany.module.ceramic")
|
||||
public class ModuleCeramic extends Module {
|
||||
@@ -70,7 +70,7 @@ public class ModuleCeramic extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID);
|
||||
ForgeRegistries.RECIPES.register(new CeramicTileRecipe());
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package binnie.botany.modules;
|
||||
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
import java.util.Set;
|
||||
@@ -9,16 +8,18 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.Constants;
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.items.ItemDatabaseBotany;
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.liquid.ManagerLiquid;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import binnie.core.modules.Module;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
@BinnieModule(moduleID = BotanyModuleUIDs.DATABASE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Database", unlocalizedDescription = "botany.module.database")
|
||||
public class ModuleDatabase extends Module {
|
||||
@@ -32,7 +33,7 @@ public class ModuleDatabase extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
RecipeManagers.carpenterManager.addRecipe(
|
||||
100,
|
||||
Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000),
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package binnie.botany.modules;
|
||||
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
import java.util.Set;
|
||||
@@ -8,7 +7,6 @@ import java.util.Set;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import binnie.core.Constants;
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.api.gardening.EnumAcidity;
|
||||
import binnie.botany.api.gardening.EnumMoisture;
|
||||
@@ -16,10 +14,12 @@ import binnie.botany.farming.CircuitGarden;
|
||||
import binnie.botany.items.EnumTubeInsulate;
|
||||
import binnie.botany.items.EnumTubeMaterial;
|
||||
import binnie.botany.items.ItemInsulatedTube;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import binnie.core.modules.Module;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
|
||||
@BinnieModule(moduleID = BotanyModuleUIDs.FARMING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Farming", unlocalizedDescription = "botany.module.farming")
|
||||
public class ModuleFarming extends Module {
|
||||
@@ -63,10 +63,7 @@ public class ModuleFarming extends Module {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
for (EnumTubeMaterial mat: EnumTubeMaterial.VALUES) {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID);
|
||||
for (EnumTubeInsulate insulate : EnumTubeInsulate.VALUES) {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package binnie.botany.modules;
|
||||
|
||||
import binnie.botany.genetics.FlowerColorMutations;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@@ -43,6 +42,7 @@ import binnie.botany.api.genetics.IFlowerRoot;
|
||||
import binnie.botany.blocks.BlockFlower;
|
||||
import binnie.botany.core.BotanyCore;
|
||||
import binnie.botany.genetics.FlowerBreedingSystem;
|
||||
import binnie.botany.genetics.FlowerColorMutations;
|
||||
import binnie.botany.genetics.FlowerDefinition;
|
||||
import binnie.botany.genetics.FlowerFactory;
|
||||
import binnie.botany.genetics.allele.AlleleEffectNone;
|
||||
@@ -119,10 +119,7 @@ public class ModuleFlowers extends Module {
|
||||
public void init() {
|
||||
FlowerColorMutations.registerFlowerColorAlleles();
|
||||
FlowerDefinition.initFlowers();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID);
|
||||
FlowerManager.flowerRegistry.registerAcceptableFlower(flower, "flowersVanilla");
|
||||
recipeUtil.addRecipe("botanist_backpack", botanistBackpack,
|
||||
|
||||
@@ -3,7 +3,6 @@ package binnie.botany.modules;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -21,7 +20,6 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.fml.common.eventhandler.Event;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
import binnie.core.Constants;
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.CreativeTabBotany;
|
||||
import binnie.botany.api.gardening.EnumAcidity;
|
||||
@@ -41,12 +39,14 @@ import binnie.botany.items.ItemWeed;
|
||||
import binnie.botany.tile.TileCeramic;
|
||||
import binnie.botany.tile.TileCeramicBrick;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.item.ItemMisc;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import binnie.core.modules.Module;
|
||||
import binnie.core.util.OreDictionaryUtil;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.Module;
|
||||
|
||||
@BinnieModule(moduleID = BotanyModuleUIDs.GARDENING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Gardening", unlocalizedDescription = "botany.module.gardening")
|
||||
public class ModuleGardening extends Module {
|
||||
@@ -118,7 +118,7 @@ public class ModuleGardening extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID);
|
||||
IGardeningManager gardening = BotanyCore.getGardening();
|
||||
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
package binnie.botany.modules;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
|
||||
import forestry.api.core.Tabs;
|
||||
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.machines.BotanyMachine;
|
||||
import binnie.core.Constants;
|
||||
@@ -7,15 +13,11 @@ import binnie.core.Mods;
|
||||
import binnie.core.machines.MachineGroup;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import binnie.core.modules.ExtraTreesModuleUIDs;
|
||||
import binnie.core.modules.Module;
|
||||
import binnie.core.modules.ModuleManager;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import binnie.extratrees.items.ExtraTreeItems;
|
||||
import binnie.core.modules.ExtraTreesModuleUIDs;
|
||||
import forestry.api.core.Tabs;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
|
||||
@BinnieModule(moduleID = BotanyModuleUIDs.MACHINES, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Machines", unlocalizedDescription = "botany.module.machines")
|
||||
public class ModuleMachine extends Module {
|
||||
@@ -29,7 +31,7 @@ public class ModuleMachine extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID);
|
||||
if (ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)) {
|
||||
recipeUtil.addRecipe("tileworker", BotanyMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing"));
|
||||
|
||||
@@ -1,29 +1,20 @@
|
||||
package binnie.extrabees;
|
||||
|
||||
import binnie.core.api.genetics.IBreedingSystem;
|
||||
import binnie.core.gui.BinnieGUIHandler;
|
||||
import binnie.core.liquid.ManagerLiquid;
|
||||
import binnie.extrabees.genetics.gui.analyst.AnalystPagePlugin;
|
||||
import binnie.extrabees.gui.ExtraBeesGUID;
|
||||
import binnie.genetics.api.GeneticsApi;
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.List;
|
||||
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.SidedProxy;
|
||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
@@ -43,11 +34,15 @@ import forestry.core.proxy.Proxies;
|
||||
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.api.genetics.IBreedingSystem;
|
||||
import binnie.core.gui.BinnieGUIHandler;
|
||||
import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
|
||||
import binnie.extrabees.genetics.BeeBreedingSystem;
|
||||
import binnie.extrabees.genetics.ExtraBeeDefinition;
|
||||
import binnie.extrabees.genetics.ExtraBeesFlowers;
|
||||
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
|
||||
import binnie.extrabees.genetics.gui.analyst.AnalystPagePlugin;
|
||||
import binnie.extrabees.gui.ExtraBeesGUID;
|
||||
import binnie.extrabees.init.BlockRegister;
|
||||
import binnie.extrabees.init.ItemRegister;
|
||||
import binnie.extrabees.init.RecipeRegister;
|
||||
@@ -60,6 +55,7 @@ import binnie.extrabees.utils.MaterialBeehive;
|
||||
import binnie.extrabees.utils.config.ConfigHandler;
|
||||
import binnie.extrabees.utils.config.ConfigurationMain;
|
||||
import binnie.extrabees.worldgen.ExtraBeesWorldGenerator;
|
||||
import binnie.genetics.api.GeneticsApi;
|
||||
|
||||
@Mod(
|
||||
modid = ExtraBees.MODID,
|
||||
@@ -84,16 +80,25 @@ public class ExtraBees {
|
||||
|
||||
public static ConfigHandler configHandler;
|
||||
|
||||
@Nullable
|
||||
public static Material materialBeehive;
|
||||
@Nullable
|
||||
public static Block hive;
|
||||
@Nullable
|
||||
public static Block alveary;
|
||||
@Nullable
|
||||
public static Block ectoplasm;
|
||||
@Nullable
|
||||
public static Item comb;
|
||||
@Nullable
|
||||
public static Item propolis;
|
||||
@Nullable
|
||||
public static Item honeyDrop;
|
||||
@Nullable
|
||||
public static ItemHoneyCrystal honeyCrystal;
|
||||
public static Item dictionary;
|
||||
@Nullable
|
||||
public static ItemMiscProduct itemMisc;
|
||||
@Nullable
|
||||
public static Item dictionaryBees;
|
||||
|
||||
@Mod.EventHandler
|
||||
@@ -104,13 +109,7 @@ public class ExtraBees {
|
||||
configHandler.addConfigurable(new ConfigurationMain());
|
||||
BlockRegister.preInitBlocks();
|
||||
ItemRegister.preInitItems();
|
||||
try {
|
||||
Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class);
|
||||
m.setAccessible(true);
|
||||
m.invoke(null, new Object[]{GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)});
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
registerGuis();
|
||||
Proxies.render.registerModels();
|
||||
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(this, new BinnieGUIHandler(ExtraBeesGUID.values()));
|
||||
@@ -131,27 +130,24 @@ public class ExtraBees {
|
||||
ExtraBeesEffect.doInit();
|
||||
ExtraBeesFlowers.doInit();
|
||||
ExtraBeeDefinition.doInit();
|
||||
BlockRegister.doInitBlocks();
|
||||
RecipeRegister.doInitRecipes();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void postInit(final FMLPostInitializationEvent evt) {
|
||||
BlockRegister.postInitBlocks();
|
||||
RecipeRegister.postInitRecipes();
|
||||
//Register mutations
|
||||
AlvearyMutationHandler.registerMutationItems();
|
||||
RecipeManagers.carpenterManager.addRecipe(
|
||||
100,
|
||||
Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000),
|
||||
ItemStack.EMPTY,
|
||||
new ItemStack(dictionaryBees),
|
||||
"X#X", "YEY", "RDR",
|
||||
'#', Blocks.GLASS_PANE,
|
||||
'X', Items.GOLD_INGOT,
|
||||
'Y', "ingotTin",
|
||||
'R', Items.REDSTONE,
|
||||
'D', Items.DIAMOND,
|
||||
'E', Items.EMERALD
|
||||
);
|
||||
}
|
||||
|
||||
private void registerGuis(){
|
||||
try {
|
||||
Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class);
|
||||
m.setAccessible(true);
|
||||
m.invoke(null, new Object[]{GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)});
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
@@ -26,7 +26,7 @@ public final class BlockRegister {
|
||||
GameRegistry.registerTileEntity(TileEntityExtraBeesAlvearyPart.class, "TileEntityExtraBeesAlvearyPart");
|
||||
}
|
||||
|
||||
public static void postInitBlocks() {
|
||||
public static void doInitBlocks() {
|
||||
registerHiveDrops();
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@ import forestry.apiculture.blocks.BlockAlvearyType;
|
||||
import forestry.core.PluginCore;
|
||||
import forestry.core.fluids.Fluids;
|
||||
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.liquid.ManagerLiquid;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.alveary.EnumAlvearyLogicType;
|
||||
@@ -29,12 +31,11 @@ import binnie.extrabees.items.types.EnumHoneyComb;
|
||||
import binnie.extrabees.items.types.EnumHoneyDrop;
|
||||
import binnie.extrabees.items.types.EnumPropolis;
|
||||
import binnie.extrabees.items.types.ExtraBeeItems;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
|
||||
public final class RecipeRegister {
|
||||
private static final RecipeUtil RECIPE_UTIL = new RecipeUtil(ExtraBees.MODID);
|
||||
|
||||
public static void postInitRecipes() {
|
||||
public static void doInitRecipes() {
|
||||
if (Loader.isModLoaded("ic2")) {
|
||||
RECIPE_UTIL.addRecipe("honey_crystal", ExtraBees.honeyCrystal.getCharged(0), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1));
|
||||
}
|
||||
@@ -49,7 +50,6 @@ public final class RecipeRegister {
|
||||
}
|
||||
EnumHiveFrame.init(RECIPE_UTIL);
|
||||
addForestryRecipes();
|
||||
addForestryRecipes();
|
||||
addMiscItemRecipes();
|
||||
addAlvearyRecipes();
|
||||
}
|
||||
@@ -77,7 +77,19 @@ public final class RecipeRegister {
|
||||
}
|
||||
|
||||
private static void addForestryRecipes() {
|
||||
RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD);
|
||||
RecipeManagers.carpenterManager.addRecipe(
|
||||
100,
|
||||
Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000),
|
||||
ItemStack.EMPTY,
|
||||
new ItemStack(ExtraBees.dictionaryBees),
|
||||
"X#X", "YEY", "RDR",
|
||||
'#', Blocks.GLASS_PANE,
|
||||
'X', Items.GOLD_INGOT,
|
||||
'Y', "ingotTin",
|
||||
'R', Items.REDSTONE,
|
||||
'D', Items.DIAMOND,
|
||||
'E', Items.EMERALD
|
||||
);
|
||||
}
|
||||
|
||||
private static void addMiscItemRecipes() {
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
package binnie.extrabees;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import binnie.extrabees.utils.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
@@ -68,7 +68,7 @@ public class ModuleAlcohol extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
IBreweryManager breweryManager = ExtraTreesRecipeManager.breweryManager;
|
||||
IFruitPressManager fruitPressManager = ExtraTreesRecipeManager.fruitPressManager;
|
||||
|
||||
|
||||
@@ -101,10 +101,6 @@ public class ModuleCarpentry extends Module {
|
||||
MinecraftForge.EVENT_BUS.register(blockCarpentry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
for (final EnumDesign design : EnumDesign.values()) {
|
||||
|
||||
@@ -148,10 +148,7 @@ public class ModuleCore extends Module {
|
||||
Food.MANGO.addJuice(10, 400, 20);
|
||||
Food.STARFRUIT.addJuice(10, 300, 10);
|
||||
Food.CANDLENUT.addJuice(20, 50, 10);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID);
|
||||
MinecraftForge.addGrassSeed(new ItemStack(itemHops), 5);
|
||||
|
||||
@@ -185,107 +182,6 @@ public class ModuleCore extends Module {
|
||||
|
||||
FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1));
|
||||
FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Resin.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Resin.get(1).getFluid(), 30, 10000, 1));
|
||||
/* if (BinnieCore.getBinnieProxy().isDebug()) {
|
||||
try {
|
||||
final PrintWriter outputSpecies = new PrintWriter(new FileWriter("data/species.html"));
|
||||
final PrintWriter outputLogs = new PrintWriter(new FileWriter("data/logs.html"));
|
||||
final PrintWriter outputPlanks = new PrintWriter(new FileWriter("data/planks.html"));
|
||||
final PrintWriter outputFruit = new PrintWriter(new FileWriter("data/fruit.html"));
|
||||
final PrintWriter outputDesigns = new PrintWriter(new FileWriter("data/designs.html"));
|
||||
final Queue<IAlleleTreeSpecies> speciesQueue = new LinkedList<>();
|
||||
for (final ETTreeDefinition s : ETTreeDefinition.values()) {
|
||||
speciesQueue.add(s.getSpecies());
|
||||
}
|
||||
final Queue<IWoodType> logQueue = new LinkedList<>();
|
||||
Collections.addAll(logQueue, EnumETLog.values());
|
||||
final Queue<IDesignMaterial> plankQueue = new LinkedList<>();
|
||||
Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.values());
|
||||
final Queue<AlleleETFruit> fruitQueue = new LinkedList<>();
|
||||
fruitQueue.addAll(AlleleETFruit.values());
|
||||
final Queue<IDesign> designQueue = new LinkedList<>();
|
||||
designQueue.addAll(CarpentryManager.carpentryInterface.getSortedDesigns());
|
||||
fruitQueue.remove(AlleleETFruit.Apple);
|
||||
outputSpecies.println("<table style=\"width: 100%;\">");
|
||||
while (!speciesQueue.isEmpty()) {
|
||||
outputSpecies.println("<tr>");
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
final IAlleleTreeSpecies species = speciesQueue.poll();
|
||||
outputSpecies.println("<td>" + ((species == null) ? "" : species.getAlleleName()) + "</td>");
|
||||
}
|
||||
outputSpecies.println("</tr>");
|
||||
}
|
||||
outputSpecies.println("</table>");
|
||||
outputLogs.println("<table style=\"width: 100%;\">");
|
||||
while (!logQueue.isEmpty()) {
|
||||
outputLogs.println("<tr>");
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
final EnumETLog wood5 = (EnumETLog) logQueue.poll();
|
||||
if (wood5 == null) {
|
||||
outputLogs.println("<td></td>");
|
||||
} else {
|
||||
final String img = "<img alt=\"" + wood5.getName() + "\" src=\"images/logs/" + wood5.toString().toLowerCase() + "Bark.png\">";
|
||||
outputLogs.println("<td>" + img + " " + wood5.getName() + "</td>");
|
||||
}
|
||||
}
|
||||
outputLogs.println("</tr>");
|
||||
}
|
||||
outputLogs.println("</table>");
|
||||
outputPlanks.println("<table style=\"width: 100%;\">");
|
||||
while (!plankQueue.isEmpty()) {
|
||||
outputPlanks.println("<tr>");
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
final IDesignMaterial wood2 = plankQueue.poll();
|
||||
if (wood2 == null) {
|
||||
outputPlanks.println("<td></td>");
|
||||
} else {
|
||||
final String img = "<img alt=\"" + wood2.getDesignMaterialName() + "\" src=\"images/planks/" + wood2.getDesignMaterialName() + ".png\">";
|
||||
outputPlanks.println("<td>" + img + " " + wood2.getDesignMaterialName() + "</td>");
|
||||
}
|
||||
}
|
||||
outputPlanks.println("</tr>");
|
||||
}
|
||||
outputPlanks.println("</table>");
|
||||
outputFruit.println("<table style=\"width: 100%;\">");
|
||||
while (!fruitQueue.isEmpty()) {
|
||||
outputFruit.println("<tr>");
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
final AlleleETFruit wood6 = fruitQueue.poll();
|
||||
if (wood6 == null) {
|
||||
outputFruit.println("<td></td>");
|
||||
} else {
|
||||
final String fruit = wood6.getNameOfFruit();
|
||||
final String img2 = "<img alt=\"" + wood6.getAlleleName() + "\" src=\"images/fruits/" + fruit + ".png\">";
|
||||
outputFruit.println("<td>" + img2 + " " + wood6.getAlleleName() + "</td>");
|
||||
}
|
||||
}
|
||||
outputFruit.println("</tr>");
|
||||
}
|
||||
outputFruit.println("</table>");
|
||||
outputDesigns.println("<table style=\"width: 100%;\">");
|
||||
while (!designQueue.isEmpty()) {
|
||||
outputDesigns.println("<tr>");
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
final IDesign wood4 = designQueue.poll();
|
||||
if (wood4 == null) {
|
||||
outputDesigns.println("<td></td>");
|
||||
} else {
|
||||
final String texture = wood4.getTopPattern().getPattern().toString().toLowerCase();
|
||||
final String img2 = "<img alt=\"" + texture + "\" src=\"images/pattern/" + texture + ".png\">";
|
||||
outputDesigns.println("<td>" + img2 + " " + wood4.getName() + "</td>");
|
||||
}
|
||||
}
|
||||
outputDesigns.println("</tr>");
|
||||
}
|
||||
outputDesigns.println("</table>");
|
||||
outputSpecies.close();
|
||||
outputLogs.close();
|
||||
outputPlanks.close();
|
||||
outputFruit.close();
|
||||
outputDesigns.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -21,12 +21,4 @@ public class ModuleKitchen extends Module {
|
||||
machineGroup.customRenderer = false;
|
||||
blockKitchen = machineGroup.getBlock();*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
}
|
||||
}
|
||||
@@ -61,7 +61,7 @@ public class ModuleMachine extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID);
|
||||
recipeUtil.addRecipe("lumbermill", ExtraTreeMachine.Lumbermill.get(1), "gAg", "GsG", "gPg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'A', Items.IRON_AXE, 's', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze");
|
||||
recipeUtil.addRecipe("press", ExtraTreeMachine.Press.get(1), "iGi", "tSt", "tPt", 'i', "ingotIron", 'G', Blocks.GLASS, 't', "ingotTin", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze");
|
||||
|
||||
@@ -5,19 +5,20 @@ import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import forestry.api.recipes.ICarpenterManager;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.liquid.ManagerLiquid;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.ExtraTreesModuleUIDs;
|
||||
import binnie.core.modules.Module;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.items.ItemMothDatabase;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.Module;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
@BinnieModule(moduleID = ExtraTreesModuleUIDs.MOTH_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.moth")
|
||||
public class ModuleMothDatabase extends Module {
|
||||
@@ -32,7 +33,7 @@ public class ModuleMothDatabase extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
ICarpenterManager carpenterManager = RecipeManagers.carpenterManager;
|
||||
|
||||
carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD);
|
||||
|
||||
@@ -5,18 +5,19 @@ import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import forestry.api.recipes.ICarpenterManager;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.liquid.ManagerLiquid;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.ExtraTreesModuleUIDs;
|
||||
import binnie.core.modules.Module;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.items.ItemArboristDatabase;
|
||||
import binnie.core.modules.BinnieModule;
|
||||
import binnie.core.modules.Module;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
@BinnieModule(moduleID = ExtraTreesModuleUIDs.TREE_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.tree")
|
||||
public class ModuleTreeDatabase extends Module {
|
||||
@@ -30,7 +31,7 @@ public class ModuleTreeDatabase extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
ICarpenterManager carpenterManager = RecipeManagers.carpenterManager;
|
||||
carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(ModuleTreeDatabase.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD);
|
||||
}
|
||||
|
||||
@@ -128,10 +128,6 @@ public class ModuleWood extends Module {
|
||||
|
||||
public static IBreedingSystem treeBreedingSystem;
|
||||
|
||||
//TODO: Unused ?
|
||||
public static String[] branches = new String[]{"Malus Maleae Amygdaloideae Rosaceae", "Musa Musaceae Zingiberales Commelinids Angiosperms", "Sorbus Maleae", "Tsuga Pinaceae", "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems"};;
|
||||
public static List<List<String>> classifications = new ArrayList<>();
|
||||
|
||||
private static void registerOreDictWildcard(String oreDictName, Block block) {
|
||||
OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE));
|
||||
}
|
||||
@@ -142,7 +138,7 @@ public class ModuleWood extends Module {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
public void registerItemsAndBlocks() {
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
WoodAccess woodAccess = WoodAccess.getInstance();
|
||||
registerPlanks();
|
||||
@@ -372,10 +368,7 @@ public class ModuleWood extends Module {
|
||||
if (BinnieCore.isLepidopteryActive()) {
|
||||
ButterflySpecies.initButterflies();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID);
|
||||
for (BlockETLog log : logs) {
|
||||
ItemStack logInput = new ItemStack(log, 1, OreDictionary.WILDCARD_VALUE);
|
||||
|
||||
@@ -1,7 +1,18 @@
|
||||
package binnie.genetics.item;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.Constants;
|
||||
@@ -15,13 +26,6 @@ import binnie.core.util.RecipeUtil;
|
||||
import binnie.genetics.CreativeTabGenetics;
|
||||
import binnie.genetics.Genetics;
|
||||
import binnie.genetics.recipes.RegistryRecipe;
|
||||
import com.google.common.base.Preconditions;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ModuleItems implements IInitializable {
|
||||
public static BinnieSprite iconNight;
|
||||
@@ -94,7 +98,7 @@ public class ModuleItems implements IInitializable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
public void init() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID);
|
||||
recipeUtil.addShapelessRecipe("dna_dye_from_glowstone", GeneticsItems.DNADye.get(8),
|
||||
Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5)
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
package binnie.genetics.machine;
|
||||
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.IInitializable;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.machines.MachineGroup;
|
||||
import binnie.core.machines.inventory.ValidatorSprite;
|
||||
import binnie.core.util.RecipeUtil;
|
||||
import binnie.genetics.CreativeTabGenetics;
|
||||
import binnie.genetics.Genetics;
|
||||
import binnie.genetics.item.GeneticsItems;
|
||||
@@ -47,10 +47,7 @@ public class ModuleMachine implements IInitializable {
|
||||
@Override
|
||||
public void init() {
|
||||
Incubator.addRecipes();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID);
|
||||
Acclimatiser.setupRecipes();
|
||||
final Object[] standardCircuit = {Mods.Forestry.stack("chipsets", 1, 1)};
|
||||
|
||||
Reference in new issue
Block a user