Update to the latest forge. Rename PacketUpdateSavePage -> UpdateSavedPagePacket to match vanilla and add 'Item' to the name of the ArmorTooltip class.

This commit is contained in:
alexbegt committed 2019-09-27 21:43:24 -04:00
1 parent f8572ced09
commit 56d8289ed2
4 files changed
+52 -52

No files matched your search

@@ -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));
}
/**
@@ -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);
}
@@ -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<NetworkEvent.Context> 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<NetworkEvent.Context> 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);
}
}