From 25a58e091bd3f4e82c2ecd747bfa7c18a03e6804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Tue, 12 Jul 2016 18:20:40 +0200 Subject: [PATCH] Polished limestone / slate / basalt --- TODO.txt | 3 +- graphics/smooth-stones.xcf | Bin 0 -> 6037 bytes src/java/mmm/MmmDeco.java | 3 + src/java/mmm/deco/DSmoothStone.java | 70 ++++++++++++++++++ src/java/mmm/materials/MRock.java | 8 ++ .../blockstates/deco/smoothstone/basalt.json | 5 ++ .../deco/smoothstone/limestone.json | 5 ++ .../blockstates/deco/smoothstone/slate.json | 5 ++ src/resources/assets/mmm/lang/en_US.lang | 4 + .../models/block/deco/smoothstone/basalt.json | 6 ++ .../block/deco/smoothstone/limestone.json | 6 ++ .../models/block/deco/smoothstone/slate.json | 6 ++ .../models/item/deco/smoothstone/basalt.json | 3 + .../item/deco/smoothstone/limestone.json | 3 + .../models/item/deco/smoothstone/slate.json | 3 + .../blocks/deco/smoothstone/basalt.png | Bin 0 -> 473 bytes .../blocks/deco/smoothstone/limestone.png | Bin 0 -> 514 bytes .../blocks/deco/smoothstone/slate.png | Bin 0 -> 410 bytes 18 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 graphics/smooth-stones.xcf create mode 100644 src/java/mmm/deco/DSmoothStone.java create mode 100644 src/resources/assets/mmm/blockstates/deco/smoothstone/basalt.json create mode 100644 src/resources/assets/mmm/blockstates/deco/smoothstone/limestone.json create mode 100644 src/resources/assets/mmm/blockstates/deco/smoothstone/slate.json create mode 100644 src/resources/assets/mmm/models/block/deco/smoothstone/basalt.json create mode 100644 src/resources/assets/mmm/models/block/deco/smoothstone/limestone.json create mode 100644 src/resources/assets/mmm/models/block/deco/smoothstone/slate.json create mode 100644 src/resources/assets/mmm/models/item/deco/smoothstone/basalt.json create mode 100644 src/resources/assets/mmm/models/item/deco/smoothstone/limestone.json create mode 100644 src/resources/assets/mmm/models/item/deco/smoothstone/slate.json create mode 100644 src/resources/assets/mmm/textures/blocks/deco/smoothstone/basalt.png create mode 100644 src/resources/assets/mmm/textures/blocks/deco/smoothstone/limestone.png create mode 100644 src/resources/assets/mmm/textures/blocks/deco/smoothstone/slate.png diff --git a/TODO.txt b/TODO.txt index 213ea76..d5f2e0d 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,7 +5,7 @@ deco No Copper pots deco No Copper plates deco No Lanterns deco No Light plates -deco No Stone - Smooth + stairs + slabs +deco No Stone - Stairs + slabs Limestone Slate Basalt @@ -45,7 +45,6 @@ materials No Metals Silver materials No Liquids Mercury -materials No Missing bamboo plank textures BF materials No Make bamboo behave like bamboo BF materials No Olivine ------------------------------------------------------------------------------------------------------- diff --git a/graphics/smooth-stones.xcf b/graphics/smooth-stones.xcf new file mode 100644 index 0000000000000000000000000000000000000000..4cc0e5f3dd0c668181d0df9578b7dca0e14743c2 GIT binary patch literal 6037 zcmeHLOK%(373QS{%a-C-oyMD@B~U=H1-K^X!FiEGQluVHBwLA$c2g9UWmyp{iH4*W z$tpHv+apblzDJ(rwusmM{8F6B=brC7XYQOcx>t)!EB8Ea&EN6-((5H$(9YW(%NL*{1ec4@PmTQ6<-#4>%h3Cv z--P~(En~ayg8ld4etr>XuP&|3EiPPLTwA&gDi_Qn*X8w%x0e?@>+$8K+gAoI-&vfG zFUQwBm)p0iYm2w$Jl-F9+wCcW&z`yh&|6P|I`f{d7BKX!^?P&kORI|>pW_RZZ$C|G z>#qJ{b!o%1v^xLh!aBys@7!5m*mx2kMjusmG>4&h9qfjF4@(H^c=A1$YvAWD*VzeJ zwm-m9pXeC8@^{74_q&~_9h>;uRH&}j)%Ol`yky5- z&mZ(^2d||&>0X{)iN`nI^xRsG&)@CJy>CL!4dWc@w7!ZhII%;{^?h_$*SCwu|0@qB zyYjCW`AClTmTtXJciTK)H@zj#@hNz8_B{SzIWG)<;ZDLAZeszzrRSAi*thdZ`#v6Y zTK_d$aH56u>W?1Q_0Qrlnkh_&M@GlT#wRAmVq)xd7=**4lQ(}nbA2ot6vN?2G#VL+ zj7^M<#$usR1RG9Y9~~KqqUdi%qGQq7o0Fqc)05ZVcztSO^7>C^V$-j^`r50}NNjX$ z=8YRSVv(`w8#kt+5mAf)MO2KAf~QDyJQf>`L`P#G$MMWeCy*zO?LZvIP9WHE20L~l zaU45=IF6k_9LG)|j$kHsvmDF%eI!Lwq>ms-FYTu&f?xnZ5)1=eG{Z84 zpP>l?SaGLlzaMlynjk3(;$S(R1GE>=q?hu8H;y4`h9Fp$^pYIM`u)^3k|urNgXR3R zpJlud$A<(Cm?eBb13rLplX z;W!%LKrZqD5vW7pGmOG0_^Cki0iF>8LMR*z1Vf@92ZGqYFl;Eqf?HmIk8?;Ac?g_l zcrb&&VR<#8pCfL_e{R^vxAt2Q(fHfO+%WO95z>FCijk*cs zX02*kR=t7gYM`;KX3O1bebA~~7;XU`aP?LLY)pWgRSP?4SQQKCfO`+fP~&m4QMHiO zXQJj~Uy82hmDC^n@?U7!pRCw! zjY`ERtD0UeVNR{6mvpTNS{SQkqonC2kU=V|D!42bR1Mo26{A=Jlx|eql~%1<(lm_L z3ME6=^r`_URW%H?01;KnhF;K1np#4oy-Kx=%3lCl*EIEniYkwQ7I@0Qvuo(!qM%|{ zutn;}nyLbmp{rV1Efxy}qgvL>Sky}UN)jb^rQCK-+R93s2}wapJ-4-$laq3OJC{@x zSxL%rB9WA{N+zS^(&Re1+S t&VN#mEBLcuhq2fO7p46-z^PrVw%er@5S+RN{iXNp30rsReLTjI{s+;$_m2Po literal 0 HcmV?d00001 diff --git a/src/java/mmm/MmmDeco.java b/src/java/mmm/MmmDeco.java index f283423..9c0e3ff 100644 --- a/src/java/mmm/MmmDeco.java +++ b/src/java/mmm/MmmDeco.java @@ -3,6 +3,7 @@ package mmm; import mmm.deco.DChairs; import mmm.deco.DSeatEntity; +import mmm.deco.DSmoothStone; import mmm.deco.DStairs; import mmm.deco.DTables; import mmm.deco.doors.DDoors; @@ -15,6 +16,7 @@ import net.minecraftforge.fml.common.registry.EntityRegistry; public class MmmDeco { + public static final DSmoothStone STONE; public static final DStairs STAIRS; public static final DSlabs SLAB; public static final DFences FENCE; @@ -24,6 +26,7 @@ public class MmmDeco public static final DThrones THRONE; static { + STONE = new DSmoothStone( ); STAIRS = new DStairs( ); SLAB = new DSlabs( ); FENCE = new DFences( ); diff --git a/src/java/mmm/deco/DSmoothStone.java b/src/java/mmm/deco/DSmoothStone.java new file mode 100644 index 0000000..ad4956f --- /dev/null +++ b/src/java/mmm/deco/DSmoothStone.java @@ -0,0 +1,70 @@ +package mmm.deco; + + +import com.google.common.base.Throwables; + +import mmm.MmmMaterials; +import mmm.core.CAccessors; +import mmm.core.CRegistry; +import mmm.core.api.I_RecipeRegistrar; +import mmm.materials.MRock; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; + + + +public class DSmoothStone +{ + + public static class SmoothStoneBlock + extends Block + implements I_RecipeRegistrar + { + + public final MRock rock; + + + public SmoothStoneBlock( final MRock rock ) + { + super( Material.ROCK ); + this.rock = rock; + this.setCreativeTab( CreativeTabs.BUILDING_BLOCKS ); + try { + this.setHardness( CAccessors.getBlockHardness( rock ) ); + this.setResistance( CAccessors.getBlockResistance( rock ) ); + } catch ( final Throwable t ) { + throw Throwables.propagate( t ); + } + this.setSoundType( SoundType.STONE ); + this.setHarvestLevel( "pickaxe" , rock.rockHarvestLevel ); + CRegistry.setIdentifiers( this , "deco" , "smoothstone" , rock.name ); + } + + + @Override + public void registerRecipes( ) + { + GameRegistry.addShapedRecipe( new ItemStack( this , 4 ) , // + "RR" , // + "RR" , // + 'R' , this.rock ); + } + + } + + public final SmoothStoneBlock LIMESTONE; + public final SmoothStoneBlock SLATE; + public final SmoothStoneBlock BASALT; + + + public DSmoothStone( ) + { + CRegistry.addBlock( this.LIMESTONE = new SmoothStoneBlock( MmmMaterials.ROCK.LIMESTONE ) ); + CRegistry.addBlock( this.SLATE = new SmoothStoneBlock( MmmMaterials.ROCK.SLATE ) ); + CRegistry.addBlock( this.BASALT = new SmoothStoneBlock( MmmMaterials.ROCK.BASALT ) ); + } +} diff --git a/src/java/mmm/materials/MRock.java b/src/java/mmm/materials/MRock.java index fac6b8f..a5cef0b 100644 --- a/src/java/mmm/materials/MRock.java +++ b/src/java/mmm/materials/MRock.java @@ -15,6 +15,10 @@ public class MRock implements I_MRock { + public final int rockHarvestLevel; + public final String name; + + public MRock( final String name , final MapColor mapColor ) { this( name , mapColor , 0 , 1.5f , 10f ); @@ -31,11 +35,15 @@ public class MRock final float resistance ) { super( Material.ROCK , mapColor ); + this.rockHarvestLevel = harvestLevel; + this.name = name; + this.setCreativeTab( CreativeTabs.BUILDING_BLOCKS ); this.setHardness( hardness ); this.setResistance( resistance ); this.setSoundType( SoundType.STONE ); this.setHarvestLevel( "pickaxe" , harvestLevel ); + CRegistry.setIdentifiers( this , "materials" , "rock" , name ); CRegistry.addBlock( this ); } diff --git a/src/resources/assets/mmm/blockstates/deco/smoothstone/basalt.json b/src/resources/assets/mmm/blockstates/deco/smoothstone/basalt.json new file mode 100644 index 0000000..91790ef --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/smoothstone/basalt.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:deco/smoothstone/basalt" } + } +} diff --git a/src/resources/assets/mmm/blockstates/deco/smoothstone/limestone.json b/src/resources/assets/mmm/blockstates/deco/smoothstone/limestone.json new file mode 100644 index 0000000..e61a920 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/smoothstone/limestone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:deco/smoothstone/limestone" } + } +} diff --git a/src/resources/assets/mmm/blockstates/deco/smoothstone/slate.json b/src/resources/assets/mmm/blockstates/deco/smoothstone/slate.json new file mode 100644 index 0000000..8864918 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/smoothstone/slate.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:deco/smoothstone/slate" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 52bd4b7..7655d26 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -133,6 +133,10 @@ item.mmm.food.milk.horse.name=Horse milk item.mmm.food.milk.donkey.name=Donkey milk +tile.mmm.deco.smoothstone.limestone.name=Polished Limestone +tile.mmm.deco.smoothstone.basalt.name=Polished Basalt +tile.mmm.deco.smoothstone.slate.name=Polished Slate + tile.mmm.deco.stairs.granite.name=Granite Stairs tile.mmm.deco.stairs.diorite.name=Diorite Stairs tile.mmm.deco.stairs.andesite.name=Andesite Stairs diff --git a/src/resources/assets/mmm/models/block/deco/smoothstone/basalt.json b/src/resources/assets/mmm/models/block/deco/smoothstone/basalt.json new file mode 100644 index 0000000..b085d64 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/smoothstone/basalt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/deco/smoothstone/basalt" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/smoothstone/limestone.json b/src/resources/assets/mmm/models/block/deco/smoothstone/limestone.json new file mode 100644 index 0000000..e7b2829 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/smoothstone/limestone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/deco/smoothstone/limestone" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/smoothstone/slate.json b/src/resources/assets/mmm/models/block/deco/smoothstone/slate.json new file mode 100644 index 0000000..eea1ad0 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/smoothstone/slate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/deco/smoothstone/slate" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/smoothstone/basalt.json b/src/resources/assets/mmm/models/item/deco/smoothstone/basalt.json new file mode 100644 index 0000000..78cacd8 --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/smoothstone/basalt.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/deco/smoothstone/basalt" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/smoothstone/limestone.json b/src/resources/assets/mmm/models/item/deco/smoothstone/limestone.json new file mode 100644 index 0000000..78ce9f8 --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/smoothstone/limestone.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/deco/smoothstone/limestone" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/smoothstone/slate.json b/src/resources/assets/mmm/models/item/deco/smoothstone/slate.json new file mode 100644 index 0000000..c22e084 --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/smoothstone/slate.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/deco/smoothstone/slate" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/deco/smoothstone/basalt.png b/src/resources/assets/mmm/textures/blocks/deco/smoothstone/basalt.png new file mode 100644 index 0000000000000000000000000000000000000000..4b175baed6394dc7d1681a4c19f99aa658946a98 GIT binary patch literal 473 zcmV;~0Ve*5P)Q$iRVN`U%abCV(9+VC+lNi3XrTvdhK^VVS#XIPaGxR#)a;wy+~0W>Ma8_IWw{PP|rb&F`p zf|6!0yw60AN@Q=4Hs|W%2))k;p*T*9n#QqY*rSQq?NK58SnI3`v=9U!E@^A0D2Ivi zg_s#V)4|TGK-3nUhykU|{&2-HKD72*H!q{84Mg#@|5Jdbw|Mk^(k5~jy+Q?i^(H|m z1Us|v3#G^;F}jOTc4zkl6HN^%aQ0)cs8 z?x+gY#99Xxs-%<{hMDv8>47ld@!=M40T}CuIZvd*%!z)3nNgL@^SW!{@#`%ybC5Nu zDgdeyjHTjEYn_@Wm;=ySU@cH3%^LyGFCSNXl{g}E;&CCOBNYOu1OynGV~HW6a$;tf zH!25`Ff&w>aV7v}M)U*QT}VPIY7PPwIbOgW^M;#Ixs=Qdw)e^e6DW~H)q)x39ghpD zM61~aE-qkB)!bNxQF!Z^LDjMrpzTvs?qU^l`;-bvxC3Tnoo|*Sjs@|*x1z;`$^o`4 z7{18wnpcqKPCqUL(qe!Bk#p>aT3+8E3uV4RZv7xL2_b9))L5THKLBHn>(Z>EwGKVj z1S+YT%y|-7b49pTJf)QfFuVnE`LI%$^IiK5smO5>%>x9|L;|oivR&-0BZ+($?KNJf z^@Ff|dEElG_sl`%WS&=G&wX13qqX4ZHw)rxdzBL*+!~U=d_6KF`pt^(-W^mtKmQ<} zzTfff{>xI{3w3<@OlyrCgIS4tTN6587BArX_YdBTf0Hg%o3-+u8~^|S07*qoM6N<$ Eg2aO2BLDyZ literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/blocks/deco/smoothstone/slate.png b/src/resources/assets/mmm/textures/blocks/deco/smoothstone/slate.png new file mode 100644 index 0000000000000000000000000000000000000000..dce8065a05ebd11f2f522f548ae779899a15842a GIT binary patch literal 410 zcmV;L0cHM)P)8^r6426qSjrz+N-quIu1(b-y6-B}OH93ZuxlJa_bU8g;$hO<s@D%k$ja z-6oTX4Z~nrmc<=;zu(sPefTaG3u~Ije81mYS(XvlbzL}4r_(sg_g6H+B;EX0x%~ZugzD=t2E>JcctF$4R(z zR;!gcPUG5s=PZ3{Pp;Rixwb1cXO*HUr1r#%qKKVN&6(*4AhjnkIhN>hxg_TdMFg*Gynhq literal 0 HcmV?d00001