diff --git a/TODO.txt b/TODO.txt index 1929036..f7f026b 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 Aluminium (bauxite) materials.ore No Silver (native, horn silver) materials.ore No Lead (galena) materials.ore No Cinnabar diff --git a/graphics/ore.xcf b/graphics/ore.xcf index 15221e1..ea6107e 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 50bb19d..dbf76f4 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -1,6 +1,7 @@ package mmm.materials; +import mmm.materials.ore.MOBauxite; import mmm.materials.ore.MOCassiterite; import mmm.materials.ore.MOCopper; import mmm.materials.ore.MOCuprite; @@ -52,6 +53,7 @@ public class Materials public static final MOre ORE_CASSITERITE; public static final MOre ORE_SPHALERITE; public static final MOre ORE_ROCK_SALT; + public static final MOre ORE_BAUXITE; static { // Rocks @@ -95,6 +97,7 @@ public class Materials ORE_CASSITERITE = new MOCassiterite( ); ORE_SPHALERITE = new MOSphalerite( ); ORE_ROCK_SALT = new MORockSalt( ); + ORE_BAUXITE = new MOBauxite( ); // Other recipes URegistry.addRecipeRegistrar( new Materials( ) ); diff --git a/src/java/mmm/materials/ore/MOBauxite.java b/src/java/mmm/materials/ore/MOBauxite.java new file mode 100644 index 0000000..161a2f9 --- /dev/null +++ b/src/java/mmm/materials/ore/MOBauxite.java @@ -0,0 +1,34 @@ +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; +import net.minecraft.block.state.pattern.BlockMatcher; + + + +public class MOBauxite + extends MOre + implements I_UOreGenerationRegistrar +{ + + public MOBauxite( ) + { + super( "bauxite" , 1 ); + } + + + @Override + public void addConditions( final List< WGOreCondition > conditions ) + { + conditions.add( new WGOreCondition( WLocation.inOverworld( ) , new WGOreParameters( this.getDefaultState( ) , + 10 , 9 , 45 , 80 , BlockMatcher.forBlock( Materials.ROCK_LIMESTONE ) ) ) ); + } + +} diff --git a/src/resources/assets/mmm/blockstates/materials/ore/bauxite.json b/src/resources/assets/mmm/blockstates/materials/ore/bauxite.json new file mode 100644 index 0000000..77deaca --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/ore/bauxite.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/ore/bauxite" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 1a88f4e..947f3cf 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -15,6 +15,8 @@ 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 +tile.mmm.materials.ore.bauxite.name=Bauxite + 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/bauxite.json b/src/resources/assets/mmm/models/block/materials/ore/bauxite.json new file mode 100644 index 0000000..5095c0b --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/ore/bauxite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/ore/bauxite" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ore/bauxite.json b/src/resources/assets/mmm/models/item/materials/ore/bauxite.json new file mode 100644 index 0000000..2e1f120 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ore/bauxite.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/ore/bauxite" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/bauxite.png b/src/resources/assets/mmm/textures/blocks/materials/ore/bauxite.png new file mode 100644 index 0000000..9ac0902 Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/materials/ore/bauxite.png differ