Add Concrete Backfiller

5 files changed, 250 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 4eacd9dca6..f55913b356 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -638,7 +638,7 @@ public enum ItemList implements IItemContainer {
     Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_HSSG, Casing_Coil_Naquadah, Casing_Coil_NaquadahAlloy,

     MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, MobRep_LuV, MobRep_ZPM, MobRep_UV, Cover_PlayerDetector, Machine_Multi_HeatExchanger,

     Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced,

-    Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, Seismic_Prospector_Adv, OilDrill1, OilDrill2, OilDrill3, OreDrill1, OreDrill2, OreDrill3, OreDrill4, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,

+    Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, Seismic_Prospector_Adv, OilDrill1, OilDrill2, OilDrill3, ConcreteBackfiller1, ConcreteBackfiller3, OreDrill1, OreDrill2, OreDrill3, OreDrill4, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,

     Battery_Charger_4by4_ULV, Battery_Charger_4by4_LV, Battery_Charger_4by4_MV, Battery_Charger_4by4_HV, Battery_Charger_4by4_EV, Battery_Charger_4by4_IV, Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, Battery_Charger_4by4_MAX,

     MicroTransmitter_HV, MicroTransmitter_EV, MicroTransmitter_IV, MicroTransmitter_LUV, MicroTransmitter_ZPM,

     Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4,

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java
new file mode 100644
index 0000000000..a509d35ad3
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller1.java
@@ -0,0 +1,51 @@
+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GT_MetaTileEntity_ConcreteBackfiller1 extends GT_MetaTileEntity_ConcreteBackfillerBase {
+    public GT_MetaTileEntity_ConcreteBackfiller1(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_ConcreteBackfiller1(String aName) {
+        super(aName);
+    }
+
+    @Override
+    public String[] getDescription() {
+        return getDescriptionInternal("");
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_ConcreteBackfiller1(mName);
+    }
+
+    @Override
+    protected ItemList getCasingBlockItem() {
+        return ItemList.Casing_SolidSteel;
+    }
+
+    @Override
+    protected Materials getFrameMaterial() {
+        return Materials.Steel;
+    }
+
+    @Override
+    protected int getCasingTextureIndex() {
+        return 16;
+    }
+
+    @Override
+    protected int getRadius() {
+        return 16;
+    }
+
+    @Override
+    protected int getMinTier() {
+        return 2;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller3.java
new file mode 100644
index 0000000000..ff5bc7e039
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfiller3.java
@@ -0,0 +1,66 @@
+package gregtech.common.tileentities.machines.multi;
+
+import static gregtech.api.enums.GT_Values.VN;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.item.ItemStack;
+
+public class GT_MetaTileEntity_ConcreteBackfiller3 extends GT_MetaTileEntity_ConcreteBackfillerBase {
+    public GT_MetaTileEntity_ConcreteBackfiller3(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_ConcreteBackfiller3(String aName) {
+        super(aName);
+    }
+
+    @Override
+    public String[] getDescription() {
+    	String casings = getCasingBlockItem().get(0).getDisplayName();
+		return new String[]{
+                "Controller Block for the Advanced Concrete Backfiller",
+                "Size(WxHxD): 3x7x3", "Controller (Front middle at bottom)",
+                "3x1x3 Base of " + casings,
+                "1x3x1 " + casings + " pillar (Center of base)",
+                "1x3x1 " + getFrameMaterial().mName + " Frame Boxes (Each pillar side and on top)",
+                "1x Input Hatch (One of base casings)",
+                "1x Maintenance Hatch (One of base casings)",
+                "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
+                "Put Programmed Circuits into Data Access to config radius",
+                "Radius = (total config value) * 2 blocks",
+                "Default 64, Maximum 128",};
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_ConcreteBackfiller3(mName);
+    }
+
+    @Override
+    protected ItemList getCasingBlockItem() {
+        return ItemList.Casing_StableTitanium;
+    }
+
+    @Override
+    protected Materials getFrameMaterial() {
+        return Materials.Titanium;
+    }
+
+    @Override
+    protected int getCasingTextureIndex() {
+        return 50;
+    }
+
+    @Override
+    protected int getRadius() {
+    	int tConfig = getTotalConfigValue() * 2;
+        return tConfig >= 128 ? 128 : tConfig <= 0 ? 64 : tConfig;
+    }
+
+    @Override
+    protected int getMinTier() {
+        return 4;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java
new file mode 100644
index 0000000000..4940e9508b
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java
@@ -0,0 +1,127 @@
+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.gui.GT_GUIContainer_MultiMachine;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+
+import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GT_Values.VN;
+
+public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTileEntity_DrillerBase {
+	
+	private int mLastXOff = 0, mLastZOff = 0;
+	
+	public GT_MetaTileEntity_ConcreteBackfillerBase(int aID, String aName, String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+	
+	public GT_MetaTileEntity_ConcreteBackfillerBase(String aName) {
+        super(aName);
+    }
+
+	protected String[] getDescriptionInternal(String tierSuffix) {
+		String casings = getCasingBlockItem().get(0).getDisplayName();
+		return new String[]{
+                "Controller Block for the Concrete Backfiller " + (tierSuffix != null ? tierSuffix : ""),
+                "Size(WxHxD): 3x7x3", "Controller (Front middle at bottom)",
+                "3x1x3 Base of " + casings,
+                "1x3x1 " + casings + " pillar (Center of base)",
+                "1x3x1 " + getFrameMaterial().mName + " Frame Boxes (Each pillar side and on top)",
+                "1x Input Hatch (One of base casings)",
+                "1x Maintenance Hatch (One of base casings)",
+                "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
+                "Radius is " + getRadius() + " blocks"};
+	}
+
+	@Override
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "DrillingRig.png");
+	}
+	
+	protected abstract int getRadius();
+
+	@Override
+	protected boolean checkHatches() {
+		return !mMaintenanceHatches.isEmpty() && !mInputHatches.isEmpty() && !mEnergyHatches.isEmpty();
+	}
+
+	@Override
+	protected void setElectricityStats() {
+		this.mEfficiency = getCurrentEfficiency(null);
+        this.mEfficiencyIncrease = 10000;
+        //T1 = 48; T2 = 192; T3 = 768; T4 = 3072
+        this.mEUt = 12 * (1 << (getMinTier() << 1));
+        this.mMaxProgresstime = (isPickingPipes ? 240: 80) / (1 << getMinTier());
+
+        long voltage = getMaxInputVoltage();
+        long overclockEu = V[Math.max(1, GT_Utility.getTier(voltage)) - 1];
+        while (this.mEUt <= overclockEu) {
+            this.mEUt *= 4;
+            this.mMaxProgresstime /= 2;
+        }
+
+        this.mEUt = -this.mEUt;
+        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);		
+	}
+	
+	@Override
+	protected boolean workingUpward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) {
+		if (isRefillableBlock(xPipe, yHead - 1, zPipe))
+			return tryRefillBlock(xPipe, yHead - 1, zPipe);
+		int radius = getRadius();
+		if (mLastXOff == 0 && mLastZOff == 0) {
+			mLastXOff = - radius;
+			mLastZOff = - radius;
+		}
+		if (yHead != yDrill) {
+			for (int i = mLastXOff; i <= radius; i++) {
+				for (int j = (i == mLastXOff ? mLastZOff : - radius); j <= radius; j++) {
+					if (isRefillableBlock(xPipe + i, yHead, zPipe + j)){
+						mLastXOff = i;
+						mLastZOff = j;
+						return tryRefillBlock(xPipe + i, yHead, zPipe + j);
+					}
+				}
+			}
+		}
+		
+		if (tryPickPipe()) {
+			mLastXOff = 0;
+			mLastZOff = 0;
+            return true;
+        } else {
+            isPickingPipes = false;
+            stopMachine();
+            return false;
+        }
+	}
+    
+	private boolean isRefillableBlock(int aX, int aY, int aZ){
+		if (getBaseMetaTileEntity().getTileEntity(aX, aY, aZ) != null) return false;
+		if (getBaseMetaTileEntity().getAir(aX, aY, aZ) || !getBaseMetaTileEntity().getBlock(aX, aY, aZ).getMaterial().isSolid())
+			return true;
+		return false;
+	}
+	
+	private boolean tryRefillBlock(int aX, int aY, int aZ) {
+		if (!tryConsumeFluid())
+			return false;
+		getBaseMetaTileEntity().getWorld().setBlock(aX, aY, aZ, GregTech_API.sBlockConcretes, 8, 3);
+		return true;
+	}
+	
+	private boolean tryConsumeFluid() {
+        if (!depleteInput(Materials.Concrete.getMolten(144L))){
+        	mMaxProgresstime = 0;
+        	return false;
+        }
+        return true;
+    }
+
+}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 0626fce020..1958b4685f 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1237,6 +1237,11 @@ public class GT_Loader_MetaTileEntities implements Runnable {
         GT_ModHandler.addCraftingRecipe(ItemList.OilDrill1.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV});

         GT_ModHandler.addCraftingRecipe(ItemList.OilDrill1.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Motor_HV});

         GT_ModHandler.addCraftingRecipe(ItemList.OilDrill1.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill2, 'W', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV});

+        

+        ItemList.ConcreteBackfiller1.set(new GT_MetaTileEntity_ConcreteBackfiller1(135, "multimachine.concretebackfiller1", "Concrete Backfiller").getStackForm(1));

+        ItemList.ConcreteBackfiller3.set(new GT_MetaTileEntity_ConcreteBackfiller3(136, "multimachine.concretebackfiller3", "Advanced Concrete Backfiller").getStackForm(1));

+        GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller1.get(1L, new Object[0]), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_MV});

+        GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller3.get(1L, new Object[0]), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_EV});

 

         ItemList.OreDrill1.set(new GT_MetaTileEntity_OreDrillingPlant1(1158, "multimachine.oredrill1", "Ore Drilling Plant").getStackForm(1));

         GT_ModHandler.addCraftingRecipe(ItemList.OreDrill1.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_EV, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV});