From 479e014f348b8400e74eaf5059dfdd8e3bf31880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Sun, 3 Jul 2016 18:18:14 +0200
Subject: [PATCH] Chalk (no gen)
---
src/java/mmm/materials/Materials.java | 9 ++++--
src/java/mmm/materials/rock/MRChalk.java | 28 ++++++++++++++++++
.../{MLimestone.java => MRLimestone.java} | 4 +--
.../mmm/blockstates/materials/rock/chalk.json | 5 ++++
src/resources/assets/mmm/lang/en_US.lang | 1 +
.../models/block/materials/rock/chalk.json | 6 ++++
.../mmm/models/item/materials/rock/chalk.json | 3 ++
.../textures/blocks/materials/rock/chalk.png | Bin 0 -> 266 bytes
8 files changed, 51 insertions(+), 5 deletions(-)
create mode 100644 src/java/mmm/materials/rock/MRChalk.java
rename src/java/mmm/materials/rock/{MLimestone.java => MRLimestone.java} (95%)
create mode 100644 src/resources/assets/mmm/blockstates/materials/rock/chalk.json
create mode 100644 src/resources/assets/mmm/models/block/materials/rock/chalk.json
create mode 100644 src/resources/assets/mmm/models/item/materials/rock/chalk.json
create mode 100644 src/resources/assets/mmm/textures/blocks/materials/rock/chalk.png
diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java
index 93255fe..188b017 100644
--- a/src/java/mmm/materials/Materials.java
+++ b/src/java/mmm/materials/Materials.java
@@ -6,7 +6,8 @@ import mmm.materials.ore.MOCopper;
import mmm.materials.ore.MOCuprite;
import mmm.materials.ore.MOMalachite;
import mmm.materials.ore.MOSphalerite;
-import mmm.materials.rock.MLimestone;
+import mmm.materials.rock.MRChalk;
+import mmm.materials.rock.MRLimestone;
import mmm.utils.I_URecipeRegistrar;
import mmm.utils.URegistry;
import net.minecraft.block.material.MapColor;
@@ -20,7 +21,8 @@ import net.minecraft.item.Item;
public class Materials
implements I_URecipeRegistrar
{
- public static final MLimestone ROCK_LIMESTONE;
+ public static final MRLimestone ROCK_LIMESTONE;
+ public static final MRChalk ROCK_CHALK;
public static final MMetal GOLD;
public static final MMetal IRON;
@@ -48,7 +50,8 @@ public class Materials
static {
// Rocks
- URegistry.addBlock( ROCK_LIMESTONE = new MLimestone( ) );
+ URegistry.addBlock( ROCK_LIMESTONE = new MRLimestone( ) );
+ URegistry.addBlock( ROCK_CHALK = new MRChalk( ) );
// Vanilla metals
GOLD = new MMetal( Blocks.GOLD_BLOCK , Items.GOLD_INGOT , Items.GOLD_NUGGET );
diff --git a/src/java/mmm/materials/rock/MRChalk.java b/src/java/mmm/materials/rock/MRChalk.java
new file mode 100644
index 0000000..e311a27
--- /dev/null
+++ b/src/java/mmm/materials/rock/MRChalk.java
@@ -0,0 +1,28 @@
+package mmm.materials.rock;
+
+
+import mmm.utils.URegistry;
+import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+
+
+public class MRChalk
+ extends Block
+{
+
+ public MRChalk( )
+ {
+ super( Material.ROCK , MapColor.SNOW );
+ this.setCreativeTab( CreativeTabs.BUILDING_BLOCKS );
+ this.setHardness( 1f );
+ this.setResistance( 5f );
+ this.setSoundType( SoundType.STONE );
+ this.setHarvestLevel( "pickaxe" , 0 );
+ URegistry.setIdentifiers( this , "materials" , "rock" , "chalk" );
+ }
+
+}
diff --git a/src/java/mmm/materials/rock/MLimestone.java b/src/java/mmm/materials/rock/MRLimestone.java
similarity index 95%
rename from src/java/mmm/materials/rock/MLimestone.java
rename to src/java/mmm/materials/rock/MRLimestone.java
index 7e2066b..d48237c 100644
--- a/src/java/mmm/materials/rock/MLimestone.java
+++ b/src/java/mmm/materials/rock/MRLimestone.java
@@ -16,12 +16,12 @@ import net.minecraft.creativetab.CreativeTabs;
-public class MLimestone
+public class MRLimestone
extends Block
implements I_UOreGenerationRegistrar
{
- public MLimestone( )
+ public MRLimestone( )
{
super( Material.ROCK , MapColor.SNOW );
this.setCreativeTab( CreativeTabs.BUILDING_BLOCKS );
diff --git a/src/resources/assets/mmm/blockstates/materials/rock/chalk.json b/src/resources/assets/mmm/blockstates/materials/rock/chalk.json
new file mode 100644
index 0000000..107021d
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/materials/rock/chalk.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "normal": { "model": "mmm:materials/rock/chalk" }
+ }
+}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 0bfe863..cca2afa 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -9,6 +9,7 @@ gui.mmm.tech.base.am.disabled=Deactivated
tile.mmm.materials.rock.limestone.name=Limestone
+tile.mmm.materials.rock.chalk.name=Chalk
item.mmm.materials.stone.coke.name=Coke
item.mmm.materials.stone.slag.name=Slag
diff --git a/src/resources/assets/mmm/models/block/materials/rock/chalk.json b/src/resources/assets/mmm/models/block/materials/rock/chalk.json
new file mode 100644
index 0000000..2ca225d
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/materials/rock/chalk.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "mmm:blocks/materials/rock/chalk"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/rock/chalk.json b/src/resources/assets/mmm/models/item/materials/rock/chalk.json
new file mode 100644
index 0000000..f8f1025
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/rock/chalk.json
@@ -0,0 +1,3 @@
+{
+ "parent": "mmm:block/materials/rock/chalk"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/blocks/materials/rock/chalk.png b/src/resources/assets/mmm/textures/blocks/materials/rock/chalk.png
new file mode 100644
index 0000000000000000000000000000000000000000..97cea711a88c77b95062785e2292689b1a9b8d6d
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|7d>4ZLp08p2A&pTR^)j6-+t@b
zA2;r?EHk{KY%Dp=wP{Aj@AeGAyR}01_gXhRT5JAIW6_M2k;bok+IzS-bMs{uN=pbj
z^am*NOB{J}&_em~(|>l&%sbP}tsD<Ln3gP{toHfNXR+GUNiCm~%{DNY8P2X={OQO3
z%scJ6j|BU!q<oI3Tv)_a<m+@qc;f|~nxscIR`ccV+<wQK*3F`#^`~db({p~$qzmWI
rh|;}aGcBYl{GZ3t@~8c{8Rz+h&b%mnpfKAV=s5;YS3j3^P6<r_;%9PQ
literal 0
HcmV?d00001