From 42a455d4c0e51ed9b6aa92c03215e5e24c3b2fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Thu, 7 Jul 2016 14:50:21 +0200 Subject: [PATCH] Rock salt --- TODO.txt | 1 - graphics/ore.xcf | Bin 2659 -> 5383 bytes src/java/mmm/materials/Materials.java | 5 +++ src/java/mmm/materials/ore/MORockSalt.java | 35 ++++++++++++++++++ .../blockstates/materials/ore/rock_salt.json | 5 +++ src/resources/assets/mmm/lang/en_US.lang | 3 ++ .../models/block/materials/ore/rock_salt.json | 6 +++ .../models/item/materials/ore/rock_salt.json | 3 ++ .../item/materials/stone/rock_salt.json | 6 +++ .../blocks/materials/ore/rock_salt.png | Bin 0 -> 392 bytes .../items/materials/stone/rock_salt.png | Bin 0 -> 195 bytes 11 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/java/mmm/materials/ore/MORockSalt.java create mode 100644 src/resources/assets/mmm/blockstates/materials/ore/rock_salt.json create mode 100644 src/resources/assets/mmm/models/block/materials/ore/rock_salt.json create mode 100644 src/resources/assets/mmm/models/item/materials/ore/rock_salt.json create mode 100644 src/resources/assets/mmm/models/item/materials/stone/rock_salt.json create mode 100644 src/resources/assets/mmm/textures/blocks/materials/ore/rock_salt.png create mode 100644 src/resources/assets/mmm/textures/items/materials/stone/rock_salt.png diff --git a/TODO.txt b/TODO.txt index e895a7b..1929036 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 Rock salt materials.ore No Aluminium (bauxite) materials.ore No Silver (native, horn silver) materials.ore No Lead (galena) diff --git a/graphics/ore.xcf b/graphics/ore.xcf index e38298b9f7c434f4e7a718a3e1c9a0e10ea74ee8..15221e1f04fa80b84d8f35a7e46e5d5be57301f9 100644 GIT binary patch literal 5383 zcmeHLT}&KR6rP#=0d~uRW!p5NCX>`e7K2&J11}zIDO$P$(HgKy`UA`E&dSf?&TWMj znf5_!leV+fY6TNh6C|d@7eri|s4@152TiR%Pqp*nvoFR5X?Hwl_TC0?`#>U^wA|!7 z_x#**&%Jl%oVmM+WdEQ#6pgFL!r`3~wsH>QA3?}6k_tp|V@8q)*n$W*B8=F|c^bC` z$8X2JJb}~JB>TG(v6@6W*@G$x?Xpy*v*Es&s;ByrJt1FJJP}RxrP6AZ)77LC-Cb(< z$*|K3FtywiLf7sBuEMU~pCQ*FeXuK<97w3OA{Hu#3n{s-=IB6@smXz;7SqW;6_4vN zc5i{?{ZCb1v(lB$fj9Y*Bzcx3$u}fPfuAI4^Hn_NPlOeF@gV42i(h1^ftXrHW-o%y z-bNI2p2n1L9y^Ji0ga*NLkQl_c^bcInZ9%xUxqx*D_RjU!e2c1CxlUwl)bo*Z77TN z;#j4V+qq8ZB{^p>g)JJUshPwnhRZ~1{;3%TGc?9DCbPRHGh`!Y3i6j`m}qt}*^o^y zbDMW?AQ~0+yFq>o?WS?kU`Q21F>@LkJuIg=0c0HROz1T+xSK6GJ~DIWzil$~!ld7DxadEh3lH0h>GfVOoTb4=@6$sBg zxE$T1+$Qt>4webqi-HSL#6iy6seUXAC2EZG5h%1niu_;Jn8zt#zImrH^a%1|y?C15 zuep)yyx)_&k$?|E0zL#!(I{ABcCJ^A3GrmXuH+9SB9XAh_{7Ja>wNSvm&)y&WS2Yj z0+}LvNwRIp_LH`l3!6!B5%CZyAyP_2AyP)fu{t7^o~@)RBC_p1#iy1+|J%if%I;b( zI0`K!-~3hRzKFayGb}#-r?`>p{4FFu1h4JJ79WKATDbVsu2=Ed!IK5Mz-vfEB4J_% z-sCo}3%pD64yqA!vnfVYA{2zzc1v`t2_oExO|}c|IFJ-R+v6zdmh;%^;!@I*OlS;$ z@X_3bstZ+!wOnmzp0)mbqMy*>#^<34@~v!)GvZLNx|B_<)RkQ!S%&F$$V`0O-q{}? z1Gt&_XnrgLuSDR~I~JVy?#kRWj6mz<;jy-tGtdh&F#J5s!L_!A?$@maut1wUaQ^4i zSFo@!+;;|g=H7zC-<)jN2Qr+pj=z6VI9vGqr5j*P%>x{S4qUoL literal 2659 zcmeHIJ#Q015ZyiBosAs~5e`B!5+{LB9LdNbMG$35Ku}OZV}k9oNaD!1ActmqD3-tB zjxzo`ZbC)LSI`~rt@nZ>j1WSiK&_1;%*?`pbZn zFc*N*)*B%Rj2hqr5pdD@%v(YJWz6S$DBJAswtJmsZ`gkdN+2%9YN8HyI#Dv%=|63h zSG&FK!Omb9t=g$M>^*5mts5;n7C7rJ)WFs!3%2I*=;sc%j*|WMc7LxIt>@1Id9a9d zT=V%}Uq$`B?YNV0|DfAVI_l(r-2EdpV@_}7J-8uX;|lK!5x&Y9%x8fmfOqLX7XtWgzz}b3W_lJfD;M=isw0YkEKtV2tlPf6oDYH@r>fvQ}R%)W8`ec;W(}~eie~I;Utd*yv301+Q3fxgPRXT=IMrYH>WUTdMY>d{* zS80sg57SA^64}&vCQ#{gEXQEAQ4?cStc)}TZA(dWjQU0e>iyJ~G768=N{z=#3;q8< z`WH9ki8K>|kQuQ8ctAn;nZ#TLeBg{IAdbXkEQ%tq!2*1C&xwApox*$VgU*nw4UqxZ zTz}Hcto*BHMv5JIGjowQGtb~gfU^W|vB*`A>q{=^xL}p*&BJu-uufB<@o5@|a;r?I z2B!*GcI|L8Nna*)nhK3i(@5mYGMyTnDqz{QWOE}OZPaNhG(JsZLypRHYH+H6W!E;e zwD*>uwPJ5K+HEJ#c*5Vk+A8+&Rq#4lvH)P@w{&H;qz$jbAyLMcreBMx1pR(g6)Eq#L%KtyMPY0H0{6HQOsolZGFQ8`VlA)ZGw@r2~g>n9&8 zwQmo03{B-v`Wl1uH1u5m|FQq-o4uN)BBRQefI8p-q5X2DsKMvo!xFyY5)(<3@&7=w I09?zy0h$CTb^rhX diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index 7295776..50bb19d 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -5,6 +5,7 @@ import mmm.materials.ore.MOCassiterite; import mmm.materials.ore.MOCopper; import mmm.materials.ore.MOCuprite; import mmm.materials.ore.MOMalachite; +import mmm.materials.ore.MORockSalt; import mmm.materials.ore.MOSphalerite; import mmm.materials.rock.MRChalk; import mmm.materials.rock.MRLimestone; @@ -43,12 +44,14 @@ public class Materials public static final Item ITEM_CUPRITE; public static final Item ITEM_CASSITERITE; public static final Item ITEM_SPHALERITE; + public static final Item ITEM_ROCK_SALT; public static final MOre ORE_COPPER; public static final MOre ORE_MALACHITE; public static final MOre ORE_CUPRITE; public static final MOre ORE_CASSITERITE; public static final MOre ORE_SPHALERITE; + public static final MOre ORE_ROCK_SALT; static { // Rocks @@ -83,6 +86,7 @@ public class Materials ITEM_CUPRITE = Materials.makeItem( "cuprite" ); ITEM_CASSITERITE = Materials.makeItem( "cassiterite" ); ITEM_SPHALERITE = Materials.makeItem( "sphalerite" ); + ITEM_ROCK_SALT = Materials.makeItem( "rock_salt" ); // Actual ores ORE_COPPER = new MOCopper( ); @@ -90,6 +94,7 @@ public class Materials ORE_CUPRITE = new MOCuprite( ); ORE_CASSITERITE = new MOCassiterite( ); ORE_SPHALERITE = new MOSphalerite( ); + ORE_ROCK_SALT = new MORockSalt( ); // Other recipes URegistry.addRecipeRegistrar( new Materials( ) ); diff --git a/src/java/mmm/materials/ore/MORockSalt.java b/src/java/mmm/materials/ore/MORockSalt.java new file mode 100644 index 0000000..3a7c670 --- /dev/null +++ b/src/java/mmm/materials/ore/MORockSalt.java @@ -0,0 +1,35 @@ +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; + + + +public class MORockSalt + extends MOre + implements I_UOreGenerationRegistrar +{ + + public MORockSalt( ) + { + super( "rock_salt" , 0 ); + this.setDrops( Materials.ITEM_ROCK_SALT , 2 , 5 ); + this.setExperience( 0 , 1 ); + } + + + @Override + public void addConditions( final List< WGOreCondition > conditions ) + { + conditions.add( new WGOreCondition( WLocation.inOverworld( ) , + new WGOreParameters( this.getDefaultState( ) , 5 , 30 , 45 , 255 ) ) ); + } + +} diff --git a/src/resources/assets/mmm/blockstates/materials/ore/rock_salt.json b/src/resources/assets/mmm/blockstates/materials/ore/rock_salt.json new file mode 100644 index 0000000..a5cbeb4 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/ore/rock_salt.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/ore/rock_salt" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 20694ca..1a88f4e 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -12,6 +12,9 @@ tile.mmm.materials.rock.limestone.name=Limestone tile.mmm.materials.rock.chalk.name=Chalk 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 + 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/rock_salt.json b/src/resources/assets/mmm/models/block/materials/ore/rock_salt.json new file mode 100644 index 0000000..c2a4127 --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/ore/rock_salt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/ore/rock_salt" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ore/rock_salt.json b/src/resources/assets/mmm/models/item/materials/ore/rock_salt.json new file mode 100644 index 0000000..2d680d5 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ore/rock_salt.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/ore/rock_salt" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/stone/rock_salt.json b/src/resources/assets/mmm/models/item/materials/stone/rock_salt.json new file mode 100644 index 0000000..940b2ff --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/stone/rock_salt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/materials/stone/rock_salt" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/rock_salt.png b/src/resources/assets/mmm/textures/blocks/materials/ore/rock_salt.png new file mode 100644 index 0000000000000000000000000000000000000000..23d10dfa7cc2884fe523c57592757300b1087798 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE`7#J8uJzX3_EKZjOpXO=`5ZF8aHT#b1 zsRA$E1fsTRE;*vY!rA1Y(y{HD_!s5vX)kVAT;DAre|%^9xjB-)BCcjUhdl+REz@)t zV5#~3RC3n|=8oD)H|{1K>=aUWnzJz9$3Y?DW6jOH+;WQ#iXoGae#kLlaOz#mu(FE( z@D|n+${+UJyb*ri`ma(u$E>eaImbPmH8c|UM}3^@q&3N_LDJx|x6JY6OKaEVhEJP( zZOhFy4s};HZQWSa(#Jl-@{HBfpKm%+CE`=xFjnbK^H!U(%&L2d?DS9lk!h#p?}cB@ z*f5dLxp&Tqtr~M|E4QqzExmi+WqxJJk9#JJrOY5^G-+N_iZu`gP3I j{S4Q$G`-2S)l6@gB{|#H?sjPS1qx74S3j3^P6bP0l+XkKi?Bm1 literal 0 HcmV?d00001