mirror of
https://github.com/GTNewHorizons/ForbiddenMagic.git
synced 2026-11-22 04:52:22 +00:00
Removing unnecessary class
This commit is contained in:
1 parent
624390d398
commit
33437f214c
2 files changed
+15
-30
No files matched your search
@@ -1,7 +1,9 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import fox.spiteful.forbidden.potions.DarkPotions;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import thaumcraft.api.wands.WandTriggerRegistry;
|
||||
|
||||
@@ -22,8 +24,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
public class Forbidden {
|
||||
@Instance("ForbiddenMagic")
|
||||
public static Forbidden instance;
|
||||
public static ForbiddenTab tab = new ForbiddenTab("forbidden");
|
||||
public static ForbiddenTab crysTab;
|
||||
public static CreativeTabs tab = new CreativeTabs("forbidden"){
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return ForbiddenItems.fork;
|
||||
}
|
||||
};
|
||||
public static CreativeTabs crysTab;
|
||||
@SidedProxy(clientSide = "fox.spiteful.forbidden.client.ClientProxy", serverSide = "fox.spiteful.forbidden.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
public static WandOverlord wandLord;
|
||||
@@ -33,7 +40,12 @@ public class Forbidden {
|
||||
instance = this;
|
||||
Config.configurate(event.getSuggestedConfigurationFile());
|
||||
if (Config.wrathCage)
|
||||
crysTab = new ForbiddenTab("mobcrystal", true);
|
||||
crysTab = new CreativeTabs("mobcrystal"){
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return ForbiddenItems.mobCrystal;
|
||||
}
|
||||
};
|
||||
Compat.initiate();
|
||||
DarkAspects.initAspects();
|
||||
Config.spawnilify();
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
package fox.spiteful.forbidden;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
|
||||
public final class ForbiddenTab extends CreativeTabs {
|
||||
private boolean crystal = false;
|
||||
|
||||
public ForbiddenTab(String tabName) {
|
||||
super(tabName);
|
||||
}
|
||||
|
||||
public ForbiddenTab(String tabName, boolean mobCrystal) {
|
||||
super(tabName);
|
||||
crystal = mobCrystal;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
if (!crystal)
|
||||
return ForbiddenItems.fork;
|
||||
else
|
||||
return ForbiddenItems.mobCrystal;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user