From 56d8289ed22ca9d9b8893f877544de62eff08cb3 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Fri, 27 Sep 2019 21:43:15 -0400 Subject: [PATCH] Update to the latest forge. Rename PacketUpdateSavePage -> UpdateSavedPagePacket to match vanilla and add 'Item' to the name of the ArmorTooltip class. --- gradle.properties | 2 +- .../mantle/client/book/BookLoader.java | 6 +- ...rmorTooltip.java => ArmorTooltipItem.java} | 4 +- ...edPage.java => UpdateSavedPagePacket.java} | 92 +++++++++---------- 4 files changed, 52 insertions(+), 52 deletions(-) rename src/main/java/slimeknights/mantle/item/{ArmorTooltip.java => ArmorTooltipItem.java} (83%) rename src/main/java/slimeknights/mantle/network/book/{PacketUpdateSavedPage.java => UpdateSavedPagePacket.java} (83%) diff --git a/gradle.properties b/gradle.properties index 6a47ea4..9eaefd0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ minecraft_version=1.14.4 minecraft_version_toml=14 # Forge Version Information -forge_version=28.1.1 +forge_version=28.1.24 forge_version_toml=28 # Mappings Information diff --git a/src/main/java/slimeknights/mantle/client/book/BookLoader.java b/src/main/java/slimeknights/mantle/client/book/BookLoader.java index 83494d7..4395c86 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookLoader.java +++ b/src/main/java/slimeknights/mantle/client/book/BookLoader.java @@ -17,7 +17,7 @@ import slimeknights.mantle.client.book.data.content.*; import slimeknights.mantle.client.book.data.deserializer.HexStringDeserializer; import slimeknights.mantle.client.book.repository.BookRepository; import slimeknights.mantle.network.NetworkWrapper; -import slimeknights.mantle.network.book.PacketUpdateSavedPage; +import slimeknights.mantle.network.book.UpdateSavedPagePacket; import javax.annotation.Nonnull; import java.util.HashMap; @@ -38,7 +38,7 @@ public class BookLoader implements IResourceManagerReloadListener { private static final NetworkWrapper wrapper = new NetworkWrapper("mantle:books"); public BookLoader() { - wrapper.registerPacket(PacketUpdateSavedPage.class, PacketUpdateSavedPage::encode, PacketUpdateSavedPage::new, PacketUpdateSavedPage::handle); + wrapper.registerPacket(UpdateSavedPagePacket.class, UpdateSavedPagePacket::encode, UpdateSavedPagePacket::new, UpdateSavedPagePacket::handle); // Register page types registerPageType("blank", ContentBlank.class); @@ -130,7 +130,7 @@ public class BookLoader implements IResourceManagerReloadListener { } BookHelper.writeSavedPage(item, page); - wrapper.network.sendToServer(new PacketUpdateSavedPage(page)); + wrapper.network.sendToServer(new UpdateSavedPagePacket(page)); } /** diff --git a/src/main/java/slimeknights/mantle/item/ArmorTooltip.java b/src/main/java/slimeknights/mantle/item/ArmorTooltipItem.java similarity index 83% rename from src/main/java/slimeknights/mantle/item/ArmorTooltip.java rename to src/main/java/slimeknights/mantle/item/ArmorTooltipItem.java index 48f3b4a..48323bc 100644 --- a/src/main/java/slimeknights/mantle/item/ArmorTooltip.java +++ b/src/main/java/slimeknights/mantle/item/ArmorTooltipItem.java @@ -14,9 +14,9 @@ import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nullable; import java.util.List; -public class ArmorTooltip extends ArmorItem { +public class ArmorTooltipItem extends ArmorItem { - public ArmorTooltip(IArmorMaterial armorMaterial, EquipmentSlotType equipmentSlot, Item.Properties builder) { + public ArmorTooltipItem(IArmorMaterial armorMaterial, EquipmentSlotType equipmentSlot, Item.Properties builder) { super(armorMaterial, equipmentSlot, builder); } diff --git a/src/main/java/slimeknights/mantle/network/book/PacketUpdateSavedPage.java b/src/main/java/slimeknights/mantle/network/book/UpdateSavedPagePacket.java similarity index 83% rename from src/main/java/slimeknights/mantle/network/book/PacketUpdateSavedPage.java rename to src/main/java/slimeknights/mantle/network/book/UpdateSavedPagePacket.java index e17cfb3..207cbbd 100644 --- a/src/main/java/slimeknights/mantle/network/book/PacketUpdateSavedPage.java +++ b/src/main/java/slimeknights/mantle/network/book/UpdateSavedPagePacket.java @@ -1,46 +1,46 @@ -package slimeknights.mantle.network.book; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Hand; -import net.minecraftforge.fml.network.NetworkEvent; -import slimeknights.mantle.client.book.BookHelper; -import slimeknights.mantle.network.AbstractPacket; - -import java.util.function.Supplier; - -public class PacketUpdateSavedPage extends AbstractPacket { - - private String pageName; - - public PacketUpdateSavedPage(String pageName) { - this.pageName = pageName; - } - - public PacketUpdateSavedPage(PacketBuffer buffer) { - this.pageName = buffer.readString(32767); - } - - @Override - public void encode(PacketBuffer buf) { - buf.writeString(this.pageName); - } - - @Override - public void handle(Supplier context) { - context.get().enqueueWork(() -> { - if (context.get().getSender() != null && this.pageName != null) { - PlayerEntity player = context.get().getSender(); - - ItemStack is = player.getHeldItem(Hand.MAIN_HAND); - - if (!is.isEmpty()) { - BookHelper.writeSavedPage(is, this.pageName); - } - } - }); - - context.get().setPacketHandled(true); - } -} +package slimeknights.mantle.network.book; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.Hand; +import net.minecraftforge.fml.network.NetworkEvent; +import slimeknights.mantle.client.book.BookHelper; +import slimeknights.mantle.network.AbstractPacket; + +import java.util.function.Supplier; + +public class UpdateSavedPagePacket extends AbstractPacket { + + private String pageName; + + public UpdateSavedPagePacket(String pageName) { + this.pageName = pageName; + } + + public UpdateSavedPagePacket(PacketBuffer buffer) { + this.pageName = buffer.readString(32767); + } + + @Override + public void encode(PacketBuffer buf) { + buf.writeString(this.pageName); + } + + @Override + public void handle(Supplier context) { + context.get().enqueueWork(() -> { + if (context.get().getSender() != null && this.pageName != null) { + PlayerEntity player = context.get().getSender(); + + ItemStack is = player.getHeldItem(Hand.MAIN_HAND); + + if (!is.isEmpty()) { + BookHelper.writeSavedPage(is, this.pageName); + } + } + }); + + context.get().setPacketHandled(true); + } +}