From 37f4d6745d7fe48b38bb23b3520b6c68b5c6a3ae Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Wed, 2 Dec 2020 04:55:51 +0300 Subject: [PATCH] Rock model changes --- .../java/ru/betterend/registry/EndBlocks.java | 2 +- .../java/ru/betterend/registry/EndTags.java | 2 +- .../world/features/terrain/GeyserFeature.java | 4 +-- .../world/surface/SurfaceBuilders.java | 2 +- .../betterend/blockstates/sulphuric_rock.json | 10 ++++++ .../assets/betterend/lang/en_us.json | 30 +++++++++--------- .../assets/betterend/lang/ru_ru.json | 30 +++++++++--------- .../models/block/sulphuric_rock.json | 7 ++++ .../betterend/models/item/sulphuric_rock.json | 3 ++ .../{sulfuric_rock.png => sulphuric_rock.png} | Bin ...k_bricks.png => sulphuric_rock_bricks.png} | Bin ...png => sulphuric_rock_bricks_wall_top.png} | Bin ....png => sulphuric_rock_lantern_bottom.png} | Bin ...de.png => sulphuric_rock_lantern_side.png} | Bin ...top.png => sulphuric_rock_lantern_top.png} | Bin ...ide.png => sulphuric_rock_pillar_side.png} | Bin ..._top.png => sulphuric_rock_pillar_top.png} | Bin ...lished.png => sulphuric_rock_polished.png} | Bin ..._side.png => sulphuric_rock_post_side.png} | Bin ...st_top.png => sulphuric_rock_post_top.png} | Bin ...ock_tiles.png => sulphuric_rock_tiles.png} | Bin .../textures/block/sulphuric_rock_top.png | Bin 0 -> 1887 bytes 22 files changed, 55 insertions(+), 35 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/sulphuric_rock.json create mode 100644 src/main/resources/assets/betterend/models/block/sulphuric_rock.json create mode 100644 src/main/resources/assets/betterend/models/item/sulphuric_rock.json rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock.png => sulphuric_rock.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_bricks.png => sulphuric_rock_bricks.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_bricks_wall_top.png => sulphuric_rock_bricks_wall_top.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_lantern_bottom.png => sulphuric_rock_lantern_bottom.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_lantern_side.png => sulphuric_rock_lantern_side.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_lantern_top.png => sulphuric_rock_lantern_top.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_pillar_side.png => sulphuric_rock_pillar_side.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_pillar_top.png => sulphuric_rock_pillar_top.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_polished.png => sulphuric_rock_polished.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_post_side.png => sulphuric_rock_post_side.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_post_top.png => sulphuric_rock_post_top.png} (100%) rename src/main/resources/assets/betterend/textures/block/{sulfuric_rock_tiles.png => sulphuric_rock_tiles.png} (100%) create mode 100644 src/main/resources/assets/betterend/textures/block/sulphuric_rock_top.png diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 6f4fed77..a6834dcf 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -98,7 +98,7 @@ public class EndBlocks { // Rocks // public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND); public static final StoneMaterial VIOLECITE = new StoneMaterial("violecite", MaterialColor.PURPLE); - public static final StoneMaterial SULFURIC_ROCK = new StoneMaterial("sulfuric_rock", MaterialColor.BROWN); + public static final StoneMaterial SULPHURIC_ROCK = new StoneMaterial("sulphuric_rock", MaterialColor.BROWN); public static final Block BRIMSTONE = registerBlock("brimstone", new BlockBrimstone()); public static final Block SULPHUR_CRYSTAL = registerBlock("sulphur_crystal", new BlockSulphurCrystal()); diff --git a/src/main/java/ru/betterend/registry/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index 70cfcd17..02da5ffe 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -71,7 +71,7 @@ public class EndTags { } }); - TagHelper.addTag(GEN_TERRAIN, EndBlocks.ENDER_ORE, EndBlocks.FLAVOLITE.stone, EndBlocks.VIOLECITE.stone, EndBlocks.SULFURIC_ROCK.stone, EndBlocks.BRIMSTONE); + TagHelper.addTag(GEN_TERRAIN, EndBlocks.ENDER_ORE, EndBlocks.FLAVOLITE.stone, EndBlocks.VIOLECITE.stone, EndBlocks.SULPHURIC_ROCK.stone, EndBlocks.BRIMSTONE); ToolManagerImpl.tag(HAMMERS).register(new ModdedToolsVanillaBlocksToolHandler( Arrays.asList( diff --git a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java index 9ce814f8..5d55f9ff 100644 --- a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java @@ -39,7 +39,7 @@ public class GeyserFeature extends DefaultFeature { int halfHeight = MHelper.randRange(10, 20, random); float radius1 = halfHeight * 0.5F; float radius2 = halfHeight * 0.1F + 0.5F; - SDF sdf = new SDFCapedCone().setHeight(halfHeight).setRadius1(radius1).setRadius2(radius2).setBlock(EndBlocks.SULFURIC_ROCK.stone); + SDF sdf = new SDFCapedCone().setHeight(halfHeight).setRadius1(radius1).setRadius2(radius2).setBlock(EndBlocks.SULPHURIC_ROCK.stone); sdf = new SDFTranslate().setTranslate(0, halfHeight - 3, 0).setSource(sdf); int count = halfHeight; @@ -61,7 +61,7 @@ public class GeyserFeature extends DefaultFeature { SDF water = new SDFCapedCone().setHeight(radius - 4).setRadius1(0).setRadius2(radius - 3).setBlock(Blocks.WATER); bowl = new SDFUnion().setSourceA(water).setSourceB(bowl);*/ - SDF bowl = new SDFCapedCone().setHeight(radius).setRadius1(0).setRadius2(radius).setBlock(EndBlocks.SULFURIC_ROCK.stone); + SDF bowl = new SDFCapedCone().setHeight(radius).setRadius1(0).setRadius2(radius).setBlock(EndBlocks.SULPHURIC_ROCK.stone); SDF brimstone = new SDFCapedCone().setHeight(radius).setRadius1(0).setRadius2(radius).setBlock(EndBlocks.BRIMSTONE); brimstone = new SDFTranslate().setTranslate(0, 2F, 0).setSource(brimstone); diff --git a/src/main/java/ru/betterend/world/surface/SurfaceBuilders.java b/src/main/java/ru/betterend/world/surface/SurfaceBuilders.java index a97348e5..90c200ef 100644 --- a/src/main/java/ru/betterend/world/surface/SurfaceBuilders.java +++ b/src/main/java/ru/betterend/world/surface/SurfaceBuilders.java @@ -12,7 +12,7 @@ public class SurfaceBuilders { public static final TernarySurfaceConfig DEFAULT_END_CONFIG = makeSimpleConfig(Blocks.END_STONE); public static final TernarySurfaceConfig FLAVOLITE_CONFIG = makeSimpleConfig(EndBlocks.FLAVOLITE.stone); public static final TernarySurfaceConfig BRIMSTONE_CONFIG = makeSimpleConfig(EndBlocks.BRIMSTONE); - public static final TernarySurfaceConfig SULFURIC_ROCK_CONFIG = makeSimpleConfig(EndBlocks.SULFURIC_ROCK.stone); + public static final TernarySurfaceConfig SULFURIC_ROCK_CONFIG = makeSimpleConfig(EndBlocks.SULPHURIC_ROCK.stone); public static final SurfaceBuilder SULPHURIC_SURFACE = register("sulphuric_surface", new SulphuricSurfaceBuilder()); diff --git a/src/main/resources/assets/betterend/blockstates/sulphuric_rock.json b/src/main/resources/assets/betterend/blockstates/sulphuric_rock.json new file mode 100644 index 00000000..d1ed4491 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/sulphuric_rock.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/sulphuric_rock" }, + { "model": "betterend:block/sulphuric_rock", "y": 90 }, + { "model": "betterend:block/sulphuric_rock", "y": 180 }, + { "model": "betterend:block/sulphuric_rock", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 20364078..72b4f7c4 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -365,21 +365,21 @@ "block.betterend.bushy_grass": "Bushy Grass", "block.betterend.brimstone": "Brimstone", - "block.betterend.sulfuric_rock": "Sulfuric Rock", - "block.betterend.sulfuric_rock_bricks": "Sulfuric Rock Bricks", - "block.betterend.sulfuric_rock_bricks_slab": "Sulfuric Rock Bricks Slab", - "block.betterend.sulfuric_rock_bricks_stairs": "Sulfuric Rock Bricks Stairs", - "block.betterend.sulfuric_rock_bricks_wall": "Sulfuric Rock Bricks Wall", - "block.betterend.sulfuric_rock_button": "Sulfuric Rock Button", - "block.betterend.sulfuric_rock_lantern": "Sulfuric Rock Lantern", - "block.betterend.sulfuric_rock_pedestal": "Sulfuric Rock Pedestal", - "block.betterend.sulfuric_rock_pillar": "Sulfuric Rock Pillar", - "block.betterend.sulfuric_rock_plate": "Sulfuric Rock Plate", - "block.betterend.sulfuric_rock_polished": "Sulfuric Rock Polished", - "block.betterend.sulfuric_rock_slab": "Sulfuric Rock Slab", - "block.betterend.sulfuric_rock_stairs": "Sulfuric Rock Stairs", - "block.betterend.sulfuric_rock_tiles": "Sulfuric Rock Tiles", - "block.betterend.sulfuric_rock_wall": "Sulfuric Rock Wall", + "block.betterend.sulphuric_rock": "sulphuric Rock", + "block.betterend.sulphuric_rock_bricks": "sulphuric Rock Bricks", + "block.betterend.sulphuric_rock_bricks_slab": "sulphuric Rock Bricks Slab", + "block.betterend.sulphuric_rock_bricks_stairs": "sulphuric Rock Bricks Stairs", + "block.betterend.sulphuric_rock_bricks_wall": "sulphuric Rock Bricks Wall", + "block.betterend.sulphuric_rock_button": "sulphuric Rock Button", + "block.betterend.sulphuric_rock_lantern": "sulphuric Rock Lantern", + "block.betterend.sulphuric_rock_pedestal": "sulphuric Rock Pedestal", + "block.betterend.sulphuric_rock_pillar": "sulphuric Rock Pillar", + "block.betterend.sulphuric_rock_plate": "sulphuric Rock Plate", + "block.betterend.sulphuric_rock_polished": "sulphuric Rock Polished", + "block.betterend.sulphuric_rock_slab": "sulphuric Rock Slab", + "block.betterend.sulphuric_rock_stairs": "sulphuric Rock Stairs", + "block.betterend.sulphuric_rock_tiles": "sulphuric Rock Tiles", + "block.betterend.sulphuric_rock_wall": "sulphuric Rock Wall", "block.betterend.sulphur_crystal": "Sulphur Crystal", "item.betterend.crystalline_sulphur": "Crystalline Sulphur" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 2f4ff9e2..3462de8a 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -367,21 +367,21 @@ "block.betterend.bushy_grass": "Густая трава", "block.betterend.brimstone": "Сера", - "block.betterend.sulfuric_rock": "Серный камень", - "block.betterend.sulfuric_rock_bricks": "Кирпичи из серного камня", - "block.betterend.sulfuric_rock_bricks_slab": "Кирпичная плита из серного камня", - "block.betterend.sulfuric_rock_bricks_stairs": "Кирпичные ступени из серного камня", - "block.betterend.sulfuric_rock_bricks_wall": "Стена из серного камня", - "block.betterend.sulfuric_rock_button": "Кнопка из серного камня", - "block.betterend.sulfuric_rock_lantern": "Фонарь из серного камня", - "block.betterend.sulfuric_rock_pedestal": "Пьедестал из серного камня", - "block.betterend.sulfuric_rock_pillar": "Колонна из серного камня", - "block.betterend.sulfuric_rock_plate": "Нажимная плита из серного камня", - "block.betterend.sulfuric_rock_polished": "Полированный серный камень", - "block.betterend.sulfuric_rock_slab": "Плита из серного камня", - "block.betterend.sulfuric_rock_stairs": "Ступени из серного камня", - "block.betterend.sulfuric_rock_tiles": "Плитка из серного камня", - "block.betterend.sulfuric_rock_wall": "Стена из серного камня", + "block.betterend.sulphuric_rock": "Серный камень", + "block.betterend.sulphuric_rock_bricks": "Кирпичи из серного камня", + "block.betterend.sulphuric_rock_bricks_slab": "Кирпичная плита из серного камня", + "block.betterend.sulphuric_rock_bricks_stairs": "Кирпичные ступени из серного камня", + "block.betterend.sulphuric_rock_bricks_wall": "Стена из серного камня", + "block.betterend.sulphuric_rock_button": "Кнопка из серного камня", + "block.betterend.sulphuric_rock_lantern": "Фонарь из серного камня", + "block.betterend.sulphuric_rock_pedestal": "Пьедестал из серного камня", + "block.betterend.sulphuric_rock_pillar": "Колонна из серного камня", + "block.betterend.sulphuric_rock_plate": "Нажимная плита из серного камня", + "block.betterend.sulphuric_rock_polished": "Полированный серный камень", + "block.betterend.sulphuric_rock_slab": "Плита из серного камня", + "block.betterend.sulphuric_rock_stairs": "Ступени из серного камня", + "block.betterend.sulphuric_rock_tiles": "Плитка из серного камня", + "block.betterend.sulphuric_rock_wall": "Стена из серного камня", "block.betterend.sulphur_crystal": "Кристалл серы", "item.betterend.crystalline_sulphur": "Кристаллическая сера" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/sulphuric_rock.json b/src/main/resources/assets/betterend/models/block/sulphuric_rock.json new file mode 100644 index 00000000..964d4462 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/sulphuric_rock.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "betterend:block/sulphuric_rock_top", + "side": "betterend:block/sulphuric_rock" + } +} diff --git a/src/main/resources/assets/betterend/models/item/sulphuric_rock.json b/src/main/resources/assets/betterend/models/item/sulphuric_rock.json new file mode 100644 index 00000000..c306b4d8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/sulphuric_rock.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/sulphuric_rock" +} diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_bricks.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_bricks.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_bricks.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_bricks.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_bricks_wall_top.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_bricks_wall_top.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_bricks_wall_top.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_bricks_wall_top.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_lantern_bottom.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_lantern_bottom.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_lantern_bottom.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_lantern_side.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_lantern_side.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_lantern_side.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_lantern_side.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_lantern_top.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_lantern_top.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_lantern_top.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_lantern_top.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_pillar_side.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_pillar_side.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_pillar_side.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_pillar_side.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_pillar_top.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_pillar_top.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_pillar_top.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_pillar_top.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_polished.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_polished.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_polished.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_polished.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_post_side.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_post_side.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_post_side.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_post_side.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_post_top.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_post_top.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_post_top.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_post_top.png diff --git a/src/main/resources/assets/betterend/textures/block/sulfuric_rock_tiles.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_tiles.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/sulfuric_rock_tiles.png rename to src/main/resources/assets/betterend/textures/block/sulphuric_rock_tiles.png diff --git a/src/main/resources/assets/betterend/textures/block/sulphuric_rock_top.png b/src/main/resources/assets/betterend/textures/block/sulphuric_rock_top.png new file mode 100644 index 0000000000000000000000000000000000000000..fe2f23fcf6ef7989281ba90506ce6609672f3a3d GIT binary patch literal 1887 zcmcIlZ*0_L81GOL*fJeX!rV}6r*WtD`saGRYqJ~7-RW)a&Sg8dnJ{MmyuE97*LH2U zyPZN7W2R5Tv5oIm(dz z@6;g3+KXze*Y1t9^OBx&3$iW(cP3>(G=em4$ryq(0BlqQaa9Xoe@vaiP*o0KJ>Ccz zF~-ov4V9|ohDvch);pDM(H zR{<2%ti_PBL3PEZ`j5hP8}G!7BCHKN%<2G^|mB0~^ZlBpWDs%xmjD2V!y z9l)T{d_@Z{-7=mISxAe^PMZ}667eE#QQlJkfJE#z{85TLNOdJC_V`XijNaTFGq@u zQe=D9RN>1bByVPQRLPK0(E8G6mg|C0^0ZlmJ^r zO$l*87+M@d|5ekXCv`KT%g}R=)6kF|W)W5`SiO$M z$XMaFdJFefr!!BRP5?-{LhNA5`}3@4ENI^>EwSrQH)}HeUWE z8xMG<{+wTSy>j8fyXM9Buf14fzw3Kr&4EJq(a^byqx(X^?GbC#T^&n)ytr#(JF>5DX3z44PJGvg z2a)jG4V!EBhO@4PldtU^J{)ifSH`oh#D*Wb&qpWEPT%)Mux{zmt)JCCP)$8Nxa}%2 YH?}zAJv6q#`2@CxqQOs|eBtGP0CoI!rvLx| literal 0 HcmV?d00001