Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved a few prefabs into their correct packages, also removed debug spam

Browse source
This commit is contained in:
Robert S 2014-05-17 09:12:42 -04:00
parent b6c73f5a7c
commit dbcd5aad20
10 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java
View file

@ -21,8 +21,8 @@ import resonant.api.IRotatable;
import resonant.lib.config.Config;
import resonant.lib.utility.FluidUtility;
import resonantinduction.core.Reference;
import resonantinduction.core.fluid.TilePressureNode;
import resonantinduction.core.grid.fluid.FluidPressureNode;
import resonantinduction.core.grid.fluid.TilePressureNode;
import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java
View file

@ -35,9 +35,9 @@ import resonant.lib.utility.inventory.InventoryUtility;
import resonantinduction.archaic.fluid.grate.TileGrate;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction.RecipeType;
import resonantinduction.core.fluid.TilePressureNode;
import resonantinduction.core.grid.fluid.FluidPressureNode;
import resonantinduction.core.grid.fluid.IPressureNodeProvider;
import resonantinduction.core.grid.fluid.TilePressureNode;
import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java
View file

@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import resonant.lib.utility.LanguageUtility;
import resonantinduction.archaic.Archaic;
import resonantinduction.core.fluid.TileFluidDistribution;
import resonantinduction.core.grid.fluid.TileFluidDistribution;
import universalelectricity.api.energy.UnitDisplay;
import universalelectricity.api.energy.UnitDisplay.Unit;
import universalelectricity.api.energy.UnitDisplay.UnitPrefix;

4
archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java
View file

@ -5,8 +5,8 @@ import java.util.LinkedList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import resonantinduction.core.fluid.FluidDistributionetwork;
import resonantinduction.core.fluid.IFluidDistribution;
import resonantinduction.core.grid.fluid.FluidDistributionetwork;
import resonantinduction.core.grid.fluid.IFluidDistribution;
/** Network that handles connected tanks
*

6
archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java
View file

@ -28,9 +28,9 @@ import resonant.lib.utility.inventory.InventoryUtility;
import resonant.lib.utility.render.RenderBlockUtility;
import resonantinduction.archaic.Archaic;
import resonantinduction.core.Reference;
import resonantinduction.core.fluid.FluidDistributionetwork;
import resonantinduction.core.fluid.IFluidDistribution;
import resonantinduction.core.fluid.TileFluidDistribution;
import resonantinduction.core.grid.fluid.FluidDistributionetwork;
import resonantinduction.core.grid.fluid.IFluidDistribution;
import resonantinduction.core.grid.fluid.TileFluidDistribution;
import universalelectricity.api.UniversalElectricity;
import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.relauncher.Side;

5
src/main/scala/resonantinduction/core/fluid/FluidDistributionetwork.java → src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.fluid;
package resonantinduction.core.grid.fluid;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
@ -83,10 +83,7 @@ public abstract class FluidDistributionetwork extends NodeNetwork<FluidDistribut
public int fill(IFluidDistribution source, ForgeDirection from, FluidStack resource, boolean doFill)
{
System.out.println("FluidDistributionNetwork: Filling " + resource + " Tank: " + this.getTank().getFluidAmount());
System.out.println("FluidDistributionNetwork: Tank Contains Fluid: " + getTank().getFluid() + " Tank: " + this.getTank().getFluidAmount());
int fill = this.getTank().fill(resource.copy(), doFill);
System.out.println("FluidDistributionNetwork: Filled " + fill + " Tank: " + this.getTank().getFluidAmount());
if (fill > 0)
{
needsUpdate = true;

2
src/main/scala/resonantinduction/core/fluid/IFluidDistribution.java → src/main/scala/resonantinduction/core/grid/fluid/IFluidDistribution.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.fluid;
package resonantinduction.core.grid.fluid;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.IFluidHandler;

2
src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java → src/main/scala/resonantinduction/core/grid/fluid/TileFluidDistribution.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.fluid;
package resonantinduction.core.grid.fluid;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;

2
src/main/scala/resonantinduction/core/fluid/TileFluidNode.java → src/main/scala/resonantinduction/core/grid/fluid/TileFluidNode.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.fluid;
package resonantinduction.core.grid.fluid;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;

4
src/main/scala/resonantinduction/core/fluid/TilePressureNode.java → src/main/scala/resonantinduction/core/grid/fluid/TilePressureNode.java
View file

@ -1,4 +1,4 @@
package resonantinduction.core.fluid;
package resonantinduction.core.grid.fluid;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.ForgeDirection;
@ -8,8 +8,6 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import resonant.api.grid.INode;
import resonant.lib.network.IPacketReceiverWithID;
import resonantinduction.core.grid.fluid.FluidPressureNode;
import resonantinduction.core.grid.fluid.IPressureNodeProvider;
/**
* A prefab class for tiles that use the fluid network.