From 3de9d91bb080ad2a3bbc61cbe9f36f4aaa47f637 Mon Sep 17 00:00:00 2001 From: Prospector Date: Tue, 21 Jan 2020 22:09:40 -0800 Subject: [PATCH] v2.1.9 - Update to 1.15.2 --- build.gradle | 2 ++ gradle.properties | 12 ++++++------ .../traverse/block/TraverseBlocks.java | 10 +++++----- .../traverse/entity/TraverseEntities.java | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 01b103b..3b2aba7 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,8 @@ dependencies { modCompile "com.terraformersmc:terraform:${project.terraform_version}" include "com.terraformersmc:terraform:${project.terraform_version}" + + compileOnly "com.google.code.findbugs:jsr305:3.0.2" } processResources { diff --git a/gradle.properties b/gradle.properties index 39ae60f..2d702f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ org.gradle.jvmargs=-Xmx1G -mod_version=2.1.8 +mod_version=2.1.9 maven_group=com.terraformersmc archive_name=traverse -minecraft_version=1.15.1-pre1 -yarn_mappings=1.15.1-pre1+build.1 -loader_version=0.7.2+build.174 -fabric_version=0.4.24+build.279-1.15 -terraform_version=1.3.4+build.17 +minecraft_version=1.15.2 +yarn_mappings=1.15.2+build.2 +loader_version=0.7.5+build.178 +fabric_version=0.4.29+build.290-1.15 +terraform_version=1.3.5+build.19 diff --git a/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java b/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java index 6bd5281..60200b1 100644 --- a/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java +++ b/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java @@ -27,20 +27,20 @@ public class TraverseBlocks { private static final Map BLOCKS = new HashMap<>(); public static final Block RED_AUTUMNAL_LEAVES = add("red_autumnal_leaves", new LeavesBlock(Block.Settings.copy(Blocks.OAK_LEAVES)), ItemGroup.DECORATIONS); - public static final Block RED_AUTUMNAL_SAPLING = add("red_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize2), + public static final Block RED_AUTUMNAL_SAPLING = add("red_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize), () -> TraverseBiomeFeatures.RED_AUTUMNAL_TREE_CONFIG)), ItemGroup.DECORATIONS); public static final Block BROWN_AUTUMNAL_LEAVES = add("brown_autumnal_leaves", new LeavesBlock(Block.Settings.copy(Blocks.OAK_LEAVES)), ItemGroup.DECORATIONS); - public static final Block BROWN_AUTUMNAL_SAPLING = add("brown_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize2), + public static final Block BROWN_AUTUMNAL_SAPLING = add("brown_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize), () -> TraverseBiomeFeatures.BROWN_AUTUMNAL_TREE_CONFIG)), ItemGroup.DECORATIONS); public static final Block ORANGE_AUTUMNAL_LEAVES = add("orange_autumnal_leaves", new LeavesBlock(Block.Settings.copy(Blocks.OAK_LEAVES)), ItemGroup.DECORATIONS); - public static final Block ORANGE_AUTUMNAL_SAPLING = add("orange_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize2), + public static final Block ORANGE_AUTUMNAL_SAPLING = add("orange_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize), () -> TraverseBiomeFeatures.ORANGE_AUTUMNAL_TREE_CONFIG)), ItemGroup.DECORATIONS); public static final Block YELLOW_AUTUMNAL_LEAVES = add("yellow_autumnal_leaves", new LeavesBlock(Block.Settings.copy(Blocks.OAK_LEAVES)), ItemGroup.DECORATIONS); - public static final Block YELLOW_AUTUMNAL_SAPLING = add("yellow_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize2), + public static final Block YELLOW_AUTUMNAL_SAPLING = add("yellow_autumnal_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize), () -> TraverseBiomeFeatures.YELLOW_AUTUMNAL_TREE_CONFIG)), ItemGroup.DECORATIONS); public static final Block FIR_PLANKS = add("fir_planks", new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS).build()), ItemGroup.BUILDING_BLOCKS); - public static final Block FIR_SAPLING = add("fir_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize2), + public static final Block FIR_SAPLING = add("fir_sapling", new TerraformSaplingBlock(new TerraformSaplingGenerator(() -> new OakTreeFeature(BranchedTreeFeatureConfig::deserialize), () -> TraverseBiomeFeatures.FIR_TREE_CONFIG)), ItemGroup.DECORATIONS); public static final Block STRIPPED_FIR_LOG = add("stripped_fir_log", new LogBlock(MaterialColor.BROWN, FabricBlockSettings.copy(Blocks.OAK_LOG).build()), ItemGroup.BUILDING_BLOCKS); public static final Block STRIPPED_FIR_WOOD = add("stripped_fir_wood", new LogBlock(MaterialColor.BROWN, FabricBlockSettings.copy(Blocks.OAK_LOG).build()), ItemGroup.BUILDING_BLOCKS); diff --git a/src/main/java/com/terraformersmc/traverse/entity/TraverseEntities.java b/src/main/java/com/terraformersmc/traverse/entity/TraverseEntities.java index 8f732e0..ba12158 100644 --- a/src/main/java/com/terraformersmc/traverse/entity/TraverseEntities.java +++ b/src/main/java/com/terraformersmc/traverse/entity/TraverseEntities.java @@ -31,7 +31,7 @@ private static EntityType registerBoat(String name, ItemCon Item item = Registry.register(Registry.ITEM, id, new TerraformBoatItem((world, x, y, z) -> { TerraformBoatEntity entity = boatSupplier.get().create(world); if (entity != null) { - entity.setPosition(x, y, z); + entity.setPos(x, y, z); } return entity; }, new Item.Settings().maxCount(1).group(ItemGroup.TRANSPORTATION)));