mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Compiles for 1.9! Very buggy, some things are missing.
This commit is contained in:
1 parent
5d74c1254b
commit
7bf554b024
135 files changed
+1710
-1919
No files matched your search
@@ -69,7 +69,7 @@ public class ContainerFabricator extends ContainerLiquidTanks<TileFabricator> im
|
||||
public void detectAndSendChanges() {
|
||||
super.detectAndSendChanges();
|
||||
|
||||
for (ICrafting crafter : crafters) {
|
||||
for (ICrafting crafter : listeners) {
|
||||
tile.sendGUINetworkData(this, crafter);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ public class ContainerFermenter extends ContainerLiquidTanks<TileFermenter> {
|
||||
public void detectAndSendChanges() {
|
||||
super.detectAndSendChanges();
|
||||
|
||||
for (ICrafting crafter : crafters) {
|
||||
for (ICrafting crafter : listeners) {
|
||||
tile.sendGUINetworkData(this, crafter);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ public class ContainerMoistener extends ContainerLiquidTanks<TileMoistener> impl
|
||||
public void detectAndSendChanges() {
|
||||
super.detectAndSendChanges();
|
||||
|
||||
for (ICrafting crafter : crafters) {
|
||||
for (ICrafting crafter : listeners) {
|
||||
tile.sendGUINetworkData(this, crafter);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class ContainerRaintank extends ContainerLiquidTanks<TileRaintank> {
|
||||
public void detectAndSendChanges() {
|
||||
super.detectAndSendChanges();
|
||||
|
||||
for (ICrafting crafter : crafters) {
|
||||
for (ICrafting crafter : listeners) {
|
||||
tile.sendGUINetworkData(this, crafter);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,21 +11,17 @@
|
||||
package forestry.factory.tiles;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedList;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.core.config.Constants;
|
||||
@@ -43,9 +39,6 @@ import forestry.factory.gui.ContainerBottler;
|
||||
import forestry.factory.gui.GuiBottler;
|
||||
import forestry.factory.inventory.InventoryBottler;
|
||||
import forestry.factory.recipes.BottlerRecipe;
|
||||
import forestry.factory.triggers.FactoryTriggers;
|
||||
|
||||
import buildcraft.api.statements.ITriggerExternal;
|
||||
|
||||
public class TileBottler extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler {
|
||||
private static final int TICKS_PER_RECIPE_TIME = 5;
|
||||
@@ -197,14 +190,15 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid
|
||||
}
|
||||
|
||||
/* ITRIGGERPROVIDER */
|
||||
@Optional.Method(modid = "BuildCraftAPI|statements")
|
||||
@Override
|
||||
public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
|
||||
LinkedList<ITriggerExternal> res = new LinkedList<>();
|
||||
res.add(FactoryTriggers.lowResource25);
|
||||
res.add(FactoryTriggers.lowResource10);
|
||||
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(FactoryTriggers.lowResource25);
|
||||
// res.add(FactoryTriggers.lowResource10);
|
||||
// return res;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public Object getGui(EntityPlayer player, int data) {
|
||||
|
||||
@@ -12,7 +12,6 @@ package forestry.factory.tiles;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedList;
|
||||
import java.util.Stack;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -20,10 +19,6 @@ import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.CircuitSocketType;
|
||||
@@ -44,9 +39,6 @@ import forestry.factory.gui.ContainerCentrifuge;
|
||||
import forestry.factory.gui.GuiCentrifuge;
|
||||
import forestry.factory.inventory.InventoryCentrifuge;
|
||||
import forestry.factory.recipes.CentrifugeRecipeManager;
|
||||
import forestry.factory.triggers.FactoryTriggers;
|
||||
|
||||
import buildcraft.api.statements.ITriggerExternal;
|
||||
|
||||
public class TileCentrifuge extends TilePowered implements ISocketable, ISidedInventory {
|
||||
private static final int TICKS_PER_RECIPE_TIME = 1;
|
||||
@@ -196,14 +188,15 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn
|
||||
}
|
||||
|
||||
/* ITRIGGERPROVIDER */
|
||||
@Optional.Method(modid = "BuildCraftAPI|statements")
|
||||
@Override
|
||||
public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
|
||||
LinkedList<ITriggerExternal> res = new LinkedList<>();
|
||||
res.add(FactoryTriggers.lowResource25);
|
||||
res.add(FactoryTriggers.lowResource10);
|
||||
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(FactoryTriggers.lowResource25);
|
||||
// res.add(FactoryTriggers.lowResource10);
|
||||
// return res;
|
||||
// }
|
||||
|
||||
/* ISocketable */
|
||||
@Override
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
package forestry.factory.tiles;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedList;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
@@ -20,14 +18,12 @@ import net.minecraft.inventory.ICrafting;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.api.fuels.FermenterFuel;
|
||||
@@ -49,9 +45,6 @@ import forestry.factory.gui.ContainerFermenter;
|
||||
import forestry.factory.gui.GuiFermenter;
|
||||
import forestry.factory.inventory.InventoryFermenter;
|
||||
import forestry.factory.recipes.FermenterRecipeManager;
|
||||
import forestry.factory.triggers.FactoryTriggers;
|
||||
|
||||
import buildcraft.api.statements.ITriggerExternal;
|
||||
|
||||
public class TileFermenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler {
|
||||
private final FilteredTank resourceTank;
|
||||
@@ -331,14 +324,15 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
}
|
||||
|
||||
/* ITRIGGERPROVIDER */
|
||||
@Optional.Method(modid = "BuildCraftAPI|statements")
|
||||
@Override
|
||||
public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
|
||||
LinkedList<ITriggerExternal> res = new LinkedList<>();
|
||||
res.add(FactoryTriggers.lowResource25);
|
||||
res.add(FactoryTriggers.lowResource10);
|
||||
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(FactoryTriggers.lowResource25);
|
||||
// res.add(FactoryTriggers.lowResource10);
|
||||
// return res;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public Object getGui(EntityPlayer player, int data) {
|
||||
|
||||
@@ -10,46 +10,39 @@
|
||||
******************************************************************************/
|
||||
package forestry.factory.triggers;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import forestry.core.tiles.TileEngine;
|
||||
import forestry.core.tiles.TilePowered;
|
||||
import forestry.core.triggers.Trigger;
|
||||
|
||||
import buildcraft.api.statements.IStatementContainer;
|
||||
import buildcraft.api.statements.IStatementParameter;
|
||||
|
||||
// TODO: BuildCraft for 1.9
|
||||
public class TriggerLowFuel extends Trigger {
|
||||
|
||||
private float threshold = 0.25F;
|
||||
|
||||
public TriggerLowFuel(String uid, float threshold) {
|
||||
super(uid, "lowFuel");
|
||||
// super(uid, "lowFuel");
|
||||
this.threshold = threshold;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return super.getDescription() + " < " + threshold * 100 + "%";
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if the tile given in parameter activates the trigger, given the parameters.
|
||||
*/
|
||||
@Override
|
||||
public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
|
||||
if (tile instanceof TilePowered) {
|
||||
return !((TilePowered) tile).hasFuelMin(threshold);
|
||||
}
|
||||
|
||||
if (tile instanceof TileEngine) {
|
||||
TileEngine tileEngine = (TileEngine) tile;
|
||||
return !tileEngine.hasFuelMin(threshold);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
// @Override
|
||||
// public String getDescription() {
|
||||
// return super.getDescription() + " < " + threshold * 100 + "%";
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Return true if the tile given in parameter activates the trigger, given the parameters.
|
||||
// */
|
||||
// @Override
|
||||
// public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
//
|
||||
// if (tile instanceof TilePowered) {
|
||||
// return !((TilePowered) tile).hasFuelMin(threshold);
|
||||
// }
|
||||
//
|
||||
// if (tile instanceof TileEngine) {
|
||||
// TileEngine tileEngine = (TileEngine) tile;
|
||||
// return !tileEngine.hasFuelMin(threshold);
|
||||
// }
|
||||
//
|
||||
// return false;
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -10,39 +10,33 @@
|
||||
******************************************************************************/
|
||||
package forestry.factory.triggers;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import forestry.core.tiles.TilePowered;
|
||||
import forestry.core.triggers.Trigger;
|
||||
|
||||
import buildcraft.api.statements.IStatementContainer;
|
||||
import buildcraft.api.statements.IStatementParameter;
|
||||
|
||||
// TODO: BuildCraft for 1.9
|
||||
public class TriggerLowResource extends Trigger {
|
||||
|
||||
private float threshold = 0.25F;
|
||||
|
||||
public TriggerLowResource(String tag, float threshold) {
|
||||
super(tag, "lowResources");
|
||||
// super(tag, "lowResources");
|
||||
this.threshold = threshold;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return super.getDescription() + " < " + threshold * 100 + "%";
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if the tile given in parameter activates the trigger, given the parameters.
|
||||
*/
|
||||
@Override
|
||||
public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
if (!(tile instanceof TilePowered)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return !((TilePowered) tile).hasResourcesMin(threshold);
|
||||
}
|
||||
// @Override
|
||||
// public String getDescription() {
|
||||
// return super.getDescription() + " < " + threshold * 100 + "%";
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Return true if the tile given in parameter activates the trigger, given the parameters.
|
||||
// */
|
||||
// @Override
|
||||
// public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
|
||||
// if (!(tile instanceof TilePowered)) {
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// return !((TilePowered) tile).hasResourcesMin(threshold);
|
||||
// }
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user