Skip to content

Commit 9f429c7

Browse files
primetoxinzprimetoxinz
committed
Added most tools and armour models
1 parent 305b99b commit 9f429c7

39 files changed

+92
-19
lines changed

‎Botania_Client.launch

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Botania"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/tyler/programming/Botania/eclipse/assets"/></launchConfiguration>

‎Botania_Server.launch

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Botania"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/tyler/programming/Botania/eclipse/assets"/></launchConfiguration>

‎gradle/wrapper/gradle-wrapper.jar

1.22 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Oct 27 18:34:11 EDT 2014
2-
distributionBase=GRADLE_USER_HOME
3-
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
1+
#Mon Sep 14 12:28:28 PDT 2015
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

‎src/main/java/vazkii/botania/client/core/handler/ModelHandler.java

+44-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package vazkii.botania.client.core.handler;
22

3+
import static vazkii.botania.common.item.ModItems.*;
4+
35
import java.util.List;
46

57
import com.google.common.collect.ImmutableList;
@@ -23,7 +25,6 @@
2325
import vazkii.botania.common.block.ModFluffBlocks;
2426
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
2527
import vazkii.botania.common.item.ItemGaiaHead;
26-
import vazkii.botania.common.item.ModItems;
2728
import vazkii.botania.common.lib.LibItemNames;
2829

