diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3d0dee6e8..30d399d8d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 211ae5a57..9397848f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 27 18:34:11 EDT 2014 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip +#Mon Sep 14 12:28:28 PDT 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip 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 0b2f7318a..69832fa8e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -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() {} -} +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 151f73802..51df139d4 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -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); } + */ } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 60b40037d..f194ddbae 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 5b8c67e09..c7511c368 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -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); 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..0fdd68e10 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackLotus.json @@ -0,0 +1,7 @@ +{ + "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..0a84472a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/createFiles.sh @@ -0,0 +1,9 @@ +#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'); +Files=('glassPick' 'starSword' 'thunderSword') +#Files=( 'Pick' 'Shovel' 'Axe' 'Sword' 'Shears') +Type="standard_tool" +for i in "${Files[@]}";do + FileFormat="{\"parent\":\"botania:item/$Type\",\"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..fe4171316 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dragonstone.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/dragonstone" + } +} \ No newline at end of file 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..ad4cc65c0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/dreamwoodTwig" + } +} \ No newline at end of file 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..20557e911 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementium.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumAxe.json b/src/main/resources/assets/botania/models/item/elementiumAxe.json new file mode 100644 index 000000000..fde365304 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumAxe.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumAxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumBoots.json b/src/main/resources/assets/botania/models/item/elementiumBoots.json new file mode 100644 index 000000000..3b3eac354 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumBoots.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumChest.json b/src/main/resources/assets/botania/models/item/elementiumChest.json new file mode 100644 index 000000000..abd22195e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumChest.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumHelm.json b/src/main/resources/assets/botania/models/item/elementiumHelm.json new file mode 100644 index 000000000..d599aa5b3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumHelm.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumLegs.json b/src/main/resources/assets/botania/models/item/elementiumLegs.json new file mode 100644 index 000000000..4f5b4eda4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumLegs.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumLegs" + } +} \ No newline at end of file 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..4083a6e44 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumNugget.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumPick.json b/src/main/resources/assets/botania/models/item/elementiumPick.json new file mode 100644 index 000000000..4c71badcf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumPick.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumShears.json new file mode 100644 index 000000000..c7c41a82c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumShears" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShovel.json b/src/main/resources/assets/botania/models/item/elementiumShovel.json new file mode 100644 index 000000000..cda4564a9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumShovel.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumShovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumSword.json b/src/main/resources/assets/botania/models/item/elementiumSword.json new file mode 100644 index 000000000..e5f75013b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumSword.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumSword" + } +} \ No newline at end of file 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..ba6b1497e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderAirBottle.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/enderAirBottle" + } +} \ No newline at end of file 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..03650aabd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gaiaIngot.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/gaiaIngot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/glassPick.json b/src/main/resources/assets/botania/models/item/glassPick.json new file mode 100644 index 000000000..ae9b40053 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/glassPick.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/glassPick" + } +} \ No newline at end of file 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..25cdc3ac4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lifeEssence.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/lifeEssence" + } +} \ No newline at end of file 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..82e629f29 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodTwig.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/livingwoodTwig" + } +} \ No newline at end of file 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..ec6de6840 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaDiamond.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaDiamond" + } +} \ No newline at end of file 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..d52005f58 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaPearl.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaPearl" + } +} \ No newline at end of file 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..b22f30d7c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaPowder.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaPowder" + } +} \ No newline at end of file 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..aafad4fca --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaString.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaString" + } +} \ No newline at end of file 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..c6bc8b4a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteel.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelAxe.json b/src/main/resources/assets/botania/models/item/manasteelAxe.json new file mode 100644 index 000000000..3618e4037 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelAxe.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelAxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelBoots.json b/src/main/resources/assets/botania/models/item/manasteelBoots.json new file mode 100644 index 000000000..c48a7313f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelBoots.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelChest.json b/src/main/resources/assets/botania/models/item/manasteelChest.json new file mode 100644 index 000000000..50c29c8b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelChest.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelHelm.json b/src/main/resources/assets/botania/models/item/manasteelHelm.json new file mode 100644 index 000000000..fd7b58c68 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelHelm.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelLegs.json b/src/main/resources/assets/botania/models/item/manasteelLegs.json new file mode 100644 index 000000000..f9a1e7d53 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelLegs.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelLegs" + } +} \ No newline at end of file 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..29c5a61d6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelNugget.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelPick.json b/src/main/resources/assets/botania/models/item/manasteelPick.json new file mode 100644 index 000000000..66e17bb4c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelPick.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShears.json b/src/main/resources/assets/botania/models/item/manasteelShears.json new file mode 100644 index 000000000..bd49d11d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelShears.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelShears" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShovel.json b/src/main/resources/assets/botania/models/item/manasteelShovel.json new file mode 100644 index 000000000..979e63daf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelShovel.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelShovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelSword.json b/src/main/resources/assets/botania/models/item/manasteelSword.json new file mode 100644 index 000000000..8bbcfee9c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelSword.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveBoots.json new file mode 100644 index 000000000..818be5b7e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json new file mode 100644 index 000000000..20cdebbb7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveBootsHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweaveChest.json new file mode 100644 index 000000000..4e5a0a1bf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json new file mode 100644 index 000000000..6bde05c69 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveChestHoliday" + } +} \ No newline at end of file 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..1fd6ddc37 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveCloth.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveCloth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweaveHelm.json new file mode 100644 index 000000000..e3ec41e5e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json new file mode 100644 index 000000000..8ca9c66fb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveHelmHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweaveLegs.json new file mode 100644 index 000000000..fde3761e3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json new file mode 100644 index 000000000..b2f6bb10b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveLegsHoliday" + } +} \ No newline at end of file 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..709f876ae --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pebble.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pebble" + } +} \ No newline at end of file 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..0ac7b0451 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pestleAndMortar.json @@ -0,0 +1,7 @@ +{ + "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..e89d13f8a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pixieDust.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pixieDust" + } +} \ No newline at end of file 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..49f092321 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/placeholder.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/placeholder" + } +} \ No newline at end of file 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..d87bab9a4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/prismarineShard" + } +} \ No newline at end of file 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..6a4dce193 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redString.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/redString" + } +} \ No newline at end of file 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..02a8b6173 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redstoneRoot.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/redstoneRoot" + } +} \ No newline at end of file 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..0d2f7b73d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/root.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/root" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starSword.json b/src/main/resources/assets/botania/models/item/starSword.json new file mode 100644 index 000000000..bd9e12c03 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/starSword.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/starSword" + } +} \ No newline at end of file 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..33d20773a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteel.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelBoots.json b/src/main/resources/assets/botania/models/item/terrasteelBoots.json new file mode 100644 index 000000000..4de87776d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelBoots.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelChest.json b/src/main/resources/assets/botania/models/item/terrasteelChest.json new file mode 100644 index 000000000..c09a12720 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelChest.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelm.json b/src/main/resources/assets/botania/models/item/terrasteelHelm.json new file mode 100644 index 000000000..ceadee6f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelHelm.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelLegs.json b/src/main/resources/assets/botania/models/item/terrasteelLegs.json new file mode 100644 index 000000000..80ab18f37 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelLegs.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelLegs" + } +} \ No newline at end of file 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..548329dc1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelNugget.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thunderSword.json b/src/main/resources/assets/botania/models/item/thunderSword.json new file mode 100644 index 000000000..aee5fd5ab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thunderSword.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/thunderSword" + } +} \ No newline at end of file