From c390ed74f2b7bf24b9a5f285057b540de2ff1207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Thu, 7 Jul 2016 17:08:16 +0200 Subject: [PATCH] Cinnabar --- TODO.txt | 4 ++- src/java/mmm/materials/Materials.java | 3 ++ src/java/mmm/materials/ore/MOCinnabar.java | 32 ++++++++++++++++++ .../blockstates/materials/ore/cinnabar.json | 5 +++ src/resources/assets/mmm/lang/en_US.lang | 2 ++ .../models/block/materials/ore/cinnabar.json | 6 ++++ .../models/item/materials/ore/cinnabar.json | 3 ++ .../blocks/materials/ore/cinnabar.png | Bin 0 -> 486 bytes 8 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/java/mmm/materials/ore/MOCinnabar.java create mode 100644 src/resources/assets/mmm/blockstates/materials/ore/cinnabar.json create mode 100644 src/resources/assets/mmm/models/block/materials/ore/cinnabar.json create mode 100644 src/resources/assets/mmm/models/item/materials/ore/cinnabar.json create mode 100644 src/resources/assets/mmm/textures/blocks/materials/ore/cinnabar.png diff --git a/TODO.txt b/TODO.txt index 1486f24..c13f8e8 100644 --- a/TODO.txt +++ b/TODO.txt @@ -41,6 +41,7 @@ materials No Alloys materials No Metal from slag -> in metal recycler materials No Black sand +materials No Quicksand / quagmire materials No Metals Lead Aluminium @@ -53,8 +54,9 @@ materials.rock No Smooth slate materials.rock No Basalt ------------------------------------------------------------------------------------------------------- materials.ore No Silver (native, horn silver) -materials.ore No Cinnabar materials.ore No Olivine +materials.ore No Sulfur +materials.ore No Saltpeter ------------------------------------------------------------------------------------------------------- tech.base No Alloy furnace -> fix item pickup in creative mode BF diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index 0d5420a..50d1418 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -3,6 +3,7 @@ package mmm.materials; import mmm.materials.ore.MOBauxite; import mmm.materials.ore.MOCassiterite; +import mmm.materials.ore.MOCinnabar; import mmm.materials.ore.MOCopper; import mmm.materials.ore.MOCuprite; import mmm.materials.ore.MOGalena; @@ -56,6 +57,7 @@ public class Materials public static final MOre ORE_ROCK_SALT; public static final MOre ORE_BAUXITE; public static final MOre ORE_GALENA; + public static final MOre ORE_CINNABAR; static { // Rocks @@ -101,6 +103,7 @@ public class Materials ORE_ROCK_SALT = new MORockSalt( ); ORE_BAUXITE = new MOBauxite( ); ORE_GALENA = new MOGalena( ); + ORE_CINNABAR = new MOCinnabar( ); // Other recipes URegistry.addRecipeRegistrar( new Materials( ) ); diff --git a/src/java/mmm/materials/ore/MOCinnabar.java b/src/java/mmm/materials/ore/MOCinnabar.java new file mode 100644 index 0000000..bd4f625 --- /dev/null +++ b/src/java/mmm/materials/ore/MOCinnabar.java @@ -0,0 +1,32 @@ +package mmm.materials.ore; + + +import java.util.List; + +import mmm.materials.MOre; +import mmm.utils.I_UOreGenerationRegistrar; +import mmm.world.WLocation; +import mmm.world.gen.WGOreCondition; +import mmm.world.gen.WGOreParameters; + + + +public class MOCinnabar + extends MOre + implements I_UOreGenerationRegistrar +{ + + public MOCinnabar( ) + { + super( "cinnabar" , 1 ); + } + + + @Override + public void addConditions( final List< WGOreCondition > conditions ) + { + conditions.add( new WGOreCondition( WLocation.inOverworld( ) , + new WGOreParameters( this.getDefaultState( ) , 1 , 20 , 0 , 50 ) ) ); + } + +} diff --git a/src/resources/assets/mmm/blockstates/materials/ore/cinnabar.json b/src/resources/assets/mmm/blockstates/materials/ore/cinnabar.json new file mode 100644 index 0000000..6dc024e --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/ore/cinnabar.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/ore/cinnabar" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index c0915a9..b1b5901 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -19,6 +19,8 @@ tile.mmm.materials.ore.bauxite.name=Bauxite tile.mmm.materials.ore.galena.name=Galena +tile.mmm.materials.ore.cinnabar.name=Cinnabar + 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/cinnabar.json b/src/resources/assets/mmm/models/block/materials/ore/cinnabar.json new file mode 100644 index 0000000..44f18e7 --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/ore/cinnabar.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/ore/cinnabar" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ore/cinnabar.json b/src/resources/assets/mmm/models/item/materials/ore/cinnabar.json new file mode 100644 index 0000000..ab2dae4 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ore/cinnabar.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/ore/cinnabar" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/cinnabar.png b/src/resources/assets/mmm/textures/blocks/materials/ore/cinnabar.png new file mode 100644 index 0000000000000000000000000000000000000000..95bc58398602bdab09391443c524ce835f63d195 GIT binary patch literal 486 zcmV@P)q)X~ zYz!pikaXC2SJ{pBv?Kva@CQlO)2FkJ@D}dHpWlDzx(YJ^X9QrpFYEfP=`NR(%ejbQ z+im?kTko3HN}$B1ZDL4_vz!u3>FxPtwq_cK!|S(x8VUesEayd4R^H7K6P~6?aV{Ba zH=D2PmF3Io9XvUpThxLXMpEDQJV6N0 zuZQ#b)KoP^I-fp-l*4@tkXzN}yXgv!`>Fu|GrNMZl@K}u58*!as%|&yt&q}LV^c&{ zJFUoS)b-3ic^n>GYd+6QY`o}*@-s8d#E_pBg;F5Q<@Pm=!L+@_k2P4f7 cy_bIe0XOV?ZzeVEBLDyZ07*qoM6N<$g8GQv