v2.1.9 - Update to 1.15.2

TerraformersMC · Jan 22, 2020 · 3de9d91 · 3de9d91
1 parent 6626d9e
commit 3de9d91
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git 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
@@ -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
@@ -27,20 +27,20 @@ public class TraverseBlocks {
 	private static final Map<Identifier, Block> 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
@@ -31,7 +31,7 @@ private static EntityType<TerraformBoatEntity> 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)));