diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 6c05414a8..106aa8a83 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,16 +1,17 @@ package vazkii.botania.client.core.handler; +import java.util.List; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; @@ -23,191 +24,245 @@ 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 java.util.List; +import vazkii.botania.common.lib.LibItemNames; public final class ModelHandler { - // Very hardocode-y right now. Will be refactored after things work. - // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). - // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files - public static void registerModels() { - /** Custom statemappers **/ - registerStateMappers(); + // Very hardocode-y right now. Will be refactored after things work. + // In addition, many of the jsons currently use the vanilla format (simple + // and verified bug-free). + // Once things settle down, we'll move to forge jsons, which will + // drastically cut down on the number of json files + public static void registerModels() { + /** Custom statemappers **/ + registerStateMappers(); - /** ItemBlocks **/ - registerStorageItemBlocks(); - registerMushroomItemBlocks(); - registerFlowerItemBlocks(); - registerLivingRockWood(); - registerAltGrass(); - registerStairs(); - registerSlabs(); - registerFullSlabs(); - registerPanes(); - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); + /** ItemBlocks **/ + registerStorageItemBlocks(); + registerMushroomItemBlocks(); + registerFlowerItemBlocks(); + registerLivingRockWood(); + registerAltGrass(); + registerStairs(); + registerSlabs(); + registerFullSlabs(); + registerPanes(); + registerStandardItems(); + registerStandardBlocks(); + registerManaResources(); + /** Normal Items **/ - /** Normal Items **/ - registerItemModel(ModItems.lexicon); + /** Special Item Meshers **/ + } - /** Special Item Meshers **/ - } + private static void registerStandardBlocks() { + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); - private static void registerStateMappers() { - // Ignore vanilla variant in flowers - ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + } - // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + private static void registerStandardItems() { + registerItemModel(ModItems.pestleAndMortar); + registerItemModel(ModItems.blackLotus); + registerItemModel(ModItems.blackLotus, 1); + registerItemModel(ModItems.lexicon); + registerItemModel(ModItems.manaResource, 0); + registerItemModel(ModItems.manaResource, 1); + } - // Ignore dummy variant in slabs - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + private static void registerStateMappers() { + // Ignore vanilla variant in flowers + ModelLoader.setCustomStateMapper(ModBlocks.flower, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); - for (Block b : ModFluffBlocks.pavementSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + // Ignore vanilla variant in walls + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - for (Block b : ModFluffBlocks.stoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + // Ignore dummy variant in slabs + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - List otherSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, - ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, - ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab - }); + for (Block b : ModFluffBlocks.pavementSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - for (Block b : otherSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + for (Block b : ModFluffBlocks.stoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - // Ignore both dummy variant and half prop in full slabs - for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + List otherSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlab, + ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, + ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, + ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, + ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, + ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab }); - for (Block b : ModFluffBlocks.pavementFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + for (Block b : otherSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - for (Block b : ModFluffBlocks.stoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + // Ignore both dummy variant and half prop in full slabs + for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - List otherFullSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, - ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, - ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, - ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull - }); + for (Block b : ModFluffBlocks.pavementFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - for (Block b : otherFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - } + for (Block b : ModFluffBlocks.stoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - private static void registerAltGrass() { - Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); - for (AltGrassVariant variant : AltGrassVariant.values()) { - String name = "botania:altGrass_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } + List otherFullSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlabFull, + ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, + ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, + ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, + ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, + ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, + ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, + ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, + ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, + ModFluffBlocks.sunnyQuartzSlabFull }); - private static void registerStorageItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.storage); - for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:storage_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } + for (Block b : otherFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } - private static void registerMushroomItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.mushroom); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:mushroom_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); - } - } + private static void registerAltGrass() { + Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); + for (AltGrassVariant variant : AltGrassVariant.values()) { + String name = "botania:altGrass_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerFlowerItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.flower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:flower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); - } + private static void registerStorageItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.storage); + for (StorageVariant variant : StorageVariant.values()) { + String name = "botania:storage_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } + } - item = Item.getItemFromBlock(ModBlocks.shinyFlower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:shinyFlower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); - } - } + private static void registerMushroomItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.mushroom); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:mushroom_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerLivingRockWood() { - Item item = Item.getItemFromBlock(ModBlocks.livingrock); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:livingrock_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } + private static void registerFlowerItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.flower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:flower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), + new ModelResourceLocation(name, "inventory")); + } - item = Item.getItemFromBlock(ModBlocks.livingwood); - for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:livingwood_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } + item = Item.getItemFromBlock(ModBlocks.shinyFlower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:shinyFlower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerStairs() { - registerItemModel(ModFluffBlocks.livingwoodStairs); - registerItemModel(ModFluffBlocks.livingwoodPlankStairs); - registerItemModel(ModFluffBlocks.livingrockStairs); - registerItemModel(ModFluffBlocks.livingrockBrickStairs); + private static void registerLivingRockWood() { + Item item = Item.getItemFromBlock(ModBlocks.livingrock); + for (LivingRockVariant variant : LivingRockVariant.values()) { + String name = "botania:livingrock_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } - } + item = Item.getItemFromBlock(ModBlocks.livingwood); + for (LivingWoodVariant variant : LivingWoodVariant.values()) { + String name = "botania:livingwood_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerSlabs() { + private static void registerStairs() { + registerItemModel(ModFluffBlocks.livingwoodStairs); + registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + registerItemModel(ModFluffBlocks.livingrockStairs); + registerItemModel(ModFluffBlocks.livingrockBrickStairs); - } + } - private static void registerFullSlabs() { + private static void registerSlabs() { - } + } - private static void registerPanes() { + private static void registerFullSlabs() { - } + } - private static void registerItemModel(Block b) { - registerItemModel(Item.getItemFromBlock(b)); - } + private static void registerPanes() { - private static void registerItemModel(Item i) { - ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); - ModelLoader.setCustomModelResourceLocation(i, 0, new ModelResourceLocation(loc, "inventory")); - } + } + + private static void registerManaResources() { + Item item = ModItems.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 registerItemModel(Block b) { + registerItemModel(Item.getItemFromBlock(b)); + } + + private static void registerItemModel(Item i) { + registerItemModel(i, 0); + } + + private static void registerItemModel(Item i, int meta) { + ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); + System.out.println(loc); + ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); + } - private ModelHandler() {} } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 151f73802..3b2b83ef6 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,13 +10,8 @@ */ 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.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; @@ -30,6 +25,14 @@ 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; +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 { @@ -61,9 +64,11 @@ public class Botania { etFuturumLoaded = Loader.isModLoaded("etfuturum"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); - + // TODO remove this \/ + MinecraftForge.EVENT_BUS.register(this); proxy.preInit(event); } + @EventHandler public void init(FMLInitializationEvent event) { proxy.init(event); @@ -94,8 +99,13 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } - /*@EventHandler - public void missingMappings(FMLMissingMappingsEvent event) { - AliasHandler.onMissingMappings(event); - }*/ + // 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); } + */ } diff --git a/src/main/resources/assets/botania/models/item/blackLotus.json b/src/main/resources/assets/botania/models/item/blackLotus.json new file mode 100644 index 000000000..68a694482 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackLotus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/blackLotus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/createFiles.sh b/src/main/resources/assets/botania/models/item/createFiles.sh new file mode 100755 index 000000000..c5739f8bf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/createFiles.sh @@ -0,0 +1,7 @@ +Files=('manasteel' 'manaPearl' 'manaDiamond' 'livingwoodTwig' 'terrasteel' 'lifeEssence' 'redstoneRoot' 'elementium' 'pixieDust' 'dragonstone' 'prismarineShard' 'placeholder' 'redString' 'dreamwoodTwig' 'gaiaIngot' 'enderAirBottle' +'manaString' 'manasteelNugget' 'terrasteelNugget' 'elementiumNugget' 'root' 'pebble' 'manaweaveCloth' 'manaPowder'); + +for i in "${Files[@]}";do + FileFormat="{\"parent\":\"botania:item/standard_item\",\"textures\":{\"layer0\":\"botania:items/$i\"}}" + echo $FileFormat >> $i".json" +done diff --git a/src/main/resources/assets/botania/models/item/dragonstone.json b/src/main/resources/assets/botania/models/item/dragonstone.json new file mode 100644 index 000000000..3f40ad93e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dragonstone.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dragonstone"}} diff --git a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json new file mode 100644 index 000000000..9ac500966 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dreamwoodTwig"}} diff --git a/src/main/resources/assets/botania/models/item/elementium.json b/src/main/resources/assets/botania/models/item/elementium.json new file mode 100644 index 000000000..1ea04b844 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementium.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementium"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumNugget.json b/src/main/resources/assets/botania/models/item/elementiumNugget.json new file mode 100644 index 000000000..809ecbc9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumNugget.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumNugget"}} diff --git a/src/main/resources/assets/botania/models/item/enderAirBottle.json b/src/main/resources/assets/botania/models/item/enderAirBottle.json new file mode 100644 index 000000000..02103d348 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderAirBottle.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/enderAirBottle"}} diff --git a/src/main/resources/assets/botania/models/item/gaiaIngot.json b/src/main/resources/assets/botania/models/item/gaiaIngot.json new file mode 100644 index 000000000..3acfe0742 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gaiaIngot.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/gaiaIngot"}} diff --git a/src/main/resources/assets/botania/models/item/lifeEssence.json b/src/main/resources/assets/botania/models/item/lifeEssence.json new file mode 100644 index 000000000..e4101a4af --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lifeEssence.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/lifeEssence"}} diff --git a/src/main/resources/assets/botania/models/item/livingwoodTwig.json b/src/main/resources/assets/botania/models/item/livingwoodTwig.json new file mode 100644 index 000000000..195e38efa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodTwig.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/livingwoodTwig"}} diff --git a/src/main/resources/assets/botania/models/item/manaDiamond.json b/src/main/resources/assets/botania/models/item/manaDiamond.json new file mode 100644 index 000000000..759281745 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaDiamond.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaDiamond"}} diff --git a/src/main/resources/assets/botania/models/item/manaPearl.json b/src/main/resources/assets/botania/models/item/manaPearl.json new file mode 100644 index 000000000..087c473bd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaPearl.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPearl"}} diff --git a/src/main/resources/assets/botania/models/item/manaPowder.json b/src/main/resources/assets/botania/models/item/manaPowder.json new file mode 100644 index 000000000..9df90c85a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaPowder.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPowder"}} diff --git a/src/main/resources/assets/botania/models/item/manaString.json b/src/main/resources/assets/botania/models/item/manaString.json new file mode 100644 index 000000000..08fadb23f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaString.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaString"}} diff --git a/src/main/resources/assets/botania/models/item/manasteel.json b/src/main/resources/assets/botania/models/item/manasteel.json new file mode 100644 index 000000000..a9a5973d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteel"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelNugget.json b/src/main/resources/assets/botania/models/item/manasteelNugget.json new file mode 100644 index 000000000..12fb2b672 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelNugget.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelNugget"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveCloth.json b/src/main/resources/assets/botania/models/item/manaweaveCloth.json new file mode 100644 index 000000000..fd1ceb9fd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveCloth.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveCloth"}} diff --git a/src/main/resources/assets/botania/models/item/pebble.json b/src/main/resources/assets/botania/models/item/pebble.json new file mode 100644 index 000000000..60a49dc9f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pebble.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pebble"}} diff --git a/src/main/resources/assets/botania/models/item/pestleAndMortar.json b/src/main/resources/assets/botania/models/item/pestleAndMortar.json new file mode 100644 index 000000000..ddf772436 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pestleAndMortar.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/pestleAndMortar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieDust.json b/src/main/resources/assets/botania/models/item/pixieDust.json new file mode 100644 index 000000000..23612dd34 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pixieDust.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pixieDust"}} diff --git a/src/main/resources/assets/botania/models/item/placeholder.json b/src/main/resources/assets/botania/models/item/placeholder.json new file mode 100644 index 000000000..f5059861c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/placeholder.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/placeholder"}} diff --git a/src/main/resources/assets/botania/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineShard.json new file mode 100644 index 000000000..f7cdeea95 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/prismarineShard"}} diff --git a/src/main/resources/assets/botania/models/item/redString.json b/src/main/resources/assets/botania/models/item/redString.json new file mode 100644 index 000000000..53a201b2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redString.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redString"}} diff --git a/src/main/resources/assets/botania/models/item/redstoneRoot.json b/src/main/resources/assets/botania/models/item/redstoneRoot.json new file mode 100644 index 000000000..5d8b915d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redstoneRoot.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redstoneRoot"}} diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/root.json new file mode 100644 index 000000000..b8b664832 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/root.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/root"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteel.json b/src/main/resources/assets/botania/models/item/terrasteel.json new file mode 100644 index 000000000..10d7c5e58 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteel"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteelNugget.json b/src/main/resources/assets/botania/models/item/terrasteelNugget.json new file mode 100644 index 000000000..34a7681a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelNugget.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelNugget"}}