diff options
Diffstat (limited to 'src/Java/miscutil/core')
10 files changed, 158 insertions, 40 deletions
diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java index a1e12cea8b..7d6c49db87 100644 --- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java +++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java @@ -2,6 +2,7 @@ package miscutil.core.handler; import miscutil.core.intermod.forestry.HANDLER_Forestry; import miscutil.core.intermod.growthcraft.HANDLER_Growthcraft; +import miscutil.core.intermod.psychedelicraft.HANDLER_Psychedelicraft; import miscutil.core.intermod.thermalfoundation.HANDLER_ThermalFoundation; import miscutil.gregtech.HANDLER_Gregtech; @@ -12,19 +13,22 @@ public class COMPAT_IntermodStaging { HANDLER_ThermalFoundation.preInit(); HANDLER_Gregtech.preInit(); HANDLER_Forestry.preInit(); + HANDLER_Psychedelicraft.preInit(); } public static void init(){ - HANDLER_ThermalFoundation.Init(); + HANDLER_ThermalFoundation.init(); HANDLER_Gregtech.init(); HANDLER_Forestry.Init(); + HANDLER_Psychedelicraft.init(); } public static void postInit(){ HANDLER_ThermalFoundation.postInit(); HANDLER_Gregtech.postInit(); HANDLER_Forestry.postInit(); + HANDLER_Psychedelicraft.postInit(); } diff --git a/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java b/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java index f670477318..166dd1ce01 100644 --- a/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java +++ b/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java @@ -1,6 +1,8 @@ package miscutil.core.intermod.forestry; +import miscutil.core.intermod.forestry.apiculture.blocks.FR_BlockRegistryApiculture; import miscutil.core.intermod.forestry.apiculture.items.FR_ItemRegistryApiculture; +import miscutil.core.intermod.forestry.apiculture.tiles.FR_TileHandler; import miscutil.core.lib.LoadedMods; public class HANDLER_Forestry { @@ -8,12 +10,13 @@ public class HANDLER_Forestry { public static void preInit(){ if (LoadedMods.Forestry){ FR_ItemRegistryApiculture.RegisterApiculture(); + FR_BlockRegistryApiculture.RegistryApiculture(); } } public static void Init(){ if (LoadedMods.Forestry){ - + FR_TileHandler.init(); } } diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java index 24f34e3829..f22404e2f0 100644 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java +++ b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java @@ -28,7 +28,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.apiculture.MaterialBeehive; import forestry.apiculture.multiblock.TileAlveary; -import forestry.apiculture.multiblock.TileAlvearyPlain; import forestry.core.blocks.BlockStructure; import forestry.core.render.TextureManager; @@ -86,16 +85,8 @@ public class FR_BlockAlveary extends BlockStructure { public TileEntity createTileEntity(World world, int metadata) { if (metadata < 0 || metadata > Type.VALUES.length) { return null; - } - - Type type = Type.VALUES[metadata]; - switch (type) { - case MUTATRON: - return new TileAlvearyMutatron(); - case PLAIN: - default: - return new TileAlvearyPlain(); - } + } + return new TileAlvearyMutatron(); } @Override @@ -118,7 +109,7 @@ public class FR_BlockAlveary extends BlockStructure { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[14]; + icons = new IIcon[7]; icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain"); icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance"); icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom"); @@ -131,22 +122,10 @@ public class FR_BlockAlveary extends BlockStructure { @SideOnly(Side.CLIENT) @Override public IIcon getIcon(int side, int metadata) { - if ((metadata <= 1 || metadata == Type.MUTATRON.ordinal()) - && (side == 1 || side == 0)) { + if ((metadata <= 1 /*|| metadata == Type.MUTATRON.ordinal()*/) && (side == 1 || side == 0)) { return icons[BOTTOM]; } - - Type type = Type.VALUES[metadata]; - - switch (type) { - case PLAIN: - return icons[PLAIN]; - case MUTATRON: - return icons[MUTATRON_OFF]; - default: - return null; - } - + return icons[MUTATRON_OFF]; } @SideOnly(Side.CLIENT) diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java new file mode 100644 index 0000000000..9709c13e50 --- /dev/null +++ b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package miscutil.core.intermod.forestry.apiculture.blocks; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.core.blocks.BlockRegistry; +import forestry.core.items.ItemBlockForestry; +import forestry.core.utils.StringUtil; +public class FR_BlockRegistryApiculture extends BlockRegistry { + + public static FR_BlockAlveary alveary; + + public static void RegistryApiculture() { + + alveary = registerBlock2(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary"); + } + + protected static <T extends Block> T registerBlock2(T block, Class<? extends ItemBlock> itemClass, String name, Object... itemCtorArgs) { + + block.setBlockName(name); + GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs); + return block; + } + + protected static void registerOreDictWildcard(String oreDictName, Block block) { + OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); + } +}
\ No newline at end of file diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java b/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java new file mode 100644 index 0000000000..fbbe0edf25 --- /dev/null +++ b/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java @@ -0,0 +1,16 @@ +package miscutil.core.intermod.forestry.apiculture.tiles; + +import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron; +import cpw.mods.fml.common.registry.GameRegistry; + +public class FR_TileHandler { + + public static void init(){ + // Inducers for swarmer + //BeeManager.inducers.put(items.royalJelly.getItemStack(), 10); + + GameRegistry.registerTileEntity(TileAlvearyMutatron.class, "MiscUtils.AlvearyMutatron"); + + } + +} diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/HANDLER_Psychedelicraft.java b/src/Java/miscutil/core/intermod/psychedelicraft/HANDLER_Psychedelicraft.java new file mode 100644 index 0000000000..f92b794cd0 --- /dev/null +++ b/src/Java/miscutil/core/intermod/psychedelicraft/HANDLER_Psychedelicraft.java @@ -0,0 +1,27 @@ +package miscutil.core.intermod.psychedelicraft; + +import miscutil.core.intermod.psychedelicraft.fluids.PS_Fluids; +import miscutil.core.lib.LoadedMods; + + +public class HANDLER_Psychedelicraft { + + public static void preInit(){ + if (LoadedMods.Psychedelicraft){ + PS_Fluids.registerFluids(); + } + } + + public static void init(){ + if (LoadedMods.Psychedelicraft){ + PS_Fluids.registerAlcohols(); + } + } + + public static void postInit(){ + if (LoadedMods.Psychedelicraft){ + + } + } + +} diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java b/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java deleted file mode 100644 index b299819a81..0000000000 --- a/src/Java/miscutil/core/intermod/psychedelicraft/Psychedelicraft_Booze.java +++ /dev/null @@ -1,11 +0,0 @@ -package miscutil.core.intermod.psychedelicraft; - - -public class Psychedelicraft_Booze { - - public static void run(){ - //Psychedelicraft; - //ivtoolkit - } - -} diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java b/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java new file mode 100644 index 0000000000..2d2af56967 --- /dev/null +++ b/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java @@ -0,0 +1,54 @@ +package miscutil.core.intermod.psychedelicraft.fluids; + +import ivorius.ivtoolkit.gui.IntegerRange; +import ivorius.psychedelicraft.blocks.TileEntityMashTub; +import ivorius.psychedelicraft.config.PSConfig; +import ivorius.psychedelicraft.fluids.FluidAlcohol; +import ivorius.psychedelicraft.items.PSItems; +import miscutil.core.lib.CORE; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.ShapelessOreRecipe; +import cpw.mods.fml.common.registry.GameRegistry; + +public class PS_Fluids { + + public static FluidAlcohol alcJD; + + public static void registerFluids(){ + alcJD = new FluidAlcohol("psc_JD", 2, 0.45D, 1.9D, 0.15D, PSConfig.alcInfoPotato); + alcJD.addName(CORE.MODID + "drinkMash", new IntegerRange(0, -1), new IntegerRange(0, 0)); + alcJD.addName(CORE.MODID + "drinkAgedWhisky", new IntegerRange(0, 0), new IntegerRange(1, -1)); + alcJD.addName(CORE.MODID + "drinkWhisky", new IntegerRange(0, -1), new IntegerRange(1, -1)); + alcJD.setColor(-1426150904); + alcJD.setStillIconName(CORE.MODID + "mash_still"); + alcJD.setFlowingIconName(CORE.MODID + "mash_flow"); + alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(0, 3), new IntegerRange(2, -1), CORE.MODID + "clear_still", CORE.MODID + "clear_flow"); + alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(4, 13), new IntegerRange(0, -1), CORE.MODID + "rum_semi_mature_still", CORE.MODID + "rum_semi_mature_flow"); + alcJD.addIcon(new IntegerRange(-1, -1), new IntegerRange(14, -1), new IntegerRange(0, -1), CORE.MODID + "rum_mature_still", CORE.MODID + "rum_mature_flow"); + FluidRegistry.registerFluid(alcJD); + } + + public static void registerAlcohols(){ + addMashTubRecipe2(new FluidStack(alcJD, TileEntityMashTub.MASH_TUB_CAPACITY), new Object[] { "foodPotato", "foodPotato", "foodPotato", "foodPotato", "foodPotato", "foodBanana", "foodBanana", "foodBanana" }); + } + + private static void addMashTubRecipe2(FluidStack fluid, Object... ingredients) + { + ItemStack mashTubStack = new ItemStack(PSItems.itemMashTub); + PSItems.itemMashTub.fill(mashTubStack, fluid, true); + + Object[] ing = new Object[ingredients.length + 1]; + System.arraycopy(ingredients, 0, ing, 1, ingredients.length); + ing[0] = new ItemStack(PSItems.itemMashTub); + + addShapelessRecipe2(mashTubStack, ing); + } + + private static void addShapelessRecipe2(ItemStack output, Object... params) + { + GameRegistry.addRecipe(new ShapelessOreRecipe(output, params)); + } + +} diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java b/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java index e5eb609fe8..c510763bd0 100644 --- a/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java +++ b/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java @@ -16,7 +16,7 @@ public class HANDLER_ThermalFoundation { } } - public static void Init(){ + public static void init(){ if (LoadedMods.CoFHCore){ TF_Fluids.init(); TF_Items.init(); diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index f7afcc3225..f4241b945c 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -25,6 +25,7 @@ public class LoadedMods { public static boolean CoFHCore = false; public static boolean Forestry = false; public static boolean MagicBees = false; + public static boolean Psychedelicraft = false; public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper @@ -126,6 +127,11 @@ public class LoadedMods { Utils.LOG_INFO("Components enabled for: MagicBees"); totalMods++; } + if (Loader.isModLoaded("psychedelicraft") == true){ + Psychedelicraft = true; + Utils.LOG_INFO("Components enabled for: Psychedelicraft"); + totalMods++; + } Utils.LOG_INFO("Content found for "+totalMods+" mods"); |