Compiles for 1.9! Very buggy, some things are missing.

This commit is contained in:
mezz committed 2016-05-05 01:11:21 -07:00
1 parent 5d74c1254b
commit 7bf554b024
135 files changed
+1710 -1919

No files matched your search

+5 -4
View File
@@ -71,10 +71,11 @@ public class PluginMail extends BlankForestryPlugin {
blocks.mail.addDefinitions(BlockTypeMail.VALUES);
}
@Override
public void registerTriggers() {
MailTriggers.initialize();
}
// TODO: Buildcraft for 1.9
// @Override
// public void registerTriggers() {
// MailTriggers.initialize();
// }
@Override
public void doInit() {
@@ -22,8 +22,8 @@ import forestry.mail.tiles.TileTrader;
public enum BlockTypeMail implements IBlockType {
MAILBOX(0, TileMailbox.class, "mailbox"),
TRADE_STATION(1, TileTrader.class, "trade.station"),
PHILATELIST(2, TileStampCollector.class, "stamp.collector");
TRADE_STATION(1, TileTrader.class, "trade_station"),
PHILATELIST(2, TileStampCollector.class, "stamp_collector");
public static final BlockTypeMail[] VALUES = values();
@@ -179,7 +179,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe
super.detectAndSendChanges();
if (needsSynch) {
for (ICrafting crafter : crafters) {
for (ICrafting crafter : listeners) {
crafter.sendProgressBarUpdate(this, 0, stationIndex);
crafter.sendProgressBarUpdate(this, 1, stations.size());
crafter.sendProgressBarUpdate(this, 2, currentFilter);
@@ -19,6 +19,8 @@ import net.minecraft.world.World;
import com.mojang.authlib.GameProfile;
import net.minecraftforge.fml.common.FMLCommonHandler;
import forestry.api.mail.EnumAddressee;
import forestry.api.mail.ILetter;
import forestry.api.mail.IMailAddress;
@@ -121,7 +123,7 @@ public class ContainerLetter extends ContainerItemInventory<ItemInventoryLetter>
}
public void handleRequestLetterInfo(EntityPlayer player, String recipientName, EnumAddressee type) {
IMailAddress recipient = getRecipient(recipientName, type);
IMailAddress recipient = getRecipient(player.getServer(), recipientName, type);
getLetter().setRecipient(recipient);
@@ -134,10 +136,10 @@ public class ContainerLetter extends ContainerItemInventory<ItemInventoryLetter>
Proxies.net.sendToPlayer(new PacketLetterInfoResponse(type, tradeInfo, recipient), player);
}
private static IMailAddress getRecipient(String recipientName, EnumAddressee type) {
private static IMailAddress getRecipient(MinecraftServer minecraftServer, String recipientName, EnumAddressee type) {
switch (type) {
case PLAYER: {
GameProfile gameProfile = MinecraftServer.getServer().getPlayerProfileCache().getGameProfileForUsername(recipientName);
GameProfile gameProfile = minecraftServer.getPlayerProfileCache().getGameProfileForUsername(recipientName);
if (gameProfile == null) {
gameProfile = new GameProfile(new UUID(0, 0), recipientName);
}
@@ -12,6 +12,7 @@ package forestry.mail.gui;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ClickType;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -49,10 +50,10 @@ public class ContainerMailbox extends ContainerTile<TileMailbox> {
}
@Override
public ItemStack slotClick(int slotIndex, int button, int par3, EntityPlayer player) {
ItemStack stack = super.slotClick(slotIndex, button, par3, player);
public ItemStack slotClick(int slotId, int dragType_or_button, ClickType clickTypeIn, EntityPlayer player) {
ItemStack stack = super.slotClick(slotId, dragType_or_button, clickTypeIn, player);
if (SlotUtil.isSlotInRange(slotIndex, SLOT_LETTERS, SLOT_LETTERS_COUNT)) {
if (SlotUtil.isSlotInRange(slotId, SLOT_LETTERS, SLOT_LETTERS_COUNT)) {
if (!player.worldObj.isRemote && mailInventory != null) {
POBoxInfo info = mailInventory.getPOBoxInfo();
Proxies.net.sendToPlayer(new PacketPOBoxInfoUpdate(info), player);
@@ -31,10 +31,10 @@ public class ContainerTradeName extends ContainerTile<TileTrader> {
super.detectAndSendChanges();
if (tile.isLinked()) {
for (Object crafter : crafters) {
for (Object crafter : listeners) {
if (crafter instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) crafter;
tile.openGui(player);
tile.openGui(player, player.getHeldItemMainhand());
}
}
}
@@ -11,11 +11,15 @@
package forestry.mail.gui;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.init.SoundEvents;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.world.World;
import forestry.core.config.Config;
import forestry.core.config.Constants;
@@ -92,7 +96,9 @@ public class GuiMailboxInfo extends Gui {
}
if (playJingle) {
Proxies.common.getRenderWorld().playSoundAtEntity(Proxies.common.getClientInstance().thePlayer, "random.levelup", 1.0f, 1.0f);
EntityPlayerSP thePlayer = Proxies.common.getClientInstance().thePlayer;
World world = Proxies.common.getRenderWorld();
world.playSound(null, thePlayer.posX, thePlayer.posY, thePlayer.posZ, SoundEvents.ENTITY_PLAYER_LEVELUP, SoundCategory.PLAYERS, 1.0f, 1.0F);
}
this.poInfo = info;
@@ -17,6 +17,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
@@ -39,16 +42,13 @@ public class ItemLetter extends ItemWithGui {
}
@Override
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) {
if (!world.isRemote) {
if (itemstack.stackSize == 1) {
openGui(entityplayer);
} else {
entityplayer.addChatMessage(new TextComponentTranslation("for.chat.mail.wrongstacksize"));
}
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) {
if (itemStackIn.stackSize == 1) {
return super.onItemRightClick(itemStackIn, worldIn, playerIn, hand);
} else {
playerIn.addChatMessage(new TextComponentTranslation("for.chat.mail.wrongstacksize"));
return ActionResult.newResult(EnumActionResult.FAIL, itemStackIn);
}
return itemstack;
}
@Override
@@ -10,21 +10,14 @@
******************************************************************************/
package forestry.mail.tiles;
import java.util.Collection;
import java.util.LinkedList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World;
import com.mojang.authlib.GameProfile;
import net.minecraftforge.fml.common.Optional;
import forestry.api.mail.ILetter;
import forestry.api.mail.IMailAddress;
import forestry.api.mail.IPostalState;
@@ -36,9 +29,6 @@ import forestry.mail.POBox;
import forestry.mail.PostRegistry;
import forestry.mail.gui.ContainerMailbox;
import forestry.mail.gui.GuiMailbox;
import forestry.mail.triggers.MailTriggers;
import buildcraft.api.statements.ITriggerExternal;
public class TileMailbox extends TileBase implements IMailContainer {
@@ -114,13 +104,14 @@ public class TileMailbox extends TileBase implements IMailContainer {
return false;
}
@Optional.Method(modid = "BuildCraftAPI|statements")
@Override
public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
LinkedList<ITriggerExternal> res = new LinkedList<>();
res.add(MailTriggers.triggerHasMail);
return res;
}
// TODO: Buildcraft for 1.9
// @Optional.Method(modid = "BuildCraftAPI|statements")
// @Override
// public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
// LinkedList<ITriggerExternal> res = new LinkedList<>();
// res.add(MailTriggers.triggerHasMail);
// return res;
// }
@Override
public Object getGui(EntityPlayer player, int data) {
@@ -11,18 +11,12 @@
package forestry.mail.tiles;
import java.io.IOException;
import java.util.Collection;
import java.util.LinkedList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.Optional;
import forestry.api.core.IErrorLogic;
import forestry.api.mail.IMailAddress;
@@ -44,9 +38,6 @@ import forestry.mail.gui.GuiTradeName;
import forestry.mail.gui.GuiTrader;
import forestry.mail.inventory.InventoryTradeStation;
import forestry.mail.network.packets.PacketTraderAddressResponse;
import forestry.mail.triggers.MailTriggers;
import buildcraft.api.statements.ITriggerExternal;
public class TileTrader extends TileBase {
@@ -59,7 +50,7 @@ public class TileTrader extends TileBase {
}
@Override
public void openGui(EntityPlayer player) {
public void openGui(EntityPlayer player, ItemStack heldItem) {
short data = (short) (isLinked() ? 0 : 1);
GuiHandler.openGui(player, this, data);
}
@@ -312,20 +303,21 @@ public class TileTrader extends TileBase {
return (TradeStation) PostManager.postRegistry.getOrCreateTradeStation(worldObj, getAccessHandler().getOwner(), address);
}
@Optional.Method(modid = "BuildCraftAPI|statements")
@Override
public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
LinkedList<ITriggerExternal> res = new LinkedList<>();
res.add(MailTriggers.lowPaper64);
res.add(MailTriggers.lowPaper32);
res.add(MailTriggers.lowInput25);
res.add(MailTriggers.lowInput10);
res.add(MailTriggers.lowPostage40);
res.add(MailTriggers.lowPostage20);
res.add(MailTriggers.highBuffer90);
res.add(MailTriggers.highBuffer75);
return res;
}
// TODO: Buildcraft for 1.9
// @Optional.Method(modid = "BuildCraftAPI|statements")
// @Override
// public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
// LinkedList<ITriggerExternal> res = new LinkedList<>();
// res.add(MailTriggers.lowPaper64);
// res.add(MailTriggers.lowPaper32);
// res.add(MailTriggers.lowInput25);
// res.add(MailTriggers.lowInput10);
// res.add(MailTriggers.lowPostage40);
// res.add(MailTriggers.lowPostage20);
// res.add(MailTriggers.highBuffer90);
// res.add(MailTriggers.highBuffer75);
// return res;
// }
@Override
public Object getGui(EntityPlayer player, int data) {
@@ -10,28 +10,27 @@
******************************************************************************/
package forestry.mail.triggers;
import forestry.core.triggers.Trigger;
// TODO: Buildcraft for 1.9
public class MailTriggers {
public static Trigger triggerHasMail;
public static Trigger lowPaper64;
public static Trigger lowPaper32;
public static Trigger lowPostage40;
public static Trigger lowPostage20;
public static Trigger lowInput25;
public static Trigger lowInput10;
public static Trigger highBuffer75;
public static Trigger highBuffer90;
public static void initialize() {
triggerHasMail = new TriggerHasMail();
lowPaper64 = new TriggerLowPaper("mail.lowPaper.64", 64);
lowPaper32 = new TriggerLowPaper("mail.lowPaper.32", 32);
lowPostage40 = new TriggerLowStamps("mail.lowStamps.40", 40);
lowPostage20 = new TriggerLowStamps("mail.lowStamps.20", 20);
lowInput25 = new TriggerLowInput("mail.lowInput.25", 0.25f);
lowInput10 = new TriggerLowInput("mail.lowInput.10", 0.1f);
highBuffer75 = new TriggerBuffer("mail.lowBuffer.75", 0.75f);
highBuffer90 = new TriggerBuffer("mail.lowBuffer.90", 0.90f);
}
// public static Trigger triggerHasMail;
// public static Trigger lowPaper64;
// public static Trigger lowPaper32;
// public static Trigger lowPostage40;
// public static Trigger lowPostage20;
// public static Trigger lowInput25;
// public static Trigger lowInput10;
// public static Trigger highBuffer75;
// public static Trigger highBuffer90;
//
// public static void initialize() {
// triggerHasMail = new TriggerHasMail();
// lowPaper64 = new TriggerLowPaper("mail.lowPaper.64", 64);
// lowPaper32 = new TriggerLowPaper("mail.lowPaper.32", 32);
// lowPostage40 = new TriggerLowStamps("mail.lowStamps.40", 40);
// lowPostage20 = new TriggerLowStamps("mail.lowStamps.20", 20);
// lowInput25 = new TriggerLowInput("mail.lowInput.25", 0.25f);
// lowInput10 = new TriggerLowInput("mail.lowInput.10", 0.1f);
// highBuffer75 = new TriggerBuffer("mail.lowBuffer.75", 0.75f);
// highBuffer90 = new TriggerBuffer("mail.lowBuffer.90", 0.90f);
// }
}
@@ -10,36 +10,28 @@
******************************************************************************/
package forestry.mail.triggers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
// TODO: Buildcraft for 1.9
public class TriggerBuffer {//extends Trigger {
import forestry.core.triggers.Trigger;
import forestry.mail.tiles.TileTrader;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
public class TriggerBuffer extends Trigger {
private final float threshold;
public TriggerBuffer(String tag, float threshold) {
super(tag, "mailBuffer");
this.threshold = threshold;
}
@Override
public String getDescription() {
return super.getDescription() + " > " + threshold * 100 + "%";
}
@Override
public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
if (!(tile instanceof TileTrader)) {
return false;
}
return ((TileTrader) tile).hasOutputBufMin(threshold);
}
// private final float threshold;
//
// public TriggerBuffer(String tag, float threshold) {
// super(tag, "mailBuffer");
// this.threshold = threshold;
// }
//
// @Override
// public String getDescription() {
// return super.getDescription() + " > " + threshold * 100 + "%";
// }
//
// @Override
// public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
//
// if (!(tile instanceof TileTrader)) {
// return false;
// }
//
// return ((TileTrader) tile).hasOutputBufMin(threshold);
// }
}
@@ -10,29 +10,21 @@
******************************************************************************/
package forestry.mail.triggers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
// TODO: Buildcraft for 1.9
public class TriggerHasMail {//extends Trigger {
import forestry.core.triggers.Trigger;
import forestry.mail.tiles.IMailContainer;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
public class TriggerHasMail extends Trigger {
public TriggerHasMail() {
super("mail.hasMail", "hasMail");
}
@Override
public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
if (!(tile instanceof IMailContainer)) {
return false;
}
return ((IMailContainer) tile).hasMail();
}
// public TriggerHasMail() {
// super("mail.hasMail", "hasMail");
// }
//
// @Override
// public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
//
// if (!(tile instanceof IMailContainer)) {
// return false;
// }
//
// return ((IMailContainer) tile).hasMail();
// }
}
@@ -10,36 +10,28 @@
******************************************************************************/
package forestry.mail.triggers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
// TODO: Buildcraft for 1.9
public class TriggerLowInput {//extends Trigger {
import forestry.core.triggers.Trigger;
import forestry.mail.tiles.TileTrader;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
public class TriggerLowInput extends Trigger {
private final float threshold;
public TriggerLowInput(String tag, float threshold) {
super(tag, "lowInput");
this.threshold = threshold;
}
@Override
public String getDescription() {
return super.getDescription() + " < " + threshold * 100 + "%";
}
@Override
public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
if (!(tile instanceof TileTrader)) {
return false;
}
return !((TileTrader) tile).hasInputBufMin(threshold);
}
// private final float threshold;
//
// public TriggerLowInput(String tag, float threshold) {
// super(tag, "lowInput");
// this.threshold = threshold;
// }
//
// @Override
// public String getDescription() {
// return super.getDescription() + " < " + threshold * 100 + "%";
// }
//
// @Override
// public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
//
// if (!(tile instanceof TileTrader)) {
// return false;
// }
//
// return !((TileTrader) tile).hasInputBufMin(threshold);
// }
}
@@ -10,37 +10,29 @@
******************************************************************************/
package forestry.mail.triggers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
// TODO: Buildcraft for 1.9
public class TriggerLowPaper {//} extends Trigger {
import forestry.core.triggers.Trigger;
import forestry.mail.tiles.TileTrader;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
public class TriggerLowPaper extends Trigger {
private final int threshold;
public TriggerLowPaper(String tag, int threshold) {
super(tag, "lowPaper");
this.threshold = threshold;
}
@Override
public String getDescription() {
return super.getDescription() + " < " + threshold;
}
@Override
public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
if (!(tile instanceof TileTrader)) {
return false;
}
return !((TileTrader) tile).hasPaperMin(threshold);
}
// private final int threshold;
//
// public TriggerLowPaper(String tag, int threshold) {
// super(tag, "lowPaper");
// this.threshold = threshold;
// }
//
// @Override
// public String getDescription() {
// return super.getDescription() + " < " + threshold;
// }
//
// @Override
// public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
//
// if (!(tile instanceof TileTrader)) {
// return false;
// }
//
// return !((TileTrader) tile).hasPaperMin(threshold);
// }
}
@@ -10,37 +10,29 @@
******************************************************************************/
package forestry.mail.triggers;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import forestry.core.triggers.Trigger;
import forestry.mail.tiles.TileTrader;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
public class TriggerLowStamps extends Trigger {
private final int threshold;
public TriggerLowStamps(String tag, int threshold) {
super(tag, "lowStamps");
this.threshold = threshold;
}
@Override
public String getDescription() {
return super.getDescription() + " < " + threshold + "p";
}
@Override
public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
if (!(tile instanceof TileTrader)) {
return false;
}
return !((TileTrader) tile).hasPostageMin(threshold);
}
// TODO: Buildcraft for 1.9
public class TriggerLowStamps {//extends Trigger {
//
// private final int threshold;
//
// public TriggerLowStamps(String tag, int threshold) {
// super(tag, "lowStamps");
// this.threshold = threshold;
// }
//
// @Override
// public String getDescription() {
// return super.getDescription() + " < " + threshold + "p";
// }
//
// @Override
// public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
//
// if (!(tile instanceof TileTrader)) {
// return false;
// }
//
// return !((TileTrader) tile).hasPostageMin(threshold);
// }
}