remove debug code, whoops

This commit is contained in:
primetoxinz committed 2015-12-22 23:17:09 -05:00
1 parent e77678593f
commit 7e0145bf34
3 files changed
+13 -61

No files matched your search

@@ -10,8 +10,6 @@
*/
package vazkii.botania.common;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -25,7 +23,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.common.core.handler.IMCHandler;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.proxy.CommonProxy;
@@ -64,8 +61,7 @@ public class Botania {
etFuturumLoaded = Loader.isModLoaded("etfuturum");
lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla();
// TODO remove this \/
MinecraftForge.EVENT_BUS.register(this);
proxy.preInit(event);
}
@@ -99,11 +95,6 @@ public class Botania {
IMCHandler.processMessages(event.getMessages());
}
// TODO remove this, was for testing
@SubscribeEvent
public void tooltip(ItemTooltipEvent e) {
e.toolTip.add(e.itemStack.getUnlocalizedName() + ":" + e.itemStack.getItemDamage());
}
/*
* @EventHandler public void missingMappings(FMLMissingMappingsEvent event)
* { AliasHandler.onMissingMappings(event); }
@@ -16,20 +16,17 @@ import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lib.LibItemNames;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemManaCookie extends ItemFood {
public ItemManaCookie() {
super(0, 0.1F, false);
setPotionEffect(Potion.saturation.id, 1, 0, 1F);
setPotionEffect(Potion.saturation.id, 1, 0, 1F);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
setUnlocalizedName(LibItemNames.MANA_COOKIE);
}
@@ -48,9 +45,12 @@ public class ItemManaCookie extends ItemFood {
@Override
public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.",
"item." + LibResources.PREFIX_MOD);
}
// todo 1.8 return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack);
// todo 1.8 return
// stack.getDisplayName().toLowerCase().equals("totalbiscuit") ?
// totalBiscuitIcon : super.getIconIndex(stack);
}
@@ -35,34 +35,7 @@ import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelLegs;
import vazkii.botania.common.item.equipment.bauble.ItemAuraRing;
import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic;
import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant;
import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel;
import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing;
import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing;
import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing;
import vazkii.botania.common.item.equipment.bauble.ItemHolyCloak;
import vazkii.botania.common.item.equipment.bauble.ItemIcePendant;
import vazkii.botania.common.item.equipment.bauble.ItemItemFinder;
import vazkii.botania.common.item.equipment.bauble.ItemKnockbackBelt;
import vazkii.botania.common.item.equipment.bauble.ItemLavaPendant;
import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing;
import vazkii.botania.common.item.equipment.bauble.ItemManaRing;
import vazkii.botania.common.item.equipment.bauble.ItemMiningRing;
import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
import vazkii.botania.common.item.equipment.bauble.ItemPixieRing;
import vazkii.botania.common.item.equipment.bauble.ItemReachRing;
import vazkii.botania.common.item.equipment.bauble.ItemSpeedUpBelt;
import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant;
import vazkii.botania.common.item.equipment.bauble.ItemSuperTravelBelt;
import vazkii.botania.common.item.equipment.bauble.ItemSwapRing;
import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet;
import vazkii.botania.common.item.equipment.bauble.ItemTravelBelt;
import vazkii.botania.common.item.equipment.bauble.ItemUnholyCloak;
import vazkii.botania.common.item.equipment.bauble.ItemWaterRing;
import vazkii.botania.common.item.equipment.bauble.*;
import vazkii.botania.common.item.equipment.tool.ItemEnderDagger;
import vazkii.botania.common.item.equipment.tool.ItemGlassPick;
import vazkii.botania.common.item.equipment.tool.ItemStarSword;
@@ -103,19 +76,7 @@ import vazkii.botania.common.item.relic.ItemKingKey;
import vazkii.botania.common.item.relic.ItemLokiRing;
import vazkii.botania.common.item.relic.ItemOdinRing;
import vazkii.botania.common.item.relic.ItemThorRing;
import vazkii.botania.common.item.rod.ItemCobbleRod;
import vazkii.botania.common.item.rod.ItemDirtRod;
import vazkii.botania.common.item.rod.ItemDiviningRod;
import vazkii.botania.common.item.rod.ItemExchangeRod;
import vazkii.botania.common.item.rod.ItemFireRod;
import vazkii.botania.common.item.rod.ItemGravityRod;
import vazkii.botania.common.item.rod.ItemMissileRod;
import vazkii.botania.common.item.rod.ItemRainbowRod;
import vazkii.botania.common.item.rod.ItemSkyDirtRod;
import vazkii.botania.common.item.rod.ItemSmeltRod;
import vazkii.botania.common.item.rod.ItemTerraformRod;
import vazkii.botania.common.item.rod.ItemTornadoRod;
import vazkii.botania.common.item.rod.ItemWaterRod;
import vazkii.botania.common.item.rod.*;
import vazkii.botania.common.lib.LibOreDict;
public final class ModItems {
@@ -319,7 +280,7 @@ public final class ModItems {
terraPick = new ItemTerraPick();
divaCharm = new ItemDivaCharm();
flightTiara = new ItemFlightTiara();
enderDagger = new ItemEnderDagger();
enderDagger = new ItemEnderDagger();
quartz = new ItemQuartz();
waterRod = new ItemWaterRod();
elementiumHelm = new ItemElementiumHelm();
@@ -418,7 +379,7 @@ public final class ModItems {
baubleBox = new ItemBaubleBox();
OreDictionary.registerOre(LibOreDict.LEXICON, lexicon);
for(int i = 0; i < 16; i++) {
for (int i = 0; i < 16; i++) {
OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i));
OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i));
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
@@ -457,7 +418,7 @@ public final class ModItems {
BotaniaAPI.blackListItemFromLoonium(blackLotus);
int min = Item.getIdFromItem(Items.record_13);
int max = Item.getIdFromItem(Items.record_wait);
for(int i = min; i <= max; i++)
for (int i = min; i <= max; i++)
BotaniaAPI.blackListItemFromLoonium(Item.getItemById(i));
OreDictionary.registerOre("rodBlaze", Items.blaze_rod);