diff --git a/src/main/java/tauri/dev/jsg/item/notebook/PageNotebookItem.java b/src/main/java/tauri/dev/jsg/item/notebook/PageNotebookItem.java index 1f71bb02..ee2b4c31 100644 --- a/src/main/java/tauri/dev/jsg/item/notebook/PageNotebookItem.java +++ b/src/main/java/tauri/dev/jsg/item/notebook/PageNotebookItem.java @@ -76,6 +76,7 @@ public void registerCustomModel(IRegistry re public void setCustomModelLocation() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName() + "_empty", "inventory")); ModelLoader.setCustomModelResourceLocation(this, 1, new ModelResourceLocation(getRegistryName() + "_filled", "inventory")); + ModelLoader.setCustomModelResourceLocation(this, 2, new ModelResourceLocation(getRegistryName() + "_end", "inventory")); } @Nonnull @@ -132,10 +133,13 @@ public TileEntityItemStackRenderer createTEISR() { } @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + public void addInformation(ItemStack stack, World world, @Nonnull List tooltip, @Nonnull ITooltipFlag flag) { if (stack.getItemDamage() == 0) { tooltip.add(JSG.proxy.localize("item.jsg.page_notebook.empty")); } + else if (stack.getItemDamage() == 2) { + tooltip.add(JSG.proxy.localize("item.jsg.page_notebook.end")); + } else { if (stack.hasTagCompound()) { diff --git a/src/main/java/tauri/dev/jsg/packet/gui/entry/EntryActionToServer.java b/src/main/java/tauri/dev/jsg/packet/gui/entry/EntryActionToServer.java index fa89872d..257a1785 100644 --- a/src/main/java/tauri/dev/jsg/packet/gui/entry/EntryActionToServer.java +++ b/src/main/java/tauri/dev/jsg/packet/gui/entry/EntryActionToServer.java @@ -14,6 +14,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import tauri.dev.jsg.JSG; import tauri.dev.jsg.item.JSGItems; import tauri.dev.jsg.item.linkable.dialer.UniverseDialerItem; import tauri.dev.jsg.item.linkable.dialer.UniverseDialerMode; @@ -29,6 +30,7 @@ import tauri.dev.jsg.util.BlockHelpers; import java.nio.charset.StandardCharsets; +import java.util.Map; public class EntryActionToServer implements IMessage { private EnumHand hand; @@ -300,6 +302,12 @@ public IMessage onMessage(EntryActionToServer message, MessageContext ctx) { int originId; if (message.index == 1) { // gate is not generated - there is no tileEntity + StargateNetwork sgn = StargateNetwork.get(world); + Map map = sgn.getMapNotGenerated().get(message.targetGatePos); + if(map == null){ + JSG.info("Lol123"); + continue; + } address = StargateNetwork.get(world).getMapNotGenerated().get(message.targetGatePos).get(s); originId = StargateClassicBaseTile.getOriginId(null, message.targetGatePos.dimensionID, -1); } else { diff --git a/src/main/resources/assets/jsg/loot_tables/stronghold.json b/src/main/resources/assets/jsg/loot_tables/stronghold.json index ced61b2d..a5c636b2 100644 --- a/src/main/resources/assets/jsg/loot_tables/stronghold.json +++ b/src/main/resources/assets/jsg/loot_tables/stronghold.json @@ -7,7 +7,9 @@ { "type": "item", "name": "jsg:page_notebook", - "data": 1, + "data": 2, + "meta": 2, + "damage": 2, "weight": 100, "functions" : [ { diff --git a/src/main/resources/assets/jsg/models/item/page_notebook_end.json b/src/main/resources/assets/jsg/models/item/page_notebook_end.json new file mode 100644 index 00000000..2781b50f --- /dev/null +++ b/src/main/resources/assets/jsg/models/item/page_notebook_end.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "jsg:items/page_base", + "layer1": "jsg:items/notebook_page_end" + } +} diff --git a/src/main/resources/assets/jsg/textures/items/notebook_page_end.png b/src/main/resources/assets/jsg/textures/items/notebook_page_end.png new file mode 100644 index 00000000..61a7ad35 Binary files /dev/null and b/src/main/resources/assets/jsg/textures/items/notebook_page_end.png differ