From 5f43e794744e7f058b1ae82d3985dc9f3d80b4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Fri, 8 Jul 2016 15:15:07 +0200 Subject: [PATCH] Saltpeter Also recipe for gunpowder using charcoal, sulphur and saltpeter. --- TODO.txt | 6 ++---- graphics/ore.xcf | Bin 8378 -> 9365 bytes src/java/mmm/materials/Materials.java | 15 +++++++++++++++ src/java/mmm/world/gen/WGBasalt.java | 3 --- .../blockstates/materials/ore/saltpeter.json | 5 +++++ src/resources/assets/mmm/lang/en_US.lang | 3 +++ .../models/block/materials/ore/saltpeter.json | 6 ++++++ .../models/item/materials/ore/saltpeter.json | 3 +++ .../materials/stone/saltpeter_powder.json | 6 ++++++ .../blocks/materials/ore/saltpeter.png | Bin 0 -> 397 bytes .../materials/stone/saltpeter_powder.png | Bin 0 -> 233 bytes 11 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 src/resources/assets/mmm/blockstates/materials/ore/saltpeter.json create mode 100644 src/resources/assets/mmm/models/block/materials/ore/saltpeter.json create mode 100644 src/resources/assets/mmm/models/item/materials/ore/saltpeter.json create mode 100644 src/resources/assets/mmm/models/item/materials/stone/saltpeter_powder.json create mode 100644 src/resources/assets/mmm/textures/blocks/materials/ore/saltpeter.png create mode 100644 src/resources/assets/mmm/textures/items/materials/stone/saltpeter_powder.png diff --git a/TODO.txt b/TODO.txt index 97555cb..fab788b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -56,9 +56,7 @@ materials.rock No Smooth limestone materials.rock No Smooth slate materials.rock No Smooth basalt ------------------------------------------------------------------------------------------------------- -materials.ore No Silver (native, horn silver) materials.ore No Olivine -materials.ore No Saltpeter ------------------------------------------------------------------------------------------------------- tech.base No Alloy furnace -> fix item pickup in creative mode BF @@ -76,6 +74,7 @@ animals ??? Goats ------------------------------------------------------------------------------------------------------- world ??? Improved system to handle neighbouring biomes BF world.gen ??? Make basalt gen behave correctly at chunk boundaries BF +world.gen ??? Improve saltpeter gen so it generates in caves only BF world ??? Volcanos ------------------------------------------------------------------------------------------------------- ??? ??? Sub-blocks @@ -83,5 +82,4 @@ world ??? Volcanos ??? ??? Insulated redstone wires ??? ??? Electrical-like power ??? ??? Atlases -??? ??? "Luggage" (chests with persistent contents) -??? ??? Blackboard \ No newline at end of file +??? ??? "Luggage" (chests with persistent contents) \ No newline at end of file diff --git a/graphics/ore.xcf b/graphics/ore.xcf index 4e229510796aab92b4985d8ae88d4013563d8650..0b9d3370189231cbc968bea1fb8805d3bfe2f58a 100644 GIT binary patch delta 1591 zcmc(eO=uHA6vy9gn%1V6)TWq7+pOuDVtcR_K?Job6swmiNI_84q5(ku|9zK1VFM0plunT;}$?_6rl46fW8xrD=#vq0m3@~ zpn2t~15hvXZ!uOh^@ed(?G2@${*gf8X_HmxHx~YAOoe-t3A3(WdLyL?ybQ&Z! zsiMz~+4Nul<*tzvG8(yHoQ-TyGS>j2d{wJ80e5Y>C!r%3Y(MWHeet z-=dYwSAdr10g{`>$}-s;=B8Ui>7D?_4deYX79TPW#$!t66hNXkfO5yyOETJey;kPl zL^l06fO6NwD;Z5pp~=J;x}%*#50lC6*K$>Zq)x&YkE!4#Jg2FuN5z0bLr6Fc|OEx7K6Gm*GGKHC9c8f)qxr=2Y1WG)| zvn-$C!cVU%*gxiMLTHZBN&$1lar5)DB`ngXiRBQ+e6v)t7ceE1I>j<$o@o){5K^{n z-{onco-YZKkpkDd(-qQh9c6-t>88CUt$^^DE};vcN?V+?~3VScMArQ`i^0 zfOE_(I4*I$ipMA>oFJA}bcwZy84p*}d|xDSK^QbJLNNJn4ao75*0KRPytWO<@l&*x z4cNu^_@7PyI-lx9SG1db1L8u|hAwWF7=a6&kHn%;#5wYOb*L6*hk)rqWaS&z1D GzWobdEgk3p delta 719 zcmZ9~F-XHe7zN;Wt+gbDq}oCP)}*Ok6-A0pqM(QlS{((!7I7&qqKktrx;a@84ksxN z4uXOr859SLIuucGbJD@3lZ%Uki(YKi{2qi0@4kCn!tG34jBF3F>C@ps#t(qTETG;3 zdJhmg1k5nd@(Q$W0@fm6=fplc<2fLd0T8V}4M1R7zI&sd1vcD`KqlxM{Y7AMTlpLP zve1M35b9$515oaKR5pe+O2d}RqBjBYq7= 40 ) { - System.err.println( "BASALT at " + mbp ); - } } } } diff --git a/src/resources/assets/mmm/blockstates/materials/ore/saltpeter.json b/src/resources/assets/mmm/blockstates/materials/ore/saltpeter.json new file mode 100644 index 0000000..adcfa18 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/ore/saltpeter.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/ore/saltpeter" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 946c0f2..425a810 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -27,6 +27,9 @@ item.mmm.materials.stone.sulphur_powder.name=Sulphur Powder tile.mmm.materials.ore.silver.name=Native Silver +tile.mmm.materials.ore.saltpeter.name=Saltpeter +item.mmm.materials.stone.saltpeter_powder.name=Saltpeter Powder + item.mmm.materials.stone.coke.name=Coke item.mmm.materials.stone.slag.name=Slag item.mmm.materials.nugget.iron.name=Iron Nugget diff --git a/src/resources/assets/mmm/models/block/materials/ore/saltpeter.json b/src/resources/assets/mmm/models/block/materials/ore/saltpeter.json new file mode 100644 index 0000000..1877b16 --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/ore/saltpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/ore/saltpeter" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ore/saltpeter.json b/src/resources/assets/mmm/models/item/materials/ore/saltpeter.json new file mode 100644 index 0000000..6e9a01b --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ore/saltpeter.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/ore/saltpeter" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/stone/saltpeter_powder.json b/src/resources/assets/mmm/models/item/materials/stone/saltpeter_powder.json new file mode 100644 index 0000000..9337732 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/stone/saltpeter_powder.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/materials/stone/saltpeter_powder" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/saltpeter.png b/src/resources/assets/mmm/textures/blocks/materials/ore/saltpeter.png new file mode 100644 index 0000000000000000000000000000000000000000..536fadfedc6b0bfeb28a06aaf95c9f34e92b13af GIT binary patch literal 397 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEkTG{@;P%qK7|Roakc@uc!y^9}xz1;;Npnspt} zIy^1);w!@%mHgYwL=xL{1O%BHnO2``y}fPfvdk$;uOB>ObrgKof9?XyA*GqFykecx z+ozxW*0kHm>NuCPPQXJ3zb3mI%?Uj|j3*ytrsv2B8ElHUkub4Nm-D>Lu}6<&IyfGm pE1W*Vt3knU!+mox?RnFF+U?zS%zdugiEE%x^>p=fS?83{1OPk6qv8Mn literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/materials/stone/saltpeter_powder.png b/src/resources/assets/mmm/textures/items/materials/stone/saltpeter_powder.png new file mode 100644 index 0000000000000000000000000000000000000000..ed3a5028cfd6d67ba6401bcbc89596816c04aed6 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr~7dkPvC{@Qa)UigWIa