From ef53c03d31e3bc2b4345ce7f00e47d4c0cc1955c Mon Sep 17 00:00:00 2001 From: Motschen Date: Fri, 12 Jun 2020 17:46:45 +0200 Subject: [PATCH] Update to 1.16-pre4 --- build.gradle | 2 +- gradle.properties | 12 +-- .../motschen/verticalslabs/VerticalSlabs.java | 82 +++++++++---------- src/main/resources/fabric.mod.json | 4 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/build.gradle b/build.gradle index a3c9ddc..17444f8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.2.6-SNAPSHOT' + id 'fabric-loom' version '0.2.7-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index e9ba5ec..11e302f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.15.2 - yarn_mappings=1.15.2+build.14 - loader_version=0.7.8+build.184 + minecraft_version=1.16-pre4 + yarn_mappings=1.16-pre4+build.1 + loader_version=0.8.7+build.201 # Mod Properties - mod_version = 1.0.0 + mod_version = 1.0.3 maven_group = eu.midnightdust.motschen - archives_base_name = diagonalslabs + archives_base_name = verticalslabs # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.4.32+build.292-1.15 + fabric_version=0.12.0+build.360-1.16 diff --git a/src/main/java/eu/midnightdust/motschen/verticalslabs/VerticalSlabs.java b/src/main/java/eu/midnightdust/motschen/verticalslabs/VerticalSlabs.java index 83dc4b3..9a9c437 100644 --- a/src/main/java/eu/midnightdust/motschen/verticalslabs/VerticalSlabs.java +++ b/src/main/java/eu/midnightdust/motschen/verticalslabs/VerticalSlabs.java @@ -1,9 +1,9 @@ package eu.midnightdust.motschen.verticalslabs; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.block.FabricBlockSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -import net.fabricmc.fabric.api.tools.FabricToolTags; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.item.*; @@ -15,45 +15,45 @@ public class VerticalSlabs implements ModInitializer { public static final String MOD_ID = "verticalslabs"; public static final ItemGroup VerticalSlabsGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "vertical_slabs"), () -> new ItemStack(VerticalSlabs.VERTICAL_OAK_SLAB)); - public static final Block VERTICAL_OAK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_SPRUCE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_BIRCH_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_JUNGLE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_ACACIA_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_DARK_OAK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_CRIMSON_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_WARPED_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES).build()); - public static final Block VERTICAL_STONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_SMOOTH_STONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_CUT_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_COBBLESTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_STONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_NETHER_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_QUARTZ_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_RED_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_CUT_RED_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_PURPUR_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_PRISMARINE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_PRISMARINE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_DARK_PRISMARINE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_POLISHED_GRANITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_SMOOTH_RED_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_MOSSY_STONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_POLISHED_DIORITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_MOSSY_COBBLESTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_END_STONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_SMOOTH_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_SMOOTH_QUARTZ_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_GRANITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_ANDESITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_RED_NETHER_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_POLISHED_ANDESITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_DIORITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_BLACKSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_POLISHED_BLACKSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); - public static final Block VERTICAL_POLISHED_BLACKSTONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES).build()); + public static final Block VERTICAL_OAK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_SPRUCE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_BIRCH_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_JUNGLE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_ACACIA_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_DARK_OAK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_CRIMSON_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_WARPED_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2f).breakByTool(FabricToolTags.AXES)); + public static final Block VERTICAL_STONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_SMOOTH_STONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_CUT_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_COBBLESTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_STONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_NETHER_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_QUARTZ_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_RED_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_CUT_RED_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_PURPUR_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_PRISMARINE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_PRISMARINE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_DARK_PRISMARINE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_POLISHED_GRANITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_SMOOTH_RED_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_MOSSY_STONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_POLISHED_DIORITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_MOSSY_COBBLESTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_END_STONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_SMOOTH_SANDSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_SMOOTH_QUARTZ_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_GRANITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_ANDESITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_RED_NETHER_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_POLISHED_ANDESITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_DIORITE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_BLACKSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_POLISHED_BLACKSTONE_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); + public static final Block VERTICAL_POLISHED_BLACKSTONE_BRICK_SLAB = new VerticalSlab(FabricBlockSettings.of(Material.STONE).sounds(BlockSoundGroup.STONE).hardness(2f).breakByHand(false).breakByTool(FabricToolTags.PICKAXES)); @Override public void onInitialize() { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8a2dcb5..c890f11 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "verticalslabs", - "version": "1.0.1", + "version": "1.3.0", "name": "Vertical Slabs", "description": "Adds vertical slabs to the game!", @@ -14,7 +14,7 @@ "issues": "https://github.com/TeamMidnightDust/verticalslabs/issues" }, - "license": "GNU LGPLv2", + "license": "MIT", "icon": "assets/verticalslabs/icon.png", "environment": "*",