2930
public final class ModelHandler {
@@ -62,12 +63,47 @@ private static void registerStandardBlocks() {
6263
}
6364

6465
private static void registerStandardItems() {
65-
registerItemModel(ModItems.pestleAndMortar);
66-
registerItemModel(ModItems.blackLotus);
67-
registerItemModel(ModItems.blackLotus, 1);
68-
registerItemModel(ModItems.lexicon);
69-
registerItemModel(ModItems.manaResource, 0);
70-
registerItemModel(ModItems.manaResource, 1);
66+
registerItemModel(pestleAndMortar);
67+
registerItemModel(blackLotus);
68+
registerItemModel(blackLotus, 1);
69+
registerItemModel(lexicon);
70+
71+
registerItemModel(manasteelHelm);
72+
registerItemModel(manasteelChest);
73+
registerItemModel(manasteelLegs);
74+
registerItemModel(manasteelBoots);
75+
76+
registerItemModel(manasteelPick);
77+
registerItemModel(manasteelShovel);
78+
registerItemModel(manasteelAxe);
79+
registerItemModel(manasteelShears);
80+
registerItemModel(manasteelSword);
81+
82+
registerItemModel(elementiumHelm);
83+
registerItemModel(elementiumChest);
84+
registerItemModel(elementiumLegs);
85+
registerItemModel(elementiumBoots);
86+
87+
registerItemModel(elementiumPick);
88+
registerItemModel(elementiumShovel);
89+
registerItemModel(elementiumAxe);
90+
registerItemModel(elementiumShears);
91+
registerItemModel(elementiumSword);
92+
93+
registerItemModel(manaweaveHelm);
94+
registerItemModel(manaweaveChest);
95+
registerItemModel(manaweaveLegs);
96+
registerItemModel(manaweaveBoots);
97+
98+
registerItemModel(terrasteelHelm);
99+
registerItemModel(terrasteelHelmRevealing);
100+
registerItemModel(terrasteelChest);
101+
registerItemModel(terrasteelLegs);
102+
registerItemModel(terrasteelBoots);
103+
104+
registerItemModel(starSword);
105+
registerItemModel(thunderSword);
106+
registerItemModel(glassPick);
71107
}
72108

73109
private static void registerStateMappers() {
@@ -243,7 +279,7 @@ private static void registerPanes() {
243279
}
244280

245281
private static void registerManaResources() {
246-
Item item = ModItems.manaResource;
282+
Item item = manaResource;
247283
for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) {
248284
String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i];
249285
ModelLoader.addVariantName(item, name);

‎src/main/resources/assets/botania/models/item/createFiles.sh

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
Files=('manasteel' 'manaPearl' 'manaDiamond' 'livingwoodTwig' 'terrasteel' 'lifeEssence' 'redstoneRoot' 'elementium' 'pixieDust' 'dragonstone' 'prismarineShard' 'placeholder' 'redString' 'dreamwoodTwig' 'gaiaIngot' 'enderAirBottle'
2-
'manaString' 'manasteelNugget' 'terrasteelNugget' 'elementiumNugget' 'root' 'pebble' 'manaweaveCloth' 'manaPowder');
3-
1+
#Files=('manasteel' 'manaPearl' 'manaDiamond' 'livingwoodTwig' 'terrasteel' 'lifeEssence' 'redstoneRoot' 'elementium' 'pixieDust' 'dragonstone' 'prismarineShard' 'placeholder' 'redString' 'dreamwoodTwig' 'gaiaIngot' 'enderAirBottle'
2+
#'manaString' 'manasteelNugget' 'terrasteelNugget' 'elementiumNugget' 'root' 'pebble' 'manaweaveCloth' 'manaPowder');
3+
Files=('glassPick' 'starSword' 'thunderSword')
4+
#Files=( 'Pick' 'Shovel' 'Axe' 'Sword' 'Shears')
5+
Type="standard_tool"
46
for i in "${Files[@]}";do
5-
FileFormat="{\"parent\":\"botania:item/standard_item\",\"textures\":{\"layer0\":\"botania:items/$i\"}}"
6-
echo $FileFormat >> $i".json"
7+
FileFormat="{\"parent\":\"botania:item/$Type\",\"textures\":{\"layer0\":\"botania:items/$i\"}}"
8+
echo $FileFormat >> "$i.json"
79
done

‎src/main/resources/assets/botania/models/item/elementiumAxe.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumAxe"}}

‎src/main/resources/assets/botania/models/item/elementiumBoots.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumBoots"}}

‎src/main/resources/assets/botania/models/item/elementiumChest.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumChest"}}

‎src/main/resources/assets/botania/models/item/elementiumHelm.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumHelm"}}

‎src/main/resources/assets/botania/models/item/elementiumLegs.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumLegs"}}

‎src/main/resources/assets/botania/models/item/elementiumPick.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumPick"}}

‎src/main/resources/assets/botania/models/item/elementiumShears.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShears"}}

‎src/main/resources/assets/botania/models/item/elementiumShovel.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShovel"}}

‎src/main/resources/assets/botania/models/item/elementiumSword.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumSword"}}

‎src/main/resources/assets/botania/models/item/glassPick.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/glassPick"}}

‎src/main/resources/assets/botania/models/item/manasteelAxe.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelAxe"}}

‎src/main/resources/assets/botania/models/item/manasteelBoots.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelBoots"}}

‎src/main/resources/assets/botania/models/item/manasteelChest.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelChest"}}

‎src/main/resources/assets/botania/models/item/manasteelHelm.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelHelm"}}

‎src/main/resources/assets/botania/models/item/manasteelLegs.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelLegs"}}

‎src/main/resources/assets/botania/models/item/manasteelPick.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelPick"}}

‎src/main/resources/assets/botania/models/item/manasteelShears.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShears"}}

‎src/main/resources/assets/botania/models/item/manasteelShovel.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShovel"}}

‎src/main/resources/assets/botania/models/item/manasteelSword.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelSword"}}

‎src/main/resources/assets/botania/models/item/manaweaveBoots.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBoots"}}

‎src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBootsHoliday"}}

‎src/main/resources/assets/botania/models/item/manaweaveChest.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChest"}}

‎src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChestHoliday"}}

‎src/main/resources/assets/botania/models/item/manaweaveHelm.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelm"}}

‎src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelmHoliday"}}

‎src/main/resources/assets/botania/models/item/manaweaveLegs.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegs"}}

‎src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegsHoliday"}}

‎src/main/resources/assets/botania/models/item/starSword.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/starSword"}}

‎src/main/resources/assets/botania/models/item/terrasteelBoots.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelBoots"}}

‎src/main/resources/assets/botania/models/item/terrasteelChest.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelChest"}}

‎src/main/resources/assets/botania/models/item/terrasteelHelm.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelHelm"}}

‎src/main/resources/assets/botania/models/item/terrasteelLegs.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelLegs"}}

‎src/main/resources/assets/botania/models/item/thunderSword.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/thunderSword"}}

0 commit comments

Comments
 (0)