From 3a5ba9fbfd55a61173c3e72e0686f99bfb08cfa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Thu, 7 Jul 2016 15:05:33 +0200 Subject: [PATCH] Bauxite --- TODO.txt | 1 - graphics/ore.xcf | Bin 5383 -> 6574 bytes src/java/mmm/materials/Materials.java | 3 ++ src/java/mmm/materials/ore/MOBauxite.java | 34 ++++++++++++++++++ .../blockstates/materials/ore/bauxite.json | 5 +++ src/resources/assets/mmm/lang/en_US.lang | 2 ++ .../models/block/materials/ore/bauxite.json | 6 ++++ .../models/item/materials/ore/bauxite.json | 3 ++ .../textures/blocks/materials/ore/bauxite.png | Bin 0 -> 434 bytes 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/java/mmm/materials/ore/MOBauxite.java create mode 100644 src/resources/assets/mmm/blockstates/materials/ore/bauxite.json create mode 100644 src/resources/assets/mmm/models/block/materials/ore/bauxite.json create mode 100644 src/resources/assets/mmm/models/item/materials/ore/bauxite.json create mode 100644 src/resources/assets/mmm/textures/blocks/materials/ore/bauxite.png diff --git a/TODO.txt b/TODO.txt index 1929036..f7f026b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -46,7 +46,6 @@ materials.rock No Smooth limestone materials.rock No Smooth slate materials.rock No Basalt ------------------------------------------------------------------------------------------------------- -materials.ore No Aluminium (bauxite) materials.ore No Silver (native, horn silver) materials.ore No Lead (galena) materials.ore No Cinnabar diff --git a/graphics/ore.xcf b/graphics/ore.xcf index 15221e1f04fa80b84d8f35a7e46e5d5be57301f9..ea6107e4ca9cc377f3349c57ad834c7a88bf10ac 100644 GIT binary patch delta 1495 zcmZ8hO^6&t6s}kOv)S1=lkAM{ZoI5}NMJ-Zi-{ftHwO^}!Gi~rT-_WNF$tJkz_|!s z#6()~;87aIf}k|$!MeyC>R=s;ra@Y~dGx%y%+5@=->d0Pb}Xn@^}g?Y@2i5Y{(Si4 z)yHqr>p$URIJjx8X4}^$b#^ypZLtq~5d8(IuvmA%wds*EGvsFa+UQK1c7fE zm#`1r)QiY@hm+Dl1>cfNS$JW^_MA~Uw}p!wl_9)CR+F1pSFj!Y8KrWH1Mpp7;@tsO z)<`q4c|Oj0CvA`;=Eq}ejU5{^He}|xv1F^f4X0z9gANQ?%3~AeGZcc9=E$1tuiImB-1+8ypvg=5%qDJWhzURN)@TORvBfLZo_GsY0!b9 zjC8C*JwqW#sg5$%Dezo8Q&?msb(JEERF!%MLcQ-8>k;fjHT5b|-r+N$^)@IX)pVqS~712Dvt zsCuR59ha^)lhOJd5+=Bu7>JRq*U2}un+)Uo*ZHwFBR&>l)gWn4j>o&wX~+g!xx{(0 z7ygs&p8uPYVRW$5**~MfZ9DHTYdRk$KSf8wwcA2;|MzcLySrSv_9^Gj+JCuvu+#kx zP6&cN>C&+Grx5EuoT_k29rPFD#%I+q#@Q9DMN~N3Jhi delta 506 zcmZ2y+^#jjj?rMFy)~okbOr|2-wX^~6$}h~R~Zs}|d81_sU=gfIipY_|Pig>a>8=Rth1*^?h|{G4pdm!ib^1xXLk zcrFf9JzNr-5A*RcYH@2YF!26FQVTSn+XhuFw-1PqFn^a&iV|NTk{+P>e66T@_@+*F z5H5j+SiBa08>%$O8~n3S#rRi&_?r{OSQt0QifS^kFaf!f4{}LBP4SrgPh4D0xCB)f i$RyzoR59ThldUBVGKoY_HWU#S%tw_Jsh_MQ*#iL7DMV!e diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index 50bb19d..dbf76f4 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -1,6 +1,7 @@ package mmm.materials; +import mmm.materials.ore.MOBauxite; import mmm.materials.ore.MOCassiterite; import mmm.materials.ore.MOCopper; import mmm.materials.ore.MOCuprite; @@ -52,6 +53,7 @@ public class Materials public static final MOre ORE_CASSITERITE; public static final MOre ORE_SPHALERITE; public static final MOre ORE_ROCK_SALT; + public static final MOre ORE_BAUXITE; static { // Rocks @@ -95,6 +97,7 @@ public class Materials ORE_CASSITERITE = new MOCassiterite( ); ORE_SPHALERITE = new MOSphalerite( ); ORE_ROCK_SALT = new MORockSalt( ); + ORE_BAUXITE = new MOBauxite( ); // Other recipes URegistry.addRecipeRegistrar( new Materials( ) ); diff --git a/src/java/mmm/materials/ore/MOBauxite.java b/src/java/mmm/materials/ore/MOBauxite.java new file mode 100644 index 0000000..161a2f9 --- /dev/null +++ b/src/java/mmm/materials/ore/MOBauxite.java @@ -0,0 +1,34 @@ +package mmm.materials.ore; + + +import java.util.List; + +import mmm.materials.MOre; +import mmm.materials.Materials; +import mmm.utils.I_UOreGenerationRegistrar; +import mmm.world.WLocation; +import mmm.world.gen.WGOreCondition; +import mmm.world.gen.WGOreParameters; +import net.minecraft.block.state.pattern.BlockMatcher; + + + +public class MOBauxite + extends MOre + implements I_UOreGenerationRegistrar +{ + + public MOBauxite( ) + { + super( "bauxite" , 1 ); + } + + + @Override + public void addConditions( final List< WGOreCondition > conditions ) + { + conditions.add( new WGOreCondition( WLocation.inOverworld( ) , new WGOreParameters( this.getDefaultState( ) , + 10 , 9 , 45 , 80 , BlockMatcher.forBlock( Materials.ROCK_LIMESTONE ) ) ) ); + } + +} diff --git a/src/resources/assets/mmm/blockstates/materials/ore/bauxite.json b/src/resources/assets/mmm/blockstates/materials/ore/bauxite.json new file mode 100644 index 0000000..77deaca --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/ore/bauxite.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/ore/bauxite" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 1a88f4e..947f3cf 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -15,6 +15,8 @@ tile.mmm.materials.rock.slate.name=Slate tile.mmm.materials.ore.rock_salt.name=Rock Salt item.mmm.materials.stone.rock_salt.name=Salt Crystals +tile.mmm.materials.ore.bauxite.name=Bauxite + 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/bauxite.json b/src/resources/assets/mmm/models/block/materials/ore/bauxite.json new file mode 100644 index 0000000..5095c0b --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/ore/bauxite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/ore/bauxite" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ore/bauxite.json b/src/resources/assets/mmm/models/item/materials/ore/bauxite.json new file mode 100644 index 0000000..2e1f120 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ore/bauxite.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/ore/bauxite" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/bauxite.png b/src/resources/assets/mmm/textures/blocks/materials/ore/bauxite.png new file mode 100644 index 0000000000000000000000000000000000000000..9ac090226cb45b292d8b573a7acc516c8504929b GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNJ3B9f6vJKnMGOp#_MR?|Ar_~TcNC?4{?C0pd~w2r z8)v<%5BxauaA|_nbSpN2#x;y>6GaalX#W*72kv1geq^J6{D0)FRS}}f)y$SP5)*u# zze%5oRZ?pbrVreX3ODRA}%2<_~}x?f92}6Vi}wo8xrp^O9!y{ z$eie8w=`^w5mM^@P~E%o-G8lQ*%t8$xeYg)&gfsd&eG1kNy1G*$=Y5bLs~;-LhR(_ ztKDLpm>#N_vQ{uGI_}cEl+j|DL(xR8OC1g@i7C++a~mU>{J4!Ct