mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Merge branch 'MC18' of github.com:primetoxinz/Botania into primetoxinz-MC18
This commit is contained in:
commit
92e90ed2b9
66 files changed
+519
-76
No files matched your search
@@ -24,9 +24,11 @@ import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
|
||||
import vazkii.botania.common.item.ItemGaiaHead;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import static vazkii.botania.common.item.ModItems.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@@ -42,6 +44,7 @@ public final class ModelHandler {
|
||||
registerStateMappers();
|
||||
|
||||
/** ItemBlocks **/
|
||||
registerStandardBlocks();
|
||||
registerStorageItemBlocks();
|
||||
registerMushroomItemBlocks();
|
||||
registerFlowerItemBlocks();
|
||||
@@ -51,15 +54,69 @@ public final class ModelHandler {
|
||||
registerSlabs();
|
||||
registerFullSlabs();
|
||||
registerPanes();
|
||||
registerItemModel(ModBlocks.manaGlass);
|
||||
registerItemModel(ModBlocks.elfGlass);
|
||||
registerPylons();
|
||||
|
||||
/** Normal Items **/
|
||||
registerItemModel(ModItems.lexicon);
|
||||
registerStandardItems();
|
||||
registerManaResources();
|
||||
|
||||
/** Special Item Meshers **/
|
||||
}
|
||||
private static void registerStandardBlocks() {
|
||||
registerItemModel(ModBlocks.manaGlass);
|
||||
registerItemModel(ModBlocks.elfGlass);
|
||||
}
|
||||
private static void registerStandardItems() {
|
||||
registerItemModel(pestleAndMortar);
|
||||
registerItemModel(blackLotus);
|
||||
registerItemModel(blackLotus, 1);
|
||||
registerItemModel(lexicon);
|
||||
|
||||
registerItemModel(manasteelHelm);
|
||||
registerItemModel(manasteelChest);
|
||||
registerItemModel(manasteelLegs);
|
||||
registerItemModel(manasteelBoots);
|
||||
|
||||
registerItemModel(manasteelPick);
|
||||
registerItemModel(manasteelShovel);
|
||||
registerItemModel(manasteelAxe);
|
||||
registerItemModel(manasteelShears);
|
||||
registerItemModel(manasteelSword);
|
||||
|
||||
registerItemModel(elementiumHelm);
|
||||
registerItemModel(elementiumChest);
|
||||
registerItemModel(elementiumLegs);
|
||||
registerItemModel(elementiumBoots);
|
||||
|
||||
registerItemModel(elementiumPick);
|
||||
registerItemModel(elementiumShovel);
|
||||
registerItemModel(elementiumAxe);
|
||||
registerItemModel(elementiumShears);
|
||||
registerItemModel(elementiumSword);
|
||||
|
||||
registerItemModel(manaweaveHelm);
|
||||
registerItemModel(manaweaveChest);
|
||||
registerItemModel(manaweaveLegs);
|
||||
registerItemModel(manaweaveBoots);
|
||||
|
||||
registerItemModel(terrasteelHelm);
|
||||
registerItemModel(terrasteelHelmRevealing);
|
||||
registerItemModel(terrasteelChest);
|
||||
registerItemModel(terrasteelLegs);
|
||||
registerItemModel(terrasteelBoots);
|
||||
|
||||
registerItemModel(starSword);
|
||||
registerItemModel(thunderSword);
|
||||
registerItemModel(glassPick);
|
||||
}
|
||||
private static void registerManaResources() {
|
||||
Item item = manaResource;
|
||||
for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) {
|
||||
String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i];
|
||||
ModelLoader.addVariantName(item, name);
|
||||
ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory"));
|
||||
}
|
||||
}
|
||||
|
||||
private static void registerStateMappers() {
|
||||
// Ignore vanilla variant in flowers
|
||||
@@ -217,11 +274,13 @@ public final class ModelHandler {
|
||||
private static void registerItemModel(Block b) {
|
||||
registerItemModel(Item.getItemFromBlock(b));
|
||||
}
|
||||
|
||||
private static void registerItemModel(Item i) {
|
||||
private static void registerItemModel(Item i,int meta) {
|
||||
ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i);
|
||||
ModelLoader.setCustomModelResourceLocation(i, 0, new ModelResourceLocation(loc, "inventory"));
|
||||
ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory"));
|
||||
}
|
||||
private static void registerItemModel(Item i) {
|
||||
registerItemModel(i, 0);
|
||||
}
|
||||
|
||||
private ModelHandler() {}
|
||||
}
|
||||
}
|
||||
@@ -10,13 +10,6 @@
|
||||
*/
|
||||
package vazkii.botania.common;
|
||||
|
||||
import vazkii.botania.common.core.handler.IMCHandler;
|
||||
import vazkii.botania.common.core.handler.ManaNetworkHandler;
|
||||
import vazkii.botania.common.core.proxy.CommonProxy;
|
||||
import vazkii.botania.common.integration.coloredlights.ILightHelper;
|
||||
import vazkii.botania.common.integration.coloredlights.LightHelperColored;
|
||||
import vazkii.botania.common.integration.coloredlights.LightHelperVanilla;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventHandler;
|
||||
@@ -30,6 +23,13 @@ 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 vazkii.botania.common.core.handler.IMCHandler;
|
||||
import vazkii.botania.common.core.handler.ManaNetworkHandler;
|
||||
import vazkii.botania.common.core.proxy.CommonProxy;
|
||||
import vazkii.botania.common.integration.coloredlights.ILightHelper;
|
||||
import vazkii.botania.common.integration.coloredlights.LightHelperColored;
|
||||
import vazkii.botania.common.integration.coloredlights.LightHelperVanilla;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY)
|
||||
public class Botania {
|
||||
@@ -64,6 +64,7 @@ public class Botania {
|
||||
|
||||
proxy.preInit(event);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void init(FMLInitializationEvent event) {
|
||||
proxy.init(event);
|
||||
@@ -94,8 +95,8 @@ public class Botania {
|
||||
IMCHandler.processMessages(event.getMessages());
|
||||
}
|
||||
|
||||
/*@EventHandler
|
||||
public void missingMappings(FMLMissingMappingsEvent event) {
|
||||
AliasHandler.onMissingMappings(event);
|
||||
}*/
|
||||
/*
|
||||
* @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);
|
||||
|
||||
Reference in new issue
Block a user