diff --git a/common/src/main/kotlin/org/valkyrienskies/tournament/TournamentBlocks.kt b/common/src/main/kotlin/org/valkyrienskies/tournament/TournamentBlocks.kt index 4e89073..9cda734 100644 --- a/common/src/main/kotlin/org/valkyrienskies/tournament/TournamentBlocks.kt +++ b/common/src/main/kotlin/org/valkyrienskies/tournament/TournamentBlocks.kt @@ -8,10 +8,7 @@ import net.minecraft.world.item.BlockItem import net.minecraft.world.item.CreativeModeTab import net.minecraft.world.item.Item import net.minecraft.world.level.Explosion -import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.Blocks -import net.minecraft.world.level.block.FireBlock -import net.minecraft.world.level.block.OreBlock +import net.minecraft.world.level.block.* import net.minecraft.world.level.block.state.BlockBehaviour import org.valkyrienskies.mod.common.hooks.VSGameEvents import org.valkyrienskies.tournament.util.extension.explodeShip @@ -32,6 +29,7 @@ object TournamentBlocks { lateinit var BALLAST : RegistrySupplier lateinit var POWERED_BALLOON : RegistrySupplier lateinit var BALLOON : RegistrySupplier + lateinit var FLOATER : RegistrySupplier lateinit var THRUSTER : RegistrySupplier lateinit var THRUSTER_TINY : RegistrySupplier lateinit var SPINNER : RegistrySupplier @@ -53,6 +51,11 @@ object TournamentBlocks { BALLAST = register("ballast", ::BallastBlock) POWERED_BALLOON = register("balloon", ::PoweredBalloonBlock) BALLOON = register("balloon_unpowered", ::BalloonBlock) + FLOATER = register("floater") { Block( + BlockBehaviour.Properties.of(Material.WOOD) + .sound(SoundType.WOOD) + .strength(1.0f, 2.0f) + )} THRUSTER = register("thruster") { ThrusterBlock( { 1.0 }, @@ -159,6 +162,8 @@ object TournamentBlocks { fun makeFlammables() { flammableBlock(SEAT.get(), 15, 25) flammableBlock(POWERED_BALLOON.get(), 30, 60) + flammableBlock(BALLOON.get(), 30, 60) + flammableBlock(FLOATER.get(), 30, 60) } fun registerItems(items: DeferredRegister) { diff --git a/common/src/main/resources/assets/vs_tournament/blockstates/floater.json b/common/src/main/resources/assets/vs_tournament/blockstates/floater.json new file mode 100644 index 0000000..2232a54 --- /dev/null +++ b/common/src/main/resources/assets/vs_tournament/blockstates/floater.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vs_tournament:block/floater" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/vs_tournament/lang/en_us.json b/common/src/main/resources/assets/vs_tournament/lang/en_us.json index 7af3de7..ff938db 100644 --- a/common/src/main/resources/assets/vs_tournament/lang/en_us.json +++ b/common/src/main/resources/assets/vs_tournament/lang/en_us.json @@ -2,6 +2,7 @@ "block.vs_tournament.ballast": "Ballast", "block.vs_tournament.balloon": "Powered Balloon", "block.vs_tournament.balloon_unpowered": "Balloon", + "block.vs_tournament.floater": "Floater", "block.vs_tournament.spinner": "Spinner", "block.vs_tournament.thruster": "Thruster", "block.vs_tournament.tiny_thruster": "Tiny Thruster", diff --git a/common/src/main/resources/assets/vs_tournament/models/block/floater.json b/common/src/main/resources/assets/vs_tournament/models/block/floater.json new file mode 100644 index 0000000..a27c6f5 --- /dev/null +++ b/common/src/main/resources/assets/vs_tournament/models/block/floater.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "vs_tournament:block/floater" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/vs_tournament/models/item/floater.json b/common/src/main/resources/assets/vs_tournament/models/item/floater.json new file mode 100644 index 0000000..d3cd9e4 --- /dev/null +++ b/common/src/main/resources/assets/vs_tournament/models/item/floater.json @@ -0,0 +1,3 @@ +{ + "parent": "vs_tournament:block/floater" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/vs_tournament/textures/block/floater.png b/common/src/main/resources/assets/vs_tournament/textures/block/floater.png index 0395c45..2ec6e9b 100644 Binary files a/common/src/main/resources/assets/vs_tournament/textures/block/floater.png and b/common/src/main/resources/assets/vs_tournament/textures/block/floater.png differ diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json index 8f2cf7a..076f7a1 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "vs_tournament:seat" + "vs_tournament:seat", + "vs_tournament:floater" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/vs_tournament/loot_tables/blocks/floater.json b/common/src/main/resources/data/vs_tournament/loot_tables/blocks/floater.json new file mode 100644 index 0000000..ad32e65 --- /dev/null +++ b/common/src/main/resources/data/vs_tournament/loot_tables/blocks/floater.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "vs_tournament:floater" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/vs_tournament/recipes/floater.json b/common/src/main/resources/data/vs_tournament/recipes/floater.json new file mode 100644 index 0000000..f2dfec6 --- /dev/null +++ b/common/src/main/resources/data/vs_tournament/recipes/floater.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#S#", + " # " + ], + "key": { + "#": { + "tag": "minecraft:planks" + }, + "S": { + "item": "minecraft:string" + } + }, + "result": { + "item": "vs_tournament:floater", + "count": 4 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/vs_tournament/vs_mass/tournament.json b/common/src/main/resources/data/vs_tournament/vs_mass/tournament.json index 54010f5..4ccd749 100644 --- a/common/src/main/resources/data/vs_tournament/vs_mass/tournament.json +++ b/common/src/main/resources/data/vs_tournament/vs_mass/tournament.json @@ -26,5 +26,9 @@ { "block": "vs_tournament:sensor", "mass": 200.0 + }, + { + "block": "vs_tournament:floater", + "mass": 200.0 } ]