From 50208ddf599e69329eefd25f2f3a551250cf61b9 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 2 Jul 2016 21:55:52 +1000 Subject: %Renamed xmod handlers. +Added in a new Bee Frame - The Mutagenic Frame. --- .../miscutil/core/xmod/forestry/HANDLER_FR.java | 26 +++++ .../core/xmod/forestry/HANDLER_Forestry.java | 26 ----- .../forestry/apiculture/items/FR_ItemRegistry.java | 58 ---------- .../apiculture/items/magicbees/FR_StringUtil.java | 24 ---- .../apiculture/items/magicbees/MB_FrameType.java | 107 ----------------- .../apiculture/items/magicbees/MB_ItemFrame.java | 103 ----------------- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 61 ++++++++++ .../xmod/forestry/bees/items/FR_StringUtil.java | 24 ++++ .../xmod/forestry/bees/items/MB_FrameType.java | 108 ++++++++++++++++++ .../xmod/forestry/bees/items/MB_ItemFrame.java | 126 +++++++++++++++++++++ .../miscutil/core/xmod/gregtech/HANDLER_GT.java | 42 +++++++ .../core/xmod/gregtech/HANDLER_Gregtech.java | 42 ------- .../miscutil/core/xmod/growthcraft/HANDLER_GC.java | 16 +++ .../core/xmod/growthcraft/HANDLER_Growthcraft.java | 16 --- .../core/xmod/psychedelicraft/HANDLER_Psych.java | 27 +++++ .../psychedelicraft/HANDLER_Psychedelicraft.java | 27 ----- .../core/xmod/thermalfoundation/HANDLER_TF.java | 37 ++++++ .../HANDLER_ThermalFoundation.java | 37 ------ 18 files changed, 467 insertions(+), 440 deletions(-) create mode 100644 src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java create mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java create mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java create mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java create mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java create mode 100644 src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java delete mode 100644 src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java create mode 100644 src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java delete mode 100644 src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java create mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java (limited to 'src/Java/miscutil/core/xmod') diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java new file mode 100644 index 0000000000..e00d0d541b --- /dev/null +++ b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java @@ -0,0 +1,26 @@ +package miscutil.core.xmod.forestry; + +import miscutil.core.lib.LoadedMods; +import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry; + +public class HANDLER_FR { + + public static void preInit(){ + if (LoadedMods.Forestry){ + FR_ItemRegistry.Register(); + //FR_BlockRegistryApiculture.RegistryApiculture(); + } + } + + public static void Init(){ + if (LoadedMods.Forestry){ + //FR_TileHandler.init(); + } + } + + public static void postInit(){ + if (LoadedMods.Forestry){ + + } + } +} diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java deleted file mode 100644 index 50b07e7535..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java +++ /dev/null @@ -1,26 +0,0 @@ -package miscutil.core.xmod.forestry; - -import miscutil.core.lib.LoadedMods; -import miscutil.core.xmod.forestry.apiculture.items.FR_ItemRegistry; - -public class HANDLER_Forestry { - - public static void preInit(){ - if (LoadedMods.Forestry){ - FR_ItemRegistry.Register(); - //FR_BlockRegistryApiculture.RegistryApiculture(); - } - } - - public static void Init(){ - if (LoadedMods.Forestry){ - //FR_TileHandler.init(); - } - } - - public static void postInit(){ - if (LoadedMods.Forestry){ - - } - } -} diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java deleted file mode 100644 index 3772d70918..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * 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.xmod.forestry.apiculture.items; -import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_FrameType; -import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_ItemFrame; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.core.utils.StringUtil; - -public class FR_ItemRegistry { - - - //----- Apiary Frames ---------------------- - //public static FR_ItemHiveFrame frameUntreated; - //public static FR_ItemHiveFrame frameImpregnated; - //public static FR_ItemHiveFrame frameProven; - - //Magic Bee Frame Items - public static MB_ItemFrame hiveFrameAccelerated; - public static MB_ItemFrame hiveFrameVoid; - - public static void Register() { - - //Forestry Frames - //frameUntreated = registerItem(new FR_ItemHiveFrame(80, 0.9f), "frameUntreated"); - //frameImpregnated = registerItem(new FR_ItemHiveFrame(240, 0.4f), "frameImpregnated"); - //frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven"); - - //Magic Bee like Frames - hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED); - hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID); - ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 18)); - ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 23)); - - - - - } - - protected static T registerItem(T item, String name) { - item.setUnlocalizedName(name); - GameRegistry.registerItem(item, StringUtil.cleanItemName(item)); - return item; - } -} - - diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java deleted file mode 100644 index 235566f4ef..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java +++ /dev/null @@ -1,24 +0,0 @@ -package miscutil.core.xmod.forestry.apiculture.items.magicbees; - -import net.minecraft.util.StatCollector; - -public class FR_StringUtil -{ - public static String getLocalizedString(String key) - { - if(StatCollector.canTranslate(key)) - { - return StatCollector.translateToLocal(key); - } - return StatCollector.translateToFallback(key); - } - - public static String getLocalizedString(String key, Object... objects) - { - if(StatCollector.canTranslate(key)) - { - return String.format(StatCollector.translateToLocal(key), objects); - } - return String.format(StatCollector.translateToFallback(key), objects); - } -} diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java deleted file mode 100644 index 0d322d4498..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java +++ /dev/null @@ -1,107 +0,0 @@ -package miscutil.core.xmod.forestry.apiculture.items.magicbees; - -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeModifier; - -public enum MB_FrameType implements IBeeModifier -{ - ACCELERATED("Accelerated", 175, 1f, 2.5f, 0.9f, 1.8f, 1f), - VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f); - - private final String frameName; - public final int maxDamage; - - private final float territoryMod; - private final float mutationMod; - private final float lifespanMod; - private final float productionMod; - private final float floweringMod; - private final float geneticDecayMod; - private final boolean isSealed; - private final boolean isLit; - private final boolean isSunlit; - private final boolean isHellish; - - MB_FrameType(String name, int damage, float territory, float mutation, float lifespan, float production, float geneticDecay) { - this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false); - } - - MB_FrameType(String name, int damage, - float territory, float mutation, float lifespan, float production, float flowering, float geneticDecay, - boolean sealed, boolean lit, boolean sunlit, boolean hellish) - { - this.frameName = name; - this.maxDamage = damage; - - this.territoryMod = territory; - this.mutationMod = mutation; - this.lifespanMod = lifespan; - this.productionMod = production; - this.floweringMod = flowering; - this.geneticDecayMod = geneticDecay; - this.isSealed = sealed; - this.isLit = lit; - this.isSunlit = sunlit; - this.isHellish = hellish; - } - - public String getName() - { - return this.frameName; - } - - public String getLocalizedName() - { - return FR_StringUtil.getLocalizedString("frame." + this.frameName); - } - - @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return territoryMod; - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return mutationMod; - } - - @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return lifespanMod; - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return productionMod; - } - - @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return floweringMod; - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return geneticDecayMod; - } - - @Override - public boolean isSealed() { - return isSealed; - } - - @Override - public boolean isSelfLighted() { - return isLit; - } - - @Override - public boolean isSunlightSimulated() { - return isSunlit; - } - - @Override - public boolean isHellish() { - return isHellish; - } -} diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java deleted file mode 100644 index b12f29340c..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java +++ /dev/null @@ -1,103 +0,0 @@ -package miscutil.core.xmod.forestry.apiculture.items.magicbees; - -import miscutil.core.creative.AddToCreativeTab; -import miscutil.core.lib.CORE; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IHiveFrame; - -public class MB_ItemFrame extends Item implements IHiveFrame -{ - private MB_FrameType type; - - public MB_ItemFrame(MB_FrameType frameType) - { - super(); - this.type = frameType; - this.setMaxDamage(this.type.maxDamage); - this.setMaxStackSize(1); - this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName("frame" + frameType.getName()); - GameRegistry.registerItem(this, "frame" + frameType.getName()); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) - { - this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + type.getName()); - } - - // --------- IHiveFrame functions ----------------------------------------- - - @Override - public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { - frame.setItemDamage(frame.getItemDamage() + wear); - - if (frame.getItemDamage() >= frame.getMaxDamage()) { - // Break the frame. - frame = null; - } - - return frame; - } - - public IBeeModifier getBeeModifier() { - return type; - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) - { - return false; - } - - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return type.getTerritoryModifier(genome, currentModifier); - } - - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return type.getMutationModifier(genome, mate, currentModifier); - } - - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return type.getLifespanModifier(genome, mate, currentModifier); - } - - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return type.getProductionModifier(genome, currentModifier); - } - - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return type.getFloweringModifier(genome, currentModifier); - } - - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return type.getGeneticDecay(genome, currentModifier); - } - - public boolean isSealed() { - return type.isSealed(); - } - - public boolean isSelfLighted() { - return type.isSelfLighted(); - } - - public boolean isSunlightSimulated() { - return type.isSunlightSimulated(); - } - - public boolean isHellish(){ - return type.isHellish(); - } - -} diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java new file mode 100644 index 0000000000..87657bdc4c --- /dev/null +++ b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * 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.xmod.forestry.bees.items; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.core.utils.StringUtil; + +public class FR_ItemRegistry { + + + //----- Apiary Frames ---------------------- + //public static FR_ItemHiveFrame frameUntreated; + //public static FR_ItemHiveFrame frameImpregnated; + //public static FR_ItemHiveFrame frameProven; + + //Magic Bee Frame Items + public static MB_ItemFrame hiveFrameAccelerated; + public static MB_ItemFrame hiveFrameVoid; + public static MB_ItemFrame hiveFrameMutagenic; + + public static void Register() { + + //Forestry Frames + //frameUntreated = registerItem(new FR_ItemHiveFrame(80, 0.9f), "frameUntreated"); + //frameImpregnated = registerItem(new FR_ItemHiveFrame(240, 0.4f), "frameImpregnated"); + //frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven"); + + //Magic Bee like Frames + hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED); + hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare); + hiveFrameMutagenic = new MB_ItemFrame(MB_FrameType.MUTAGENIC, EnumRarity.epic); + ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 18)); + ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 23)); + ChestGenHooks.addItem(ChestGenHooks.PYRAMID_DESERT_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 1, 18)); + ChestGenHooks.addItem(ChestGenHooks.PYRAMID_JUNGLE_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 23)); + + + + + } + + protected static T registerItem(T item, String name) { + item.setUnlocalizedName(name); + GameRegistry.registerItem(item, StringUtil.cleanItemName(item)); + return item; + } +} + + diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java new file mode 100644 index 0000000000..324fd79a55 --- /dev/null +++ b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java @@ -0,0 +1,24 @@ +package miscutil.core.xmod.forestry.bees.items; + +import net.minecraft.util.StatCollector; + +public class FR_StringUtil +{ + public static String getLocalizedString(String key) + { + if(StatCollector.canTranslate(key)) + { + return StatCollector.translateToLocal(key); + } + return StatCollector.translateToFallback(key); + } + + public static String getLocalizedString(String key, Object... objects) + { + if(StatCollector.canTranslate(key)) + { + return String.format(StatCollector.translateToLocal(key), objects); + } + return String.format(StatCollector.translateToFallback(key), objects); + } +} diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java new file mode 100644 index 0000000000..af618eaccf --- /dev/null +++ b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java @@ -0,0 +1,108 @@ +package miscutil.core.xmod.forestry.bees.items; + +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeModifier; + +public enum MB_FrameType implements IBeeModifier +{ + ACCELERATED("Accelerated", 175, 1f, 2.5f, 0.9f, 1.8f, 1f), + VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f), + MUTAGENIC("Mutagenic", 3, 1f, 10f, 0.0001f, 10f, 1f); + + private final String frameName; + public final int maxDamage; + + private final float territoryMod; + private final float mutationMod; + private final float lifespanMod; + private final float productionMod; + private final float floweringMod; + private final float geneticDecayMod; + private final boolean isSealed; + private final boolean isLit; + private final boolean isSunlit; + private final boolean isHellish; + + MB_FrameType(String name, int damage, float territory, float mutation, float lifespan, float production, float geneticDecay) { + this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false); + } + + MB_FrameType(String name, int damage, + float territory, float mutation, float lifespan, float production, float flowering, float geneticDecay, + boolean sealed, boolean lit, boolean sunlit, boolean hellish) + { + this.frameName = name; + this.maxDamage = damage; + + this.territoryMod = territory; + this.mutationMod = mutation; + this.lifespanMod = lifespan; + this.productionMod = production; + this.floweringMod = flowering; + this.geneticDecayMod = geneticDecay; + this.isSealed = sealed; + this.isLit = lit; + this.isSunlit = sunlit; + this.isHellish = hellish; + } + + public String getName() + { + return this.frameName; + } + + public String getLocalizedName() + { + return FR_StringUtil.getLocalizedString("frame." + this.frameName); + } + + @Override + public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { + return territoryMod; + } + + @Override + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return mutationMod; + } + + @Override + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return lifespanMod; + } + + @Override + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + return productionMod; + } + + @Override + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + return floweringMod; + } + + @Override + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { + return geneticDecayMod; + } + + @Override + public boolean isSealed() { + return isSealed; + } + + @Override + public boolean isSelfLighted() { + return isLit; + } + + @Override + public boolean isSunlightSimulated() { + return isSunlit; + } + + @Override + public boolean isHellish() { + return isHellish; + } +} diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java new file mode 100644 index 0000000000..c400b65be2 --- /dev/null +++ b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java @@ -0,0 +1,126 @@ +package miscutil.core.xmod.forestry.bees.items; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; + +public class MB_ItemFrame extends Item implements IHiveFrame +{ + private MB_FrameType type; + private EnumRarity rarity_value = EnumRarity.uncommon; + + public MB_ItemFrame(MB_FrameType frameType) + { + this(frameType, EnumRarity.uncommon); + } + + public MB_ItemFrame(MB_FrameType frameType, EnumRarity rarity) + { + super(); + this.type = frameType; + this.setMaxDamage(this.type.maxDamage); + this.setMaxStackSize(1); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.setUnlocalizedName("frame" + frameType.getName()); + this.rarity_value = rarity; + GameRegistry.registerItem(this, "frame" + frameType.getName()); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister par1IconRegister) + { + this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + type.getName()); + } + + // --------- IHiveFrame functions ----------------------------------------- + + @Override + public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { + frame.setItemDamage(frame.getItemDamage() + wear); + + if (frame.getItemDamage() >= frame.getMaxDamage()) { + // Break the frame. + frame = null; + } + + return frame; + } + + + @Override + @SideOnly(Side.CLIENT) + public EnumRarity getRarity(ItemStack par1ItemStack){ + return rarity_value; + } + + @Override + public boolean hasEffect(ItemStack par1ItemStack){ + if (rarity_value == EnumRarity.uncommon){ + return false; + } + return true; + } + + public IBeeModifier getBeeModifier() { + return type; + } + + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) + { + return false; + } + + public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { + return type.getTerritoryModifier(genome, currentModifier); + } + + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return type.getMutationModifier(genome, mate, currentModifier); + } + + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return type.getLifespanModifier(genome, mate, currentModifier); + } + + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + return type.getProductionModifier(genome, currentModifier); + } + + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + return type.getFloweringModifier(genome, currentModifier); + } + + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { + return type.getGeneticDecay(genome, currentModifier); + } + + public boolean isSealed() { + return type.isSealed(); + } + + public boolean isSelfLighted() { + return type.isSelfLighted(); + } + + public boolean isSunlightSimulated() { + return type.isSunlightSimulated(); + } + + public boolean isHellish(){ + return type.isHellish(); + } + +} diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java new file mode 100644 index 0000000000..1218f06c4a --- /dev/null +++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java @@ -0,0 +1,42 @@ +package miscutil.core.xmod.gregtech; + +import gregtech.api.util.GT_Config; +import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; +import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; + +public class HANDLER_GT { + + public static GT_Config mMaterialProperties = null; + + public static void preInit(){ + if (mMaterialProperties != null){ + GT_Materials.init(mMaterialProperties); + + //new Processing_Ingot1(); + //new Processing_Plate1(); + //new Processing_Block(); + } + + } + + public static void init(){ + GregtechFluidHandler.run(); + /*if (Meta_GT_Proxy.mSortToTheEnd) { + new GT_ItemIterator().run(); + Meta_GT_Proxy.registerUnificationEntries(); + new GT_FuelLoader().run(); + }*/ + } + + public static void postInit(){ + /*Meta_GT_Proxy.activateOreDictHandler(); + if (Meta_GT_Proxy.mSortToTheEnd) { + Meta_GT_Proxy.registerUnificationEntries(); + } else { + new GT_ItemIterator().run(); + Meta_GT_Proxy.registerUnificationEntries(); + new GT_FuelLoader().run(); + }*/ + } + +} diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java deleted file mode 100644 index 3bfb136edf..0000000000 --- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java +++ /dev/null @@ -1,42 +0,0 @@ -package miscutil.core.xmod.gregtech; - -import gregtech.api.util.GT_Config; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; - -public class HANDLER_Gregtech { - - public static GT_Config mMaterialProperties = null; - - public static void preInit(){ - if (mMaterialProperties != null){ - GT_Materials.init(mMaterialProperties); - - //new Processing_Ingot1(); - //new Processing_Plate1(); - //new Processing_Block(); - } - - } - - public static void init(){ - GregtechFluidHandler.run(); - /*if (Meta_GT_Proxy.mSortToTheEnd) { - new GT_ItemIterator().run(); - Meta_GT_Proxy.registerUnificationEntries(); - new GT_FuelLoader().run(); - }*/ - } - - public static void postInit(){ - /*Meta_GT_Proxy.activateOreDictHandler(); - if (Meta_GT_Proxy.mSortToTheEnd) { - Meta_GT_Proxy.registerUnificationEntries(); - } else { - new GT_ItemIterator().run(); - Meta_GT_Proxy.registerUnificationEntries(); - new GT_FuelLoader().run(); - }*/ - } - -} diff --git a/src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java b/src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java new file mode 100644 index 0000000000..b0c82406d3 --- /dev/null +++ b/src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java @@ -0,0 +1,16 @@ +package miscutil.core.xmod.growthcraft; + +import miscutil.core.lib.LoadedMods; +import miscutil.core.xmod.growthcraft.booze.Register_Booze; + +public class HANDLER_GC { + + + //Run me during Pre-Init + public static void preInit(){ + if (LoadedMods.Growthcraft){ + Register_Booze.preInit(); + } + } + +} diff --git a/src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java b/src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java deleted file mode 100644 index f56830bbb9..0000000000 --- a/src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java +++ /dev/null @@ -1,16 +0,0 @@ -package miscutil.core.xmod.growthcraft; - -import miscutil.core.lib.LoadedMods; -import miscutil.core.xmod.growthcraft.booze.Register_Booze; - -public class HANDLER_Growthcraft { - - - //Run me during Pre-Init - public static void preInit(){ - if (LoadedMods.Growthcraft){ - Register_Booze.preInit(); - } - } - -} diff --git a/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java b/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java new file mode 100644 index 0000000000..278a572f0f --- /dev/null +++ b/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java @@ -0,0 +1,27 @@ +package miscutil.core.xmod.psychedelicraft; + +import miscutil.core.lib.LoadedMods; +import miscutil.core.xmod.psychedelicraft.fluids.PS_Fluids; + + +public class HANDLER_Psych { + + 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/xmod/psychedelicraft/HANDLER_Psychedelicraft.java b/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java deleted file mode 100644 index b4facc6a2d..0000000000 --- a/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java +++ /dev/null @@ -1,27 +0,0 @@ -package miscutil.core.xmod.psychedelicraft; - -import miscutil.core.lib.LoadedMods; -import miscutil.core.xmod.psychedelicraft.fluids.PS_Fluids; - - -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/xmod/thermalfoundation/HANDLER_TF.java b/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java new file mode 100644 index 0000000000..30c16860ba --- /dev/null +++ b/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java @@ -0,0 +1,37 @@ +package miscutil.core.xmod.thermalfoundation; + +import miscutil.core.lib.LoadedMods; +import miscutil.core.xmod.thermalfoundation.block.TF_Blocks; +import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids; +import miscutil.core.xmod.thermalfoundation.item.TF_Items; +import miscutil.core.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes; + +public class HANDLER_TF { + + public static void preInit(){ + if (LoadedMods.CoFHCore){ + TF_Fluids.preInit(); + TF_Items.preInit(); + TF_Blocks.preInit(); + } + } + + public static void init(){ + if (LoadedMods.CoFHCore){ + TF_Fluids.init(); + TF_Blocks.init(); + TF_Items.init(); + } + } + + public static void postInit(){ + if (LoadedMods.CoFHCore){ + TF_Fluids.postInit(); + TF_Items.postInit(); + TF_Blocks.postInit(); + if(LoadedMods.Gregtech){ + TF_Gregtech_Recipes.run(); + } + } + } +} diff --git a/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java b/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java deleted file mode 100644 index 7c77d413e5..0000000000 --- a/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java +++ /dev/null @@ -1,37 +0,0 @@ -package miscutil.core.xmod.thermalfoundation; - -import miscutil.core.lib.LoadedMods; -import miscutil.core.xmod.thermalfoundation.block.TF_Blocks; -import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids; -import miscutil.core.xmod.thermalfoundation.item.TF_Items; -import miscutil.core.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes; - -public class HANDLER_ThermalFoundation { - - public static void preInit(){ - if (LoadedMods.CoFHCore){ - TF_Fluids.preInit(); - TF_Items.preInit(); - TF_Blocks.preInit(); - } - } - - public static void init(){ - if (LoadedMods.CoFHCore){ - TF_Fluids.init(); - TF_Blocks.init(); - TF_Items.init(); - } - } - - public static void postInit(){ - if (LoadedMods.CoFHCore){ - TF_Fluids.postInit(); - TF_Items.postInit(); - TF_Blocks.postInit(); - if(LoadedMods.Gregtech){ - TF_Gregtech_Recipes.run(); - } - } - } -} -- cgit