applied https://github.com/Blood-Asp/GT5-Unofficial/pull/1425

3 files changed, 30 insertions, 21 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index dfefd70687..a761afd5cb 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -1,5 +1,11 @@
 package gregtech.api.metatileentity;

 

+import static gregtech.api.enums.GT_Values.NW;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.List;

+

 import cpw.mods.fml.common.FMLLog;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Textures;

@@ -9,7 +15,11 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity;

 import gregtech.api.net.GT_Packet_TileEntity;

 import gregtech.api.objects.GT_ItemStack;

-import gregtech.api.util.*;

+import gregtech.api.util.GT_CoverBehavior;

+import gregtech.api.util.GT_Log;

+import gregtech.api.util.GT_ModHandler;

+import gregtech.api.util.GT_OreDictUnificator;

+import gregtech.api.util.GT_Utility;

 import net.minecraft.block.Block;

 import net.minecraft.entity.Entity;

 import net.minecraft.entity.item.EntityItem;

@@ -28,12 +38,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

 

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import static gregtech.api.enums.GT_Values.NW;

-

 /**

  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!

  * <p/>

@@ -1180,11 +1184,11 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
             return false;

 

         if(isFill && mMetaTileEntity.isLiquidInput((byte) aSide.ordinal())

-                && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), this))

+                && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid, this))

             return true;

 

         if (!isFill && mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) 

-                && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), this))

+                && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()),aFluid, this))

             return true;

 

         return false;

diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java
index 04d40f30a1..9b48b15125 100644
--- a/src/main/java/gregtech/common/GT_Worldgenerator.java
+++ b/src/main/java/gregtech/common/GT_Worldgenerator.java
@@ -1,5 +1,17 @@
 package gregtech.common;

 

+import static gregtech.api.enums.GT_Values.debugOrevein;

+import static gregtech.api.enums.GT_Values.debugWorldGen;

+import static gregtech.api.enums.GT_Values.oreveinAttempts;

+import static gregtech.api.enums.GT_Values.oreveinMaxPlacementAttempts;

+import static gregtech.api.enums.GT_Values.oreveinPercentage;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.Hashtable;

+import java.util.List;

+import java.util.Random;

+

 import cpw.mods.fml.common.IWorldGenerator;

 import cpw.mods.fml.common.registry.GameRegistry;

 import gregtech.api.GregTech_API;

@@ -11,17 +23,8 @@ import gregtech.common.blocks.GT_TileEntity_Ores;
 import net.minecraft.init.Blocks;

 import net.minecraft.util.MathHelper;

 import net.minecraft.world.World;

-import net.minecraft.world.biome.BiomeGenBase;

 import net.minecraft.world.chunk.Chunk;

 import net.minecraft.world.chunk.IChunkProvider;

-import net.minecraft.world.gen.ChunkProviderEnd;

-import net.minecraft.world.gen.ChunkProviderHell;

-

-import java.util.*;

-

-import bloodasp.galacticgreg.GT_Worldgen_GT_Ore_Layer_Space;

-

-import static gregtech.api.enums.GT_Values.*;

 

 // Disabled for hardcoded value.    import static gregtech.api.enums.GT_Values.oreveinMaxSize;

 

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 2d271ffccf..46ac0b42a3 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -61,16 +61,18 @@ public class GT_Cover_Fluidfilter
     
     @Override
     public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-        if(aFluid==null){return true;}
+        if(aFluid==null){
+        	return true;
+        }
         int aFilterMode = aCoverVariable & 7;
         int aFilterFluid = aCoverVariable >>> 3;
-        return aFluid.getID() == aFilterFluid ? (aFilterMode == 0 || aFilterMode == 2 ? true : false) : (aFilterMode == 1 || aFilterMode == 3 ? true : false);
+        return aFluid.getID() == aFilterFluid ? aFilterMode == 0 || aFilterMode == 2 : aFilterMode == 1 || aFilterMode == 3;
     }
     
     @Override
     public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
         int aFilterMode = aCoverVariable & 7;
-        return  aFilterMode == 0 || aFilterMode == 1 ? false : true;
+        return  aFilterMode != 0 && aFilterMode != 1;
     }
     
     public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {