diff --git a/Botania_Client.launch b/Botania_Client.launch new file mode 100644 index 000000000..529e48409 --- /dev/null +++ b/Botania_Client.launch @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Botania_Server.launch b/Botania_Server.launch new file mode 100644 index 000000000..467a47ede --- /dev/null +++ b/Botania_Server.launch @@ -0,0 +1 @@ + \ No newline at end of file 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 106aa8a83..2b34508c3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,5 +1,7 @@ package vazkii.botania.client.core.handler; +import static vazkii.botania.common.item.ModItems.*; + import java.util.List; import com.google.common.collect.ImmutableList; @@ -23,7 +25,6 @@ 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; public final class ModelHandler { @@ -62,12 +63,47 @@ public final class ModelHandler { } 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); + 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 registerStateMappers() { @@ -243,7 +279,7 @@ public final class ModelHandler { } private static void registerManaResources() { - Item item = ModItems.manaResource; + 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); diff --git a/src/main/resources/assets/botania/models/item/createFiles.sh b/src/main/resources/assets/botania/models/item/createFiles.sh index c5739f8bf..0a84472a3 100755 --- a/src/main/resources/assets/botania/models/item/createFiles.sh +++ b/src/main/resources/assets/botania/models/item/createFiles.sh @@ -1,7 +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=('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/standard_item\",\"textures\":{\"layer0\":\"botania:items/$i\"}}" - echo $FileFormat >> $i".json" + 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/elementiumAxe.json b/src/main/resources/assets/botania/models/item/elementiumAxe.json new file mode 100644 index 000000000..85e484dba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumAxe.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumAxe"}} 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..0ff1659ae --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumBoots"}} 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..da61c403c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumChest"}} 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..7a9289ea5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumHelm"}} 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..2c4b207e1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumLegs"}} 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..1ad0b5d21 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumPick.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumPick"}} 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..5d1b51376 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShears"}} 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..75229c4c9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumShovel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShovel"}} 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..9021143a9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumSword"}} 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..b8406e26c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/glassPick.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/glassPick"}} 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..46e580d2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelAxe.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelAxe"}} 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..ccff5d9f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelBoots"}} 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..2d81f27c0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelChest"}} 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..d003d0003 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelHelm"}} 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..809e37fce --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelLegs"}} 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..b97a22ec1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelPick.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelPick"}} 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..658c3d499 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelShears.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShears"}} 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..f1172ad55 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelShovel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShovel"}} 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..caf784268 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelSword"}} 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..478b74859 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBoots"}} 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..ed06cdca9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBootsHoliday"}} 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..35ab59a9e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChest"}} 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..acd1cd398 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChestHoliday"}} 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..7cdfc5a0c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelm"}} 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..7de483baa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelmHoliday"}} 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..65d4b9b57 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegs"}} 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..769acc423 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegsHoliday"}} 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..61fc5fba0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/starSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/starSword"}} 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..ba51f3bdf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelBoots"}} 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..aef53a086 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelChest"}} 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..ee6cf6802 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelHelm"}} 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..c3172b010 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelLegs"}} 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..cca0b971f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thunderSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/thunderSword"}}