diff --git a/graphics/ore.xcf b/graphics/ore.xcf index 9531c3a..4e22951 100644 Binary files a/graphics/ore.xcf and b/graphics/ore.xcf differ diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index be600ba..ca3fc9a 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -64,6 +64,7 @@ public class Materials public static final MOre ORE_GALENA; public static final MOre ORE_CINNABAR; public static final MOre ORE_SULPHUR; + public static final MOre ORE_SILVER; static { // Rocks @@ -130,8 +131,9 @@ public class Materials ORE_SULPHUR = new MOre( "sulphur" , 0 ) // .setResistance( 2.0f ) // .setHardness( 1.0f ) // - .setDrops( ITEM_SULPHUR_POWDER , 3 , 6 ) // + .setDrops( Materials.ITEM_SULPHUR_POWDER , 3 , 6 ) // .setExperience( 1 , 2 ); + ORE_SILVER = new MOre( "silver" , 2 ); // Other recipes, ore generation parameters, etc. final Materials materials = new Materials( ); @@ -261,13 +263,13 @@ public class Materials new WGOreParameters( Materials.ORE_CUPRITE , 10 , 9 , 0 , 60 ) ) ); conditions.add( new WGOreCondition( WLocation.inOverworld( ) , - new WGOreParameters( Materials.ORE_CASSITERITE , 10 , 9 , 45 , 80 ) ) ); + new WGOreParameters( Materials.ORE_CASSITERITE , 5 , 9 , 45 , 80 ) ) ); conditions.add( new WGOreCondition( WLocation.inOverworld( ) , // new WGOreParameters( Materials.ORE_SPHALERITE , 15 , 15 ) ) ); conditions.add( new WGOreCondition( WLocation.inOverworld( ) , // - new WGOreParameters( Materials.ORE_ROCK_SALT , 5 , 30 , 45 , 255 ) ) ); + new WGOreParameters( Materials.ORE_ROCK_SALT , 1 , 30 , 45 , 255 ) ) ); conditions.add( new WGOreCondition( WLocation.inOverworld( ) , // new WGOreParameters( Materials.ORE_GALENA , 10 , 9 ) ) ); @@ -276,8 +278,11 @@ public class Materials new WGOreParameters( Materials.ORE_CINNABAR , 1 , 20 , 0 , 50 ) ) ); conditions.add( new WGOreCondition( WLocation.inTheNether( ) , // - new WGOreParameters( Materials.ORE_SULPHUR , 15 , 25 , // + new WGOreParameters( Materials.ORE_SULPHUR , 5 , 25 , // BlockMatcher.forBlock( Blocks.NETHERRACK ) ) ) ); + + conditions.add( new WGOreCondition( WLocation.inOverworld( ) , // + new WGOreParameters( Materials.ORE_SILVER , 3 , 9 , 0 , 40 ) ) ); } } diff --git a/src/resources/assets/mmm/blockstates/materials/ore/silver.json b/src/resources/assets/mmm/blockstates/materials/ore/silver.json new file mode 100644 index 0000000..8867ad7 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/ore/silver.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/ore/silver" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 149158e..946c0f2 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -25,6 +25,8 @@ tile.mmm.materials.ore.cinnabar.name=Cinnabar tile.mmm.materials.ore.sulphur.name=Sulphur item.mmm.materials.stone.sulphur_powder.name=Sulphur Powder +tile.mmm.materials.ore.silver.name=Native Silver + 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/silver.json b/src/resources/assets/mmm/models/block/materials/ore/silver.json new file mode 100644 index 0000000..beb0130 --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/ore/silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/ore/silver" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ore/silver.json b/src/resources/assets/mmm/models/item/materials/ore/silver.json new file mode 100644 index 0000000..99f9325 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ore/silver.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/ore/silver" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/silver.png b/src/resources/assets/mmm/textures/blocks/materials/ore/silver.png new file mode 100644 index 0000000..23d4ca6 Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/materials/ore/silver.png differ