diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/blocks/BlockCompendium.kt b/src/main/kotlin/io/github/lucaargolo/kibe/blocks/BlockCompendium.kt index f1f4ec9e..182ddd97 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/blocks/BlockCompendium.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/blocks/BlockCompendium.kt @@ -171,6 +171,7 @@ val STONE_SPIKES = register(Identifier(MOD_ID, "stone_spikes"), Spikes(Spikes.Ty val IRON_SPIKES = register(Identifier(MOD_ID, "iron_spikes"), Spikes(Spikes.Type.IRON, FabricBlockSettings.copyOf(Blocks.IRON_BLOCK))) val GOLD_SPIKES = register(Identifier(MOD_ID, "gold_spikes"), Spikes(Spikes.Type.GOLD, FabricBlockSettings.copyOf(Blocks.GOLD_BLOCK))) val DIAMOND_SPIKES = register(Identifier(MOD_ID, "diamond_spikes"), Spikes(Spikes.Type.DIAMOND, FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK))) +val NETHERITE_SPIKES = register(Identifier(MOD_ID, "netherite_spikes"), Spikes(Spikes.Type.NETHERITE, FabricBlockSettings.copyOf(Blocks.NETHERITE_BLOCK))) val REGULAR_CONVEYOR_BELT = register(Identifier(MOD_ID, "regular_conveyor_belt"), ConveyorBelt(0.050)) val FAST_CONVEYOR_BELT = register(Identifier(MOD_ID, "fast_conveyor_belt"), ConveyorBelt(0.1)) diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/blocks/miscellaneous/Spikes.kt b/src/main/kotlin/io/github/lucaargolo/kibe/blocks/miscellaneous/Spikes.kt index 626f6775..366227d8 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/blocks/miscellaneous/Spikes.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/blocks/miscellaneous/Spikes.kt @@ -24,6 +24,7 @@ class Spikes(private val type: Type, settings: Settings): Block(settings) { IRON(6F), GOLD(6F), DIAMOND(8F), + NETHERITE(12F) } init { @@ -51,7 +52,7 @@ class Spikes(private val type: Type, settings: Settings): Block(settings) { SpikeHelper.setSpike(entity, type) when(type) { Type.IRON, Type.STONE -> entity.damage(DamageSource.GENERIC, type.damage) - Type.GOLD, Type.DIAMOND -> entity.damage(DamageSource.player(FakePlayerEntity(world)), type.damage) + Type.GOLD, Type.DIAMOND, Type.NETHERITE -> entity.damage(DamageSource.player(FakePlayerEntity(world)), type.damage) } SpikeHelper.setSpike(entity, null) } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/utils/CreativeTab.kt b/src/main/kotlin/io/github/lucaargolo/kibe/utils/CreativeTab.kt index 8a8535fa..b19b8045 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/utils/CreativeTab.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/utils/CreativeTab.kt @@ -46,7 +46,7 @@ private fun appendItems(): List { LIGHT_GRAY_GLIDER, CYAN_GLIDER, BLUE_GLIDER, PURPLE_GLIDER, GREEN_GLIDER, BROWN_GLIDER, RED_GLIDER, BLACK_GLIDER, WHITE_RUNE, ORANGE_RUNE, MAGENTA_RUNE, LIGHT_BLUE_RUNE, YELLOW_RUNE, LIME_RUNE, PINK_RUNE, GRAY_RUNE, LIGHT_GRAY_RUNE, CYAN_RUNE, BLUE_RUNE, PURPLE_RUNE, GREEN_RUNE, BROWN_RUNE, RED_RUNE, BLACK_RUNE, - VOID_BUCKET, WOODEN_BUCKET, WATER_WOODEN_BUCKET, SLIME_BOOTS, SLIME_SLING, TORCH_SLING, ESCAPE_ROPE, COOLER, BIG_TORCH, HEATER, DEHUMIDIFIER, CHUNK_LOADER, STONE_SPIKES, IRON_SPIKES, GOLD_SPIKES, DIAMOND_SPIKES, MEASURING_TAPE, + VOID_BUCKET, WOODEN_BUCKET, WATER_WOODEN_BUCKET, SLIME_BOOTS, SLIME_SLING, TORCH_SLING, ESCAPE_ROPE, COOLER, BIG_TORCH, HEATER, DEHUMIDIFIER, CHUNK_LOADER, STONE_SPIKES, IRON_SPIKES, GOLD_SPIKES, DIAMOND_SPIKES, NETHERITE_SPIKES, MEASURING_TAPE, COBBLESTONE_GENERATOR_MK1, COBBLESTONE_GENERATOR_MK2, COBBLESTONE_GENERATOR_MK3, COBBLESTONE_GENERATOR_MK4, COBBLESTONE_GENERATOR_MK5, BASALT_GENERATOR_MK1, BASALT_GENERATOR_MK2, BASALT_GENERATOR_MK3, BASALT_GENERATOR_MK4, BASALT_GENERATOR_MK5, WHITE_SLEEPING_BAG, ORANGE_SLEEPING_BAG, MAGENTA_SLEEPING_BAG, LIGHT_BLUE_SLEEPING_BAG, YELLOW_SLEEPING_BAG, LIME_SLEEPING_BAG, PINK_SLEEPING_BAG, GRAY_SLEEPING_BAG, diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/utils/TooltipHelper.kt b/src/main/kotlin/io/github/lucaargolo/kibe/utils/TooltipHelper.kt index ebaed885..17f07d3e 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/utils/TooltipHelper.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/utils/TooltipHelper.kt @@ -22,6 +22,7 @@ fun initTooltip() { registerTooltip(IRON_SPIKES) registerTooltip(GOLD_SPIKES) registerTooltip(DIAMOND_SPIKES) + registerTooltip(NETHERITE_SPIKES) registerTooltip(HEATER) registerTooltip(DEHUMIDIFIER) diff --git a/src/main/resources/assets/kibe/blockstates/netherite_spikes.json b/src/main/resources/assets/kibe/blockstates/netherite_spikes.json new file mode 100644 index 00000000..2e42601d --- /dev/null +++ b/src/main/resources/assets/kibe/blockstates/netherite_spikes.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=up": { "model": "kibe:block/netherite_spikes" }, + "facing=down": { "model": "kibe:block/netherite_spikes", "x": 180 }, + "facing=north": { "model": "kibe:block/netherite_spikes", "x": 90 }, + "facing=south": { "model": "kibe:block/netherite_spikes", "x": 270 }, + "facing=east": { "model": "kibe:block/netherite_spikes", "x": 90, "y": 90 }, + "facing=west": { "model": "kibe:block/netherite_spikes", "x": 270, "y": 90 } + } +} diff --git a/src/main/resources/assets/kibe/lang/en_us.json b/src/main/resources/assets/kibe/lang/en_us.json index 9ca958cf..5d192555 100644 --- a/src/main/resources/assets/kibe/lang/en_us.json +++ b/src/main/resources/assets/kibe/lang/en_us.json @@ -5,6 +5,7 @@ "block.kibe.iron_spikes": "Iron Spikes", "block.kibe.gold_spikes": "Gold Spikes", "block.kibe.diamond_spikes": "Diamond Spikes", + "block.kibe.netherite_spikes": "Netherite Spikes", "block.kibe.regular_conveyor_belt": "Regular Conveyor Belt", "block.kibe.fast_conveyor_belt": "Fast Conveyor Belt", @@ -218,6 +219,7 @@ "tooltip.kibe.lore.iron_spikes": "§5§oEntities drops regular items", "tooltip.kibe.lore.gold_spikes": "§5§oEntities drops xp", "tooltip.kibe.lore.diamond_spikes": "§5§oEntities drops xp and player only items", + "tooltip.kibe.lore.netherite_spikes": "§5§oEntities drops xp and player only items", "tooltip.kibe.lore.cooler": "§5§oAuto consumes any food stored in it", "tooltip.kibe.lore.big_torch": "§5§oFill with torches to keep chunks mob-free", diff --git a/src/main/resources/assets/kibe/lang/ru_ru.json b/src/main/resources/assets/kibe/lang/ru_ru.json index 7e6ad902..4256f1d7 100644 --- a/src/main/resources/assets/kibe/lang/ru_ru.json +++ b/src/main/resources/assets/kibe/lang/ru_ru.json @@ -5,6 +5,7 @@ "block.kibe.iron_spikes": "Железные шипы", "block.kibe.gold_spikes": "Золотые шипы", "block.kibe.diamond_spikes": "Алмазные шипы", + "block.kibe.netherite_spikes": "Незеритовые шипы", "block.kibe.regular_conveyor_belt": "Обычная конвейерная лента", "block.kibe.fast_conveyor_belt": "Быстрая конвейерная лента", @@ -207,6 +208,7 @@ "tooltip.kibe.lore.iron_spikes": "§5§oС сущностей выпадают предметы", "tooltip.kibe.lore.gold_spikes": "§5§oС сущностей выпадает опыт", "tooltip.kibe.lore.diamond_spikes": "§5§oС сущностей выпадает опыт и предметы", + "tooltip.kibe.lore.netherite_spikes": "§5§oС сущностей выпадает опыт и предметы", "tooltip.kibe.lore.cooler": "§5§oАвтоматически употребляет любую еду, хранящуюся в нем.", "tooltip.kibe.lore.big_torch": "§5§oЗаполните факелами, чтобы очистить чанки от мобов.", diff --git a/src/main/resources/assets/kibe/models/block/netherite_spikes.json b/src/main/resources/assets/kibe/models/block/netherite_spikes.json new file mode 100644 index 00000000..d7b2babf --- /dev/null +++ b/src/main/resources/assets/kibe/models/block/netherite_spikes.json @@ -0,0 +1,7 @@ +{ + "parent": "kibe:block/spikes", + "textures": { + "0": "block/netherite_block", + "particle": "block/netherite_block" + } +} diff --git a/src/main/resources/assets/kibe/models/item/netherite_spikes.json b/src/main/resources/assets/kibe/models/item/netherite_spikes.json new file mode 100644 index 00000000..1e3cb6eb --- /dev/null +++ b/src/main/resources/assets/kibe/models/item/netherite_spikes.json @@ -0,0 +1,3 @@ +{ + "parent": "kibe:block/netherite_spikes" +} diff --git a/src/main/resources/data/kibe/loot_tables/blocks/netherite_spikes.json b/src/main/resources/data/kibe/loot_tables/blocks/netherite_spikes.json new file mode 100644 index 00000000..01db66ec --- /dev/null +++ b/src/main/resources/data/kibe/loot_tables/blocks/netherite_spikes.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "kibe:netherite_spikes" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/kibe/recipes/netherite_spikes.json b/src/main/resources/data/kibe/recipes/netherite_spikes.json new file mode 100644 index 00000000..a930943a --- /dev/null +++ b/src/main/resources/data/kibe/recipes/netherite_spikes.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#_#" + ], + "key": { + "#": { + "item": "minecraft:netherite_sword" + }, + "_": [ + { + "item": "kibe:diamond_spikes" + } + ] + }, + "result": { + "item": "kibe:netherite_spikes", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json index 2394e680..011389cc 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -7,6 +7,7 @@ "kibe:wither_proof_block", "kibe:wither_proof_sand", "kibe:wither_proof_glass", - "kibe:wither_builder" + "kibe:wither_builder", + "kibe:netherite_spikes" ] } \ No newline at end of file