From 82cc16cf3ca733b153d83412ce25a741b053d756 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Wed, 20 Jan 2016 16:57:25 -0500 Subject: [PATCH] Renamed Dark Wood to Umbran Wood, renamed Ghastly Souls to Souls --- .../api/achievement/BOPAchievements.java | 2 +- .../biomesoplenty/api/block/BOPBlocks.java | 8 +- .../java/biomesoplenty/api/item/BOPItems.java | 4 +- .../biome/overworld/BiomeGenOminousWoods.java | 4 +- .../common/block/BlockBOPLeaves.java | 4 +- .../common/block/BlockBOPSapling.java | 2 +- .../biomesoplenty/common/enums/BOPTrees.java | 2 +- .../biomesoplenty/common/enums/BOPWoods.java | 2 +- .../handler/AchievementEventHandler.java | 4 +- .../common/init/ModAchievements.java | 6 +- .../biomesoplenty/common/init/ModBlocks.java | 8 +- .../common/init/ModCrafting.java | 2 +- .../biomesoplenty/common/init/ModItems.java | 4 +- .../common/integration/ThaumcraftCompat.java | 8 +- .../blockstates/dark_double_slab.json | 5 -- .../biomesoplenty/blockstates/dark_slab.json | 6 -- .../biomesoplenty/blockstates/leaves_1.json | 2 +- .../biomesoplenty/blockstates/log_0.json | 8 +- .../biomesoplenty/blockstates/planks.json | 2 +- .../biomesoplenty/blockstates/planks_0.json | 2 +- .../biomesoplenty/blockstates/sapling_0.json | 2 +- ...door_block.json => umbran_door_block.json} | 64 +++++++------- .../blockstates/umbran_double_slab.json | 5 ++ .../{dark_fence.json => umbran_fence.json} | 32 +++---- ...fence_gate.json => umbran_fence_gate.json} | 32 +++---- .../blockstates/umbran_slab.json | 6 ++ .../{dark_stairs.json => umbran_stairs.json} | 80 +++++++++--------- .../blockstates/wood_slab_0.json | 4 +- .../assets/biomesoplenty/lang/de_DE.lang | 2 +- .../assets/biomesoplenty/lang/en_US.lang | 24 +++--- .../models/block/dark_door_bottom.json | 7 -- .../models/block/dark_door_bottom_rh.json | 7 -- .../models/block/dark_door_top.json | 7 -- .../models/block/dark_door_top_rh.json | 7 -- .../models/block/dark_inner_stairs.json | 8 -- .../biomesoplenty/models/block/dark_log.json | 7 -- .../models/block/dark_log_side.json | 7 -- .../models/block/dark_outer_stairs.json | 8 -- .../models/block/dark_stairs.json | 8 -- .../{dark_bark.json => umbran_bark.json} | 2 +- .../models/block/umbran_door_bottom.json | 7 ++ .../models/block/umbran_door_bottom_rh.json | 7 ++ .../models/block/umbran_door_top.json | 7 ++ .../models/block/umbran_door_top_rh.json | 7 ++ ...sed.json => umbran_fence_gate_closed.json} | 2 +- ..._open.json => umbran_fence_gate_open.json} | 2 +- ...ntory.json => umbran_fence_inventory.json} | 2 +- ...{dark_fence_n.json => umbran_fence_n.json} | 2 +- ...ark_fence_ne.json => umbran_fence_ne.json} | 2 +- ...ark_fence_ns.json => umbran_fence_ns.json} | 2 +- ...k_fence_nse.json => umbran_fence_nse.json} | 2 +- ...fence_nsew.json => umbran_fence_nsew.json} | 2 +- ...fence_post.json => umbran_fence_post.json} | 2 +- .../models/block/umbran_inner_stairs.json | 8 ++ .../{dark_leaves.json => umbran_leaves.json} | 2 +- .../models/block/umbran_log.json | 7 ++ .../models/block/umbran_log_side.json | 7 ++ .../models/block/umbran_outer_stairs.json | 8 ++ .../{dark_planks.json => umbran_planks.json} | 2 +- ...{dark_sapling.json => umbran_sapling.json} | 2 +- .../models/block/umbran_stairs.json | 8 ++ ...osed.json => umbran_wall_gate_closed.json} | 2 +- ...e_open.json => umbran_wall_gate_open.json} | 2 +- .../models/item/{dark_door.json => soul.json} | 3 +- .../{ghastly_soul.json => umbran_door.json} | 3 +- .../{dark_fence.json => umbran_fence.json} | 2 +- ...fence_gate.json => umbran_fence_gate.json} | 2 +- .../{dark_planks.json => umbran_leaves.json} | 2 +- .../item/{dark_log.json => umbran_log.json} | 2 +- .../{dark_leaves.json => umbran_planks.json} | 2 +- ...{dark_sapling.json => umbran_sapling.json} | 2 +- .../{dark_stairs.json => umbran_stairs.json} | 2 +- ...k_wood_slab.json => umbran_wood_slab.json} | 2 +- ...r_dark_lower.png => door_umbran_lower.png} | Bin ...r_dark_upper.png => door_umbran_upper.png} | Bin .../{leaves_dark.png => leaves_umbran.png} | Bin .../{sapling_dark.png => sapling_umbran.png} | Bin .../blocks/{dark_log.png => umbran_log.png} | Bin .../{dark_log_top.png => umbran_log_top.png} | Bin .../{dark_planks.png => umbran_planks.png} | Bin .../items/{door_dark.png => door_umbran.png} | Bin .../items/{ghastly_soul.png => soul.png} | Bin 82 files changed, 260 insertions(+), 260 deletions(-) delete mode 100644 src/main/resources/assets/biomesoplenty/blockstates/dark_double_slab.json delete mode 100644 src/main/resources/assets/biomesoplenty/blockstates/dark_slab.json rename src/main/resources/assets/biomesoplenty/blockstates/{dark_door_block.json => umbran_door_block.json} (56%) create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/umbran_double_slab.json rename src/main/resources/assets/biomesoplenty/blockstates/{dark_fence.json => umbran_fence.json} (53%) rename src/main/resources/assets/biomesoplenty/blockstates/{dark_fence_gate.json => umbran_fence_gate.json} (53%) create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/umbran_slab.json rename src/main/resources/assets/biomesoplenty/blockstates/{dark_stairs.json => umbran_stairs.json} (51%) delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom_rh.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_door_top.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_door_top_rh.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_inner_stairs.json delete mode 100755 src/main/resources/assets/biomesoplenty/models/block/dark_log.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_log_side.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_outer_stairs.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/dark_stairs.json rename src/main/resources/assets/biomesoplenty/models/block/{dark_bark.json => umbran_bark.json} (55%) create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_rh.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_rh.json rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_gate_closed.json => umbran_fence_gate_closed.json} (55%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_gate_open.json => umbran_fence_gate_open.json} (54%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_inventory.json => umbran_fence_inventory.json} (54%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_n.json => umbran_fence_n.json} (51%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_ne.json => umbran_fence_ne.json} (51%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_ns.json => umbran_fence_ns.json} (51%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_nse.json => umbran_fence_nse.json} (52%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_nsew.json => umbran_fence_nsew.json} (52%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_fence_post.json => umbran_fence_post.json} (52%) create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_inner_stairs.json rename src/main/resources/assets/biomesoplenty/models/block/{dark_leaves.json => umbran_leaves.json} (52%) create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_log_side.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_outer_stairs.json rename src/main/resources/assets/biomesoplenty/models/block/{dark_planks.json => umbran_planks.json} (53%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_sapling.json => umbran_sapling.json} (50%) create mode 100644 src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json rename src/main/resources/assets/biomesoplenty/models/block/{dark_wall_gate_closed.json => umbran_wall_gate_closed.json} (54%) rename src/main/resources/assets/biomesoplenty/models/block/{dark_wall_gate_open.json => umbran_wall_gate_open.json} (54%) rename src/main/resources/assets/biomesoplenty/models/item/{dark_door.json => soul.json} (88%) rename src/main/resources/assets/biomesoplenty/models/item/{ghastly_soul.json => umbran_door.json} (88%) rename src/main/resources/assets/biomesoplenty/models/item/{dark_fence.json => umbran_fence.json} (81%) rename src/main/resources/assets/biomesoplenty/models/item/{dark_fence_gate.json => umbran_fence_gate.json} (84%) rename src/main/resources/assets/biomesoplenty/models/item/{dark_planks.json => umbran_leaves.json} (79%) mode change 100755 => 100644 rename src/main/resources/assets/biomesoplenty/models/item/{dark_log.json => umbran_log.json} (80%) mode change 100755 => 100644 rename src/main/resources/assets/biomesoplenty/models/item/{dark_leaves.json => umbran_planks.json} (79%) rename src/main/resources/assets/biomesoplenty/models/item/{dark_sapling.json => umbran_sapling.json} (87%) rename src/main/resources/assets/biomesoplenty/models/item/{dark_stairs.json => umbran_stairs.json} (83%) rename src/main/resources/assets/biomesoplenty/models/item/{dark_wood_slab.json => umbran_wood_slab.json} (78%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{door_dark_lower.png => door_umbran_lower.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{door_dark_upper.png => door_umbran_upper.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{leaves_dark.png => leaves_umbran.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{sapling_dark.png => sapling_umbran.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{dark_log.png => umbran_log.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{dark_log_top.png => umbran_log_top.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{dark_planks.png => umbran_planks.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/items/{door_dark.png => door_umbran.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/items/{ghastly_soul.png => soul.png} (100%) diff --git a/src/main/java/biomesoplenty/api/achievement/BOPAchievements.java b/src/main/java/biomesoplenty/api/achievement/BOPAchievements.java index 5c197abde..2e301a33d 100644 --- a/src/main/java/biomesoplenty/api/achievement/BOPAchievements.java +++ b/src/main/java/biomesoplenty/api/achievement/BOPAchievements.java @@ -28,7 +28,7 @@ public class BOPAchievements public static Achievement grow_sacred_oak; public static Achievement obtain_honeycomb; public static Achievement obtain_pixie_dust; - public static Achievement obtain_ghastly_soul; + public static Achievement obtain_soul; public static Achievement obtain_celestial_crystal; public static Achievement craft_ornamental_artifact; public static Achievement craft_ambrosia; diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 9ba1a2bbb..adb863d3c 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -49,7 +49,7 @@ public class BOPBlocks public static Block double_wood_slab_1; public static Block sacred_oak_stairs; public static Block cherry_stairs; - public static Block dark_stairs; + public static Block umbran_stairs; public static Block fir_stairs; public static Block ethereal_stairs; public static Block magic_stairs; @@ -63,7 +63,7 @@ public class BOPBlocks public static Block mahogany_stairs; public static Block sacred_oak_fence; public static Block cherry_fence; - public static Block dark_fence; + public static Block umbran_fence; public static Block fir_fence; public static Block ethereal_fence; public static Block magic_fence; @@ -77,7 +77,7 @@ public class BOPBlocks public static Block mahogany_fence; public static Block sacred_oak_fence_gate; public static Block cherry_fence_gate; - public static Block dark_fence_gate; + public static Block umbran_fence_gate; public static Block fir_fence_gate; public static Block ethereal_fence_gate; public static Block magic_fence_gate; @@ -91,7 +91,7 @@ public class BOPBlocks public static Block mahogany_fence_gate; public static Block sacred_oak_door; public static Block cherry_door; - public static Block dark_door; + public static Block umbran_door; public static Block fir_door; public static Block ethereal_door; public static Block magic_door; diff --git a/src/main/java/biomesoplenty/api/item/BOPItems.java b/src/main/java/biomesoplenty/api/item/BOPItems.java index 800ef9c97..bab242bf2 100644 --- a/src/main/java/biomesoplenty/api/item/BOPItems.java +++ b/src/main/java/biomesoplenty/api/item/BOPItems.java @@ -43,7 +43,7 @@ public class BOPItems public static Item green_dye; public static Item white_dye; public static Item black_dye; - public static Item ghastly_soul; + public static Item soul; public static Item pixie_dust; public static Item ichor; public static Item pinecone; @@ -54,7 +54,7 @@ public class BOPItems public static Item sacred_oak_door; public static Item cherry_door; - public static Item dark_door; + public static Item umbran_door; public static Item fir_door; public static Item ethereal_door; public static Item magic_door; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index 4ce7047a8..9aedeaf38 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -78,8 +78,8 @@ public class BiomeGenOminousWoods extends BOPBiome // trees & logs GeneratorWeighted treeGenerator = new GeneratorWeighted(9); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("dark_moss", 2, (new GeneratorBasicTree.Builder()).log(BOPWoods.DARK).leaves(BOPTrees.DARK).minHeight(8).maxHeight(12).minLeavesRadius(2).vine(BOPBlocks.tree_moss.getDefaultState()).create()); - treeGenerator.add("dark_spruce", 6, (new GeneratorTaigaTree.Builder()).log(BOPWoods.DARK).leaves(BOPTrees.DARK).maxHeight(20).create()); // TODO: implement pine cones + treeGenerator.add("umbran_moss", 2, (new GeneratorBasicTree.Builder()).log(BOPWoods.UMBRAN).leaves(BOPTrees.UMBRAN).minHeight(8).maxHeight(12).minLeavesRadius(2).vine(BOPBlocks.tree_moss.getDefaultState()).create()); + treeGenerator.add("umbran_spruce", 6, (new GeneratorTaigaTree.Builder()).log(BOPWoods.UMBRAN).leaves(BOPTrees.UMBRAN).maxHeight(20).create()); // TODO: implement pine cones // grasses GeneratorWeighted grassGenerator = new GeneratorWeighted(3.0F); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java index 42bbe440c..9db520f7d 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java @@ -139,7 +139,7 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock { switch (tree) { - case BAMBOO: case DARK: case DEAD: case ETHEREAL: case FIR: case HELLBARK: case JACARANDA: case MAGIC: case MAPLE: case ORANGE_AUTUMN: case ORIGIN: case PINK_CHERRY: case WHITE_CHERRY: case YELLOW_AUTUMN: case RED_BIG_FLOWER: case YELLOW_BIG_FLOWER: + case BAMBOO: case UMBRAN: case DEAD: case ETHEREAL: case FIR: case HELLBARK: case JACARANDA: case MAGIC: case MAPLE: case ORANGE_AUTUMN: case ORIGIN: case PINK_CHERRY: case WHITE_CHERRY: case YELLOW_AUTUMN: case RED_BIG_FLOWER: case YELLOW_BIG_FLOWER: return ColoringType.PLAIN; case FLOWERING: return ColoringType.OVERLAY; @@ -252,7 +252,7 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock case ORANGE_AUTUMN: case BAMBOO: case MAGIC: - case DARK: + case UMBRAN: case DEAD: case FIR: case ETHEREAL: diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java index 9d9d4863d..a91d474b9 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java @@ -164,7 +164,7 @@ public class BlockBOPSapling extends BlockBOPDecoration implements IGrowable { return new GeneratorBulbTree.Builder().minHeight(6).maxHeight(18).log(BOPBlocks.bamboo.getDefaultState()).leaves(BOPTrees.BAMBOO).create(); case MAGIC: //Not implemented return new WorldGenTrees(true); - case DARK: //Not implemented + case UMBRAN: //Not implemented return new WorldGenTrees(true); case DEAD: return new GeneratorBasicTree.Builder().log(BlockPlanks.EnumType.OAK).leaves(BOPTrees.DEAD).minHeight(5).maxHeight(8).create(); diff --git a/src/main/java/biomesoplenty/common/enums/BOPTrees.java b/src/main/java/biomesoplenty/common/enums/BOPTrees.java index cb15b805e..60c67a94d 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPTrees.java +++ b/src/main/java/biomesoplenty/common/enums/BOPTrees.java @@ -16,7 +16,7 @@ import com.google.common.base.Predicate; public enum BOPTrees implements IStringSerializable, IPagedVariants { - YELLOW_AUTUMN, ORANGE_AUTUMN, BAMBOO, MAGIC, DARK, DEAD, FIR, ETHEREAL, ORIGIN, PINK_CHERRY, WHITE_CHERRY, MAPLE, HELLBARK, FLOWERING, JACARANDA, SACRED_OAK, MANGROVE, PALM, REDWOOD, WILLOW, PINE, MAHOGANY, RED_BIG_FLOWER, YELLOW_BIG_FLOWER; + YELLOW_AUTUMN, ORANGE_AUTUMN, BAMBOO, MAGIC, UMBRAN, DEAD, FIR, ETHEREAL, ORIGIN, PINK_CHERRY, WHITE_CHERRY, MAPLE, HELLBARK, FLOWERING, JACARANDA, SACRED_OAK, MANGROVE, PALM, REDWOOD, WILLOW, PINE, MAHOGANY, RED_BIG_FLOWER, YELLOW_BIG_FLOWER; @Override public String getName() { diff --git a/src/main/java/biomesoplenty/common/enums/BOPWoods.java b/src/main/java/biomesoplenty/common/enums/BOPWoods.java index 849b7f62a..ec6b06a97 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPWoods.java +++ b/src/main/java/biomesoplenty/common/enums/BOPWoods.java @@ -16,7 +16,7 @@ import com.google.common.base.Predicate; public enum BOPWoods implements IStringSerializable, IPagedVariants { - SACRED_OAK, CHERRY, DARK, FIR, ETHEREAL, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW, PINE, HELLBARK, JACARANDA, MAHOGANY, GIANT_FLOWER, DEAD; + SACRED_OAK, CHERRY, UMBRAN, FIR, ETHEREAL, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW, PINE, HELLBARK, JACARANDA, MAHOGANY, GIANT_FLOWER, DEAD; @Override public String getName() { diff --git a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java index 8287ec144..bd2df33eb 100644 --- a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java @@ -114,9 +114,9 @@ public class AchievementEventHandler } //Soul Searching Achievement - if (item != null && item == BOPItems.ghastly_soul) + if (item != null && item == BOPItems.soul) { - player.triggerAchievement(BOPAchievements.obtain_ghastly_soul); + player.triggerAchievement(BOPAchievements.obtain_soul); } //Honeycomb's Big Achievement diff --git a/src/main/java/biomesoplenty/common/init/ModAchievements.java b/src/main/java/biomesoplenty/common/init/ModAchievements.java index 8c0d452d3..f393ffe00 100644 --- a/src/main/java/biomesoplenty/common/init/ModAchievements.java +++ b/src/main/java/biomesoplenty/common/init/ModAchievements.java @@ -22,10 +22,10 @@ import static biomesoplenty.api.achievement.BOPAchievements.obtain_celestial_cry import static biomesoplenty.api.achievement.BOPAchievements.obtain_coral; import static biomesoplenty.api.achievement.BOPAchievements.obtain_deathbloom; import static biomesoplenty.api.achievement.BOPAchievements.obtain_flowers; -import static biomesoplenty.api.achievement.BOPAchievements.obtain_ghastly_soul; import static biomesoplenty.api.achievement.BOPAchievements.obtain_honeycomb; import static biomesoplenty.api.achievement.BOPAchievements.obtain_miners_delight; import static biomesoplenty.api.achievement.BOPAchievements.obtain_pixie_dust; +import static biomesoplenty.api.achievement.BOPAchievements.obtain_soul; import static biomesoplenty.api.achievement.BOPAchievements.obtain_thorn; import static biomesoplenty.api.achievement.BOPAchievements.obtain_turnip; import static biomesoplenty.api.achievement.BOPAchievements.obtain_wilted_lily; @@ -74,9 +74,9 @@ public class ModAchievements obtain_berry = addAchievement("achievement.obtain_berry", "obtain_berry", 2, 1, new ItemStack(BOPItems.berries), obtain_flowers); eat_shroom_powder = addAchievement("achievement.eat_shroom_powder", "eat_shroom_powder", 5, -1, new ItemStack(BOPItems.shroompowder), obtain_berry); obtain_honeycomb = addAchievement("achievement.obtain_honeycomb", "obtain_honeycomb", 4, 1, new ItemStack(BOPItems.filled_honeycomb), eat_shroom_powder); - obtain_ghastly_soul = addAchievement("achievement.obtain_ghastly_soul", "obtain_ghastly_soul", 3, 4, new ItemStack(BOPItems.ghastly_soul), obtain_honeycomb); + obtain_soul = addAchievement("achievement.obtain_soul", "obtain_soul", 3, 4, new ItemStack(BOPItems.soul), obtain_honeycomb); obtain_celestial_crystal = addAchievement("achievement.obtain_celestial_crystal", "obtain_celestial_crystal", 6, 3, new ItemStack(BOPItems.crystal_shard), obtain_honeycomb); - use_enderporter = addAchievement("achievement.use_enderporter", "use_enderporter", 1, 7, new ItemStack(BOPItems.enderporter), obtain_ghastly_soul).setSpecial(); + use_enderporter = addAchievement("achievement.use_enderporter", "use_enderporter", 1, 7, new ItemStack(BOPItems.enderporter), obtain_soul).setSpecial(); craft_ambrosia = addAchievement("achievement.craft_ambrosia", "craft_ambrosia", 7, 5, new ItemStack(BOPItems.ambrosia), obtain_celestial_crystal).setSpecial(); obtain_coral = addAchievement("achievement.obtain_coral", "obtain_coral", 2, -2, new ItemStack(BOPBlocks.coral), obtain_flowers); diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index 2e05ddb74..dadddb0ea 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -145,7 +145,7 @@ public class ModBlocks // stairs have no variant metadata, use a new BlockBOPStairs instance for each (note there's no giant_flower_stairs or dead_stairs) sacred_oak_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.SACRED_OAK), "sacred_oak_stairs" ); cherry_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.CHERRY), "cherry_stairs" ); - dark_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.DARK), "dark_stairs" ); + umbran_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.UMBRAN), "umbran_stairs" ); fir_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.FIR), "fir_stairs" ); ethereal_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.ETHEREAL), "ethereal_stairs" ); magic_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.MAGIC), "magic_stairs" ); @@ -161,7 +161,7 @@ public class ModBlocks // fences have no variant metadata, use a new BlockBOPFence instance for each (note there's no giant_flower_fence or dead_fence) sacred_oak_fence = registerBlock( new BlockBOPFence(BOPWoods.SACRED_OAK), "sacred_oak_fence" ); cherry_fence = registerBlock( new BlockBOPFence(BOPWoods.CHERRY), "cherry_fence" ); - dark_fence = registerBlock( new BlockBOPFence(BOPWoods.DARK), "dark_fence" ); + umbran_fence = registerBlock( new BlockBOPFence(BOPWoods.UMBRAN), "umbran_fence" ); fir_fence = registerBlock( new BlockBOPFence(BOPWoods.FIR), "fir_fence" ); ethereal_fence = registerBlock( new BlockBOPFence(BOPWoods.ETHEREAL), "ethereal_fence" ); magic_fence = registerBlock( new BlockBOPFence(BOPWoods.MAGIC), "magic_fence" ); @@ -177,7 +177,7 @@ public class ModBlocks // fence gates have no variant metadata, use a new BlockBOPFenceGate instance for each (note there's no giant_flower_fence_gate or dead_fence_gate) sacred_oak_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.SACRED_OAK), "sacred_oak_fence_gate" ); cherry_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.CHERRY), "cherry_fence_gate" ); - dark_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.DARK), "dark_fence_gate" ); + umbran_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.UMBRAN), "umbran_fence_gate" ); fir_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.FIR), "fir_fence_gate" ); ethereal_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.ETHEREAL), "ethereal_fence_gate" ); magic_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.MAGIC), "magic_fence_gate" ); @@ -193,7 +193,7 @@ public class ModBlocks // doors have no variant metadata, use a new BlockBOPDoor instance for each (note there's no giant_flower_door or dead_door) sacred_oak_door = registerDoor( new BlockBOPDoor(BOPWoods.SACRED_OAK), "sacred_oak_door", BOPItems.sacred_oak_door ); cherry_door = registerDoor( new BlockBOPDoor(BOPWoods.CHERRY), "cherry_door", BOPItems.cherry_door ); - dark_door = registerDoor( new BlockBOPDoor(BOPWoods.DARK), "dark_door", BOPItems.dark_door ); + umbran_door = registerDoor( new BlockBOPDoor(BOPWoods.UMBRAN), "umbran_door", BOPItems.umbran_door ); fir_door = registerDoor( new BlockBOPDoor(BOPWoods.FIR), "fir_door", BOPItems.fir_door ); ethereal_door = registerDoor( new BlockBOPDoor(BOPWoods.ETHEREAL), "ethereal_door", BOPItems.ethereal_door ); magic_door = registerDoor( new BlockBOPDoor(BOPWoods.MAGIC), "magic_door", BOPItems.magic_door ); diff --git a/src/main/java/biomesoplenty/common/init/ModCrafting.java b/src/main/java/biomesoplenty/common/init/ModCrafting.java index 92db2a613..f4b718426 100644 --- a/src/main/java/biomesoplenty/common/init/ModCrafting.java +++ b/src/main/java/biomesoplenty/common/init/ModCrafting.java @@ -190,7 +190,7 @@ public class ModCrafting GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.crystal), new Object[] {"CC", "CC", 'C', new ItemStack(BOPItems.crystal_shard)}); GameRegistry.addShapedRecipe(new ItemStack(Blocks.mossy_cobblestone, 1, 0), new Object[] {"MMM", "MCM", "MMM", 'M', BOPBlocks.moss, 'C', Blocks.cobblestone}); GameRegistry.addShapedRecipe(new ItemStack(Blocks.stonebrick, 1, 1), new Object[] {"MMM", "MSM", "MMM", 'M', BOPBlocks.moss, 'S', Blocks.stonebrick}); - GameRegistry.addShapedRecipe(new ItemStack(BOPItems.enderporter), new Object[] {"IOI", "OAO", "IOI", 'I', Items.ender_eye, 'O', new ItemStack(BOPItems.ghastly_soul), 'A', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal())}); + GameRegistry.addShapedRecipe(new ItemStack(BOPItems.enderporter), new Object[] {"IOI", "OAO", "IOI", 'I', Items.ender_eye, 'O', new ItemStack(BOPItems.soul), 'A', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal())}); GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.bamboo_thatching), new Object[] {"##", "##", '#', BOPBlocks.bamboo}); GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.bamboo, 8), new Object [] {" #", "# ", '#', new ItemStack(BOPBlocks.bamboo_thatching)}); GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.bamboo, 8), new Object [] {"# ", " #", '#', new ItemStack(BOPBlocks.bamboo_thatching)}); diff --git a/src/main/java/biomesoplenty/common/init/ModItems.java b/src/main/java/biomesoplenty/common/init/ModItems.java index 2e77ce6cd..b8eb716be 100644 --- a/src/main/java/biomesoplenty/common/init/ModItems.java +++ b/src/main/java/biomesoplenty/common/init/ModItems.java @@ -84,8 +84,8 @@ public class ModItems green_dye = registerItem(new Item(), "green_dye"); white_dye = registerItem(new Item(), "white_dye"); black_dye = registerItem(new Item(), "black_dye"); - ghastly_soul = registerItem(new Item(), "ghastly_soul"); - ghastly_soul.setMaxStackSize(1); + soul = registerItem(new Item(), "soul"); + soul.setMaxStackSize(1); pixie_dust = registerItem(new Item(), "pixie_dust"); ichor = registerItem(new Item(), "ichor"); pinecone = registerItem(new Item(), "pinecone"); diff --git a/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java b/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java index e02f3f810..9fa5cdcc2 100644 --- a/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java +++ b/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java @@ -46,7 +46,7 @@ public class ThaumcraftCompat //Logs - addAspectsToState(BlockBOPLog.paging.getVariantState(BOPWoods.DARK), new Aspect[] { Aspect.PLANT, Aspect.DARKNESS }, new int[] { 4, 2 }); + addAspectsToState(BlockBOPLog.paging.getVariantState(BOPWoods.UMBRAN), new Aspect[] { Aspect.PLANT, Aspect.DARKNESS }, new int[] { 4, 2 }); addAspectsToState(BlockBOPLog.paging.getVariantState(BOPWoods.ETHEREAL), new Aspect[] { Aspect.PLANT, Aspect.LIGHT }, new int[] { 4, 2 }); addAspectsToState(BlockBOPLog.paging.getVariantState(BOPWoods.HELLBARK), new Aspect[] { Aspect.PLANT, Aspect.FIRE }, new int[] { 4, 2 }); addAspectsToState(BlockBOPLog.paging.getVariantState(BOPWoods.DEAD), new Aspect[] { Aspect.PLANT, Aspect.DEATH }, new int[] { 4, 2 }); @@ -56,7 +56,7 @@ public class ThaumcraftCompat addAspectsToState(BlockBOPPlanks.paging.getVariantState(BOPWoods.SACRED_OAK), new Aspect[] { Aspect.PLANT, Aspect.LIGHT }, new int[] { 1, 1 }); addAspectsToState(BlockBOPPlanks.paging.getVariantState(BOPWoods.MAGIC), new Aspect[] { Aspect.PLANT }, new int[] { 1 }); - addAspectsToState(BlockBOPPlanks.paging.getVariantState(BOPWoods.DARK), new Aspect[] { Aspect.PLANT, Aspect.DARKNESS }, new int[] { 1, 1 }); + addAspectsToState(BlockBOPPlanks.paging.getVariantState(BOPWoods.UMBRAN), new Aspect[] { Aspect.PLANT, Aspect.DARKNESS }, new int[] { 1, 1 }); addAspectsToState(BlockBOPPlanks.paging.getVariantState(BOPWoods.ETHEREAL), new Aspect[] { Aspect.PLANT, Aspect.LIGHT }, new int[] { 1, 1 }); addAspectsToBlock(BOPBlocks.bamboo_thatching, new Aspect[] { Aspect.WATER, Aspect.PLANT }, new int[] { 4, 4 }); addAspectsToState(BlockBOPPlanks.paging.getVariantState(BOPWoods.HELLBARK), new Aspect[] { Aspect.PLANT, Aspect.FIRE }, new int[] { 1, 1 }); @@ -66,7 +66,7 @@ public class ThaumcraftCompat //TODO: addAspectsToBlock(BOPCBlocks.appleLeaves, new Aspect[] { Aspect.PLANT, Aspect.LIFE }, new int[] { 1, 1 }); //TODO: addAspectsToBlock(BOPCBlocks.persimmonLeaves, new Aspect[] { Aspect.PLANT, Aspect.LIFE }, new int[] { 1, 1 }); addAspectsToState(BlockBOPLeaves.paging.getVariantState(BOPTrees.DEAD), new Aspect[] { Aspect.PLANT, Aspect.DEATH }, new int[] { 1, 1 }); - addAspectsToState(BlockBOPLeaves.paging.getVariantState(BOPTrees.DARK), new Aspect[] { Aspect.PLANT, Aspect.DARKNESS }, new int[] { 1, 1 }); + addAspectsToState(BlockBOPLeaves.paging.getVariantState(BOPTrees.UMBRAN), new Aspect[] { Aspect.PLANT, Aspect.DARKNESS }, new int[] { 1, 1 }); addAspectsToState(BlockBOPLeaves.paging.getVariantState(BOPTrees.ETHEREAL), new Aspect[] { Aspect.PLANT, Aspect.LIGHT }, new int[] { 1, 1 }); addAspectsToState(BlockBOPLeaves.paging.getVariantState(BOPTrees.SACRED_OAK), new Aspect[] { Aspect.PLANT, Aspect.LIGHT }, new int[] { 1, 1 }); addAspectsToState(BlockBOPLeaves.paging.getVariantState(BOPTrees.MAGIC), new Aspect[] { Aspect.PLANT }, new int[] { 1 }); @@ -79,7 +79,7 @@ public class ThaumcraftCompat //TODO: Persimmon addAspectsToState(BOPCBlocks.saplings, 15, new Aspect[] { Aspect.PLANT, Aspect.PLANT, Aspect.LIFE }, new int[] { 1, 1, 2 }); addAspectsToState(BlockBOPSapling.paging.getVariantState(BOPTrees.ETHEREAL), new Aspect[] { Aspect.PLANT, Aspect.PLANT, Aspect.LIGHT }, new int[] { 1, 1, 2 }); addAspectsToState(BlockBOPSapling.paging.getVariantState(BOPTrees.MAGIC), new Aspect[] { Aspect.PLANT, Aspect.PLANT }, new int[] { 1, 1 }); - addAspectsToState(BlockBOPSapling.paging.getVariantState(BOPTrees.DARK), new Aspect[] { Aspect.PLANT, Aspect.PLANT, Aspect.DARKNESS }, new int[] { 1, 1, 2 }); + addAspectsToState(BlockBOPSapling.paging.getVariantState(BOPTrees.UMBRAN), new Aspect[] { Aspect.PLANT, Aspect.PLANT, Aspect.DARKNESS }, new int[] { 1, 1, 2 }); addAspectsToState(BlockBOPSapling.paging.getVariantState(BOPTrees.DEAD), new Aspect[] { Aspect.PLANT, Aspect.PLANT, Aspect.DEATH }, new int[] { 1, 1, 2 }); addAspectsToState(BlockBOPSapling.paging.getVariantState(BOPTrees.HELLBARK), new Aspect[] { Aspect.PLANT, Aspect.PLANT, Aspect.FIRE }, new int[] { 1, 1, 2 }); addAspectsToState(BlockBOPSapling.paging.getVariantState(BOPTrees.SACRED_OAK), new Aspect[] { Aspect.PLANT, Aspect.PLANT, Aspect.LIGHT }, new int[] { 1, 1, 2 }); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dark_double_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/dark_double_slab.json deleted file mode 100644 index e0081178e..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/dark_double_slab.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { biomesoplenty:dark_planks" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dark_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/dark_slab.json deleted file mode 100644 index 9c9114696..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/dark_slab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "biomesoplenty:half_slab_dark" }, - "half=top": { "model": "biomesoplenty:upper_slab_dark" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/leaves_1.json b/src/main/resources/assets/biomesoplenty/blockstates/leaves_1.json index 2c447c3d4..cac785bb8 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/leaves_1.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/leaves_1.json @@ -1,6 +1,6 @@ { "variants": { - "variant=dark": { "model": "biomesoplenty:dark_leaves" }, + "variant=umbran": { "model": "biomesoplenty:umbran_leaves" }, "variant=dead": { "model": "biomesoplenty:dead_leaves" }, "variant=fir": { "model": "biomesoplenty:fir_leaves" }, "variant=ethereal": { "model": "biomesoplenty:ethereal_leaves" } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/log_0.json b/src/main/resources/assets/biomesoplenty/blockstates/log_0.json index f630b024a..806d11a8a 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/log_0.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/log_0.json @@ -8,10 +8,10 @@ "axis=z,variant=cherry": { "model": "biomesoplenty:cherry_log_side" }, "axis=x,variant=cherry": { "model": "biomesoplenty:cherry_log_side", "y": 90 }, "axis=none,variant=cherry": { "model": "biomesoplenty:cherry_bark" }, - "axis=y,variant=dark": { "model": "biomesoplenty:dark_log" }, - "axis=z,variant=dark": { "model": "biomesoplenty:dark_log_side" }, - "axis=x,variant=dark": { "model": "biomesoplenty:dark_log_side", "y": 90 }, - "axis=none,variant=dark": { "model": "biomesoplenty:dark_bark" }, + "axis=y,variant=umbran": { "model": "biomesoplenty:umbran_log" }, + "axis=z,variant=umbran": { "model": "biomesoplenty:umbran_log_side" }, + "axis=x,variant=umbran": { "model": "biomesoplenty:umbran_log_side", "y": 90 }, + "axis=none,variant=umbran": { "model": "biomesoplenty:umbran_bark" }, "axis=y,variant=fir": { "model": "biomesoplenty:fir_log" }, "axis=z,variant=fir": { "model": "biomesoplenty:fir_log_side" }, "axis=x,variant=fir": { "model": "biomesoplenty:fir_log_side", "y": 90 }, diff --git a/src/main/resources/assets/biomesoplenty/blockstates/planks.json b/src/main/resources/assets/biomesoplenty/blockstates/planks.json index bf4647e95..7740d57fc 100755 --- a/src/main/resources/assets/biomesoplenty/blockstates/planks.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/planks.json @@ -2,7 +2,7 @@ "variants": { "variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_planks" }, "variant=cherry": { "model": "biomesoplenty:cherry_planks" }, - "variant=dark": { "model": "biomesoplenty:dark_planks" }, + "variant=umbran": { "model": "biomesoplenty:umbran_planks" }, "variant=fir": { "model": "biomesoplenty:fir_planks" }, "variant=ethereal": { "model": "biomesoplenty:ethereal_planks" }, "variant=magic": { "model": "biomesoplenty:magic_planks" }, diff --git a/src/main/resources/assets/biomesoplenty/blockstates/planks_0.json b/src/main/resources/assets/biomesoplenty/blockstates/planks_0.json index aef506919..39e967fe7 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/planks_0.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/planks_0.json @@ -2,7 +2,7 @@ "variants": { "variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_planks" }, "variant=cherry": { "model": "biomesoplenty:cherry_planks" }, - "variant=dark": { "model": "biomesoplenty:dark_planks" }, + "variant=umbran": { "model": "biomesoplenty:umbran_planks" }, "variant=fir": { "model": "biomesoplenty:fir_planks" }, "variant=ethereal": { "model": "biomesoplenty:ethereal_planks" }, "variant=magic": { "model": "biomesoplenty:magic_planks" }, diff --git a/src/main/resources/assets/biomesoplenty/blockstates/sapling_0.json b/src/main/resources/assets/biomesoplenty/blockstates/sapling_0.json index 2e3f13140..72a4c7129 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/sapling_0.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/sapling_0.json @@ -4,7 +4,7 @@ "variant=orange_autumn": { "model": "biomesoplenty:orange_autumn_sapling" }, "variant=bamboo": { "model": "biomesoplenty:bamboo_sapling" }, "variant=magic": { "model": "biomesoplenty:magic_sapling" }, - "variant=dark": { "model": "biomesoplenty:dark_sapling" }, + "variant=umbran": { "model": "biomesoplenty:umbran_sapling" }, "variant=dead": { "model": "biomesoplenty:dead_sapling" }, "variant=fir": { "model": "biomesoplenty:fir_sapling" }, "variant=ethereal": { "model": "biomesoplenty:ethereal_sapling" } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dark_door_block.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_door_block.json similarity index 56% rename from src/main/resources/assets/biomesoplenty/blockstates/dark_door_block.json rename to src/main/resources/assets/biomesoplenty/blockstates/umbran_door_block.json index dfc657080..a9a541380 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/dark_door_block.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_door_block.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "biomesoplenty:dark_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "biomesoplenty:dark_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "biomesoplenty:dark_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "biomesoplenty:dark_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "biomesoplenty:dark_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "biomesoplenty:dark_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "biomesoplenty:dark_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "biomesoplenty:dark_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "biomesoplenty:dark_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "biomesoplenty:dark_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "biomesoplenty:dark_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "biomesoplenty:dark_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "biomesoplenty:dark_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "biomesoplenty:dark_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "biomesoplenty:dark_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "biomesoplenty:dark_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "biomesoplenty:dark_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "biomesoplenty:dark_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "biomesoplenty:dark_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "biomesoplenty:dark_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "biomesoplenty:dark_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "biomesoplenty:dark_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "biomesoplenty:dark_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "biomesoplenty:dark_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "biomesoplenty:dark_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "biomesoplenty:dark_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "biomesoplenty:dark_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "biomesoplenty:dark_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "biomesoplenty:dark_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "biomesoplenty:dark_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "biomesoplenty:dark_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "biomesoplenty:dark_door_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "biomesoplenty:umbran_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "biomesoplenty:umbran_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "biomesoplenty:umbran_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "biomesoplenty:umbran_door_top", "y": 180 } } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/umbran_double_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_double_slab.json new file mode 100644 index 000000000..a46988484 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_double_slab.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { biomesoplenty:umbran_planks" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dark_fence.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_fence.json similarity index 53% rename from src/main/resources/assets/biomesoplenty/blockstates/dark_fence.json rename to src/main/resources/assets/biomesoplenty/blockstates/umbran_fence.json index df9c57184..f07df38d3 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/dark_fence.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_fence.json @@ -1,20 +1,20 @@ { "variants": { - "east=false,north=false,south=false,west=false": { "model": "biomesoplenty:dark_fence_post" }, - "east=false,north=true,south=false,west=false": { "model": "biomesoplenty:dark_fence_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "biomesoplenty:dark_fence_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "biomesoplenty:dark_fence_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "biomesoplenty:dark_fence_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "biomesoplenty:dark_fence_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "biomesoplenty:dark_fence_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "biomesoplenty:dark_fence_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "biomesoplenty:dark_fence_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "biomesoplenty:dark_fence_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "biomesoplenty:dark_fence_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "biomesoplenty:dark_fence_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "biomesoplenty:dark_fence_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "biomesoplenty:dark_fence_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "biomesoplenty:dark_fence_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "biomesoplenty:dark_fence_nsew", "uvlock": true } + "east=false,north=false,south=false,west=false": { "model": "biomesoplenty:umbran_fence_post" }, + "east=false,north=true,south=false,west=false": { "model": "biomesoplenty:umbran_fence_n", "uvlock": true }, + "east=true,north=false,south=false,west=false": { "model": "biomesoplenty:umbran_fence_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false": { "model": "biomesoplenty:umbran_fence_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true": { "model": "biomesoplenty:umbran_fence_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false": { "model": "biomesoplenty:umbran_fence_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false": { "model": "biomesoplenty:umbran_fence_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true": { "model": "biomesoplenty:umbran_fence_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true": { "model": "biomesoplenty:umbran_fence_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false": { "model": "biomesoplenty:umbran_fence_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true": { "model": "biomesoplenty:umbran_fence_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false": { "model": "biomesoplenty:umbran_fence_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true": { "model": "biomesoplenty:umbran_fence_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true": { "model": "biomesoplenty:umbran_fence_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true": { "model": "biomesoplenty:umbran_fence_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true": { "model": "biomesoplenty:umbran_fence_nsew", "uvlock": true } } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dark_fence_gate.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_fence_gate.json similarity index 53% rename from src/main/resources/assets/biomesoplenty/blockstates/dark_fence_gate.json rename to src/main/resources/assets/biomesoplenty/blockstates/umbran_fence_gate.json index 3d12cf81b..a011ea31d 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/dark_fence_gate.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_fence_gate.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "biomesoplenty:dark_fence_gate_closed" }, - "facing=west,in_wall=false,open=false": { "model": "biomesoplenty:dark_fence_gate_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "biomesoplenty:dark_fence_gate_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "biomesoplenty:dark_fence_gate_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "biomesoplenty:dark_fence_gate_open" }, - "facing=west,in_wall=false,open=true": { "model": "biomesoplenty:dark_fence_gate_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "biomesoplenty:dark_fence_gate_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "biomesoplenty:dark_fence_gate_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "biomesoplenty:dark_wall_gate_closed" }, - "facing=west,in_wall=true,open=false": { "model": "biomesoplenty:dark_wall_gate_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "biomesoplenty:dark_wall_gate_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "biomesoplenty:dark_wall_gate_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "biomesoplenty:dark_wall_gate_open" }, - "facing=west,in_wall=true,open=true": { "model": "biomesoplenty:dark_wall_gate_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "biomesoplenty:dark_wall_gate_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "biomesoplenty:dark_wall_gate_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "biomesoplenty:umbran_fence_gate_closed" }, + "facing=west,in_wall=false,open=false": { "model": "biomesoplenty:umbran_fence_gate_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "biomesoplenty:umbran_fence_gate_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "biomesoplenty:umbran_fence_gate_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "biomesoplenty:umbran_fence_gate_open" }, + "facing=west,in_wall=false,open=true": { "model": "biomesoplenty:umbran_fence_gate_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "biomesoplenty:umbran_fence_gate_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "biomesoplenty:umbran_fence_gate_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "biomesoplenty:umbran_wall_gate_closed" }, + "facing=west,in_wall=true,open=false": { "model": "biomesoplenty:umbran_wall_gate_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "biomesoplenty:umbran_wall_gate_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "biomesoplenty:umbran_wall_gate_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "biomesoplenty:umbran_wall_gate_open" }, + "facing=west,in_wall=true,open=true": { "model": "biomesoplenty:umbran_wall_gate_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "biomesoplenty:umbran_wall_gate_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "biomesoplenty:umbran_wall_gate_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/umbran_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_slab.json new file mode 100644 index 000000000..2bb1a6c63 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_slab.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=bottom": { "model": "biomesoplenty:half_slab_umbran" }, + "half=top": { "model": "biomesoplenty:upper_slab_umbran" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dark_stairs.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_stairs.json similarity index 51% rename from src/main/resources/assets/biomesoplenty/blockstates/dark_stairs.json rename to src/main/resources/assets/biomesoplenty/blockstates/umbran_stairs.json index 684f1619f..72bb31dfa 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/dark_stairs.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_stairs.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "biomesoplenty:dark_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "biomesoplenty:dark_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "biomesoplenty:dark_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "biomesoplenty:dark_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "biomesoplenty:dark_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "biomesoplenty:dark_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "biomesoplenty:dark_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "biomesoplenty:dark_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "biomesoplenty:dark_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "biomesoplenty:dark_inner_stairs", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "biomesoplenty:umbran_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "biomesoplenty:umbran_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "biomesoplenty:umbran_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "biomesoplenty:umbran_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "biomesoplenty:umbran_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "biomesoplenty:umbran_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "biomesoplenty:umbran_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "biomesoplenty:umbran_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "biomesoplenty:umbran_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "biomesoplenty:umbran_inner_stairs", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/wood_slab_0.json b/src/main/resources/assets/biomesoplenty/blockstates/wood_slab_0.json index 3d5942bde..ffcec6c6d 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/wood_slab_0.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/wood_slab_0.json @@ -4,8 +4,8 @@ "half=top,variant=sacred_oak": { "model": "biomesoplenty:upper_slab_sacred_oak" }, "half=bottom,variant=cherry": { "model": "biomesoplenty:half_slab_cherry" }, "half=top,variant=cherry": { "model": "biomesoplenty:upper_slab_cherry" }, - "half=bottom,variant=dark": { "model": "biomesoplenty:half_slab_dark" }, - "half=top,variant=dark": { "model": "biomesoplenty:upper_slab_dark" }, + "half=bottom,variant=umbran": { "model": "biomesoplenty:half_slab_umbran" }, + "half=top,variant=umbran": { "model": "biomesoplenty:upper_slab_umbran" }, "half=bottom,variant=fir": { "model": "biomesoplenty:half_slab_fir" }, "half=top,variant=fir": { "model": "biomesoplenty:upper_slab_fir" }, "half=bottom,variant=ethereal": { "model": "biomesoplenty:half_slab_ethereal" }, diff --git a/src/main/resources/assets/biomesoplenty/lang/de_DE.lang b/src/main/resources/assets/biomesoplenty/lang/de_DE.lang index d367d6042..ff67d2a06 100644 --- a/src/main/resources/assets/biomesoplenty/lang/de_DE.lang +++ b/src/main/resources/assets/biomesoplenty/lang/de_DE.lang @@ -418,7 +418,7 @@ item.green_dye.name=Grüner Farbstoff item.white_dye.name=Weisser Farbstoff item.black_dye.name=Schwarzer Farbstoff -item.ghastly_soul.name=Verkümmerte Seele +item.soul.name=Verkümmerte Seele item.pixie_dust.name=Elfenstaub diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 5789b37be..0b9d2f46c 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -28,8 +28,8 @@ achievement.obtain_deathbloom=I am Become Death achievement.obtain_deathbloom.desc=Acquire a deadly deathbloom achievement.obtain_honeycomb=Honeycomb's Big achievement.obtain_honeycomb.desc=Steal a filled honeycomb from a Nether wasp hive -achievement.obtain_ghastly_soul=Soul Searching -achievement.obtain_ghastly_soul.desc=Reclaim a lost soul +achievement.obtain_soul=Soul Searching +achievement.obtain_soul.desc=Reclaim a lost soul achievement.obtain_wilted_lily=Godsend achievement.obtain_wilted_lily.desc=Rescue a wilted lily flower achievement.obtain_pixie_dust=Don't Breathe This @@ -93,7 +93,6 @@ item.cherry_door.name=Cherry Door item.crystal_shard.name=Celestial Crystal Shard item.ornamental_artifact.name=Ornamental Artifact item.flax_string.name=Flax String -item.dark_door.name=Dark Door item.dart.name=Dart item.dart_blower.name=Dart Blower item.diamond_scythe.name=Diamond Scythe @@ -114,7 +113,6 @@ item.gem_ruby.name=Ruby item.gem_sapphire.name=Sapphire item.gem_tanzanite.name=Tanzanite item.gem_topaz.name=Topaz -item.ghastly_soul.name=Ghastly Soul item.green_dye.name=Green Dye item.gold_scythe.name=Golden Scythe item.hellbark_door.name=Hellbark Door @@ -164,11 +162,13 @@ item.saladfruit.name=Fruit Salad item.saladveggie.name=Veggie Salad item.saladshroom.name=Shroom Salad item.shroompowder.name=Shroom Powder +item.soul.name=Soul item.spawn_egg_pixie.name=Spawn Pixie item.spawn_egg_wasp.name=Spawn Wasp item.stone_scythe.name=Stone Scythe item.turnip.name=Turnip item.turnip_seeds.name=Turnip Seeds +item.umbran_door.name=Umbran Door item.wading_boots.name=Wading Boots item.white_dye.name=White Dye item.wildcarrots.name=Wild Carrots @@ -192,10 +192,6 @@ tile.coral.blue_coral.name=Blue Coral tile.coral.glowing_coral.name=Glowing Coral tile.coral.algae.name=Algae tile.crag_rock_slab.name=Crag Rock Slab -tile.dark_fence.name=Dark Fence -tile.dark_fence_gate.name=Dark Fence Gate -tile.dark_wood_slab.name=Dark Wood Slab -tile.dark_stairs.name=Dark Wood Stairs tile.dirt.loamy_dirt.name=Loamy Dirt tile.dirt.sandy_dirt.name=Sandy Dirt tile.dirt.silty_dirt.name=Silty Dirt @@ -284,7 +280,7 @@ tile.leaves_0.yellow_autumn_leaves.name=Yellow Autumn Leaves tile.leaves_0.orange_autumn_leaves.name=Orange Autumn Leaves tile.leaves_0.bamboo_leaves.name=Bamboo Leaves tile.leaves_0.magic_leaves.name=Magic Leaves -tile.leaves_1.dark_leaves.name=Dark Leaves +tile.leaves_1.umbran_leaves.name=Umbran Leaves tile.leaves_1.dead_leaves.name=Dead Leaves tile.leaves_1.fir_leaves.name=Fir Leaves tile.leaves_1.ethereal_leaves.name=Ethereal Leaves @@ -307,7 +303,7 @@ tile.leaves_5.yellow_big_flower_petal.name=Giant Yellow Flower Petal tile.limestone_slab.name=Limestone Slab tile.log_0.sacred_oak_log.name=Sacred Oak Wood tile.log_0.cherry_log.name=Cherry Wood -tile.log_0.dark_log.name=Dark Wood +tile.log_0.umbran_log.name=Umbran Wood tile.log_0.fir_log.name=Fir Wood tile.log_1.ethereal_log.name=Ethereal Wood tile.log_1.magic_log.name=Magic Wood @@ -355,7 +351,7 @@ tile.pine_wood_slab.name=Pine Wood Slab tile.pine_stairs.name=Pine Wood Stairs tile.planks_0.sacred_oak_planks.name=Sacred Oak Wood Planks tile.planks_0.cherry_planks.name=Cherry Wood Planks -tile.planks_0.dark_planks.name=Dark Wood Planks +tile.planks_0.umbran_planks.name=Umbran Wood Planks tile.planks_0.fir_planks.name=Fir Wood Planks tile.planks_0.ethereal_planks.name=Ethereal Wood Planks tile.planks_0.magic_planks.name=Magic Wood Planks @@ -410,7 +406,7 @@ tile.sapling_0.yellow_autumn_sapling.name=Yellow Autumn Sapling tile.sapling_0.orange_autumn_sapling.name=Orange Autumn Sapling tile.sapling_0.bamboo_sapling.name=Bamboo Sapling tile.sapling_0.magic_sapling.name=Magic Sapling -tile.sapling_0.dark_sapling.name=Dark Sapling +tile.sapling_0.umbran_sapling.name=Umbran Sapling tile.sapling_0.dead_sapling.name=Dead Sapling tile.sapling_0.fir_sapling.name=Fir Sapling tile.sapling_0.ethereal_sapling.name=Ethereal Sapling @@ -441,6 +437,10 @@ tile.stone_formations.stalagmite.name=Stalagmite tile.stone_formations.stalactite.name=Stalactite tile.tree_moss.name=Tree Moss tile.turnip_block.name=Turnip +tile.umbran_fence.name=Umbran Fence +tile.umbran_fence_gate.name=Umbran Fence Gate +tile.umbran_wood_slab.name=Umbran Wood Slab +tile.umbran_stairs.name=Umbran Wood Stairs tile.waterlily.duckweed.name=Duckweed tile.waterlily.lily_medium.name=Medium Lily Pad tile.waterlily.lily_small.name=Small Lily Pad diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom.json deleted file mode 100644 index 4de87949e..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "biomesoplenty:blocks/door_dark_lower", - "top": "biomesoplenty:blocks/door_dark_upper" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom_rh.json b/src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom_rh.json deleted file mode 100644 index 5eb2b12ee..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_door_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "biomesoplenty:blocks/door_dark_lower", - "top": "biomesoplenty:blocks/door_dark_upper" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/dark_door_top.json deleted file mode 100644 index 81048bb0b..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "biomesoplenty:blocks/door_dark_lower", - "top": "biomesoplenty:blocks/door_dark_upper" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_door_top_rh.json b/src/main/resources/assets/biomesoplenty/models/block/dark_door_top_rh.json deleted file mode 100644 index 3ab22add6..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_door_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "biomesoplenty:blocks/door_dark_lower", - "top": "biomesoplenty:blocks/door_dark_upper" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_inner_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/dark_inner_stairs.json deleted file mode 100644 index 3ba4ff91c..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "biomesoplenty:blocks/dark_planks", - "top": "biomesoplenty:blocks/dark_planks", - "side": "biomesoplenty:blocks/dark_planks" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_log.json b/src/main/resources/assets/biomesoplenty/models/block/dark_log.json deleted file mode 100755 index 3890043e0..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "biomesoplenty:blocks/dark_log_top", - "side": "biomesoplenty:blocks/dark_log" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_log_side.json b/src/main/resources/assets/biomesoplenty/models/block/dark_log_side.json deleted file mode 100644 index 2ffee4d7e..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_log_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "end": "biomesoplenty:blocks/dark_log_top", - "side": "biomesoplenty:blocks/dark_log" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_outer_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/dark_outer_stairs.json deleted file mode 100644 index b5f78fa8c..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "biomesoplenty:blocks/dark_planks", - "top": "biomesoplenty:blocks/dark_planks", - "side": "biomesoplenty:blocks/dark_planks" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/dark_stairs.json deleted file mode 100644 index 96198960f..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "biomesoplenty:blocks/dark_planks", - "top": "biomesoplenty:blocks/dark_planks", - "side": "biomesoplenty:blocks/dark_planks" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_bark.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_bark.json similarity index 55% rename from src/main/resources/assets/biomesoplenty/models/block/dark_bark.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_bark.json index 37d2b6bd5..82848fc40 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_bark.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_bark.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/dark_log" + "all": "biomesoplenty:blocks/umbran_log" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json new file mode 100644 index 000000000..965668993 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "biomesoplenty:blocks/door_umbran_lower", + "top": "biomesoplenty:blocks/door_umbran_upper" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_rh.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_rh.json new file mode 100644 index 000000000..3f2ac884a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "biomesoplenty:blocks/door_umbran_lower", + "top": "biomesoplenty:blocks/door_umbran_upper" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json new file mode 100644 index 000000000..790d906b6 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "biomesoplenty:blocks/door_umbran_lower", + "top": "biomesoplenty:blocks/door_umbran_upper" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_rh.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_rh.json new file mode 100644 index 000000000..15306f969 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "biomesoplenty:blocks/door_umbran_lower", + "top": "biomesoplenty:blocks/door_umbran_upper" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_gate_closed.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_closed.json similarity index 55% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_gate_closed.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_closed.json index 8f97e1192..ee182075b 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_gate_closed.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_closed.json @@ -1,6 +1,6 @@ { "parent": "block/fence_gate_closed", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_open.json similarity index 54% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_gate_open.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_open.json index 421f80c26..e96053365 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_gate_open.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "block/fence_gate_open", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_inventory.json similarity index 54% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_inventory.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_inventory.json index 945edb47c..28165f66c 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_inventory.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_inventory.json @@ -1,7 +1,7 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_n.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_n.json similarity index 51% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_n.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_n.json index 2d70a742c..c39923e0c 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_n.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_n.json @@ -1,6 +1,6 @@ { "parent": "block/fence_n", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_ne.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_ne.json similarity index 51% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_ne.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_ne.json index f78056bb9..d5d8f8d87 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_ne.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_ne.json @@ -1,6 +1,6 @@ { "parent": "block/fence_ne", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_ns.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_ns.json similarity index 51% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_ns.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_ns.json index e5e68bf21..f60528520 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_ns.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_ns.json @@ -1,6 +1,6 @@ { "parent": "block/fence_ns", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_nse.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_nse.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_nse.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_nse.json index a0ed11080..02ad2cb64 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_nse.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_nse.json @@ -1,6 +1,6 @@ { "parent": "block/fence_nse", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_nsew.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_nsew.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_nsew.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_nsew.json index d6630cf36..a1a6e82ab 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_nsew.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_nsew.json @@ -1,6 +1,6 @@ { "parent": "block/fence_nsew", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_post.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/block/dark_fence_post.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_fence_post.json index 9d7f17d6a..82519a1e3 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_fence_post.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_post.json @@ -1,6 +1,6 @@ { "parent": "block/fence_post", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_inner_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_inner_stairs.json new file mode 100644 index 000000000..5fbec17d3 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "biomesoplenty:blocks/umbran_planks", + "top": "biomesoplenty:blocks/umbran_planks", + "side": "biomesoplenty:blocks/umbran_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_leaves.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/block/dark_leaves.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_leaves.json index c5e6abee9..1d4b271fb 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_leaves.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_leaves.json @@ -1,6 +1,6 @@ { "parent": "block/leaves", "textures": { - "all": "biomesoplenty:blocks/leaves_dark" + "all": "biomesoplenty:blocks/leaves_umbran" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_log.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_log.json new file mode 100644 index 000000000..aab5fef25 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:blocks/umbran_log_top", + "side": "biomesoplenty:blocks/umbran_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_log_side.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_log_side.json new file mode 100644 index 000000000..a3d3008a7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_log_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "end": "biomesoplenty:blocks/umbran_log_top", + "side": "biomesoplenty:blocks/umbran_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_outer_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_outer_stairs.json new file mode 100644 index 000000000..b62e448c1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "biomesoplenty:blocks/umbran_planks", + "top": "biomesoplenty:blocks/umbran_planks", + "side": "biomesoplenty:blocks/umbran_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_planks.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_planks.json similarity index 53% rename from src/main/resources/assets/biomesoplenty/models/block/dark_planks.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_planks.json index 4a9e67e18..abf3c7c89 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_planks.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_planks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/dark_planks" + "all": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_sapling.json similarity index 50% rename from src/main/resources/assets/biomesoplenty/models/block/dark_sapling.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_sapling.json index d06aaec3c..300315895 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_sapling.json @@ -1,6 +1,6 @@ { "parent": "block/cross", "textures": { - "cross": "biomesoplenty:blocks/sapling_dark" + "cross": "biomesoplenty:blocks/sapling_umbran" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json new file mode 100644 index 000000000..c38fd5801 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "biomesoplenty:blocks/umbran_planks", + "top": "biomesoplenty:blocks/umbran_planks", + "side": "biomesoplenty:blocks/umbran_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_wall_gate_closed.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_wall_gate_closed.json similarity index 54% rename from src/main/resources/assets/biomesoplenty/models/block/dark_wall_gate_closed.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_wall_gate_closed.json index 534d02dcc..b7083d958 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_wall_gate_closed.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_wall_gate_closed.json @@ -1,6 +1,6 @@ { "parent": "block/wall_gate_closed", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dark_wall_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_wall_gate_open.json similarity index 54% rename from src/main/resources/assets/biomesoplenty/models/block/dark_wall_gate_open.json rename to src/main/resources/assets/biomesoplenty/models/block/umbran_wall_gate_open.json index 2283f8f94..f52bbde99 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dark_wall_gate_open.json +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_wall_gate_open.json @@ -1,6 +1,6 @@ { "parent": "block/wall_gate_open", "textures": { - "texture": "biomesoplenty:blocks/dark_planks" + "texture": "biomesoplenty:blocks/umbran_planks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_door.json b/src/main/resources/assets/biomesoplenty/models/item/soul.json similarity index 88% rename from src/main/resources/assets/biomesoplenty/models/item/dark_door.json rename to src/main/resources/assets/biomesoplenty/models/item/soul.json index 08ba1d25d..b23f2721d 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_door.json +++ b/src/main/resources/assets/biomesoplenty/models/item/soul.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "biomesoplenty:items/door_dark" + "layer0": "biomesoplenty:items/soul" }, "display": { "thirdperson": { @@ -16,4 +16,3 @@ } } } - diff --git a/src/main/resources/assets/biomesoplenty/models/item/ghastly_soul.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_door.json similarity index 88% rename from src/main/resources/assets/biomesoplenty/models/item/ghastly_soul.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_door.json index 4776be8c7..4ee33b5d0 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/ghastly_soul.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_door.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "biomesoplenty:items/ghastly_soul" + "layer0": "biomesoplenty:items/door_umbran" }, "display": { "thirdperson": { @@ -16,3 +16,4 @@ } } } + diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_fence.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_fence.json similarity index 81% rename from src/main/resources/assets/biomesoplenty/models/item/dark_fence.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_fence.json index edd0a1815..ecf627035 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_fence.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_fence.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/dark_fence_inventory", + "parent": "biomesoplenty:block/umbran_fence_inventory", "display": { "thirdperson": { "rotation": [ 0, 0, 180 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_fence_gate.json similarity index 84% rename from src/main/resources/assets/biomesoplenty/models/item/dark_fence_gate.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_fence_gate.json index c4fb293ad..6814a36b5 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_fence_gate.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_fence_gate.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/dark_fence_gate_closed", + "parent": "biomesoplenty:block/umbran_fence_gate_closed", "display": { "thirdperson": { "rotation": [ 0, -90, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_planks.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_leaves.json old mode 100755 new mode 100644 similarity index 79% rename from src/main/resources/assets/biomesoplenty/models/item/dark_planks.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_leaves.json index be28c09a5..8eeabc91e --- a/src/main/resources/assets/biomesoplenty/models/item/dark_planks.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_leaves.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/dark_planks", + "parent": "biomesoplenty:block/umbran_leaves", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_log.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_log.json old mode 100755 new mode 100644 similarity index 80% rename from src/main/resources/assets/biomesoplenty/models/item/dark_log.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_log.json index 026ce1b44..d2da97466 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_log.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_log.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/dark_log", + "parent": "biomesoplenty:block/umbran_log", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_leaves.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_planks.json similarity index 79% rename from src/main/resources/assets/biomesoplenty/models/item/dark_leaves.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_planks.json index 1a38c5628..50bbef967 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_leaves.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_planks.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/dark_leaves", + "parent": "biomesoplenty:block/umbran_planks", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json similarity index 87% rename from src/main/resources/assets/biomesoplenty/models/item/dark_sapling.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json index b32810473..f7ee6fa0c 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "biomesoplenty:blocks/sapling_dark" + "layer0": "biomesoplenty:blocks/sapling_umbran" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_stairs.json similarity index 83% rename from src/main/resources/assets/biomesoplenty/models/item/dark_stairs.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_stairs.json index 5fb85028c..cee78adcb 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_stairs.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/dark_stairs", + "parent": "biomesoplenty:block/umbran_stairs", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/dark_wood_slab.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_wood_slab.json similarity index 78% rename from src/main/resources/assets/biomesoplenty/models/item/dark_wood_slab.json rename to src/main/resources/assets/biomesoplenty/models/item/umbran_wood_slab.json index b3dabed6c..c05bd3fa1 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dark_wood_slab.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_wood_slab.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/half_slab_dark", + "parent": "biomesoplenty:block/half_slab_umbran", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_dark_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_dark_lower.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_dark_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_dark_upper.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_dark.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_umbran.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_dark.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_umbran.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_dark.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_umbran.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_dark.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_umbran.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dark_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dark_log.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dark_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dark_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dark_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dark_planks.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_dark.png b/src/main/resources/assets/biomesoplenty/textures/items/door_umbran.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_dark.png rename to src/main/resources/assets/biomesoplenty/textures/items/door_umbran.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ghastly_soul.png b/src/main/resources/assets/biomesoplenty/textures/items/soul.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/ghastly_soul.png rename to src/main/resources/assets/biomesoplenty/textures/items/soul.png