From b9c874943a5dc438a0858b2c38380d4e6507e63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Wed, 29 Jun 2016 20:57:43 +0200
Subject: [PATCH] Bronze tools
---
TODO.txt | 1 -
src/java/mmm/tech/tools/TechTools.java | 5 ++++-
src/resources/assets/mmm/lang/en_US.lang | 6 ++++++
.../mmm/models/item/tech/tools/bronze/axe.json | 6 ++++++
.../mmm/models/item/tech/tools/bronze/hoe.json | 6 ++++++
.../models/item/tech/tools/bronze/pickaxe.json | 6 ++++++
.../mmm/models/item/tech/tools/bronze/shovel.json | 6 ++++++
.../mmm/models/item/tech/tools/bronze/sword.json | 6 ++++++
.../mmm/textures/items/tech/tools/bronze/axe.png | Bin 0 -> 229 bytes
.../mmm/textures/items/tech/tools/bronze/hoe.png | Bin 0 -> 208 bytes
.../textures/items/tech/tools/bronze/pickaxe.png | Bin 0 -> 239 bytes
.../textures/items/tech/tools/bronze/shovel.png | Bin 0 -> 212 bytes
.../textures/items/tech/tools/bronze/sword.png | Bin 0 -> 240 bytes
13 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/axe.json
create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/hoe.json
create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/pickaxe.json
create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/shovel.json
create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/sword.json
create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/axe.png
create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/hoe.png
create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/pickaxe.png
create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/shovel.png
create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/sword.png
diff --git a/TODO.txt b/TODO.txt
index ccc5295..d57e992 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -52,7 +52,6 @@ materials.ore No Lead (galena)
-------------------------------------------------------------------------------------------------------
tech.base No Coke oven
-------------------------------------------------------------------------------------------------------
-tech.tools No Bronze tools
tech.tools No Bronze armor
-------------------------------------------------------------------------------------------------------
animals ??? Goats
diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java
index b3c202f..4dada0e 100644
--- a/src/java/mmm/tech/tools/TechTools.java
+++ b/src/java/mmm/tech/tools/TechTools.java
@@ -10,12 +10,15 @@ public class TechTools
{
public static final TTToolSet COPPER_TOOLS;
public static final TTArmorSet COPPER_ARMOR;
+ public static final TTToolSet BRONZE_TOOLS;
static {
- COPPER_TOOLS = new TTToolSet( "copper" , Materials.COPPER.INGOT , 2 , 192 , 5.0f , 1.5f , 18 , 7 , -3 );
+ COPPER_TOOLS = new TTToolSet( "copper" , Materials.COPPER.INGOT , 2 , 192 , 5.0f , 1.5f , 16 , 7 , -3 );
COPPER_ARMOR = new TTArmorSet( "copper" , Materials.COPPER.INGOT , 10 , new int[] {
1 , 3 , 4 , 1
} , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 );
+
+ BRONZE_TOOLS = new TTToolSet( "bronze" , Materials.BRONZE.INGOT , 2 , 212 , 5.5f , 1.75f , 20 , 7.5f , -3.1f );
}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 7184657..077903e 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -59,6 +59,12 @@ item.mmm.tech.tools.copper.armor.legs.name=Copper Leggings
item.mmm.tech.tools.copper.armor.chest.name=Copper Chestplate
item.mmm.tech.tools.copper.armor.head.name=Copper Helmet
+item.mmm.tech.tools.bronze.shovel.name=Bronze Shovel
+item.mmm.tech.tools.bronze.axe.name=Bronze Axe
+item.mmm.tech.tools.bronze.pickaxe.name=Bronze Pickaxe
+item.mmm.tech.tools.bronze.hoe.name=Bronze Hoe
+item.mmm.tech.tools.bronze.sword.name=Bronze Sword
+
item.milk.name=Cow milk
item.mmm.food.milk.sheep.name=Sheep milk
diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/axe.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/axe.json
new file mode 100644
index 0000000..66d5635
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/axe.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "mmm:items/tech/tools/bronze/axe"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/hoe.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/hoe.json
new file mode 100644
index 0000000..9fdbb25
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/hoe.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "mmm:items/tech/tools/bronze/hoe"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/pickaxe.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/pickaxe.json
new file mode 100644
index 0000000..59310e0
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/pickaxe.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "mmm:items/tech/tools/bronze/pickaxe"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/shovel.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/shovel.json
new file mode 100644
index 0000000..478178d
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/shovel.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "mmm:items/tech/tools/bronze/shovel"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/sword.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/sword.json
new file mode 100644
index 0000000..dbd5081
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/sword.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "mmm:items/tech/tools/bronze/sword"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/axe.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/axe.png
new file mode 100644
index 0000000000000000000000000000000000000000..292b067ddb3c220e5edbd5b2f696c28cd2231779
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNo2-yF&-CNGbAUoco-U3d7N?UF7O)!_Kl#spC?(r&
z?`5eTPcxQfm1+I&{+kx}co;K88uL`o>il>9!{p!olNc3dJI*>?Jmuh)Hkt4BlbHEa
zj5jH&RI)zHnQ+!%y+AI5M{)Wtt2;MUT-7(7RXJ{Zbk@YVwk|nrjGJ<oi7+tmFU&2H
TX?gY-Xgh<atDnm{r-UW|;@V9A
literal 0
HcmV?d00001
diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/hoe.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/hoe.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b70a32e2756b484048cf38ec2163693125db300
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNo2-zwOjm*I51>%2r;B5VMQ?J#0#yU!C;#~mr)1jg
zz5MI{EK9cppKXc?Hk;kW^E#H#eDR;h-trPpvn11@xi4S+H+{0hvz+%t+5~Nfwh3=!
xXKZ#fo4j<UQu^T>HSf<W&Z;nN%3UVHz|bfVp<}W!^c2t{22WQ%mvv4FO#l_mMH2u3
literal 0
HcmV?d00001
diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/pickaxe.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/pickaxe.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ba669daf6960854c6085b2629a88a9427be85e
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNo2-zQ#1ys{3xGm3o-U3d7N?UFB(@wlGvU9zm73@0
zmvgWEzkbH>m;GjU@gB#V2|Je0eDR;he&>Ic-3(~~>AQZ_^IE?9uTssKVtmF`rILM_
z<dd8UXHVQyj56M|Iq{z2DTb8U6A!m(Fki@ZGiz8NzTsw%+))eO1F6Ql6jg5f6lF~2
eIk9af&?B-LW$PS+Yi9u6!QkoY=d#Wzp$PyrPgVi|
literal 0
HcmV?d00001
diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/shovel.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/shovel.png
new file mode 100644
index 0000000000000000000000000000000000000000..f765106e57cdc2a069752284bf20c952710ce593
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNo2-zQ#-{r>cz{BQo-U3d7N?UFB!Ui{negA9XY$gY
zU;MHS=G|QEJxkHxZ1yvWM$_gSF47I_BwZ$_FmP1N>I_=8(>V6;{x%u&)LDu56g`XE
z=F7wwdotWjn`AmU)!2jisM+MTk~amqcof(f7{pg3Eh&FEUlM2;gQu&X%Q~loCIJ2^
BL@odT
literal 0
HcmV?d00001
diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/sword.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..64d935a77f369b5778fb4c562cba2b6d1061496c
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNo2-zQ<&FFw|A0cZo-U3d7N?UF6qsj7e)`{@xXEPx
zz0AM$XJwQx@j6`NS>$Pyz>#t7!i69Fhf;3yT$(d?F0XluPI|M6|7<hf9FE93H?xK{
z49?~(wmuw8{>B&oOV$<rPi#|Y=M0=>efjGD>=T9m-TOqF+75^`<+f$1iR`ub>*IH>
e<+j5*Muwd%i^><(*AxLA!r<xZ=d#Wzp$P!>mQw-%
literal 0
HcmV?d00001