From f6521cdddfe97de499ed385c82f39e8e2e9bbbb3 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Sat, 17 Dec 2016 13:28:08 +0100 Subject: Reimplemented different ore-types for Grantie, Diorite, Andensite. Added material, items and other stuff for each ore. Oregen rebalanced. Fixed Generator for Oregen. --- .../assets/taiga/blockstates/fluid_block.json | 21 +++++++++++++++++++++ .../assets/taiga/blockstates/jauxum_block.json | 18 ++++++++++++++++++ .../assets/taiga/blockstates/jauxum_ore.json | 18 ++++++++++++++++++ .../taiga/blockstates/karmesineandensite_ore.json | 18 ------------------ .../taiga/blockstates/karmesinediorite_ore.json | 18 ------------------ .../taiga/blockstates/karmesinegranite_ore.json | 18 ------------------ .../assets/taiga/blockstates/ovium_block.json | 18 ++++++++++++++++++ .../assets/taiga/blockstates/ovium_ore.json | 18 ++++++++++++++++++ .../assets/taiga/blockstates/terrax_block.json | 18 ++++++++++++++++++ .../assets/taiga/textures/blocks/ore/karmesine.png | Bin 16346 -> 16413 bytes .../textures/blocks/ore/karmesineandensite.png | Bin 16346 -> 0 bytes .../taiga/textures/blocks/ore/karmesinediorite.png | Bin 16328 -> 0 bytes .../taiga/textures/blocks/ore/karmesinegranite.png | Bin 16278 -> 0 bytes 13 files changed, 111 insertions(+), 54 deletions(-) create mode 100644 src/main/resources/assets/taiga/blockstates/jauxum_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/jauxum_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json delete mode 100644 src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/ovium_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/ovium_ore.json create mode 100644 src/main/resources/assets/taiga/blockstates/terrax_block.json delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index 20fbe16..70510af 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -88,6 +88,27 @@ } } ], + "jaxum_fluid": [ + { + "custom": { + "fluid": "jaxum_fluid" + } + } + ], + "ovium_fluid": [ + { + "custom": { + "fluid": "ovium_fluid" + } + } + ], + "terrax_fluid": [ + { + "custom": { + "fluid": "terrax_fluid" + } + } + ], "palladium_fluid": [ { "custom": { diff --git a/src/main/resources/assets/taiga/blockstates/jauxum_block.json b/src/main/resources/assets/taiga/blockstates/jauxum_block.json new file mode 100644 index 0000000..6df85dc --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/jauxum_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/jauxum" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/jauxum_ore.json b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json new file mode 100644 index 0000000..846b091 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/jauxum" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json deleted file mode 100644 index bd66801..0000000 --- a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "taiga:blocks/ore/karmesineandensite" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [ - {} - ], - "inventory": [ - {} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json deleted file mode 100644 index 07ba243..0000000 --- a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "taiga:blocks/ore/karmesinediorite" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [ - {} - ], - "inventory": [ - {} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json deleted file mode 100644 index 534c33e..0000000 --- a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "taiga:blocks/ore/karmesinegranite" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [ - {} - ], - "inventory": [ - {} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/ovium_block.json b/src/main/resources/assets/taiga/blockstates/ovium_block.json new file mode 100644 index 0000000..4052bcc --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/ovium_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/ovium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/ovium_ore.json b/src/main/resources/assets/taiga/blockstates/ovium_ore.json new file mode 100644 index 0000000..1c36838 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/ovium_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/ovium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/terrax_block.json b/src/main/resources/assets/taiga/blockstates/terrax_block.json new file mode 100644 index 0000000..5bd661d --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/terrax_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/terrax" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png index 7e4d7c2..811c9f0 100644 Binary files a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png deleted file mode 100644 index 7e4d7c2..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png deleted file mode 100644 index 4f14e7a..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png deleted file mode 100644 index 9b42d38..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png and /dev/null differ -- cgit v1.2.3