Update to 20w13b

Ladysnake · Mar 26, 2020 · 8f21bee · 8f21bee
1 parent c8c5072
commit 8f21bee
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Nomad Books - Changelog
 
+### Nomad Books 0.4.1 - 20w13b
+
+- Updated to Minecraft snapshot 20w13b
+
 ### Nomad Books 0.4 - 20w09a
 
 - Player now needs to be in a 10 block radius from the camp to be able to retrieve it

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.7-SNAPSHOT'
+	id 'fabric-loom' version '0.2.6-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
 	id 'org.ajoberstar.grgit' version '3.1.1'
@@ -28,6 +28,9 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
+	// You may need to force-disable transitiveness on them.
 }
 
 processResources {
@@ -93,9 +96,6 @@ task checkGitStatus() {
 			throw new RuntimeException("Git repository not ready for release (${grgit.status()})")
 		}
 		def currentBranch = grgit.branch.current().getName()
-		if (currentBranch != 'master') {
-			throw new RuntimeException("Need to be on the master branch to release (currently on ${currentBranch})")
-		}
 		grgit.fetch()
 		if (grgit.tag.list().any { it.name == project.version }) {
 			throw new RuntimeException("A tag already exists for ${project.version}")

diff --git a/gradle.properties b/gradle.properties
@@ -2,24 +2,23 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-# check these on https://fabricmc.net/use
-minecraft_version=20w09a
-yarn_mappings=20w09a+build.2
-loader_version=0.7.8+build.184
+minecraft_version=20w13b
+yarn_mappings=20w13b+build.4
+loader_version=0.7.8+build.189
 
 #Fabric api
-fabric_version=0.4.33+build.301-1.16
+fabric_version=0.5.6+build.313-1.16
 
 # Mod Properties
-mod_version = 0.3
+mod_version = 0.4.1
 maven_group = io.github.ladysnake
 archives_base_name = nomadbooks
 
 #Publishing
 owners = Ladysnake
 license_header = CC-BY-NC-SA+4.0
 curseforge_id = 356921
-curseforge_versions = 1.16
+curseforge_versions = 1.16-Snapshot
 cf_requirements = fabric-api
 release_type = beta
 changelog_url = https://github.com/Ladysnake/Nomad-Books/blob/master/CHANGELOG.md
diff --git a/src/main/java/ladysnake/nomadbooks/common/item/NomadBookItem.java b/src/main/java/ladysnake/nomadbooks/common/item/NomadBookItem.java
@@ -26,6 +26,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.*;
+import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.ChunkPos;
@@ -231,7 +232,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
                         return TypedActionResult.fail(itemStack);
                     }
 
-                    structure.method_15174(world, pos.add(new BlockPos(0, 0, 0)), new BlockPos(width, height, width), true, Blocks.STRUCTURE_VOID);
+                    structure.saveFromWorld(world, pos.add(new BlockPos(0, 0, 0)), new BlockPos(width, height, width), true, Blocks.STRUCTURE_VOID);
                     structure.setAuthor(user.getEntityName());
                     structureManager.saveStructure(new Identifier(structurePath));
 

diff --git a/src/main/java/ladysnake/nomadbooks/common/recipe/NomadBookCraftRecipe.java b/src/main/java/ladysnake/nomadbooks/common/recipe/NomadBookCraftRecipe.java
@@ -12,9 +12,8 @@
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.RecipeSerializer;
 import net.minecraft.recipe.ShapedRecipe;
-import net.minecraft.recipe.SpecialCraftingRecipe;
-import net.minecraft.util.DefaultedList;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 
 import java.util.List;

diff --git a/src/main/java/ladysnake/nomadbooks/common/recipe/NomadPageCraftRecipe.java b/src/main/java/ladysnake/nomadbooks/common/recipe/NomadPageCraftRecipe.java
@@ -12,9 +12,8 @@
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.RecipeSerializer;
 import net.minecraft.recipe.ShapedRecipe;
-import net.minecraft.recipe.SpecialCraftingRecipe;
-import net.minecraft.util.DefaultedList;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.world.World;
 
 import java.util.List;