From e13ca1bc2f9ae984845d4a3b0003fa2ad98dfb7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Thu, 16 Jun 2016 15:02:04 +0200 Subject: [PATCH] Cuprite (copper ore/gem) --- TODO.txt | 1 - src/java/mmm/materials/Materials.java | 5 +++ src/java/mmm/materials/ore/MOCuprite.java | 36 ++++++++++++++++++ .../blockstates/materials/ore/cuprite.json | 5 +++ src/resources/assets/mmm/lang/en_US.lang | 5 ++- .../models/block/materials/ore/cuprite.json | 6 +++ .../models/item/materials/ore/cuprite.json | 3 ++ .../models/item/materials/stone/cuprite.json | 6 +++ .../item/materials/stone/malachite.json | 2 +- .../textures/blocks/materials/ore/cuprite.png | Bin 0 -> 316 bytes .../items/materials/stone/cuprite.png | Bin 0 -> 385 bytes .../materials/{ore => stone}/malachite.png | Bin 12 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 src/java/mmm/materials/ore/MOCuprite.java create mode 100644 src/resources/assets/mmm/blockstates/materials/ore/cuprite.json create mode 100644 src/resources/assets/mmm/models/block/materials/ore/cuprite.json create mode 100644 src/resources/assets/mmm/models/item/materials/ore/cuprite.json create mode 100644 src/resources/assets/mmm/models/item/materials/stone/cuprite.json create mode 100644 src/resources/assets/mmm/textures/blocks/materials/ore/cuprite.png create mode 100644 src/resources/assets/mmm/textures/items/materials/stone/cuprite.png rename src/resources/assets/mmm/textures/items/materials/{ore => stone}/malachite.png (100%) diff --git a/TODO.txt b/TODO.txt index a3397f5..933e847 100644 --- a/TODO.txt +++ b/TODO.txt @@ -16,7 +16,6 @@ plants No? Eggplant plants No? Strawberries ------------------------------------------------------------------------------------------------------- ores No Rock salt -ores No Cuprite (copper) ------------------------------------------------------------------------------------------------------- animals ??? Goats ------------------------------------------------------------------------------------------------------- diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index 29da5fd..a624113 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -2,6 +2,7 @@ package mmm.materials; import mmm.materials.ore.MOCopper; +import mmm.materials.ore.MOCuprite; import mmm.materials.ore.MOMalachite; import mmm.utils.URegistry; import net.minecraft.creativetab.CreativeTabs; @@ -18,9 +19,11 @@ public class Materials public static final MMetal COPPER; public static final Item STONE_MALACHITE; + public static final Item STONE_CUPRITE; public static final MOre ORE_COPPER; public static final MOre ORE_MALACHITE; + public static final MOre ORE_CUPRITE; static { GOLD = new MMetal( Items.GOLD_INGOT , Items.GOLD_NUGGET ); @@ -28,9 +31,11 @@ public class Materials COPPER = new MMetal( "copper" , 0.4f ); URegistry.addItem( STONE_MALACHITE = makeStone( "malachite" ) ); + URegistry.addItem( STONE_CUPRITE = makeStone( "cuprite" ) ); URegistry.addBlock( ORE_COPPER = new MOCopper( ) ); URegistry.addBlock( ORE_MALACHITE = new MOMalachite( ) ); + URegistry.addBlock( ORE_CUPRITE = new MOCuprite( ) ); } diff --git a/src/java/mmm/materials/ore/MOCuprite.java b/src/java/mmm/materials/ore/MOCuprite.java new file mode 100644 index 0000000..565fe83 --- /dev/null +++ b/src/java/mmm/materials/ore/MOCuprite.java @@ -0,0 +1,36 @@ +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.WOreGenerationCondition; +import mmm.world.WOreGenerationParameters; + + + +public class MOCuprite + extends MOre + implements I_UOreGenerationRegistrar +{ + + public MOCuprite( ) + { + super( "cuprite" , 1 ); + this.setMetal( Materials.COPPER , 2 ); + this.setDrops( Materials.STONE_CUPRITE ); + this.setExperience( 2 , 5 ); + } + + + @Override + public void addConditions( final List< WOreGenerationCondition > conditions ) + { + conditions.add( new WOreGenerationCondition( WLocation.inOverworld( ) , + new WOreGenerationParameters( this.getDefaultState( ) , 10 , 9 , 0 , 60 ) ) ); + } + +} diff --git a/src/resources/assets/mmm/blockstates/materials/ore/cuprite.json b/src/resources/assets/mmm/blockstates/materials/ore/cuprite.json new file mode 100644 index 0000000..2dcf8c3 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/ore/cuprite.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/ore/cuprite" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 2ef26b8..5661746 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -28,4 +28,7 @@ item.mmm.materials.nugget.copper.name=Copper Nugget tile.mmm.materials.ore.copper.name=Native Copper item.mmm.materials.stone.malachite.name=Malachite -tile.mmm.materials.ore.malachite.name=Malachite +tile.mmm.materials.ore.malachite.name=Malachite Ore + +item.mmm.materials.stone.cuprite.name=Cuprite +tile.mmm.materials.ore.cuprite.name=Cuprite Ore diff --git a/src/resources/assets/mmm/models/block/materials/ore/cuprite.json b/src/resources/assets/mmm/models/block/materials/ore/cuprite.json new file mode 100644 index 0000000..d1b98cb --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/ore/cuprite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/ore/cuprite" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ore/cuprite.json b/src/resources/assets/mmm/models/item/materials/ore/cuprite.json new file mode 100644 index 0000000..94243b1 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ore/cuprite.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/ore/cuprite" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/stone/cuprite.json b/src/resources/assets/mmm/models/item/materials/stone/cuprite.json new file mode 100644 index 0000000..371b68e --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/stone/cuprite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/materials/stone/cuprite" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/stone/malachite.json b/src/resources/assets/mmm/models/item/materials/stone/malachite.json index 4cede72..c6cf27b 100644 --- a/src/resources/assets/mmm/models/item/materials/stone/malachite.json +++ b/src/resources/assets/mmm/models/item/materials/stone/malachite.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/materials/ore/malachite" + "layer0": "mmm:items/materials/stone/malachite" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/cuprite.png b/src/resources/assets/mmm/textures/blocks/materials/ore/cuprite.png new file mode 100644 index 0000000000000000000000000000000000000000..ff9068131585da3bace0e70bef396b2b0d2cbc03 GIT binary patch literal 316 zcmV-C0mJ@@P)jwl*wqj0 zNCoxVaI4iyf9HLv6z>LOKg+YRUhRNX?871Z_A%wXRU3gTycZ{NG?yRQ z9;O%~?HUudqx`!OF+>h~Hc)%bkHUrG)`(nqYq2g@ O0000pNYm2P-*jN2*sqWt)wzkN7XUK@b zp&0Bc_s;=aTU`3)sDu+_ltHS=!&6|9S8MHi#MTxibDnZwo)hu%;GE^QV}kdw4N9HU zthbnydM2p}R3ocY!^>opLAhm=>c9#w@lBGgK~n7lJckk#o#US)=k6(9!b@B^#>k3~ zJ>}t~*^k{e!nPwsWiY|pXp&-A{Oc(W#7$X8xz#aFn|$QNPfkqIjV^Y@&7-+cdk=f! zq98%4dYFnH;#x)l9Em~Q fQBF%AfBtYEOWvZsA7%+d00000NkvXXu0mjfk&eBT literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/materials/ore/malachite.png b/src/resources/assets/mmm/textures/items/materials/stone/malachite.png similarity index 100% rename from src/resources/assets/mmm/textures/items/materials/ore/malachite.png rename to src/resources/assets/mmm/textures/items/materials/stone/malachite.png