diff --git a/kubejs/assets/ad_astra/lang/en_us.json b/kubejs/assets/ad_astra/lang/en_us.json index 600bf4bb5..761d75ef6 100644 --- a/kubejs/assets/ad_astra/lang/en_us.json +++ b/kubejs/assets/ad_astra/lang/en_us.json @@ -1,6 +1,7 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.ad_astra.oxygen_distributor": "Breathable Air Distributor", + "block.ad_astra.infernal_spire_block": "Infernal Spire", "block.ad_astra.moon_sand": "Lunar Sand", "block.ad_astra.moon_stone": "Raw Anorthosite", "block.ad_astra.moon_cobblestone": "Anorthosite Cobble", diff --git a/kubejs/assets/beneath/lang/en_us.json b/kubejs/assets/beneath/lang/en_us.json index 71b2c93f5..f890d42f0 100644 --- a/kubejs/assets/beneath/lang/en_us.json +++ b/kubejs/assets/beneath/lang/en_us.json @@ -3,11 +3,11 @@ "block.beneath.blackstone_pebble": "Loose Pyroxenite", "block.beneath.blackstone_aqueduct": "Pyroxenite Aqueduct", "block.beneath.loose_blackstone": "Loose Pyroxenite", - "block.beneath.ore.nether_cursecoal": "Anthracite Ore", + "block.beneath.ore.nether_cursecoal": "Migmatite Anthracite Ore", "block.beneath.ore.nether_cursecoal.prospected": "Anthracite", "block.beneath.cursecoal_pile": "Anthracite Pile", - "block.beneath.ore.blackstone_sylvite": "Sylvite Ore", - "block.beneath.crackrack": "Keratophyre", + "block.beneath.ore.blackstone_sylvite": "Pyroxenite Sylvite Ore", + "block.beneath.crackrack": "Raw Keratophyre", "block.beneath.soul_clay": "Muddy Clay", "block.beneath.wood.log.crimson": "Crimson Stem", "block.beneath.wood.stripped_log.crimson": "Stripped Crimson Stem", diff --git a/kubejs/assets/betterend/blockstates/brimstone.json b/kubejs/assets/betterend/blockstates/brimstone.json new file mode 100644 index 000000000..8f26b4f6c --- /dev/null +++ b/kubejs/assets/betterend/blockstates/brimstone.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/brimstone_active" }, + { "model": "betterend:block/brimstone_active", "y": 180 }, + { "model": "betterend:block/brimstone_normal" }, + { "model": "betterend:block/brimstone_normal", "y": 180 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/flavolite_pillar.json b/kubejs/assets/betterend/blockstates/flavolite_pillar.json new file mode 100644 index 000000000..e17d208b8 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/flavolite_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "betterend:block/flavolite_pillar" + }, + "axis=z": { + "model": "betterend:block/flavolite_pillar", + "x": 90 + }, + "axis=x": { + "model": "betterend:block/flavolite_pillar", + "x": 90, + "y": 90 + } + } +} diff --git a/kubejs/assets/betterend/blockstates/hydrothermal_vent.json b/kubejs/assets/betterend/blockstates/hydrothermal_vent.json new file mode 100644 index 000000000..5ff455e55 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/hydrothermal_vent.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/hydrothermal_vent" }, + { "model": "betterend:block/hydrothermal_vent", "y": 90 }, + { "model": "betterend:block/hydrothermal_vent", "y": 180 }, + { "model": "betterend:block/hydrothermal_vent", "y": 270 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/lacugrove_bark.json b/kubejs/assets/betterend/blockstates/lacugrove_bark.json new file mode 100644 index 000000000..11e6da40d --- /dev/null +++ b/kubejs/assets/betterend/blockstates/lacugrove_bark.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lacugrove_bark", "weight": 5 }, + { "model": "betterend:block/lacugrove_bark_2", "weight": 5 }, + { "model": "betterend:block/lacugrove_bark_3" }, + { "model": "betterend:block/lacugrove_bark_4" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/lucernia_bark.json b/kubejs/assets/betterend/blockstates/lucernia_bark.json new file mode 100644 index 000000000..8faa8f4d7 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/lucernia_bark.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lucernia_bark", "weight": 6 }, + { "model": "betterend:block/lucernia_bark_2" }, + { "model": "betterend:block/lucernia_bark_3", "weight": 6 }, + { "model": "betterend:block/lucernia_bark_4" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/sandy_jadestone_pillar.json b/kubejs/assets/betterend/blockstates/sandy_jadestone_pillar.json new file mode 100644 index 000000000..f7fda332b --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sandy_jadestone_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "betterend:block/sandy_jadestone_pillar" + }, + "axis=z": { + "model": "betterend:block/sandy_jadestone_pillar", + "x": 90 + }, + "axis=x": { + "model": "betterend:block/sandy_jadestone_pillar", + "x": 90, + "y": 90 + } + } +} diff --git a/kubejs/assets/betterend/blockstates/sulphur_crystal.json b/kubejs/assets/betterend/blockstates/sulphur_crystal.json new file mode 100644 index 000000000..060336fc7 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sulphur_crystal.json @@ -0,0 +1,9 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/sulphur_crystal_0" }, + { "model": "betterend:block/sulphur_crystal_1" }, + { "model": "betterend:block/sulphur_crystal_2" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/sulphuric_rock.json b/kubejs/assets/betterend/blockstates/sulphuric_rock.json new file mode 100644 index 000000000..40d81957e --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sulphuric_rock.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/sulphuric_rock" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/sulphuric_rock_pillar.json b/kubejs/assets/betterend/blockstates/sulphuric_rock_pillar.json new file mode 100644 index 000000000..ca6a9e00c --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sulphuric_rock_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "betterend:block/sulphuric_rock_pillar" + }, + "axis=z": { + "model": "betterend:block/sulphuric_rock_pillar", + "x": 90 + }, + "axis=x": { + "model": "betterend:block/sulphuric_rock_pillar", + "x": 90, + "y": 90 + } + } +} diff --git a/kubejs/assets/betterend/blockstates/tube_worm.json b/kubejs/assets/betterend/blockstates/tube_worm.json new file mode 100644 index 000000000..69543e40d --- /dev/null +++ b/kubejs/assets/betterend/blockstates/tube_worm.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/tube_worm_01", "y": 180 }, + { "model": "betterend:block/tube_worm_02", "y": 180 }, + { "model": "betterend:block/tube_worm_03", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/tube_worm_01" }, + { "model": "betterend:block/tube_worm_02" }, + { "model": "betterend:block/tube_worm_03" } + ], + "facing=east": [ + { "model": "betterend:block/tube_worm_01", "y": 270 }, + { "model": "betterend:block/tube_worm_02", "y": 270 }, + { "model": "betterend:block/tube_worm_03", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/tube_worm_01", "y": 90 }, + { "model": "betterend:block/tube_worm_02", "y": 90 }, + { "model": "betterend:block/tube_worm_03", "y": 90 } + ] + } +} diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index 7ebc3612a..41142b02d 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -14,6 +14,7 @@ "block.betterend.bolux_mushroom": "Bolux Mushroom Colony", "block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony", "block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony", + "block.betterend.brimstone": "Brimstone", "block.betterend.bushy_grass": "Novagrass", "block.betterend.bulb_moss": "Bulb Moss", "block.betterend.cave_bush": "Carmine Lamella", @@ -45,13 +46,20 @@ "block.betterend.filalux_wings": "Filalux Wings", "block.betterend.flamaea": "Flamaea Mushroom", "block.betterend.flammalix": "Flammalix Mushroom", + "block.betterend.flavolite": "Raw Leucitite", + "block.betterend.flavolite_bricks": "Leucitite Bricks", + "block.betterend.flavolite_pillar": "Leucitite Pillar", + "block.betterend.flavolite_polished": "Polished Leucitite", + "block.betterend.flavolite_tiles": "Leucitite Tiles", "block.betterend.fracturn": "Fracturn", "block.betterend.glacian_hymenophore": "Glacian Hymenophore", "block.betterend.globulagus": "Globulagus", + "block.betterend.hydrothermal_vent": "Thermal Vent", "block.betterend.hydralux": "Hydralux", "block.betterend.hydralux_sapling": "Hydralux Sprout", "block.betterend.inflexia": "Inflexia", "block.betterend.lacugrove": "Lacugrove Algae", + "block.betterend.lacugrove_bark": "Raw Adakite", "block.betterend.lamellarium": "Lamellarium", "block.betterend.lanceleaf": "Lanceleaf", "block.betterend.lanceleaf_small": "Lanceleaf Dagger", @@ -59,6 +67,7 @@ "block.betterend.lucernia_leaves": "Lucernia Lamella", "block.betterend.lucernia_leaves_fallen": "Small Lucernia Lamella", "block.betterend.lucernia_outer_leaves": "Lucernia Hyphae", + "block.betterend.lucernia_bark": "Fiendish Spire", "block.betterend.lutebus": "Lutebus", "block.betterend.magnula": "Magnula", "block.betterend.nightshade_moss": "Nox Moss", @@ -68,11 +77,23 @@ "block.betterend.rubinea": "Rubinea", "block.betterend.ruscus": "Ruscus Grass", "block.betterend.salteago": "Salteago", + "block.betterend.sandy_jadestone": "Raw Lamproite", + "block.betterend.sandy_jadestone_bricks": "Lamproite Bricks", + "block.betterend.sandy_jadestone_pillar": "Lamproite Pillar", + "block.betterend.sandy_jadestone_polished": "Polished Lamproite", + "block.betterend.sandy_jadestone_tiles": "Lamproite Tiles", "block.betterend.selagine": "Selagine", "block.betterend.shadow_berry": "Nox Berries", "block.betterend.shadow_berry_wild": "Wild Nox Berries", "block.betterend.shadow_berry_dead": "Dead Nox Berries", "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom", + "block.betterend.sulphur_crystal": "Sulfur Crystal", + "block.betterend.sulphuric_rock": "Raw Ignimbrite", + "block.betterend.sulphuric_rock_bricks": "Ignimbrite Bricks", + "block.betterend.sulphuric_rock_pillar": "Ignimbrite Pillar", + "block.betterend.sulphuric_rock_polished": "Polished Ignimbrite", + "block.betterend.sulphuric_rock_tiles": "Ignimbrite Tiles", + "block.betterend.tube_worm": "Tube Worm", "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss", diff --git a/kubejs/assets/betterend/models/block/brimstone_active.json b/kubejs/assets/betterend/models/block/brimstone_active.json new file mode 100644 index 000000000..d7aa24865 --- /dev/null +++ b/kubejs/assets/betterend/models/block/brimstone_active.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/brimstone" + } +} diff --git a/kubejs/assets/betterend/models/block/brimstone_normal.json b/kubejs/assets/betterend/models/block/brimstone_normal.json new file mode 100644 index 000000000..da1bff0eb --- /dev/null +++ b/kubejs/assets/betterend/models/block/brimstone_normal.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/inactive_brimstone" + } +} diff --git a/kubejs/assets/betterend/models/block/flavolite_pillar.json b/kubejs/assets/betterend/models/block/flavolite_pillar.json new file mode 100644 index 000000000..c534dc009 --- /dev/null +++ b/kubejs/assets/betterend/models/block/flavolite_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "betterend:block/flavolite_pillar_top", + "side": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/hydrothermal_vent.json b/kubejs/assets/betterend/models/block/hydrothermal_vent.json new file mode 100644 index 000000000..40f1962b6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/hydrothermal_vent.json @@ -0,0 +1,164 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/sulphuric_rock", + "texture": "betterend:block/sulphuric_rock", + "rock_top": "betterend:block/sulphuric_rock_top", + "geyser_top": "betterend:block/geyser_top" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 9, 10, 8 ], + "to": [ 13, 16, 12 ], + "faces": { + "up": { "uv": [ 0, 0, 4, 4 ], "texture": "#geyser_top", "cullface": "up" }, + "north": { "uv": [ 3, 0, 7, 6 ], "texture": "#texture" }, + "south": { "uv": [ 9, 0, 13, 6 ], "texture": "#texture" }, + "west": { "uv": [ 8, 0, 12, 6 ], "texture": "#texture" }, + "east": { "uv": [ 4, 0, 8, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 0, 7 ], + "to": [ 14, 10, 13 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 10, 5, 16, 11 ], "texture": "#geyser_top" }, + "north": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 0, 1 ], + "to": [ 8, 5, 5 ], + "faces": { + "down": { "uv": [ 4, 11, 8, 15 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 1, 8, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 8, 11, 12, 16 ], "texture": "#texture" }, + "west": { "uv": [ 1, 11, 5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 11, 11, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 5, 2 ], + "to": [ 7, 11, 4 ], + "faces": { + "up": { "uv": [ 0, 4, 2, 6 ], "texture": "#geyser_top" }, + "north": { "uv": [ 8, 5, 10, 11 ], "texture": "#texture" }, + "south": { "uv": [ 6, 5, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 5, 3, 11 ], "texture": "#texture" }, + "east": { "uv": [ 13, 5, 15, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 0, 8 ], + "to": [ 5, 8, 12 ], + "faces": { + "down": { "uv": [ 1, 4, 5, 8 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 5, 12, 9, 16 ], "texture": "#geyser_top" }, + "north": { "uv": [ 11, 8, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 12, 16 ], "texture": "#texture" }, + "east": { "uv": [ 4, 8, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 8, 9 ], + "to": [ 4, 14, 11 ], + "faces": { + "up": { "uv": [ 0, 4, 2, 6 ], "texture": "#geyser_top" }, + "north": { "uv": [ 12, 2, 14, 8 ], "texture": "#texture" }, + "south": { "uv": [ 2, 2, 4, 8 ], "texture": "#texture" }, + "west": { "uv": [ 9, 2, 11, 8 ], "texture": "#texture" }, + "east": { "uv": [ 5, 2, 7, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 2, 0, 4 ], + "to": [ 5, 4, 7 ], + "faces": { + "down": { "uv": [ 2, 9, 5, 12 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 9, 13, 12, 16 ], "texture": "#geyser_top" }, + "north": { "uv": [ 11, 12, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 4, 12, 7, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 12, 12, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 3, 0, 13 ], + "to": [ 6, 4, 16 ], + "faces": { + "down": { "uv": [ 3, 0, 6, 3 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 9, 0, 12, 3 ], "texture": "#geyser_top" }, + "north": { "uv": [ 10, 12, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 3, 12, 6, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 13, 12, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 3, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 12, 0, 2 ], + "to": [ 15, 4, 5 ], + "faces": { + "down": { "uv": [ 12, 11, 15, 14 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 9, 13, 12, 16 ], "texture": "#geyser_top" }, + "north": { "uv": [ 1, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 12, 12, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 2, 12, 5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 11, 12, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 7, 0, 3 ], + "to": [ 12, 7, 8 ], + "faces": { + "down": { "uv": [ 7, 8, 12, 13 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 0, 9, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 4, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 9, 12, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 9, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 9, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 4, 0, 9 ], + "to": [ 9, 7, 14 ], + "faces": { + "down": { "uv": [ 4, 2, 9, 7 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 0, 9, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 7, 9, 12, 16 ], "texture": "#texture" }, + "south": { "uv": [ 4, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 9, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 2, 9, 7, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 3, 0, 5 ], + "to": [ 8, 9, 10 ], + "faces": { + "down": { "uv": [ 3, 6, 8, 11 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 0, 9, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 8, 7, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 3, 7, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 7, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 6, 7, 11, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark.json b/kubejs/assets/betterend/models/block/lacugrove_bark.json new file mode 100644 index 000000000..9f6d5616f --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side" + } +} diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark_2.json b/kubejs/assets/betterend/models/block/lacugrove_bark_2.json new file mode 100644 index 000000000..086106bf1 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side_2" + } +} diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark_3.json b/kubejs/assets/betterend/models/block/lacugrove_bark_3.json new file mode 100644 index 000000000..0ebc7fd4e --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side_3" + } +} diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark_4.json b/kubejs/assets/betterend/models/block/lacugrove_bark_4.json new file mode 100644 index 000000000..aba164716 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side_4" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark.json b/kubejs/assets/betterend/models/block/lucernia_bark.json new file mode 100644 index 000000000..2d1d28db2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_log_side" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark_2.json b/kubejs/assets/betterend/models/block/lucernia_bark_2.json new file mode 100644 index 000000000..1975f43dd --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_log_side_2" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark_3.json b/kubejs/assets/betterend/models/block/lucernia_bark_3.json new file mode 100644 index 000000000..98dacd59e --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_mirrored_all", + "textures": { + "all": "betterend:block/lucernia_log_side" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark_4.json b/kubejs/assets/betterend/models/block/lucernia_bark_4.json new file mode 100644 index 000000000..9b91dce6b --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_mirrored_all", + "textures": { + "all": "betterend:block/lucernia_log_side_2" + } +} diff --git a/kubejs/assets/betterend/models/block/sandy_jadestone_pillar.json b/kubejs/assets/betterend/models/block/sandy_jadestone_pillar.json new file mode 100644 index 000000000..03476c611 --- /dev/null +++ b/kubejs/assets/betterend/models/block/sandy_jadestone_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "betterend:block/sandy_jadestone_pillar_top", + "side": "betterend:block/sandy_jadestone_pillar_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphur_crystal_0.json b/kubejs/assets/betterend/models/block/sulphur_crystal_0.json new file mode 100644 index 000000000..9a3ff8de4 --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphur_crystal_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/sulphur_crystal_0" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphur_crystal_1.json b/kubejs/assets/betterend/models/block/sulphur_crystal_1.json new file mode 100644 index 000000000..8474044dd --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphur_crystal_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/sulphur_crystal_1" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphur_crystal_2.json b/kubejs/assets/betterend/models/block/sulphur_crystal_2.json new file mode 100644 index 000000000..279f1c3ed --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphur_crystal_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/sulphur_crystal_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphuric_rock.json b/kubejs/assets/betterend/models/block/sulphuric_rock.json new file mode 100644 index 000000000..1fea448f1 --- /dev/null +++ b/kubejs/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/kubejs/assets/betterend/models/block/sulphuric_rock_pillar.json b/kubejs/assets/betterend/models/block/sulphuric_rock_pillar.json new file mode 100644 index 000000000..85734fb6b --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphuric_rock_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "betterend:block/sulphuric_rock_pillar_top", + "side": "betterend:block/sulphuric_rock_pillar_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/tube_worm_01.json b/kubejs/assets/betterend/models/block/tube_worm_01.json new file mode 100644 index 000000000..ae2acdf57 --- /dev/null +++ b/kubejs/assets/betterend/models/block/tube_worm_01.json @@ -0,0 +1,95 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/tube_worm_3", + "worm3": "betterend:block/tube_worm_3", + "worm2": "betterend:block/tube_worm_2", + "worm1": "betterend:block/tube_worm_1" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 9, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 11, 0, 0 ], + "to": [ 11.001, 9, 16 ], + "rotation": { "origin": [ 11, 0, 0 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm1" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm1" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 5, 0, 0 ], + "to": [ 5.001, 9, 16 ], + "rotation": { "origin": [ 5, 0, 0 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "Box4", + "from": [ 11, 6, 3 ], + "to": [ 14, 11, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 2, 6, 5 ], + "to": [ 5, 11, 8 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 7, 9 ], + "to": [ 9.5, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 9, 3 ], + "to": [ 9.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/tube_worm_02.json b/kubejs/assets/betterend/models/block/tube_worm_02.json new file mode 100644 index 000000000..dad765bfe --- /dev/null +++ b/kubejs/assets/betterend/models/block/tube_worm_02.json @@ -0,0 +1,95 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/tube_worm_3", + "worm3": "betterend:block/tube_worm_3", + "worm2": "betterend:block/tube_worm_2", + "worm1": "betterend:block/tube_worm_1" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 9, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 11, 0, 0 ], + "to": [ 11.001, 9, 16 ], + "rotation": { "origin": [ 11, 0, 0 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 5, 0, 0 ], + "to": [ 5.001, 9, 16 ], + "rotation": { "origin": [ 5, 0, 0 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 6, 5.5 ], + "to": [ 9.5, 11, 8.5 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 1, 6, 5 ], + "to": [ 4, 11, 8 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 13.5, 7, 9 ], + "to": [ 16.5, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 11.5, 9, 3 ], + "to": [ 14.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/tube_worm_03.json b/kubejs/assets/betterend/models/block/tube_worm_03.json new file mode 100644 index 000000000..90a0db4a7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/tube_worm_03.json @@ -0,0 +1,108 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/tube_worm_3", + "worm3": "betterend:block/tube_worm_3", + "worm2": "betterend:block/tube_worm_2", + "worm1": "betterend:block/tube_worm_1" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 9, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 11, 0, 0 ], + "to": [ 11.001, 9, 16 ], + "rotation": { "origin": [ 11, 0, 0 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 5, 0, 0 ], + "to": [ 5.001, 9, 16 ], + "rotation": { "origin": [ 5, 0, 0 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 6, 5.5 ], + "to": [ 9.5, 11, 8.5 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 14, 7, 9 ], + "to": [ 17, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 11.5, 9, 3 ], + "to": [ 14.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 1.5, 9, 3 ], + "to": [ 4.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ -1, 7, 9 ], + "to": [ 2, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/hydrothermal_vent.json b/kubejs/assets/betterend/models/item/hydrothermal_vent.json new file mode 100644 index 000000000..df7a31771 --- /dev/null +++ b/kubejs/assets/betterend/models/item/hydrothermal_vent.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/hydrothermal_vent" +} diff --git a/kubejs/assets/betterend/models/item/sulphur_crystal.json b/kubejs/assets/betterend/models/item/sulphur_crystal.json new file mode 100644 index 000000000..899b962fa --- /dev/null +++ b/kubejs/assets/betterend/models/item/sulphur_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/sulphur_crystal_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/tube_worm.json b/kubejs/assets/betterend/models/item/tube_worm.json new file mode 100644 index 000000000..d754a00c5 --- /dev/null +++ b/kubejs/assets/betterend/models/item/tube_worm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/tube_worm" + } +} diff --git a/kubejs/assets/betterend/textures/block/brimstone.png b/kubejs/assets/betterend/textures/block/brimstone.png new file mode 100644 index 000000000..e6c11d99a Binary files /dev/null and b/kubejs/assets/betterend/textures/block/brimstone.png differ diff --git a/kubejs/assets/betterend/textures/block/flavolite.png b/kubejs/assets/betterend/textures/block/flavolite.png new file mode 100644 index 000000000..f259025e7 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/flavolite.png differ diff --git a/kubejs/assets/betterend/textures/block/flavolite_bricks.png b/kubejs/assets/betterend/textures/block/flavolite_bricks.png new file mode 100644 index 000000000..39d09783b Binary files /dev/null and b/kubejs/assets/betterend/textures/block/flavolite_bricks.png differ diff --git a/kubejs/assets/betterend/textures/block/flavolite_pillar_side.png b/kubejs/assets/betterend/textures/block/flavolite_pillar_side.png new file mode 100644 index 000000000..3f2e5468e Binary files /dev/null and b/kubejs/assets/betterend/textures/block/flavolite_pillar_side.png differ diff --git a/kubejs/assets/betterend/textures/block/flavolite_pillar_top.png b/kubejs/assets/betterend/textures/block/flavolite_pillar_top.png new file mode 100644 index 000000000..0330151fe Binary files /dev/null and b/kubejs/assets/betterend/textures/block/flavolite_pillar_top.png differ diff --git a/kubejs/assets/betterend/textures/block/flavolite_polished.png b/kubejs/assets/betterend/textures/block/flavolite_polished.png new file mode 100644 index 000000000..14c07cf62 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/flavolite_polished.png differ diff --git a/kubejs/assets/betterend/textures/block/flavolite_tiles.png b/kubejs/assets/betterend/textures/block/flavolite_tiles.png new file mode 100644 index 000000000..3ee5436a6 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/flavolite_tiles.png differ diff --git a/kubejs/assets/betterend/textures/block/geyser_top.png b/kubejs/assets/betterend/textures/block/geyser_top.png new file mode 100644 index 000000000..0fc22b0f1 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/geyser_top.png differ diff --git a/kubejs/assets/betterend/textures/block/inactive_brimstone.png b/kubejs/assets/betterend/textures/block/inactive_brimstone.png new file mode 100644 index 000000000..0c0b22af9 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/inactive_brimstone.png differ diff --git a/kubejs/assets/betterend/textures/block/lacugrove_log_side.png b/kubejs/assets/betterend/textures/block/lacugrove_log_side.png new file mode 100644 index 000000000..885e2800e Binary files /dev/null and b/kubejs/assets/betterend/textures/block/lacugrove_log_side.png differ diff --git a/kubejs/assets/betterend/textures/block/lacugrove_log_side_2.png b/kubejs/assets/betterend/textures/block/lacugrove_log_side_2.png new file mode 100644 index 000000000..1e4ddac31 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/lacugrove_log_side_2.png differ diff --git a/kubejs/assets/betterend/textures/block/lacugrove_log_side_3.png b/kubejs/assets/betterend/textures/block/lacugrove_log_side_3.png new file mode 100644 index 000000000..d2053e292 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/lacugrove_log_side_3.png differ diff --git a/kubejs/assets/betterend/textures/block/lacugrove_log_side_4.png b/kubejs/assets/betterend/textures/block/lacugrove_log_side_4.png new file mode 100644 index 000000000..dc310ff04 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/lacugrove_log_side_4.png differ diff --git a/kubejs/assets/betterend/textures/block/lucernia_log_side.png b/kubejs/assets/betterend/textures/block/lucernia_log_side.png new file mode 100644 index 000000000..374023582 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/lucernia_log_side.png differ diff --git a/kubejs/assets/betterend/textures/block/lucernia_log_side_2.png b/kubejs/assets/betterend/textures/block/lucernia_log_side_2.png new file mode 100644 index 000000000..6bfaba6dd Binary files /dev/null and b/kubejs/assets/betterend/textures/block/lucernia_log_side_2.png differ diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone.png b/kubejs/assets/betterend/textures/block/sandy_jadestone.png new file mode 100644 index 000000000..256ca2f79 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sandy_jadestone.png differ diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_bricks.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_bricks.png new file mode 100644 index 000000000..939a6e8d8 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sandy_jadestone_bricks.png differ diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_side.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_side.png new file mode 100644 index 000000000..94298f094 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_side.png differ diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_top.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_top.png new file mode 100644 index 000000000..d961081ba Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_top.png differ diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_polished.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_polished.png new file mode 100644 index 000000000..d69f09926 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sandy_jadestone_polished.png differ diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_tiles.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_tiles.png new file mode 100644 index 000000000..761ca2fbe Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sandy_jadestone_tiles.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphur_crystal_0.png b/kubejs/assets/betterend/textures/block/sulphur_crystal_0.png new file mode 100644 index 000000000..7620e8dae Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphur_crystal_0.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphur_crystal_1.png b/kubejs/assets/betterend/textures/block/sulphur_crystal_1.png new file mode 100644 index 000000000..42e1ec86b Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphur_crystal_1.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphur_crystal_2.png b/kubejs/assets/betterend/textures/block/sulphur_crystal_2.png new file mode 100644 index 000000000..d1d6c3de8 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphur_crystal_2.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock.png b/kubejs/assets/betterend/textures/block/sulphuric_rock.png new file mode 100644 index 000000000..9e4c20ccc Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphuric_rock.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_bricks.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_bricks.png new file mode 100644 index 000000000..d8411976d Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphuric_rock_bricks.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_side.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_side.png new file mode 100644 index 000000000..26b4c9160 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_side.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_top.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_top.png new file mode 100644 index 000000000..2d66d0bd3 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_top.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_polished.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_polished.png new file mode 100644 index 000000000..e9056aa07 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphuric_rock_polished.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_tiles.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_tiles.png new file mode 100644 index 000000000..116833311 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphuric_rock_tiles.png differ diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_top.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_top.png new file mode 100644 index 000000000..fc3065159 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/sulphuric_rock_top.png differ diff --git a/kubejs/assets/betterend/textures/block/tube_worm_1.png b/kubejs/assets/betterend/textures/block/tube_worm_1.png new file mode 100644 index 000000000..1b993308b Binary files /dev/null and b/kubejs/assets/betterend/textures/block/tube_worm_1.png differ diff --git a/kubejs/assets/betterend/textures/block/tube_worm_2.png b/kubejs/assets/betterend/textures/block/tube_worm_2.png new file mode 100644 index 000000000..7a2331ce5 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/tube_worm_2.png differ diff --git a/kubejs/assets/betterend/textures/block/tube_worm_3.png b/kubejs/assets/betterend/textures/block/tube_worm_3.png new file mode 100644 index 000000000..fb6084a77 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/tube_worm_3.png differ diff --git a/kubejs/assets/betterend/textures/item/thermal_fungus.png b/kubejs/assets/betterend/textures/item/thermal_fungus.png new file mode 100644 index 000000000..bf1056d15 Binary files /dev/null and b/kubejs/assets/betterend/textures/item/thermal_fungus.png differ diff --git a/kubejs/assets/betterend/textures/item/tube_worm.png b/kubejs/assets/betterend/textures/item/tube_worm.png new file mode 100644 index 000000000..6159c2909 Binary files /dev/null and b/kubejs/assets/betterend/textures/item/tube_worm.png differ diff --git a/kubejs/data/betterend/loot_tables/blocks/hydrothermal_vent.json b/kubejs/data/betterend/loot_tables/blocks/hydrothermal_vent.json new file mode 100644 index 000000000..c1e0b0905 --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/hydrothermal_vent.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [] +} \ No newline at end of file diff --git a/kubejs/data/betterend/loot_tables/blocks/sulphur_crystal.json b/kubejs/data/betterend/loot_tables/blocks/sulphur_crystal.json new file mode 100644 index 000000000..dd6e85c07 --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/sulphur_crystal.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gtceu:sulfur_dust" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/betterend/loot_tables/blocks/tube_worm.json b/kubejs/data/betterend/loot_tables/blocks/tube_worm.json new file mode 100644 index 000000000..c1e0b0905 --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/tube_worm.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 9fba408ca..628dfa3e8 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -293,14 +293,14 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "minecraft:powder_snow", - "min_threshold": -0.2, - "max_threshold": -0.1 + "min_threshold": -0.3, + "max_threshold": 0 }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 2, + "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 @@ -313,32 +313,6 @@ } } }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": -0.3, - "max_threshold": 0.0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 2, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "kubejs_tfc:rock", - "rock_block": "cobble", - "fallback_state": { - "Name": "ad_astra:venus_cobblestone" - } - } - } - }, { "type": "minecraft:condition", "if_true": { @@ -351,16 +325,15 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 2, + "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { - "type": "kubejs_tfc:rock", - "rock_block": "raw", - "fallback_state": { - "Name": "ad_astra:venus_stone" + "type": "minecraft:block", + "result_state": { + "Name": "betterend:flavolite" } } } @@ -369,7 +342,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 2, + "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 @@ -380,6 +353,23 @@ "Name": "ad_astra:conglomerate" } } + }, + { + "type": "tfg:badlands", + "raw_rock_weight": 20, + "palette": [ + { "Name": "create:ochrum" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:flavolite" }, + { "Name": "betterend:flavolite" }, + { "Name": "betterend:flavolite" } + ], + "fallback": { + "Name": "ad_astra:venus_stone" + } } ] } @@ -3316,13 +3306,12 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "sulfuric_ravine_sea_level", - "true_at_and_below": { - "absolute": 58 - }, - "false_at_and_above": { - "absolute": 60 + "type": "minecraft:not", + "invert": { + "type": "minecraft:water", + "offset": 1, + "surface_depth_multiplier": 0, + "add_stone_depth": false } }, "then_run": { @@ -3333,10 +3322,11 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.1, - "max_threshold": 0.2 + "type": "minecraft:stone_depth", + "offset": 1, + "surface_type": "floor", + "add_surface_depth": false, + "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:sequence", @@ -3344,11 +3334,10 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.1, + "max_threshold": 0.2 }, "then_run": { "type": "minecraft:block", @@ -3358,39 +3347,10 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.0, - "max_threshold": 0.3 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.0, + "max_threshold": 0.3 }, "then_run": { "type": "minecraft:block", @@ -3400,39 +3360,10 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": -0.4, - "max_threshold": 0.7 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": -0.4, + "max_threshold": 0.7 }, "then_run": { "type": "minecraft:block", @@ -3440,58 +3371,31 @@ } }, { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/yellow" } - } + "type": "minecraft:block", + "result_state": { "Name": "tfc:sand/black" } } ] } }, { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:sand/black" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:raw_sandstone/black" - } - } - } - ] + "type": "tfg:badlands", + "raw_rock_weight": 5, + "palette": [ + { "Name": "create:scoria" }, + { "Name": "create:ochrum" }, + { "Name": "betterend:sulphuric_rock" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:lacugrove_bark" }, + { "Name": "tfg:sandstone/raw/fluorapatite/brown" }, + { "Name": "tfg:sandstone/raw/fluorapatite/orange" }, + { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, + { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, + { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, + { "Name": "tfc:raw_sandstone/black" } + ], + "fallback": { + "Name": "ad_astra:venus_stone" + } } ] } @@ -4522,7 +4426,7 @@ }, "then_run": { "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } + "result_state": { "Name": "tfg:sand/fluorapatite/brown" } } }, { diff --git a/kubejs/data/vintageimprovements/loot_tables/blocks/sulfur_block.json b/kubejs/data/vintageimprovements/loot_tables/blocks/sulfur_block.json new file mode 100644 index 000000000..390c620e6 --- /dev/null +++ b/kubejs/data/vintageimprovements/loot_tables/blocks/sulfur_block.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gtceu:raw_sulfur", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index da873e89a..436a5b12b 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -1162,6 +1162,10 @@ function registerTFGRockRecipes(event) { { block: 'create:ochrum', dimension: 'ad_astra:mars' }, { block: 'create:scoria', dimension: 'ad_astra:venus' }, { block: 'minecraft:tuff', dimension: 'ad_astra:venus' }, + { block: 'betterend:flavolite', dimension: 'ad_astra:venus' }, + { block: 'betterend:sandy_jadestone', dimension: 'ad_astra:venus' }, + { block: 'betterend:sulphuric_rock', dimension: 'ad_astra:venus' }, + { block: 'betterend:brimstone', dimension: 'ad_astra:venus' }, { block: 'ad_astra:mercury_stone', dimension: 'ad_astra:mercury' }, { block: 'ad_astra:mercury_cobblestone', dimension: 'ad_astra:mercury' }, { block: 'create:crimsite', dimension: 'ad_astra:mercury' }, diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index e078a55b3..43f6d5572 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -79,5 +79,6 @@ const registerTFGRecipes = (event) => { registerTFGMarsIodineRecipes(event) registerTFGMarsOstrumRecipes(event) + registerTFGVenusRecipes(event) registerTFGBiochemRecipes(event) } diff --git a/kubejs/server_scripts/tfg/venus/recipes.venus.js b/kubejs/server_scripts/tfg/venus/recipes.venus.js new file mode 100644 index 000000000..51e2a90cc --- /dev/null +++ b/kubejs/server_scripts/tfg/venus/recipes.venus.js @@ -0,0 +1,22 @@ +"use strict"; + +function registerTFGVenusRecipes(event) { + + event.stonecutting('betterend:flavolite', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_bricks', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_pillar', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_polished', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_tiles', '#tfg:leucitite_blocks') + + event.stonecutting('betterend:sandy_jadestone', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_bricks', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_pillar', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_polished', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_tiles', '#tfg:lamproite_blocks') + + event.stonecutting('betterend:sulphuric_rock', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_bricks', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_pillar', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_polished', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_tiles', '#tfg:ignimbrite_blocks') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index 493030147..3b1054640 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -1,7 +1,23 @@ "use strict"; function registerTFGVenusItemTags(event) { + event.add('tfg:leucitite_blocks', 'betterend:flavolite') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_bricks') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_pillar') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_polished') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_tiles') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_bricks') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_pillar') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_polished') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_tiles') + + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_bricks') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_pillar') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_polished') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_tiles') } @@ -63,6 +79,13 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'create:scoria') event.add('ad_astra:venus_stone_replaceables', 'create:scorchia') event.add('ad_astra:venus_stone_replaceables', 'minecraft:tuff') + event.add('ad_astra:venus_stone_replaceables', 'betterend:brimstone') + event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:sandy_jadestone') + event.add('ad_astra:venus_stone_replaceables', 'betterend:sulphuric_rock') + event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:lacugrove_bark') + event.add('ad_astra:venus_stone_replaceables', 'betterend:lucernia_bark') event.add('tfc:can_carve', '#ad_astra:venus_stone_replaceables') @@ -72,6 +95,8 @@ function registerTFGVenusBlockTags(event) { event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/orange') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/white') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/yellow') + + event.add('tfg:decorative_plant_attachable', 'betterend:sulphuric_rock') } function registerTFGVenusBiomeTags(event) { diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 4e6961652..225b263e2 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -173,4 +173,101 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .opaque(true) }) //#endregion + + // Some more stone blocks from better end, for variety's sake + + event.create('betterend:brimstone') + .soundType('tuff') + .mapColor('color_yellow') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + event.create('betterend:hydrothermal_vent', 'tfg:particle_emitter_decoration') + .soundType('dripstone_block') + .mapColor('dirt') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + .opaque(false) + .fullBlock(false) + .box(1, 0, 1, 15, 16, 15) + .notSolid() + .particleOffset(0.3, 1, 0.3) + .particleVelocity(0, 0.1, 0) + .particle('minecraft:large_smoke') + .particleCount(5) + .particleForced(true) + + event.create('betterend:tube_worm', 'tfg:attached_decorative_plant') + .soundType('nether_wart') + .mapColor('terracotta_white') + .tagBlock('minecraft:replaceable') + .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:lacugrove_bark') + .soundType('basalt') + .mapColor('podzol') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + event.create('betterend:lucernia_bark') + .soundType('netherrack') + .mapColor('wood') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + event.create('betterend:sulphur_crystal', 'tfg:decorative_plant') + .soundType('deepslate') + .mapColor('gold') + .box(3, 0, 3, 13, 6, 13) + + const flavolite = [ 'flavolite', 'flavolite_bricks', 'flavolite_polished', 'flavolite_tiles' ]; + flavolite.forEach(f => { + event.create(`betterend:${f}`) + .soundType('deepslate') + .mapColor('sand') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + }) + + event.create(`betterend:flavolite_pillar`) + .property(BlockProperties.AXIS) + .placementState((event) => event.set(BlockProperties.AXIS, event.clickedFace.axis)) + .soundType('netherrack') + .mapColor('sand') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + const jadestone = [ 'sandy_jadestone', 'sandy_jadestone_bricks', 'sandy_jadestone_polished', 'sandy_jadestone_tiles' ]; + jadestone.forEach(j => { + event.create(`betterend:${j}`) + .soundType('stone') + .mapColor('color_light_green') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + }) + + event.create(`betterend:sandy_jadestone_pillar`) + .property(BlockProperties.AXIS) + .placementState((event) => event.set(BlockProperties.AXIS, event.clickedFace.axis)) + .soundType('stone') + .mapColor('color_light_green') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + const sulphuric_rock = [ 'sulphuric_rock', 'sulphuric_rock_bricks', 'sulphuric_rock_polished', 'sulphuric_rock_tiles' ]; + sulphuric_rock.forEach(s => { + event.create(`betterend:${s}`) + .soundType('dripstone_block') + .mapColor('terracotta_light_gray') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + }) + + event.create(`betterend:sulphuric_rock_pillar`) + .placementState((event) => event.set(BlockProperties.AXIS, event.clickedFace.axis)) + .property(BlockProperties.AXIS) + .soundType('dripstone_block') + .mapColor('terracotta_light_gray') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') } \ No newline at end of file diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index 85e1c3d41..54208ebc8 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -16,7 +16,6 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ 'vintageimprovements:laser_item', 'vintageimprovements:sulfur_chunk', 'vintageimprovements:sulfur', - 'vintageimprovements:sulfur_block', 'vintageimprovements:sulfuric_acid_bucket', 'vintageimprovements:copper_sulfate', 'vintageimprovements:incomplete_redstone_module',