mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-13 00:37:51 +00:00
cursed shit
This commit is contained in:
1 parent
573c089b96
commit
9d36165259
3 files changed
+13
-11
No files matched your search
@@ -16,7 +16,6 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.utils.TabMagicBees;
|
||||
import magicbees.tileentity.TileEntityApiamancersDrainerCommon;
|
||||
import magicbees.tileentity.TileEntityApiamancersDrainerGT;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.IEssentiaContainerItem;
|
||||
|
||||
@@ -25,6 +24,8 @@ public class BlockApiamancersDrainer extends BlockContainer {
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon[] icons;
|
||||
|
||||
public static Class<? extends TileEntity> drainer = TileEntityApiamancersDrainerCommon.class;
|
||||
|
||||
public BlockApiamancersDrainer() {
|
||||
super(Material.rock);
|
||||
this.setCreativeTab(TabMagicBees.tabMagicBees);
|
||||
@@ -36,8 +37,11 @@ public class BlockApiamancersDrainer extends BlockContainer {
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int metadata) {
|
||||
return TileEntityApiamancersDrainerGT.isGTLoaded ? new TileEntityApiamancersDrainerGT()
|
||||
: new TileEntityApiamancersDrainerCommon();
|
||||
try {
|
||||
return drainer.newInstance();
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,6 +14,7 @@ import net.minecraftforge.common.config.Property;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
@@ -57,7 +58,6 @@ import magicbees.main.utils.VersionInfo;
|
||||
import magicbees.main.utils.compat.BotaniaHelper;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import magicbees.storage.BackpackDefinition;
|
||||
import magicbees.tileentity.TileEntityApiamancersDrainerCommon;
|
||||
import magicbees.tileentity.TileEntityApiamancersDrainerGT;
|
||||
import magicbees.tileentity.TileEntityEffectJar;
|
||||
import magicbees.tileentity.TileEntityMagicApiary;
|
||||
@@ -163,6 +163,9 @@ public class Config {
|
||||
// ----- Config State info ----------------------------------
|
||||
public static Configuration configuration;
|
||||
|
||||
// ---- Loaded mods -----------------------------------------
|
||||
public static boolean isGTLoaded = Loader.isModLoaded("gregtech");
|
||||
|
||||
public Config(File configFile) {
|
||||
configuration = new Configuration(configFile);
|
||||
configuration.load();
|
||||
@@ -504,12 +507,10 @@ public class Config {
|
||||
GameRegistry.registerBlock(visAuraProvider, "visAuraProvider");
|
||||
GameRegistry.registerTileEntity(TileEntityVisAuraProvider.class, "visAuraProvider");
|
||||
|
||||
if (isGTLoaded) BlockApiamancersDrainer.drainer = TileEntityApiamancersDrainerGT.class;
|
||||
apiamancersDrainer = new BlockApiamancersDrainer();
|
||||
GameRegistry.registerBlock(apiamancersDrainer, "apiamancersDrainer");
|
||||
GameRegistry.registerTileEntity(
|
||||
TileEntityApiamancersDrainerGT.isGTLoaded ? TileEntityApiamancersDrainerGT.class
|
||||
: TileEntityApiamancersDrainerCommon.class,
|
||||
"apiamancersDrainer");
|
||||
GameRegistry.registerTileEntity(BlockApiamancersDrainer.drainer, "apiamancersDrainer");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
@@ -18,8 +17,6 @@ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_IndustrialA
|
||||
public class TileEntityApiamancersDrainerGT extends TileEntityApiamancersDrainerCommon
|
||||
implements IGregTechDeviceInformation {
|
||||
|
||||
public static boolean isGTLoaded = Loader.isModLoaded("gregtech");
|
||||
|
||||
@Override
|
||||
public boolean isGivingInformation() {
|
||||
return true;
|
||||
|
||||
Reference in new issue
Block a user