Update to 20w17a

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Nomad Books - Changelog
 
+### Nomad Books 0.4.2 - 20w17a
+
+- Updated to Minecraft snapshot 20w17a
+
 ### Nomad Books 0.4.1 - 20w13b
 
 - Updated to Minecraft snapshot 20w13b

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=20w13b
-yarn_mappings=20w13b+build.4
-loader_version=0.7.8+build.189
+minecraft_version=20w17a
+yarn_mappings=20w17a+build.1
+loader_version=0.8.2+build.194
 
 #Fabric api
-fabric_version=0.5.6+build.313-1.16
+fabric_version=0.6.2+build.327-1.16
 
 # Mod Properties
-mod_version = 0.4.1
+mod_version = 0.4.2
 maven_group = io.github.ladysnake
 archives_base_name = nomadbooks
 

src/main/java/ladysnake/nomadbooks/NomadBooks.java

@@ -1,7 +1,7 @@
 package ladysnake.nomadbooks;
 
-import ladysnake.nomadbooks.common.block.NomadMushroomBlock;
 import ladysnake.nomadbooks.common.block.MembraneBlock;
+import ladysnake.nomadbooks.common.block.NomadMushroomBlock;
 import ladysnake.nomadbooks.common.block.NomadMushroomStemBlock;
 import ladysnake.nomadbooks.common.item.BookUpgradeItem;
 import ladysnake.nomadbooks.common.item.NomadBookItem;
@@ -19,7 +19,6 @@
 import net.minecraft.loot.entry.ItemEntry;
 import net.minecraft.loot.function.SetNbtLootFunction;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.recipe.ShapedRecipe;
 import net.minecraft.recipe.SpecialRecipeSerializer;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.Identifier;

src/main/java/ladysnake/nomadbooks/common/block/NomadMushroomStemBlock.java

@@ -1,7 +1,6 @@
 package ladysnake.nomadbooks.common.block;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.block.MushroomBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
 

src/main/java/ladysnake/nomadbooks/common/item/NomadBookItem.java

@@ -34,7 +34,8 @@
 import net.minecraft.world.dimension.DimensionType;
 
 import java.util.List;
-import java.util.function.Predicate;
+
+import static net.minecraft.text.Style.field_24360;
 
 public class NomadBookItem extends Item {
     public static final int CAMP_RETRIEVAL_RADIUS = 10;
@@ -76,7 +77,7 @@ public ActionResult useOnBlock(ItemUsageContext context) {
                         BlockPos p = pos.add(new BlockPos(x, y, z));
                         BlockState bs = context.getWorld().getBlockState(p);
                         if (!(isBlockReplaceable(bs) || isBlockUnderwaterReplaceable(bs) && tags.getList("Upgrades", NbtType.STRING).contains(StringTag.of("aquatic_membrane")))) {
-                            context.getPlayer().addMessage(new TranslatableText("error.nomadbooks.no_space"), true);
+                            context.getPlayer().sendMessage(new TranslatableText("error.nomadbooks.no_space"), true);
                             return ActionResult.FAIL;
                         }
                     }
@@ -111,7 +112,7 @@ public ActionResult useOnBlock(ItemUsageContext context) {
                     BlockPos p = pos.add(new BlockPos(x, -1, z));
                     BlockState bs = context.getWorld().getBlockState(p);
                     if (isBlockReplaceable(bs)) {
-                        context.getPlayer().addMessage(new TranslatableText("error.nomadbooks.invalid_surface"), true);
+                        context.getPlayer().sendMessage(new TranslatableText("error.nomadbooks.invalid_surface"), true);
                         return ActionResult.FAIL;
                     }
                 }
@@ -186,10 +187,10 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
             if (user.isSneaking()) {
                 // switch boundaries display on or off
                 if (tags.getBoolean("DisplayBoundaries")) {
-                    user.addMessage(new TranslatableText("info.nomadbooks.display_boundaries_off"), true);
+                    user.sendMessage(new TranslatableText("info.nomadbooks.display_boundaries_off"), true);
                     tags.putBoolean("DisplayBoundaries", false);
                 } else {
-                    user.addMessage(new TranslatableText("info.nomadbooks.display_boundaries_on"), true);
+                    user.sendMessage(new TranslatableText("info.nomadbooks.display_boundaries_on"), true);
                     tags.putBoolean("DisplayBoundaries", true);
                 }
 
@@ -209,7 +210,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
                         world.playSound(pos.getX()+width/2+0.5, pos.getY(), pos.getZ()+width/2+0.5, SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1f, 1f, true);
                         return TypedActionResult.success(itemStack);
                     } else {
-                        user.addMessage(new TranslatableText("error.nomadbooks.camp_too_far"), true);
+                        user.sendMessage(new TranslatableText("error.nomadbooks.camp_too_far"), true);
                         return TypedActionResult.fail(itemStack);
                     }
                 }
