diff --git a/src/main/generated/assets/ragium/blockstates/lined_asphalt.json b/src/main/generated/assets/ragium/blockstates/lined_asphalt.json deleted file mode 100644 index 1cac1073..00000000 --- a/src/main/generated/assets/ragium/blockstates/lined_asphalt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ragium:block/lined_asphalt" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/blockstates/lined_asphalt_slab.json b/src/main/generated/assets/ragium/blockstates/lined_asphalt_slab.json deleted file mode 100644 index 8e8b0160..00000000 --- a/src/main/generated/assets/ragium/blockstates/lined_asphalt_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "ragium:block/lined_asphalt_slab" - }, - "type=double": { - "model": "ragium:block/lined_asphalt" - }, - "type=top": { - "model": "ragium:block/lined_asphalt_slab_top" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/blockstates/polished_asphalt.json b/src/main/generated/assets/ragium/blockstates/polished_asphalt.json new file mode 100644 index 00000000..8145605d --- /dev/null +++ b/src/main/generated/assets/ragium/blockstates/polished_asphalt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ragium:block/polished_asphalt" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/blockstates/polished_asphalt_slab.json b/src/main/generated/assets/ragium/blockstates/polished_asphalt_slab.json new file mode 100644 index 00000000..26af8927 --- /dev/null +++ b/src/main/generated/assets/ragium/blockstates/polished_asphalt_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "ragium:block/polished_asphalt_slab" + }, + "type=double": { + "model": "ragium:block/polished_asphalt" + }, + "type=top": { + "model": "ragium:block/polished_asphalt_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/blockstates/polished_asphalt_stairs.json b/src/main/generated/assets/ragium/blockstates/polished_asphalt_stairs.json new file mode 100644 index 00000000..78709e4a --- /dev/null +++ b/src/main/generated/assets/ragium/blockstates/polished_asphalt_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "ragium:block/polished_asphalt_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "ragium:block/polished_asphalt_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "ragium:block/polished_asphalt_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/blockstates/polished_gypsum.json b/src/main/generated/assets/ragium/blockstates/polished_gypsum.json new file mode 100644 index 00000000..e7b7247c --- /dev/null +++ b/src/main/generated/assets/ragium/blockstates/polished_gypsum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ragium:block/polished_gypsum" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/blockstates/polished_gypsum_slab.json b/src/main/generated/assets/ragium/blockstates/polished_gypsum_slab.json new file mode 100644 index 00000000..010a1862 --- /dev/null +++ b/src/main/generated/assets/ragium/blockstates/polished_gypsum_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "ragium:block/polished_gypsum_slab" + }, + "type=double": { + "model": "ragium:block/polished_gypsum" + }, + "type=top": { + "model": "ragium:block/polished_gypsum_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/blockstates/lined_asphalt_stairs.json b/src/main/generated/assets/ragium/blockstates/polished_gypsum_stairs.json similarity index 61% rename from src/main/generated/assets/ragium/blockstates/lined_asphalt_stairs.json rename to src/main/generated/assets/ragium/blockstates/polished_gypsum_stairs.json index f456917e..0dc0d258 100644 --- a/src/main/generated/assets/ragium/blockstates/lined_asphalt_stairs.json +++ b/src/main/generated/assets/ragium/blockstates/polished_gypsum_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner" + "model": "ragium:block/polished_gypsum_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer" + "model": "ragium:block/polished_gypsum_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs" + "model": "ragium:block/polished_gypsum_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs", + "model": "ragium:block/polished_gypsum_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs", + "model": "ragium:block/polished_gypsum_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs", + "model": "ragium:block/polished_gypsum_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner" + "model": "ragium:block/polished_gypsum_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer" + "model": "ragium:block/polished_gypsum_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs", + "model": "ragium:block/polished_gypsum_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs", + "model": "ragium:block/polished_gypsum_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs", + "model": "ragium:block/polished_gypsum_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "ragium:block/lined_asphalt_stairs_inner", + "model": "ragium:block/polished_gypsum_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "ragium:block/lined_asphalt_stairs_outer", + "model": "ragium:block/polished_gypsum_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "ragium:block/lined_asphalt_stairs", + "model": "ragium:block/polished_gypsum_stairs", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/generated/assets/ragium/blockstates/rope.json b/src/main/generated/assets/ragium/blockstates/rope.json new file mode 100644 index 00000000..5eafa5f0 --- /dev/null +++ b/src/main/generated/assets/ragium/blockstates/rope.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ragium:block/rope" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/lang/en_us.json b/src/main/generated/assets/ragium/lang/en_us.json index 09fb476a..d64c7d70 100644 --- a/src/main/generated/assets/ragium/lang/en_us.json +++ b/src/main/generated/assets/ragium/lang/en_us.json @@ -16,16 +16,20 @@ "block.ragium.iron_pipe": "Iron Pipe", "block.ragium.item_display": "Item Display", "block.ragium.large_processor": "Large Processor", - "block.ragium.lined_asphalt": "Lined Asphalt", - "block.ragium.lined_asphalt_slab": "Lined Asphalt Slab", - "block.ragium.lined_asphalt_stairs": "Lined Asphalt Stairs", "block.ragium.manual_forge": "Ragi-Anvil", "block.ragium.manual_grinder": "Ragi-Grinder", "block.ragium.manual_mixer": "Ragi-Basin", "block.ragium.mutated_soil": "Mutated Soil", "block.ragium.network_interface": "E.N.I.", "block.ragium.open_crate": "Open Crate", + "block.ragium.polished_asphalt": "Polished Asphalt", + "block.ragium.polished_asphalt_slab": "Polished Asphalt Slab", + "block.ragium.polished_asphalt_stairs": "Polished Asphalt Stairs", + "block.ragium.polished_gypsum": "Polished Gypsum", + "block.ragium.polished_gypsum_slab": "Polished Gypsum Slab", + "block.ragium.polished_gypsum_stairs": "Polished Gypsum Stairs", "block.ragium.porous_netherrack": "Porous Netherrack", + "block.ragium.rope": "Rope", "block.ragium.shaft": "Shaft", "block.ragium.sponge_cake": "Sponge Cake", "block.ragium.steel_pipe": "Steel Pipe", @@ -294,6 +298,7 @@ "tooltip.ragium.item.filter.tag_format": "- Tag Format: #namespace:path", "tooltip.ragium.item.flatten_dynamite": "Remove ALL blocks above when hit", "tooltip.ragium.item.ragi_wrench": "Right-click to rotate horizontally, change front when sneaking", + "tooltip.ragium.item.rope": "Place down Ropes when land on", "tooltip.ragium.item.trader_catalog": "Right-click to open Wandering Trader's Screen", "tooltip.ragium.item.warped_crystal": "Right-click to teleport on linked Teleport Anchor, or bind it with sneaking", "tooltip.ragium.item.warped_crystal.destination": "Destination: %s", diff --git a/src/main/generated/assets/ragium/lang/ja_jp.json b/src/main/generated/assets/ragium/lang/ja_jp.json index 7e2418d6..d44ff4d1 100644 --- a/src/main/generated/assets/ragium/lang/ja_jp.json +++ b/src/main/generated/assets/ragium/lang/ja_jp.json @@ -16,16 +16,20 @@ "block.ragium.iron_pipe": "鉄パイプ", "block.ragium.item_display": "アイテムティスプレイ", "block.ragium.large_processor": "大型処理装置", - "block.ragium.lined_asphalt": "アスファルト（白線）", - "block.ragium.lined_asphalt_slab": "アスファルト（白線）のハーフブロック", - "block.ragium.lined_asphalt_stairs": "アスファルト（白線）の階段", "block.ragium.manual_forge": "らぎ金床", "block.ragium.manual_grinder": "らぎ臼", "block.ragium.manual_mixer": "らぎ釜", "block.ragium.mutated_soil": "変異した土壌", "block.ragium.network_interface": "E.N.I.", "block.ragium.open_crate": "オープンクレート", + "block.ragium.polished_asphalt": "磨かれたアスファルト", + "block.ragium.polished_asphalt_slab": "磨かれたアスファルトのハーフブロック", + "block.ragium.polished_asphalt_stairs": "磨かれたアスファルトの階段", + "block.ragium.polished_gypsum": "磨かれた石膏", + "block.ragium.polished_gypsum_slab": "磨かれた石膏のハーフブロック", + "block.ragium.polished_gypsum_stairs": "磨かれた石膏の階段", "block.ragium.porous_netherrack": "多孔質ネザーラック", + "block.ragium.rope": "ロープ", "block.ragium.shaft": "シャフト", "block.ragium.sponge_cake": "スポンジケーキ", "block.ragium.steel_pipe": "鋼鉄パイプ", @@ -293,6 +297,7 @@ "tooltip.ragium.item.filter.tag_format": "- タグフォーマット: #namespace:path", "tooltip.ragium.item.flatten_dynamite": "着弾点より上のブロックを「すべて」消滅させる", "tooltip.ragium.item.ragi_wrench": "右クリックで水平方向の回転，シフト右クリックで正面を変更", + "tooltip.ragium.item.rope": "着弾点からロープを下す", "tooltip.ragium.item.trader_catalog": "右クリックで行商人との取引を行う", "tooltip.ragium.item.warped_crystal": "右クリックでテレポートアンカーの上にテレポート，シフト右クリックで紐づけ", "tooltip.ragium.item.warped_crystal.destination": "座標: %s", diff --git a/src/main/generated/assets/ragium/models/block/lined_asphalt_slab.json b/src/main/generated/assets/ragium/models/block/lined_asphalt_slab.json deleted file mode 100644 index 022d1a91..00000000 --- a/src/main/generated/assets/ragium/models/block/lined_asphalt_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "ragium:block/lined_asphalt", - "side": "ragium:block/lined_asphalt", - "top": "ragium:block/lined_asphalt" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/lined_asphalt_slab_top.json b/src/main/generated/assets/ragium/models/block/lined_asphalt_slab_top.json deleted file mode 100644 index 491821ab..00000000 --- a/src/main/generated/assets/ragium/models/block/lined_asphalt_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "ragium:block/lined_asphalt", - "side": "ragium:block/lined_asphalt", - "top": "ragium:block/lined_asphalt" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs.json b/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs.json deleted file mode 100644 index 080c211d..00000000 --- a/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "ragium:block/lined_asphalt", - "side": "ragium:block/lined_asphalt", - "top": "ragium:block/lined_asphalt" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs_inner.json b/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs_inner.json deleted file mode 100644 index 8367b63a..00000000 --- a/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "ragium:block/lined_asphalt", - "side": "ragium:block/lined_asphalt", - "top": "ragium:block/lined_asphalt" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs_outer.json b/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs_outer.json deleted file mode 100644 index 11bcd02d..00000000 --- a/src/main/generated/assets/ragium/models/block/lined_asphalt_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "ragium:block/lined_asphalt", - "side": "ragium:block/lined_asphalt", - "top": "ragium:block/lined_asphalt" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_asphalt.json b/src/main/generated/assets/ragium/models/block/polished_asphalt.json new file mode 100644 index 00000000..06c58e8b --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_asphalt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ragium:block/polished_asphalt" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_asphalt_slab.json b/src/main/generated/assets/ragium/models/block/polished_asphalt_slab.json new file mode 100644 index 00000000..60c6343e --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_asphalt_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "ragium:block/polished_asphalt", + "side": "ragium:block/polished_asphalt", + "top": "ragium:block/polished_asphalt" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_asphalt_slab_top.json b/src/main/generated/assets/ragium/models/block/polished_asphalt_slab_top.json new file mode 100644 index 00000000..c0cbc352 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_asphalt_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "ragium:block/polished_asphalt", + "side": "ragium:block/polished_asphalt", + "top": "ragium:block/polished_asphalt" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs.json b/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs.json new file mode 100644 index 00000000..d0abcad4 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "ragium:block/polished_asphalt", + "side": "ragium:block/polished_asphalt", + "top": "ragium:block/polished_asphalt" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs_inner.json b/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs_inner.json new file mode 100644 index 00000000..af4f74a9 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "ragium:block/polished_asphalt", + "side": "ragium:block/polished_asphalt", + "top": "ragium:block/polished_asphalt" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs_outer.json b/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs_outer.json new file mode 100644 index 00000000..e7dea694 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_asphalt_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "ragium:block/polished_asphalt", + "side": "ragium:block/polished_asphalt", + "top": "ragium:block/polished_asphalt" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/lined_asphalt.json b/src/main/generated/assets/ragium/models/block/polished_gypsum.json similarity index 60% rename from src/main/generated/assets/ragium/models/block/lined_asphalt.json rename to src/main/generated/assets/ragium/models/block/polished_gypsum.json index 4f5b4536..cd8eb956 100644 --- a/src/main/generated/assets/ragium/models/block/lined_asphalt.json +++ b/src/main/generated/assets/ragium/models/block/polished_gypsum.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ragium:block/lined_asphalt" + "all": "ragium:block/polished_gypsum" } } \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_gypsum_slab.json b/src/main/generated/assets/ragium/models/block/polished_gypsum_slab.json new file mode 100644 index 00000000..40e63373 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_gypsum_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "ragium:block/polished_gypsum", + "side": "ragium:block/polished_gypsum", + "top": "ragium:block/polished_gypsum" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_gypsum_slab_top.json b/src/main/generated/assets/ragium/models/block/polished_gypsum_slab_top.json new file mode 100644 index 00000000..4a4ff8a9 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_gypsum_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "ragium:block/polished_gypsum", + "side": "ragium:block/polished_gypsum", + "top": "ragium:block/polished_gypsum" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs.json b/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs.json new file mode 100644 index 00000000..e44655c8 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "ragium:block/polished_gypsum", + "side": "ragium:block/polished_gypsum", + "top": "ragium:block/polished_gypsum" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs_inner.json b/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs_inner.json new file mode 100644 index 00000000..617177f1 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "ragium:block/polished_gypsum", + "side": "ragium:block/polished_gypsum", + "top": "ragium:block/polished_gypsum" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs_outer.json b/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs_outer.json new file mode 100644 index 00000000..2feb2227 --- /dev/null +++ b/src/main/generated/assets/ragium/models/block/polished_gypsum_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "ragium:block/polished_gypsum", + "side": "ragium:block/polished_gypsum", + "top": "ragium:block/polished_gypsum" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/lined_asphalt.json b/src/main/generated/assets/ragium/models/item/lined_asphalt.json deleted file mode 100644 index ca450c14..00000000 --- a/src/main/generated/assets/ragium/models/item/lined_asphalt.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ragium:block/lined_asphalt" -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/lined_asphalt_slab.json b/src/main/generated/assets/ragium/models/item/lined_asphalt_slab.json deleted file mode 100644 index ebaf1807..00000000 --- a/src/main/generated/assets/ragium/models/item/lined_asphalt_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ragium:block/lined_asphalt_slab" -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/lined_asphalt_stairs.json b/src/main/generated/assets/ragium/models/item/lined_asphalt_stairs.json deleted file mode 100644 index 705f6ca0..00000000 --- a/src/main/generated/assets/ragium/models/item/lined_asphalt_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ragium:block/lined_asphalt_stairs" -} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/polished_asphalt.json b/src/main/generated/assets/ragium/models/item/polished_asphalt.json new file mode 100644 index 00000000..502a5c65 --- /dev/null +++ b/src/main/generated/assets/ragium/models/item/polished_asphalt.json @@ -0,0 +1,3 @@ +{ + "parent": "ragium:block/polished_asphalt" +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/polished_asphalt_slab.json b/src/main/generated/assets/ragium/models/item/polished_asphalt_slab.json new file mode 100644 index 00000000..5e5dd796 --- /dev/null +++ b/src/main/generated/assets/ragium/models/item/polished_asphalt_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "ragium:block/polished_asphalt_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/polished_asphalt_stairs.json b/src/main/generated/assets/ragium/models/item/polished_asphalt_stairs.json new file mode 100644 index 00000000..aeb1e67b --- /dev/null +++ b/src/main/generated/assets/ragium/models/item/polished_asphalt_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "ragium:block/polished_asphalt_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/polished_gypsum.json b/src/main/generated/assets/ragium/models/item/polished_gypsum.json new file mode 100644 index 00000000..cc05e804 --- /dev/null +++ b/src/main/generated/assets/ragium/models/item/polished_gypsum.json @@ -0,0 +1,3 @@ +{ + "parent": "ragium:block/polished_gypsum" +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/polished_gypsum_slab.json b/src/main/generated/assets/ragium/models/item/polished_gypsum_slab.json new file mode 100644 index 00000000..185290e3 --- /dev/null +++ b/src/main/generated/assets/ragium/models/item/polished_gypsum_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "ragium:block/polished_gypsum_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/polished_gypsum_stairs.json b/src/main/generated/assets/ragium/models/item/polished_gypsum_stairs.json new file mode 100644 index 00000000..aade5eb9 --- /dev/null +++ b/src/main/generated/assets/ragium/models/item/polished_gypsum_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "ragium:block/polished_gypsum_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/rope_dynamite.json b/src/main/generated/assets/ragium/models/item/rope.json similarity index 60% rename from src/main/generated/assets/ragium/models/item/rope_dynamite.json rename to src/main/generated/assets/ragium/models/item/rope.json index 9fee03e7..76601898 100644 --- a/src/main/generated/assets/ragium/models/item/rope_dynamite.json +++ b/src/main/generated/assets/ragium/models/item/rope.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "ragium:item/rope_dynamite" + "layer0": "ragium:item/rope" } } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/climbable.json b/src/main/generated/data/minecraft/tags/block/climbable.json new file mode 100644 index 00000000..d593d51b --- /dev/null +++ b/src/main/generated/data/minecraft/tags/block/climbable.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:rope" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json new file mode 100644 index 00000000..d593d51b --- /dev/null +++ b/src/main/generated/data/minecraft/tags/block/mineable/axe.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:rope" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json index 75987262..1e933cb9 100644 --- a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -31,15 +31,18 @@ "ragium:iron_pipe", "ragium:item_display", "ragium:large_processor", - "ragium:lined_asphalt", - "ragium:lined_asphalt_slab", - "ragium:lined_asphalt_stairs", "ragium:manual_forge", "ragium:manual_grinder", "ragium:manual_mixer", "ragium:nether_raginite_ore", "ragium:network_interface", "ragium:open_crate", + "ragium:polished_asphalt", + "ragium:polished_asphalt_slab", + "ragium:polished_asphalt_stairs", + "ragium:polished_gypsum", + "ragium:polished_gypsum_slab", + "ragium:polished_gypsum_stairs", "ragium:porous_netherrack", "ragium:primitive_casing", "ragium:primitive_coil", diff --git a/src/main/generated/data/minecraft/tags/block/slabs.json b/src/main/generated/data/minecraft/tags/block/slabs.json index a5c0c841..0e204be6 100644 --- a/src/main/generated/data/minecraft/tags/block/slabs.json +++ b/src/main/generated/data/minecraft/tags/block/slabs.json @@ -2,6 +2,7 @@ "values": [ "ragium:asphalt_slab", "ragium:gypsum_slab", - "ragium:lined_asphalt_slab" + "ragium:polished_asphalt_slab", + "ragium:polished_gypsum_slab" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/stairs.json b/src/main/generated/data/minecraft/tags/block/stairs.json index 462bfa35..531b0537 100644 --- a/src/main/generated/data/minecraft/tags/block/stairs.json +++ b/src/main/generated/data/minecraft/tags/block/stairs.json @@ -2,6 +2,7 @@ "values": [ "ragium:asphalt_stairs", "ragium:gypsum_stairs", - "ragium:lined_asphalt_stairs" + "ragium:polished_asphalt_stairs", + "ragium:polished_gypsum_slab" ] } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/lined_asphalt_slab.json b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt.json similarity index 74% rename from src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/lined_asphalt_slab.json rename to src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt.json index 8c9431a0..148b70bb 100644 --- a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/lined_asphalt_slab.json +++ b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:lined_asphalt" + "items": "ragium:asphalt" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "ragium:stonecutting/lined_asphalt_slab" + "recipe": "ragium:stonecutting/polished_asphalt" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "ragium:stonecutting/lined_asphalt_slab" + "ragium:stonecutting/polished_asphalt" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt_slab.json b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt_slab.json new file mode 100644 index 00000000..e0085a89 --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt_slab.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_input": { + "conditions": { + "items": [ + { + "items": "ragium:polished_asphalt" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:stonecutting/polished_asphalt_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_input" + ] + ], + "rewards": { + "recipes": [ + "ragium:stonecutting/polished_asphalt_slab" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt_stairs.json b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt_stairs.json new file mode 100644 index 00000000..522de672 --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_asphalt_stairs.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_input": { + "conditions": { + "items": [ + { + "items": "ragium:polished_asphalt" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:stonecutting/polished_asphalt_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_input" + ] + ], + "rewards": { + "recipes": [ + "ragium:stonecutting/polished_asphalt_stairs" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/lined_asphalt_stairs.json b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum.json similarity index 74% rename from src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/lined_asphalt_stairs.json rename to src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum.json index de8d3c12..3ac68f4f 100644 --- a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/lined_asphalt_stairs.json +++ b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:lined_asphalt" + "items": "ragium:gypsum" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "ragium:stonecutting/lined_asphalt_stairs" + "recipe": "ragium:stonecutting/polished_gypsum" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "ragium:stonecutting/lined_asphalt_stairs" + "ragium:stonecutting/polished_gypsum" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum_slab.json b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum_slab.json new file mode 100644 index 00000000..44ef84a0 --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum_slab.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_input": { + "conditions": { + "items": [ + { + "items": "ragium:polished_gypsum" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:stonecutting/polished_gypsum_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_input" + ] + ], + "rewards": { + "recipes": [ + "ragium:stonecutting/polished_gypsum_slab" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum_stairs.json b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum_stairs.json new file mode 100644 index 00000000..ea57bd56 --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/building_blocks/stonecutting/polished_gypsum_stairs.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_input": { + "conditions": { + "items": [ + { + "items": "ragium:polished_gypsum" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:stonecutting/polished_gypsum_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_input" + ] + ], + "rewards": { + "recipes": [ + "ragium:stonecutting/polished_gypsum_stairs" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt_slab.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_asphalt_slab.json similarity index 75% rename from src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt_slab.json rename to src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_asphalt_slab.json index ae50aee1..996b33ae 100644 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt_slab.json +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_asphalt_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:lined_asphalt" + "items": "ragium:polished_asphalt" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "ragium:shaped/lined_asphalt_slab" + "recipe": "ragium:shaped/polished_asphalt_slab" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "ragium:shaped/lined_asphalt_slab" + "ragium:shaped/polished_asphalt_slab" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_asphalt_stairs.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_asphalt_stairs.json new file mode 100644 index 00000000..61a43dad --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_asphalt_stairs.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_item": { + "conditions": { + "items": [ + { + "items": "ragium:polished_asphalt" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:shaped/polished_asphalt_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_the_item" + ] + ], + "rewards": { + "recipes": [ + "ragium:shaped/polished_asphalt_stairs" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt_stairs.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_gypsum_slab.json similarity index 75% rename from src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt_stairs.json rename to src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_gypsum_slab.json index ae763224..dbfe7758 100644 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt_stairs.json +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_gypsum_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:lined_asphalt" + "items": "ragium:polished_gypsum" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "ragium:shaped/lined_asphalt_stairs" + "recipe": "ragium:shaped/polished_gypsum_slab" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "ragium:shaped/lined_asphalt_stairs" + "ragium:shaped/polished_gypsum_slab" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_gypsum_stairs.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_gypsum_stairs.json new file mode 100644 index 00000000..f083bcef --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/polished_gypsum_stairs.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_item": { + "conditions": { + "items": [ + { + "items": "ragium:polished_gypsum" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:shaped/polished_gypsum_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_the_item" + ] + ], + "rewards": { + "recipes": [ + "ragium:shaped/polished_gypsum_stairs" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/rope.json similarity index 78% rename from src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt.json rename to src/main/generated/data/ragium/advancement/recipes/misc/shaped/rope.json index 3bea5bae..2000efb1 100644 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/lined_asphalt.json +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/rope.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:asphalt" + "items": "#minecraft:wool" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "ragium:shaped/lined_asphalt" + "recipe": "ragium:shaped/rope" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "ragium:shaped/lined_asphalt" + "ragium:shaped/rope" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/loot_table/blocks/lined_asphalt_stairs.json b/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt.json similarity index 86% rename from src/main/generated/data/ragium/loot_table/blocks/lined_asphalt_stairs.json rename to src/main/generated/data/ragium/loot_table/blocks/polished_asphalt.json index 3edd17f9..23063060 100644 --- a/src/main/generated/data/ragium/loot_table/blocks/lined_asphalt_stairs.json +++ b/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "ragium:lined_asphalt_stairs" + "name": "ragium:polished_asphalt" } ], "rolls": 1.0 diff --git a/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt_slab.json b/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt_slab.json new file mode 100644 index 00000000..a3681ba2 --- /dev/null +++ b/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "ragium:polished_asphalt_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "ragium:polished_asphalt_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt_stairs.json b/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt_stairs.json new file mode 100644 index 00000000..bfb63a7c --- /dev/null +++ b/src/main/generated/data/ragium/loot_table/blocks/polished_asphalt_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "ragium:polished_asphalt_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum.json b/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum.json new file mode 100644 index 00000000..642f1c0e --- /dev/null +++ b/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "ragium:polished_gypsum" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/loot_table/blocks/lined_asphalt_slab.json b/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum_slab.json similarity index 86% rename from src/main/generated/data/ragium/loot_table/blocks/lined_asphalt_slab.json rename to src/main/generated/data/ragium/loot_table/blocks/polished_gypsum_slab.json index d99cffb9..612b629e 100644 --- a/src/main/generated/data/ragium/loot_table/blocks/lined_asphalt_slab.json +++ b/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum_slab.json @@ -11,7 +11,7 @@ "add": false, "conditions": [ { - "block": "ragium:lined_asphalt_slab", + "block": "ragium:polished_gypsum_slab", "condition": "minecraft:block_state_property", "properties": { "type": "double" @@ -25,7 +25,7 @@ "function": "minecraft:explosion_decay" } ], - "name": "ragium:lined_asphalt_slab" + "name": "ragium:polished_gypsum_slab" } ], "rolls": 1.0 diff --git a/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum_stairs.json b/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum_stairs.json new file mode 100644 index 00000000..9ba4880f --- /dev/null +++ b/src/main/generated/data/ragium/loot_table/blocks/polished_gypsum_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "ragium:polished_gypsum_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/loot_table/blocks/lined_asphalt.json b/src/main/generated/data/ragium/loot_table/blocks/rope.json similarity index 87% rename from src/main/generated/data/ragium/loot_table/blocks/lined_asphalt.json rename to src/main/generated/data/ragium/loot_table/blocks/rope.json index b9dccb68..dd06ead8 100644 --- a/src/main/generated/data/ragium/loot_table/blocks/lined_asphalt.json +++ b/src/main/generated/data/ragium/loot_table/blocks/rope.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "ragium:lined_asphalt" + "name": "ragium:rope" } ], "rolls": 1.0 diff --git a/src/main/generated/data/ragium/recipe/shaped/lined_asphalt.json b/src/main/generated/data/ragium/recipe/shaped/lined_asphalt.json deleted file mode 100644 index ae1d01cb..00000000 --- a/src/main/generated/data/ragium/recipe/shaped/lined_asphalt.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "A": { - "item": "ragium:asphalt" - }, - "B": { - "tag": "c:dyes/white" - } - }, - "pattern": [ - "ABA", - "ABA", - "ABA" - ], - "result": { - "count": 6, - "id": "ragium:lined_asphalt" - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/polished_asphalt_slab.json b/src/main/generated/data/ragium/recipe/shaped/polished_asphalt_slab.json new file mode 100644 index 00000000..350492e5 --- /dev/null +++ b/src/main/generated/data/ragium/recipe/shaped/polished_asphalt_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "A": { + "item": "ragium:polished_asphalt" + } + }, + "pattern": [ + "AAA" + ], + "result": { + "count": 6, + "id": "ragium:polished_asphalt_slab" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/polished_asphalt_stairs.json b/src/main/generated/data/ragium/recipe/shaped/polished_asphalt_stairs.json new file mode 100644 index 00000000..c59f5716 --- /dev/null +++ b/src/main/generated/data/ragium/recipe/shaped/polished_asphalt_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "A": { + "item": "ragium:polished_asphalt" + } + }, + "pattern": [ + "A ", + "AA ", + "AAA" + ], + "result": { + "count": 4, + "id": "ragium:polished_asphalt_stairs" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/lined_asphalt_slab.json b/src/main/generated/data/ragium/recipe/shaped/polished_gypsum_slab.json similarity index 67% rename from src/main/generated/data/ragium/recipe/shaped/lined_asphalt_slab.json rename to src/main/generated/data/ragium/recipe/shaped/polished_gypsum_slab.json index e18cb2d6..38307e57 100644 --- a/src/main/generated/data/ragium/recipe/shaped/lined_asphalt_slab.json +++ b/src/main/generated/data/ragium/recipe/shaped/polished_gypsum_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "A": { - "item": "ragium:lined_asphalt" + "item": "ragium:polished_gypsum" } }, "pattern": [ @@ -11,6 +11,6 @@ ], "result": { "count": 6, - "id": "ragium:lined_asphalt_slab" + "id": "ragium:polished_gypsum_slab" } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/lined_asphalt_stairs.json b/src/main/generated/data/ragium/recipe/shaped/polished_gypsum_stairs.json similarity index 69% rename from src/main/generated/data/ragium/recipe/shaped/lined_asphalt_stairs.json rename to src/main/generated/data/ragium/recipe/shaped/polished_gypsum_stairs.json index 3bd83c93..dc0ed566 100644 --- a/src/main/generated/data/ragium/recipe/shaped/lined_asphalt_stairs.json +++ b/src/main/generated/data/ragium/recipe/shaped/polished_gypsum_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "A": { - "item": "ragium:lined_asphalt" + "item": "ragium:polished_gypsum" } }, "pattern": [ @@ -13,6 +13,6 @@ ], "result": { "count": 4, - "id": "ragium:lined_asphalt_stairs" + "id": "ragium:polished_gypsum_stairs" } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/rope.json b/src/main/generated/data/ragium/recipe/shaped/rope.json new file mode 100644 index 00000000..5b8d9146 --- /dev/null +++ b/src/main/generated/data/ragium/recipe/shaped/rope.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "minecraft:wool" + } + }, + "pattern": [ + "A", + "A", + "A" + ], + "result": { + "count": 8, + "id": "ragium:rope" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/lined_asphalt_stairs.json b/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt.json similarity index 56% rename from src/main/generated/data/ragium/recipe/stonecutting/lined_asphalt_stairs.json rename to src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt.json index d1d83b10..690807ab 100644 --- a/src/main/generated/data/ragium/recipe/stonecutting/lined_asphalt_stairs.json +++ b/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt.json @@ -1,10 +1,10 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "ragium:lined_asphalt" + "item": "ragium:asphalt" }, "result": { "count": 1, - "id": "ragium:lined_asphalt_stairs" + "id": "ragium:polished_asphalt" } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt_slab.json b/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt_slab.json new file mode 100644 index 00000000..86696ac1 --- /dev/null +++ b/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt_slab.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "ragium:polished_asphalt" + }, + "result": { + "count": 2, + "id": "ragium:polished_asphalt_slab" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt_stairs.json b/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt_stairs.json new file mode 100644 index 00000000..6929cbc0 --- /dev/null +++ b/src/main/generated/data/ragium/recipe/stonecutting/polished_asphalt_stairs.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "ragium:polished_asphalt" + }, + "result": { + "count": 1, + "id": "ragium:polished_asphalt_stairs" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum.json b/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum.json new file mode 100644 index 00000000..ff09a04a --- /dev/null +++ b/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "ragium:gypsum" + }, + "result": { + "count": 1, + "id": "ragium:polished_gypsum" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/lined_asphalt_slab.json b/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum_slab.json similarity index 55% rename from src/main/generated/data/ragium/recipe/stonecutting/lined_asphalt_slab.json rename to src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum_slab.json index 8ae73e1b..0661bf12 100644 --- a/src/main/generated/data/ragium/recipe/stonecutting/lined_asphalt_slab.json +++ b/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum_slab.json @@ -1,10 +1,10 @@ { "type": "minecraft:stonecutting", "ingredient": { - "item": "ragium:lined_asphalt" + "item": "ragium:polished_gypsum" }, "result": { "count": 2, - "id": "ragium:lined_asphalt_slab" + "id": "ragium:polished_gypsum_slab" } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum_stairs.json b/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum_stairs.json new file mode 100644 index 00000000..0fd7d12c --- /dev/null +++ b/src/main/generated/data/ragium/recipe/stonecutting/polished_gypsum_stairs.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "ragium:polished_gypsum" + }, + "result": { + "count": 1, + "id": "ragium:polished_gypsum_stairs" + } +} \ No newline at end of file diff --git a/src/main/kotlin/hiiragi283/ragium/api/extension/RagiumUtils.kt b/src/main/kotlin/hiiragi283/ragium/api/extension/RagiumUtils.kt index 83dbffd2..c5a638ab 100644 --- a/src/main/kotlin/hiiragi283/ragium/api/extension/RagiumUtils.kt +++ b/src/main/kotlin/hiiragi283/ragium/api/extension/RagiumUtils.kt @@ -15,6 +15,7 @@ import net.minecraft.block.entity.BlockEntity import net.minecraft.entity.Entity import net.minecraft.entity.LivingEntity import net.minecraft.entity.player.PlayerEntity +import net.minecraft.entity.projectile.ProjectileEntity import net.minecraft.fluid.Fluid import net.minecraft.inventory.Inventory import net.minecraft.inventory.SimpleInventory @@ -144,6 +145,28 @@ fun canTeleport(entity: Entity, world: World): Boolean = if (entity.world.regist entity.canUsePortals(true) } +fun throwEntity(world: World, player: PlayerEntity, entityBuilder: (World, PlayerEntity) -> ProjectileEntity?): Boolean { + world.playSound( + null, + player.x, + player.y, + player.z, + SoundEvents.ENTITY_SNOWBALL_THROW, + SoundCategory.PLAYERS, + 0.5f, + 0.4f / (world.getRandom().nextFloat() * 0.4f + 0.8f), + ) + if (!world.isClient) { + val entity: ProjectileEntity = entityBuilder(world, player) ?: return false + entity.apply { + setVelocity(player, player.pitch, player.yaw, 0.0f, 1.5f, 1.0f) + world.spawnEntity(this) + } + return true + } + return false +} + fun LivingEntity.getStackInActiveHand(): ItemStack = getStackInHand(activeHand) // Color // diff --git a/src/main/kotlin/hiiragi283/ragium/common/block/HTRopeBlock.kt b/src/main/kotlin/hiiragi283/ragium/common/block/HTRopeBlock.kt new file mode 100644 index 00000000..bdec9b7d --- /dev/null +++ b/src/main/kotlin/hiiragi283/ragium/common/block/HTRopeBlock.kt @@ -0,0 +1,97 @@ +package hiiragi283.ragium.common.block + +import hiiragi283.ragium.api.extension.blockSettings +import net.minecraft.block.Block +import net.minecraft.block.BlockState +import net.minecraft.block.Blocks +import net.minecraft.block.ShapeContext +import net.minecraft.block.piston.PistonBehavior +import net.minecraft.entity.player.PlayerEntity +import net.minecraft.item.ItemStack +import net.minecraft.server.world.ServerWorld +import net.minecraft.sound.SoundCategory +import net.minecraft.sound.SoundEvents +import net.minecraft.util.Hand +import net.minecraft.util.ItemActionResult +import net.minecraft.util.hit.BlockHitResult +import net.minecraft.util.math.BlockPos +import net.minecraft.util.math.Direction +import net.minecraft.util.math.random.Random +import net.minecraft.util.shape.VoxelShape +import net.minecraft.world.BlockView +import net.minecraft.world.World +import net.minecraft.world.WorldAccess +import net.minecraft.world.WorldView + +object HTRopeBlock : Block(blockSettings(Blocks.BROWN_WOOL).noCollision().pistonBehavior(PistonBehavior.DESTROY)) { + @JvmField + val SHAPE: VoxelShape = createCuboidShape(6.0, 0.0, 6.0, 10.0, 16.0, 10.0) + + override fun onUseWithItem( + stack: ItemStack, + state: BlockState, + world: World, + pos: BlockPos, + player: PlayerEntity, + hand: Hand, + hit: BlockHitResult, + ): ItemActionResult = if (stack.isOf(this.asItem())) { + val placablePos: BlockPos = + getPlacablePos(world, pos.down()) ?: return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION + if (!world.isClient) { + world.setBlockState(placablePos, defaultState) + stack.decrementUnlessCreative(1, player) + world.playSound(null, pos, SoundEvents.BLOCK_WOOL_PLACE, SoundCategory.BLOCKS) + } + ItemActionResult.success(world.isClient) + } else { + super.onUseWithItem(stack, state, world, pos, player, hand, hit) + } + + private fun getPlacablePos(world: World, pos: BlockPos): BlockPos? { + val state: BlockState = world.getBlockState(pos) + return when { + state.isOf(this) -> getPlacablePos(world, pos.down()) + state.isAir -> pos + else -> null + } + } + + override fun getStateForNeighborUpdate( + state: BlockState, + direction: Direction, + neighborState: BlockState, + world: WorldAccess, + pos: BlockPos, + neighborPos: BlockPos, + ): BlockState { + if (!state.canPlaceAt(world, pos)) { + world.scheduleBlockTick(pos, this, 1) + } + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos) + } + + override fun scheduledTick( + state: BlockState, + world: ServerWorld, + pos: BlockPos, + random: Random, + ) { + if (!state.canPlaceAt(world, pos)) { + world.breakBlock(pos, true) + } + } + + override fun canPlaceAt(state: BlockState, world: WorldView, pos: BlockPos): Boolean { + val posUp: BlockPos = pos.up() + val stateUp: BlockState = world.getBlockState(posUp) + return stateUp.isSideSolidFullSquare(world, posUp, Direction.DOWN) || stateUp.isOf(this) + } + + override fun getOutlineShape( + state: BlockState, + world: BlockView, + pos: BlockPos, + context: ShapeContext, + ): VoxelShape = SHAPE +} diff --git a/src/main/kotlin/hiiragi283/ragium/common/entity/HTDynamiteEntity.kt b/src/main/kotlin/hiiragi283/ragium/common/entity/HTDynamiteEntity.kt index 90e9739a..e663f2c6 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/entity/HTDynamiteEntity.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/entity/HTDynamiteEntity.kt @@ -16,7 +16,11 @@ class HTDynamiteEntity : ThrownItemEntity { constructor(world: World, x: Double, y: Double, z: Double) : super(RagiumEntityTypes.DYNAMITE, x, y, z, world) - var action: Action = Action { _: HTDynamiteEntity, _: HitResult -> } + private var action: Action = Action { _: HTDynamiteEntity, _: HitResult -> } + + fun setAction(action: Action): HTDynamiteEntity = apply { + this.action = action + } override fun getDefaultItem(): Item = RagiumItems.DYNAMITE diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumBlocks.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumBlocks.kt index 0ffd33fe..0b8a8ef9 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumBlocks.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumBlocks.kt @@ -39,15 +39,21 @@ object RagiumBlocks { @JvmField val ASPHALT_STAIRS = StairsBlock(ASPHALT.defaultState, blockSettings(ASPHALT)) + + // val LINED_ASPHALT: Block = Block(blockSettings(Blocks.SMOOTH_STONE)) + + // val LINED_ASPHALT_SLAB: Block = SlabBlock(blockSettings(LINED_ASPHALT)) + + // val LINED_ASPHALT_STAIRS = StairsBlock(LINED_ASPHALT.defaultState, blockSettings(LINED_ASPHALT)) @JvmField - val LINED_ASPHALT: Block = Block(blockSettings(Blocks.SMOOTH_STONE)) + val POLISHED_ASPHALT: Block = Block(blockSettings(Blocks.SMOOTH_STONE)) @JvmField - val LINED_ASPHALT_SLAB: Block = SlabBlock(blockSettings(LINED_ASPHALT)) + val POLISHED_ASPHALT_SLAB: Block = SlabBlock(blockSettings(POLISHED_ASPHALT)) @JvmField - val LINED_ASPHALT_STAIRS = StairsBlock(LINED_ASPHALT.defaultState, blockSettings(LINED_ASPHALT)) + val POLISHED_ASPHALT_STAIRS = StairsBlock(POLISHED_ASPHALT.defaultState, blockSettings(POLISHED_ASPHALT)) @JvmField val GYPSUM: Block = Block(blockSettings(Blocks.SMOOTH_STONE)) @@ -58,17 +64,34 @@ object RagiumBlocks { @JvmField val GYPSUM_STAIRS = StairsBlock(GYPSUM.defaultState, blockSettings(GYPSUM)) + @JvmField + val POLISHED_GYPSUM: Block = Block(blockSettings(Blocks.SMOOTH_STONE)) + + @JvmField + val POLISHED_GYPSUM_SLAB: Block = SlabBlock(blockSettings(POLISHED_GYPSUM)) + + @JvmField + val POLISHED_GYPSUM_STAIRS = StairsBlock(POLISHED_GYPSUM.defaultState, blockSettings(POLISHED_GYPSUM)) + @JvmField val BUILDINGS: List = listOf( + // asphalt ASPHALT, ASPHALT_SLAB, ASPHALT_STAIRS, - LINED_ASPHALT, - LINED_ASPHALT_SLAB, - LINED_ASPHALT_STAIRS, + // LINED_ASPHALT, + // LINED_ASPHALT_SLAB, + // LINED_ASPHALT_STAIRS, + POLISHED_ASPHALT, + POLISHED_ASPHALT_SLAB, + POLISHED_ASPHALT_STAIRS, + // gypsum GYPSUM, GYPSUM_SLAB, GYPSUM_STAIRS, + POLISHED_GYPSUM, + POLISHED_GYPSUM_SLAB, + POLISHED_GYPSUM_STAIRS, ) // Foods // @@ -158,6 +181,9 @@ object RagiumBlocks { @JvmField val ITEM_DISPLAY: Block = HTItemDisplayBlock + @JvmField + val ROPE: Block = HTRopeBlock + @JvmField val SHAFT: Block = HTThinPillarBlock(blockSettings(Blocks.CHAIN)) @@ -170,6 +196,7 @@ object RagiumBlocks { BUFFER, ENCHANTMENT_BOOKSHELF, ITEM_DISPLAY, + ROPE, SHAFT, ) } diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt index 9a70404a..5841e8b7 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt @@ -256,21 +256,6 @@ object RagiumItems { @JvmField val RAGI_WRENCH: Item = Item(itemSettings().descriptions(Text.translatable(RagiumTranslationKeys.RAGI_WRENCH))) - @JvmField - val ROPE_DYNAMITE: Item = HTDynamiteItem( - { entity: HTDynamiteEntity, result: HitResult -> - val world: World = entity.world - if (result is BlockHitResult) { - var pos: BlockPos = result.blockPos.offset(result.side) - while (world.isAir(pos)) { - world.setBlockState(pos, Blocks.WEEPING_VINES.defaultState) - pos = pos.down() - } - } - }, - itemSettings().component(RagiumComponentTypes.REWORK_TARGET, Unit), - ) - @JvmField val STEEL_AXE: Item = HTToolType.AXE.createToolItem(RagiumToolMaterials.STEEL) @@ -305,7 +290,6 @@ object RagiumItems { ANVIL_DYNAMITE, BEDROCK_DYNAMITE, FLATTENING_DYNAMITE, - ROPE_DYNAMITE, // non-damageable tool BACKPACK, EMPTY_FLUID_CUBE, diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt index 7ac075a6..7f250cad 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt @@ -48,6 +48,7 @@ object RagiumTranslationKeys { const val BEDROCK_DYNAMITE = "tooltip.ragium.item.bedrock_dynamite" const val FLATTENING_DYNAMITE = "tooltip.ragium.item.flatten_dynamite" const val RAGI_WRENCH = "tooltip.ragium.item.ragi_wrench" + const val ROPE = "tooltip.ragium.item.rope" const val TRADER_CATALOG = "tooltip.ragium.item.trader_catalog" const val WARPED_CRYSTAL = "tooltip.ragium.item.warped_crystal" diff --git a/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumContentRegister.kt b/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumContentRegister.kt index 72d73a68..7f2c9dbe 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumContentRegister.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumContentRegister.kt @@ -12,6 +12,7 @@ import hiiragi283.ragium.common.block.HTDrumBlock import hiiragi283.ragium.common.block.HTExporterBlock import hiiragi283.ragium.common.block.HTPipeBlock import hiiragi283.ragium.common.init.* +import hiiragi283.ragium.common.item.HTRopeBlockItem import hiiragi283.ragium.common.storage.HTEmptyFluidCubeStorage import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext import net.fabricmc.fabric.api.transfer.v1.fluid.* @@ -199,21 +200,33 @@ internal object RagiumContentRegister { registerBlock("asphalt", RagiumBlocks.ASPHALT) registerBlock("asphalt_slab", RagiumBlocks.ASPHALT_SLAB) registerBlock("asphalt_stairs", RagiumBlocks.ASPHALT_STAIRS) - registerBlock("lined_asphalt", RagiumBlocks.LINED_ASPHALT) - registerBlock("lined_asphalt_slab", RagiumBlocks.LINED_ASPHALT_SLAB) - registerBlock("lined_asphalt_stairs", RagiumBlocks.LINED_ASPHALT_STAIRS) + // registerBlock("lined_asphalt", RagiumBlocks.LINED_ASPHALT) + // registerBlock("lined_asphalt_slab", RagiumBlocks.LINED_ASPHALT_SLAB) + // registerBlock("lined_asphalt_stairs", RagiumBlocks.LINED_ASPHALT_STAIRS) + registerBlock("polished_asphalt", RagiumBlocks.POLISHED_ASPHALT) + registerBlock("polished_asphalt_slab", RagiumBlocks.POLISHED_ASPHALT_SLAB) + registerBlock("polished_asphalt_stairs", RagiumBlocks.POLISHED_ASPHALT_STAIRS) registerBlock("gypsum", RagiumBlocks.GYPSUM) registerBlock("gypsum_slab", RagiumBlocks.GYPSUM_SLAB) registerBlock("gypsum_stairs", RagiumBlocks.GYPSUM_STAIRS) + registerBlock("polished_gypsum", RagiumBlocks.POLISHED_GYPSUM) + registerBlock("polished_gypsum_slab", RagiumBlocks.POLISHED_GYPSUM_SLAB) + registerBlock("polished_gypsum_stairs", RagiumBlocks.POLISHED_GYPSUM_STAIRS) registerBlockItem(RagiumBlocks.ASPHALT) registerBlockItem(RagiumBlocks.ASPHALT_SLAB) registerBlockItem(RagiumBlocks.ASPHALT_STAIRS) - registerBlockItem(RagiumBlocks.LINED_ASPHALT) - registerBlockItem(RagiumBlocks.LINED_ASPHALT_SLAB) - registerBlockItem(RagiumBlocks.LINED_ASPHALT_STAIRS) + // registerBlockItem(RagiumBlocks.LINED_ASPHALT) + // registerBlockItem(RagiumBlocks.LINED_ASPHALT_SLAB) + // registerBlockItem(RagiumBlocks.LINED_ASPHALT_STAIRS) + registerBlockItem(RagiumBlocks.POLISHED_ASPHALT) + registerBlockItem(RagiumBlocks.POLISHED_ASPHALT_SLAB) + registerBlockItem(RagiumBlocks.POLISHED_ASPHALT_STAIRS) registerBlockItem(RagiumBlocks.GYPSUM) registerBlockItem(RagiumBlocks.GYPSUM_SLAB) registerBlockItem(RagiumBlocks.GYPSUM_STAIRS) + registerBlockItem(RagiumBlocks.POLISHED_GYPSUM) + registerBlockItem(RagiumBlocks.POLISHED_GYPSUM_SLAB) + registerBlockItem(RagiumBlocks.POLISHED_GYPSUM_STAIRS) registerBlock("sponge_cake", RagiumBlocks.SPONGE_CAKE) registerBlock("sweet_berries_cake", RagiumBlocks.SWEET_BERRIES_CAKE) @@ -272,6 +285,7 @@ internal object RagiumContentRegister { registerBlock("enchantment_bookshelf", RagiumBlocks.ENCHANTMENT_BOOKSHELF) registerBlock("item_display", RagiumBlocks.ITEM_DISPLAY) registerBlock("shaft", RagiumBlocks.SHAFT) + registerBlock("rope", RagiumBlocks.ROPE) registerBlock("infesting", RagiumBlocks.INFESTING) registerBlockItem( RagiumBlocks.BACKPACK_INTERFACE, @@ -286,6 +300,11 @@ internal object RagiumContentRegister { itemSettings().component(RagiumComponentTypes.REWORK_TARGET, Unit), ) registerBlockItem(RagiumBlocks.ITEM_DISPLAY) + registerBlockItem( + RagiumBlocks.ROPE, + itemSettings().descriptions(Text.translatable(RagiumTranslationKeys.ROPE)), + ::HTRopeBlockItem, + ) registerBlockItem(RagiumBlocks.SHAFT) } @@ -313,7 +332,6 @@ internal object RagiumContentRegister { registerItem("anvil_dynamite", RagiumItems.ANVIL_DYNAMITE) registerItem("bedrock_dynamite", RagiumItems.BEDROCK_DYNAMITE) registerItem("flattening_dynamite", RagiumItems.FLATTENING_DYNAMITE) - registerItem("rope_dynamite", RagiumItems.ROPE_DYNAMITE) registerItem("backpack", RagiumItems.BACKPACK) registerItem("empty_fluid_cube", RagiumItems.EMPTY_FLUID_CUBE) diff --git a/src/main/kotlin/hiiragi283/ragium/common/item/HTDynamiteItem.kt b/src/main/kotlin/hiiragi283/ragium/common/item/HTDynamiteItem.kt index 5d12e415..d4892b0d 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/item/HTDynamiteItem.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/item/HTDynamiteItem.kt @@ -37,10 +37,9 @@ class HTDynamiteItem(val action: HTDynamiteEntity.Action, settings: Settings) : stack.get(RagiumComponentTypes.DYNAMITE)?.appendTooltip(context, tooltip::add, type) } - override fun createEntity(world: World, user: LivingEntity): ThrownItemEntity = HTDynamiteEntity(world, user).apply { - setItem(user.getStackInActiveHand()) - this.action = this@HTDynamiteItem.action - } + override fun createEntity(world: World, user: LivingEntity): ThrownItemEntity = HTDynamiteEntity(world, user) + .apply { setItem(user.getStackInActiveHand()) } + .setAction(action) // ProjectileItem // @@ -49,10 +48,9 @@ class HTDynamiteItem(val action: HTDynamiteEntity.Action, settings: Settings) : pos: Position, stack: ItemStack, direction: Direction, - ): ProjectileEntity = HTDynamiteEntity(world, pos.x, pos.y, pos.z).apply { - setItem(stack) - this.action = this@HTDynamiteItem.action - } + ): ProjectileEntity = HTDynamiteEntity(world, pos.x, pos.y, pos.z) + .apply { setItem(stack) } + .setAction(action) // Component // diff --git a/src/main/kotlin/hiiragi283/ragium/common/item/HTRopeBlockItem.kt b/src/main/kotlin/hiiragi283/ragium/common/item/HTRopeBlockItem.kt new file mode 100644 index 00000000..09dd7355 --- /dev/null +++ b/src/main/kotlin/hiiragi283/ragium/common/item/HTRopeBlockItem.kt @@ -0,0 +1,51 @@ +package hiiragi283.ragium.common.item + +import hiiragi283.ragium.api.extension.dropStackAt +import hiiragi283.ragium.api.extension.throwEntity +import hiiragi283.ragium.common.entity.HTDynamiteEntity +import hiiragi283.ragium.common.init.RagiumBlocks +import net.minecraft.block.Block +import net.minecraft.entity.Entity +import net.minecraft.entity.player.PlayerEntity +import net.minecraft.item.BlockItem +import net.minecraft.item.ItemStack +import net.minecraft.stat.Stats +import net.minecraft.util.Hand +import net.minecraft.util.TypedActionResult +import net.minecraft.util.hit.BlockHitResult +import net.minecraft.util.hit.HitResult +import net.minecraft.util.math.BlockPos +import net.minecraft.world.World + +class HTRopeBlockItem(block: Block, settings: Settings) : BlockItem(block, settings) { + override fun use(world: World, user: PlayerEntity, hand: Hand): TypedActionResult { + val stack: ItemStack = user.getStackInHand(hand) + val copiedStack: ItemStack = stack.copy() + val count: Int = stack.count + throwEntity(world, user) { world1: World, player1: PlayerEntity -> + HTDynamiteEntity(world1, player1) + .apply { + setItem(stack) + this.stack.count = count + }.setAction { entity: HTDynamiteEntity, result: HitResult -> + val world: World = entity.world + if (result is BlockHitResult) { + var pos: BlockPos = result.blockPos.offset(result.side) + if (RagiumBlocks.ROPE.defaultState.canPlaceAt(world, pos)) { + while (world.getBlockState(pos).isAir) { + world.setBlockState(pos, RagiumBlocks.ROPE.defaultState) + entity.stack.decrement(1) + pos = pos.down() + } + entity.owner?.let { owner: Entity -> dropStackAt(owner, entity.stack) } + } else { + dropStackAt(user, copiedStack) + } + } + } + } + user.incrementStat(Stats.USED.getOrCreateStat(this)) + stack.decrementUnlessCreative(count, user) + return TypedActionResult.success(stack, world.isClient()) + } +} diff --git a/src/main/kotlin/hiiragi283/ragium/common/item/HTThrowableItem.kt b/src/main/kotlin/hiiragi283/ragium/common/item/HTThrowableItem.kt index 21006e84..857a42cd 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/item/HTThrowableItem.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/item/HTThrowableItem.kt @@ -1,13 +1,12 @@ package hiiragi283.ragium.common.item +import hiiragi283.ragium.api.extension.throwEntity import net.minecraft.entity.LivingEntity import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.projectile.thrown.ThrownItemEntity import net.minecraft.item.Item import net.minecraft.item.ItemStack import net.minecraft.item.ProjectileItem -import net.minecraft.sound.SoundCategory -import net.minecraft.sound.SoundEvents import net.minecraft.stat.Stats import net.minecraft.util.Hand import net.minecraft.util.TypedActionResult @@ -18,26 +17,13 @@ abstract class HTThrowableItem(settings: Settings) : ProjectileItem { override fun use(world: World, user: PlayerEntity, hand: Hand): TypedActionResult { val stack: ItemStack = user.getStackInHand(hand) - world.playSound( - null, - user.x, - user.y, - user.z, - SoundEvents.ENTITY_SNOWBALL_THROW, - SoundCategory.PLAYERS, - 0.5f, - 0.4f / (world.getRandom().nextFloat() * 0.4f + 0.8f), - ) - if (!world.isClient) { - createEntity(world, user).apply { - setItem(stack) - setVelocity(user, user.pitch, user.yaw, 0.0f, 1.5f, 1.0f) - world.spawnEntity(this) - } + return if (throwEntity(world, user, ::createEntity)) { + user.incrementStat(Stats.USED.getOrCreateStat(this)) + stack.decrementUnlessCreative(1, user) + TypedActionResult.success(stack, world.isClient()) + } else { + super.use(world, user, hand) } - user.incrementStat(Stats.USED.getOrCreateStat(this)) - stack.decrementUnlessCreative(1, user) - return TypedActionResult.success(stack, world.isClient()) } abstract fun createEntity(world: World, user: LivingEntity): ThrownItemEntity diff --git a/src/main/kotlin/hiiragi283/ragium/data/RagiumBlockLootProvider.kt b/src/main/kotlin/hiiragi283/ragium/data/RagiumBlockLootProvider.kt index 6decc2c0..6adc6f65 100644 --- a/src/main/kotlin/hiiragi283/ragium/data/RagiumBlockLootProvider.kt +++ b/src/main/kotlin/hiiragi283/ragium/data/RagiumBlockLootProvider.kt @@ -43,15 +43,23 @@ class RagiumBlockLootProvider(dataOutput: FabricDataOutput, registryLookup: Comp addDrop(RagiumBlocks.MUTATED_SOIL) addDrop(RagiumBlocks.POROUS_NETHERRACK) { block: Block -> withSilkTouch(block, Items.NETHERRACK) } + // asphalt addDrop(RagiumBlocks.ASPHALT) addDrop(RagiumBlocks.ASPHALT_SLAB, ::slabDrops) addDrop(RagiumBlocks.ASPHALT_STAIRS) - addDrop(RagiumBlocks.LINED_ASPHALT) - addDrop(RagiumBlocks.LINED_ASPHALT_SLAB, ::slabDrops) - addDrop(RagiumBlocks.LINED_ASPHALT_STAIRS) + // addDrop(RagiumBlocks.LINED_ASPHALT) + // addDrop(RagiumBlocks.LINED_ASPHALT_SLAB, ::slabDrops) + // addDrop(RagiumBlocks.LINED_ASPHALT_STAIRS) + addDrop(RagiumBlocks.POLISHED_ASPHALT) + addDrop(RagiumBlocks.POLISHED_ASPHALT_SLAB, ::slabDrops) + addDrop(RagiumBlocks.POLISHED_ASPHALT_STAIRS) + // gypsum addDrop(RagiumBlocks.GYPSUM) addDrop(RagiumBlocks.GYPSUM_SLAB, ::slabDrops) addDrop(RagiumBlocks.GYPSUM_STAIRS) + addDrop(RagiumBlocks.POLISHED_GYPSUM) + addDrop(RagiumBlocks.POLISHED_GYPSUM_SLAB, ::slabDrops) + addDrop(RagiumBlocks.POLISHED_GYPSUM_STAIRS) addDrop(RagiumBlocks.SPONGE_CAKE) addDrop( diff --git a/src/main/kotlin/hiiragi283/ragium/data/RagiumLangProviders.kt b/src/main/kotlin/hiiragi283/ragium/data/RagiumLangProviders.kt index 37b341ab..3cc0f7c0 100644 --- a/src/main/kotlin/hiiragi283/ragium/data/RagiumLangProviders.kt +++ b/src/main/kotlin/hiiragi283/ragium/data/RagiumLangProviders.kt @@ -90,12 +90,18 @@ object RagiumLangProviders { builder.add(RagiumBlocks.ASPHALT, "Asphalt") builder.add(RagiumBlocks.ASPHALT_SLAB, "Asphalt Slab") builder.add(RagiumBlocks.ASPHALT_STAIRS, "Asphalt Stairs") - builder.add(RagiumBlocks.LINED_ASPHALT, "Lined Asphalt") - builder.add(RagiumBlocks.LINED_ASPHALT_SLAB, "Lined Asphalt Slab") - builder.add(RagiumBlocks.LINED_ASPHALT_STAIRS, "Lined Asphalt Stairs") + // builder.add(RagiumBlocks.LINED_ASPHALT, "Lined Asphalt") + // builder.add(RagiumBlocks.LINED_ASPHALT_SLAB, "Lined Asphalt Slab") + // builder.add(RagiumBlocks.LINED_ASPHALT_STAIRS, "Lined Asphalt Stairs") + builder.add(RagiumBlocks.POLISHED_ASPHALT, "Polished Asphalt") + builder.add(RagiumBlocks.POLISHED_ASPHALT_SLAB, "Polished Asphalt Slab") + builder.add(RagiumBlocks.POLISHED_ASPHALT_STAIRS, "Polished Asphalt Stairs") builder.add(RagiumBlocks.GYPSUM, "Gypsum") builder.add(RagiumBlocks.GYPSUM_SLAB, "Gypsum Slab") builder.add(RagiumBlocks.GYPSUM_STAIRS, "Gypsum Stairs") + builder.add(RagiumBlocks.POLISHED_GYPSUM, "Polished Gypsum") + builder.add(RagiumBlocks.POLISHED_GYPSUM_SLAB, "Polished Gypsum Slab") + builder.add(RagiumBlocks.POLISHED_GYPSUM_STAIRS, "Polished Gypsum Stairs") builder.add(RagiumBlocks.SPONGE_CAKE, "Sponge Cake") builder.add(RagiumBlocks.SWEET_BERRIES_CAKE, "Sweet Berries Cake") @@ -111,6 +117,7 @@ object RagiumLangProviders { builder.add(RagiumBlocks.MANUAL_MIXER, "Ragi-Basin") builder.add(RagiumBlocks.NETWORK_INTERFACE, "E.N.I.") builder.add(RagiumBlocks.OPEN_CRATE, "Open Crate") + builder.add(RagiumBlocks.ROPE, "Rope") builder.add(RagiumBlocks.SHAFT, "Shaft") builder.add(RagiumBlocks.TELEPORT_ANCHOR, "Teleport Anchor") builder.add(RagiumBlocks.TRASH_BOX, "Trash Box") @@ -239,6 +246,7 @@ object RagiumLangProviders { RagiumTranslationKeys.RAGI_WRENCH, "Right-click to rotate horizontally, change front when sneaking", ) + builder.add(RagiumTranslationKeys.ROPE, "Place down Ropes when land on") builder.add(RagiumTranslationKeys.TRADER_CATALOG, "Right-click to open Wandering Trader's Screen") builder.add( RagiumTranslationKeys.WARPED_CRYSTAL, @@ -445,12 +453,18 @@ object RagiumLangProviders { builder.add(RagiumBlocks.ASPHALT, "アスファルト") builder.add(RagiumBlocks.ASPHALT_SLAB, "アスファルトのハーフブロック") builder.add(RagiumBlocks.ASPHALT_STAIRS, "アスファルトの階段") - builder.add(RagiumBlocks.LINED_ASPHALT, "アスファルト（白線）") - builder.add(RagiumBlocks.LINED_ASPHALT_SLAB, "アスファルト（白線）のハーフブロック") - builder.add(RagiumBlocks.LINED_ASPHALT_STAIRS, "アスファルト（白線）の階段") + // builder.add(RagiumBlocks.LINED_ASPHALT, "アスファルト（白線）") + // builder.add(RagiumBlocks.LINED_ASPHALT_SLAB, "アスファルト（白線）のハーフブロック") + // builder.add(RagiumBlocks.LINED_ASPHALT_STAIRS, "アスファルト（白線）の階段") + builder.add(RagiumBlocks.POLISHED_ASPHALT, "磨かれたアスファルト") + builder.add(RagiumBlocks.POLISHED_ASPHALT_SLAB, "磨かれたアスファルトのハーフブロック") + builder.add(RagiumBlocks.POLISHED_ASPHALT_STAIRS, "磨かれたアスファルトの階段") builder.add(RagiumBlocks.GYPSUM, "石膏") builder.add(RagiumBlocks.GYPSUM_SLAB, "石膏のハーフブロック") builder.add(RagiumBlocks.GYPSUM_STAIRS, "石膏の階段") + builder.add(RagiumBlocks.POLISHED_GYPSUM, "磨かれた石膏") + builder.add(RagiumBlocks.POLISHED_GYPSUM_SLAB, "磨かれた石膏のハーフブロック") + builder.add(RagiumBlocks.POLISHED_GYPSUM_STAIRS, "磨かれた石膏の階段") builder.add(RagiumBlocks.SPONGE_CAKE, "スポンジケーキ") builder.add(RagiumBlocks.SWEET_BERRIES_CAKE, "スイートベリーケーキ") @@ -466,6 +480,7 @@ object RagiumLangProviders { builder.add(RagiumBlocks.MANUAL_MIXER, "らぎ釜") builder.add(RagiumBlocks.NETWORK_INTERFACE, "E.N.I.") builder.add(RagiumBlocks.OPEN_CRATE, "オープンクレート") + builder.add(RagiumBlocks.ROPE, "ロープ") builder.add(RagiumBlocks.SHAFT, "シャフト") builder.add(RagiumBlocks.TELEPORT_ANCHOR, "テレポートアンカー") builder.add(RagiumBlocks.TRASH_BOX, "ゴミ箱") @@ -591,6 +606,7 @@ object RagiumLangProviders { builder.add(RagiumTranslationKeys.BEDROCK_DYNAMITE, "着弾したチャンク内の岩盤を整地する") builder.add(RagiumTranslationKeys.FLATTENING_DYNAMITE, "着弾点より上のブロックを「すべて」消滅させる") builder.add(RagiumTranslationKeys.RAGI_WRENCH, "右クリックで水平方向の回転，シフト右クリックで正面を変更") + builder.add(RagiumTranslationKeys.ROPE, "着弾点からロープを下す") builder.add(RagiumTranslationKeys.TRADER_CATALOG, "右クリックで行商人との取引を行う") builder.add( RagiumTranslationKeys.WARPED_CRYSTAL, diff --git a/src/main/kotlin/hiiragi283/ragium/data/RagiumModelProvider.kt b/src/main/kotlin/hiiragi283/ragium/data/RagiumModelProvider.kt index 7d2a51f4..adfe2553 100644 --- a/src/main/kotlin/hiiragi283/ragium/data/RagiumModelProvider.kt +++ b/src/main/kotlin/hiiragi283/ragium/data/RagiumModelProvider.kt @@ -122,14 +122,22 @@ class RagiumModelProvider(output: FabricDataOutput) : FabricModelProvider(output registerSlab(RagiumBlocks.ASPHALT_SLAB, RagiumBlocks.ASPHALT) registerStair(RagiumBlocks.ASPHALT_STAIRS, RagiumBlocks.ASPHALT) - registerSimple(RagiumBlocks.LINED_ASPHALT) - registerSlab(RagiumBlocks.LINED_ASPHALT_SLAB, RagiumBlocks.LINED_ASPHALT) - registerStair(RagiumBlocks.LINED_ASPHALT_STAIRS, RagiumBlocks.LINED_ASPHALT) + // registerSimple(RagiumBlocks.LINED_ASPHALT) + // registerSlab(RagiumBlocks.LINED_ASPHALT_SLAB, RagiumBlocks.LINED_ASPHALT) + // registerStair(RagiumBlocks.LINED_ASPHALT_STAIRS, RagiumBlocks.LINED_ASPHALT) + + registerSimple(RagiumBlocks.POLISHED_ASPHALT) + registerSlab(RagiumBlocks.POLISHED_ASPHALT_SLAB, RagiumBlocks.POLISHED_ASPHALT) + registerStair(RagiumBlocks.POLISHED_ASPHALT_STAIRS, RagiumBlocks.POLISHED_ASPHALT) registerSimple(RagiumBlocks.GYPSUM) registerSlab(RagiumBlocks.GYPSUM_SLAB, RagiumBlocks.GYPSUM) registerStair(RagiumBlocks.GYPSUM_STAIRS, RagiumBlocks.GYPSUM) + registerSimple(RagiumBlocks.POLISHED_GYPSUM) + registerSlab(RagiumBlocks.POLISHED_GYPSUM_SLAB, RagiumBlocks.POLISHED_GYPSUM) + registerStair(RagiumBlocks.POLISHED_GYPSUM_STAIRS, RagiumBlocks.POLISHED_GYPSUM) + registerSimple(RagiumBlocks.AUTO_ILLUMINATOR) registerSimple(RagiumBlocks.CREATIVE_SOURCE) registerSimple(RagiumBlocks.MUTATED_SOIL) @@ -164,6 +172,8 @@ class RagiumModelProvider(output: FabricDataOutput) : FabricModelProvider(output // static registerStaticModel(RagiumBlocks.MANUAL_FORGE) registerStaticModel(RagiumBlocks.MANUAL_MIXER) + generator.excludeFromSimpleItemModelGeneration(RagiumBlocks.ROPE) + registerStaticModel(RagiumBlocks.ROPE) registerStaticModel(RagiumBlocks.SWEET_BERRIES_CAKE) // factory registerFactory(RagiumBlocks.BACKPACK_INTERFACE, RagiumModels.ALL_TINTED) { @@ -330,8 +340,6 @@ class RagiumModelProvider(output: FabricDataOutput) : FabricModelProvider(output addAll(RagiumContents.Plates.entries) addAll(RagiumContents.RawMaterials.entries) addAll(RagiumItems.TOOLS) - remove(RagiumItems.BUJIN) - remove(RagiumItems.GIGANT_HAMMER) addAll(RagiumItems.ARMORS) addAll(RagiumContents.CircuitBoards.entries) addAll(RagiumContents.Circuits.entries) @@ -339,6 +347,10 @@ class RagiumModelProvider(output: FabricDataOutput) : FabricModelProvider(output addAll(RagiumItems.INGREDIENTS) addAll(RagiumItems.MISC) + add(RagiumBlocks.ROPE) + + remove(RagiumItems.BUJIN) + remove(RagiumItems.GIGANT_HAMMER) remove(RagiumItems.CHOCOLATE_APPLE) remove(RagiumItems.EMPTY_FLUID_CUBE) remove(RagiumItems.FILLED_FLUID_CUBE) diff --git a/src/main/kotlin/hiiragi283/ragium/data/RagiumTagProviders.kt b/src/main/kotlin/hiiragi283/ragium/data/RagiumTagProviders.kt index a8355f70..0a237142 100644 --- a/src/main/kotlin/hiiragi283/ragium/data/RagiumTagProviders.kt +++ b/src/main/kotlin/hiiragi283/ragium/data/RagiumTagProviders.kt @@ -56,16 +56,24 @@ object RagiumTagProviders { add(BlockTags.PICKAXE_MINEABLE, RagiumBlocks.POROUS_NETHERRACK) add(BlockTags.SLABS, RagiumBlocks.ASPHALT_SLAB) - add(BlockTags.SLABS, RagiumBlocks.LINED_ASPHALT_SLAB) + // add(BlockTags.SLABS, RagiumBlocks.LINED_ASPHALT_SLAB) + add(BlockTags.SLABS, RagiumBlocks.POLISHED_ASPHALT_SLAB) add(BlockTags.SLABS, RagiumBlocks.GYPSUM_SLAB) + add(BlockTags.SLABS, RagiumBlocks.POLISHED_GYPSUM_SLAB) add(BlockTags.STAIRS, RagiumBlocks.ASPHALT_STAIRS) - add(BlockTags.STAIRS, RagiumBlocks.LINED_ASPHALT_STAIRS) + // add(BlockTags.STAIRS, RagiumBlocks.LINED_ASPHALT_STAIRS) + add(BlockTags.STAIRS, RagiumBlocks.POLISHED_ASPHALT_STAIRS) add(BlockTags.STAIRS, RagiumBlocks.GYPSUM_STAIRS) + add(BlockTags.STAIRS, RagiumBlocks.POLISHED_GYPSUM_SLAB) RagiumBlocks.BUILDINGS.forEach { add(BlockTags.PICKAXE_MINEABLE, it) } RagiumBlocks.FOODS.forEach { add(BlockTags.HOE_MINEABLE, it) } RagiumBlocks.MECHANICS.forEach { add(BlockTags.PICKAXE_MINEABLE, it) } - RagiumBlocks.MISC.forEach { add(BlockTags.PICKAXE_MINEABLE, it) } + buildList { + addAll(RagiumBlocks.MISC) + remove(RagiumBlocks.ROPE) + }.forEach { add(BlockTags.PICKAXE_MINEABLE, it) } + add(BlockTags.AXE_MINEABLE, RagiumBlocks.ROPE) buildList { addAll(RagiumContents.Ores.entries) @@ -78,6 +86,8 @@ object RagiumTagProviders { addAll(RagiumContents.Drums.entries) }.forEach { add(BlockTags.PICKAXE_MINEABLE, it) } + add(BlockTags.CLIMBABLE, RagiumBlocks.ROPE) + RagiumContents.Ores.entries.forEach { ore: RagiumContents.Ores -> add(BlockTags.DRAGON_IMMUNE, ore) } diff --git a/src/main/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt b/src/main/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt index 41a32384..55b8704c 100644 --- a/src/main/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt +++ b/src/main/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt @@ -1,11 +1,7 @@ package hiiragi283.ragium.data.recipe import hiiragi283.ragium.api.RagiumAPI -import hiiragi283.ragium.api.data.HTCookingRecipeJsonBuilder -import hiiragi283.ragium.api.data.HTMachineRecipeJsonBuilder -import hiiragi283.ragium.api.data.HTShapedRecipeJsonBuilder -import hiiragi283.ragium.api.data.HTShapelessRecipeJsonBuilder -import hiiragi283.ragium.api.data.HTStonecuttingRecipeJsonBuilder +import hiiragi283.ragium.api.data.* import hiiragi283.ragium.common.RagiumContents import hiiragi283.ragium.common.init.* import hiiragi283.ragium.common.item.HTBackpackItem @@ -177,7 +173,7 @@ class RagiumVanillaRecipeProvider(output: FabricDataOutput, registriesFuture: Co registerSlab(exporter, RagiumBlocks.ASPHALT_SLAB, RagiumBlocks.ASPHALT) registerStair(exporter, RagiumBlocks.ASPHALT_STAIRS, RagiumBlocks.ASPHALT) // lined asphalt - HTShapedRecipeJsonBuilder + /* HTShapedRecipeJsonBuilder .create(RagiumBlocks.LINED_ASPHALT, 6) .patterns( "ABA", @@ -188,10 +184,28 @@ class RagiumVanillaRecipeProvider(output: FabricDataOutput, registriesFuture: Co .unlockedBy(RagiumBlocks.ASPHALT) .offerTo(exporter) registerSlab(exporter, RagiumBlocks.LINED_ASPHALT_SLAB, RagiumBlocks.LINED_ASPHALT) - registerStair(exporter, RagiumBlocks.LINED_ASPHALT_STAIRS, RagiumBlocks.LINED_ASPHALT) + registerStair(exporter, RagiumBlocks.LINED_ASPHALT_STAIRS, RagiumBlocks.LINED_ASPHALT) */ + // polished asphalt + HTStonecuttingRecipeJsonBuilder.register( + exporter, + RagiumBlocks.ASPHALT, + RagiumBlocks.POLISHED_ASPHALT, + category = RecipeCategory.BUILDING_BLOCKS, + ) + registerSlab(exporter, RagiumBlocks.POLISHED_ASPHALT_SLAB, RagiumBlocks.POLISHED_ASPHALT) + registerStair(exporter, RagiumBlocks.POLISHED_ASPHALT_STAIRS, RagiumBlocks.POLISHED_ASPHALT) // gypsum registerSlab(exporter, RagiumBlocks.GYPSUM_SLAB, RagiumBlocks.GYPSUM) registerStair(exporter, RagiumBlocks.GYPSUM_STAIRS, RagiumBlocks.GYPSUM) + // polished gypsum + HTStonecuttingRecipeJsonBuilder.register( + exporter, + RagiumBlocks.GYPSUM, + RagiumBlocks.POLISHED_GYPSUM, + category = RecipeCategory.BUILDING_BLOCKS, + ) + registerSlab(exporter, RagiumBlocks.POLISHED_GYPSUM_SLAB, RagiumBlocks.POLISHED_GYPSUM) + registerStair(exporter, RagiumBlocks.POLISHED_GYPSUM_STAIRS, RagiumBlocks.POLISHED_GYPSUM) } private fun registerSlab( @@ -278,6 +292,16 @@ class RagiumVanillaRecipeProvider(output: FabricDataOutput, registriesFuture: Co ).input('A', RagiumContents.Ingots.RAGI_ALLOY) .unlockedBy(RagiumContents.Ingots.RAGI_ALLOY) .offerTo(exporter) + + HTShapedRecipeJsonBuilder + .create(RagiumBlocks.ROPE, 8) + .patterns( + "A", + "A", + "A", + ).input('A', ItemTags.WOOL) + .unlockedBy(ItemTags.WOOL) + .offerTo(exporter) // dynamites HTShapelessRecipeJsonBuilder .create(RagiumItems.ANVIL_DYNAMITE) diff --git a/src/main/resources/assets/ragium/models/block/rope.json b/src/main/resources/assets/ragium/models/block/rope.json new file mode 100644 index 00000000..c615ad7a --- /dev/null +++ b/src/main/resources/assets/ragium/models/block/rope.json @@ -0,0 +1,23 @@ +{ + "credit": "Made by Hiiragi Russell Tsubasa", + "textures": { + "0": "block/brown_wool", + "particle": "block/brown_wool" + }, + "elements": [ + { + "from": [6, 0, 6], + "to": [10, 16, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 4, 16], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 16], "texture": "#0"}, + "south": {"uv": [8, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [12, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#0"} + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/ragium/textures/block/polished_asphalt.png b/src/main/resources/assets/ragium/textures/block/polished_asphalt.png new file mode 100644 index 00000000..351293e8 Binary files /dev/null and b/src/main/resources/assets/ragium/textures/block/polished_asphalt.png differ diff --git a/src/main/resources/assets/ragium/textures/block/polished_gypsum.png b/src/main/resources/assets/ragium/textures/block/polished_gypsum.png new file mode 100644 index 00000000..619f1fd5 Binary files /dev/null and b/src/main/resources/assets/ragium/textures/block/polished_gypsum.png differ diff --git a/src/main/resources/assets/ragium/textures/item/rope.png b/src/main/resources/assets/ragium/textures/item/rope.png new file mode 100644 index 00000000..bf0b6a2d Binary files /dev/null and b/src/main/resources/assets/ragium/textures/item/rope.png differ