@@ -304,13 +305,8 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
                 if (!world.isClient()) {
                     // remove blocks dropped by accident
                     BlockPos p2 = pos.add(new BlockPos(width, height, width));
-                    List<ItemEntity> itemEntities = world.getEntities(EntityType.ITEM, new Box(pos.getX(), pos.getY(), pos.getZ(), p2.getX(), p2.getY(), p2.getZ()), new Predicate<ItemEntity>() {
-                        @Override
-                        public boolean test(ItemEntity itemEntity) {
-                            return itemEntity.getAge() < 1;
-                        }
-                    });
-                    itemEntities.forEach(ItemEntity::remove);
+                    List<ItemEntity> itemEntities = world.getEntities(EntityType.ITEM, new Box(pos.getX(), pos.getY(), pos.getZ(), p2.getX(), p2.getY(), p2.getZ()), itemEntity -> true);
+                    itemEntities.forEach(itemEntity -> System.out.println(itemEntity.getOwner()));
                 }
 
                 // remove boundaries display
@@ -332,26 +328,26 @@ public void appendTooltip(ItemStack stack, World world, List<Text> tooltip, Tool
         if (stack.getItem().equals(NomadBooks.NOMAD_BOOK)) {
             int height = tags.getInt("Height");
             int width = tags.getInt("Width");
-            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.height", height).formatted(Formatting.GRAY));
-            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.width", width).formatted(Formatting.GRAY));
+            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.height", height).setStyle(field_24360.setColor(Formatting.GRAY)));
+            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.width", width).setStyle(field_24360.setColor(Formatting.GRAY)));
             ListTag upgrades = tags.getList("Upgrades", NbtType.STRING);
-            upgrades.forEach(tag -> tooltip.add(new TranslatableText("upgrade.nomadbooks."+tag.asString()).formatted(Formatting.DARK_AQUA)));
+            upgrades.forEach(tag -> tooltip.add(new TranslatableText("upgrade.nomadbooks."+tag.asString()).setStyle(field_24360.setColor(Formatting.DARK_AQUA))));
         }
         // if inked, show progress
         if (tags.getBoolean("Inked")) {
-            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.itinerant_ink", tags.getInt("InkProgress"), tags.getInt("InkGoal")).formatted(Formatting.BLUE));
+            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.itinerant_ink", tags.getInt("InkProgress"), tags.getInt("InkGoal")).setStyle(field_24360.setColor(Formatting.BLUE)));
         }
         // camp coordinates if deployed
         if (stack.getOrCreateTag().getFloat(NomadBooks.MODID+":deployed") == 1.0f) {
             BlockPos pos = NbtHelper.toBlockPos(tags.getCompound("CampPos"));
             DimensionType dim = DimensionType.byRawId(tags.getInt("Dimension"));
-            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.position", pos.getX()+", "+pos.getY()+", "+pos.getZ()).formatted(Formatting.DARK_GRAY));
-            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.dimension", dim).formatted(Formatting.DARK_GRAY));
+            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.position", pos.getX()+", "+pos.getY()+", "+pos.getZ()).setStyle(field_24360.setColor(Formatting.DARK_GRAY)));
+            tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.dimension", dim).setStyle(field_24360.setColor(Formatting.DARK_GRAY)));
         }
         // displaying boundaries
         if (stack.getItem() instanceof NomadBookItem) {
             if (tags.getBoolean("DisplayBoundaries")) {
-                tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.boundaries_display").formatted(Formatting.GREEN).formatted(Formatting.ITALIC));
+                tooltip.add(new TranslatableText("item.nomadbooks.nomad_book.tooltip.boundaries_display").setStyle(field_24360.setColor(Formatting.GREEN).setItalic(true)));
             }
         }
     }

src/main/java/ladysnake/nomadbooks/common/recipe/NomadBookCraftRecipe.java

@@ -48,8 +48,8 @@ public NomadBookCraftRecipe(Identifier identifier) {
     public boolean matches(CraftingInventory craftingInventory, World world) {
         List<Item> list = Lists.newArrayList();
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            list.add(craftingInventory.getInvStack(i).getItem());
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            list.add(craftingInventory.getStack(i).getItem());
         }
 
         return list.equals(NOMAD_BOOK_RECIPE_1) || list.equals(NOMAD_BOOK_RECIPE_2);
@@ -58,8 +58,8 @@ public boolean matches(CraftingInventory craftingInventory, World world) {
     public ItemStack craft(CraftingInventory craftingInventory) {
         List<Item> list = Lists.newArrayList();
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            list.add(craftingInventory.getInvStack(i).getItem());
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            list.add(craftingInventory.getStack(i).getItem());
         }
 
         if (list.equals(NOMAD_BOOK_RECIPE_1) || list.equals(NOMAD_BOOK_RECIPE_2)) {

src/main/java/ladysnake/nomadbooks/common/recipe/NomadBookDismantleRecipe.java

@@ -1,7 +1,6 @@
 package ladysnake.nomadbooks.common.recipe;
 
 import ladysnake.nomadbooks.NomadBooks;
-import ladysnake.nomadbooks.common.item.NomadBookItem;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.util.NbtType;
@@ -20,8 +19,8 @@ public NomadBookDismantleRecipe(Identifier identifier) {
     public boolean matches(CraftingInventory craftingInventory, World world) {
         ItemStack book = null;
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack = craftingInventory.getStack(i);
             if (itemStack.getItem().equals(NomadBooks.NOMAD_BOOK)) {
                 book = itemStack;
             } else if (!itemStack.isEmpty()) {
@@ -35,8 +34,8 @@ public boolean matches(CraftingInventory craftingInventory, World world) {
     public ItemStack craft(CraftingInventory craftingInventory) {
         ItemStack book = null;
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack = craftingInventory.getStack(i);
             if (itemStack.getItem().equals(NomadBooks.NOMAD_BOOK)) {
                 book = itemStack;
             } else if (!itemStack.isEmpty()) {

src/main/java/ladysnake/nomadbooks/common/recipe/NomadBookHeightUpgradeRecipe.java

@@ -23,8 +23,8 @@ public boolean matches(CraftingInventory craftingInventory, World world) {
         ItemStack itemStack = ItemStack.EMPTY;
         List<ItemStack> list = Lists.newArrayList();
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack2 = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack2 = craftingInventory.getStack(i);
             if (!itemStack2.isEmpty()) {
                 if (itemStack2.getItem().equals(NomadBooks.NOMAD_BOOK)) {
                     if (!itemStack.isEmpty()) {
@@ -49,8 +49,8 @@ public ItemStack craft(CraftingInventory craftingInventory) {
         List<Item> list = Lists.newArrayList();
         ItemStack itemStack = ItemStack.EMPTY;
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack2 = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack2 = craftingInventory.getStack(i);
             if (!itemStack2.isEmpty()) {
                 Item item = itemStack2.getItem();
                 if (item.equals(NomadBooks.NOMAD_BOOK)) {

src/main/java/ladysnake/nomadbooks/common/recipe/NomadBookInkRecipe.java

@@ -24,8 +24,8 @@ public boolean matches(CraftingInventory craftingInventory, World world) {
         List<Item> ingredients = Lists.newArrayList();
         ItemStack book = null;
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack = craftingInventory.getStack(i);
             Item item = itemStack.getItem();
             if (item.equals(NomadBooks.NOMAD_BOOK)) {
                 book = itemStack;
@@ -41,8 +41,8 @@ public ItemStack craft(CraftingInventory craftingInventory) {
         List<Item> ingredients = Lists.newArrayList();
         ItemStack book = null;
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack = craftingInventory.getStack(i);
             Item item = itemStack.getItem();
             if (item.equals(NomadBooks.NOMAD_BOOK)) {
                 book = itemStack;

src/main/java/ladysnake/nomadbooks/common/recipe/NomadBookUpgradeRecipe.java

@@ -1,6 +1,5 @@
 package ladysnake.nomadbooks.common.recipe;
 
-import com.google.common.collect.Lists;
 import ladysnake.nomadbooks.NomadBooks;
 import ladysnake.nomadbooks.common.item.BookUpgradeItem;
 import net.fabricmc.api.EnvType;
@@ -15,8 +14,6 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 
-import java.util.List;
-
 public class NomadBookUpgradeRecipe extends SpecialCraftingRecipe {
     public NomadBookUpgradeRecipe(Identifier identifier) {
         super(identifier);
@@ -26,8 +23,8 @@ public boolean matches(CraftingInventory craftingInventory, World world) {
         ItemStack book = null;
         String upgrade = null;
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack = craftingInventory.getStack(i);
             if (book == null && itemStack.getItem().equals(NomadBooks.NOMAD_BOOK)) {
                 book = itemStack;
             } else if (upgrade == null && itemStack.getItem() instanceof BookUpgradeItem) {
@@ -44,8 +41,8 @@ public ItemStack craft(CraftingInventory craftingInventory) {
         ItemStack book = null;
         String upgrade = null;
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            ItemStack itemStack = craftingInventory.getInvStack(i);
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            ItemStack itemStack = craftingInventory.getStack(i);
             if (book == null && itemStack.getItem().equals(NomadBooks.NOMAD_BOOK)) {
                 book = itemStack;
             } else if (upgrade == null && itemStack.getItem() instanceof BookUpgradeItem) {

src/main/java/ladysnake/nomadbooks/common/recipe/NomadPageCraftRecipe.java

@@ -48,8 +48,8 @@ public NomadPageCraftRecipe(Identifier identifier) {
     public boolean matches(CraftingInventory craftingInventory, World world) {
         List<Item> list = Lists.newArrayList();
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-             list.add(craftingInventory.getInvStack(i).getItem());
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+             list.add(craftingInventory.getStack(i).getItem());
         }
 
         return list.equals(NOMAD_PAGE_RECIPE_1) || list.equals(NOMAD_PAGE_RECIPE_2);
@@ -58,8 +58,8 @@ public boolean matches(CraftingInventory craftingInventory, World world) {
     public ItemStack craft(CraftingInventory craftingInventory) {
         List<Item> list = Lists.newArrayList();
 
-        for(int i = 0; i < craftingInventory.getInvSize(); ++i) {
-            list.add(craftingInventory.getInvStack(i).getItem());
+        for(int i = 0; i < craftingInventory.size(); ++i) {
+            list.add(craftingInventory.getStack(i).getItem());
         }
 
         if (list.equals(NOMAD_PAGE_RECIPE_1) || list.equals(NOMAD_PAGE_RECIPE_2)) {

src/main/java/ladysnake/nomadbooks/mixin/ClientPlayerEntityMixin.java

@@ -25,8 +25,8 @@ public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
     @Inject(at = @At(value = "HEAD"), method = "tick")
     private void displayBoundaries(CallbackInfo info) {
         if (world.getTime() % 10 == 0) {
-            for (int i = 0; i < this.inventory.getInvSize(); ++i) {
-                ItemStack itemStack = this.inventory.getInvStack(i);
+            for (int i = 0; i < this.inventory.size(); ++i) {
+                ItemStack itemStack = this.inventory.getStack(i);
                 if (itemStack.getItem() instanceof NomadBookItem) {
                     CompoundTag tags = itemStack.getOrCreateSubTag(NomadBooks.MODID);
                     if (tags.getBoolean("DisplayBoundaries")) {