diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
5 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java index dad53f54f6..738afb0d90 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java @@ -634,10 +634,10 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas // Handle Custom Hatches if (aMetaTileEntity instanceof MTEHatchInputBattery) { - log("Found GT_MetaTileEntity_Hatch_InputBattery"); + log("Found MTEHatchInputBattery"); aDidAdd = addToMachineListInternal(mChargeHatches, aMetaTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof MTEHatchOutputBattery) { - log("Found GT_MetaTileEntity_Hatch_OutputBattery"); + log("Found MTEHatchOutputBattery"); aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof METHatchAirIntake) { aDidAdd = addToMachineListInternal(mAirIntakes, aMetaTileEntity, aBaseCasingIndex) @@ -1020,7 +1020,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas if (tCurrentItem != null) { // Logger.INFO("Holding Item."); if (tCurrentItem.getItem() instanceof MetaGeneratedTool) { - // Logger.INFO("Is GT_MetaGenerated_Tool."); + // Logger.INFO("Is MetaGeneratedTool."); int[] aOreID = OreDictionary.getOreIDs(tCurrentItem); for (int id : aOreID) { // Plunger diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index d1a6ac34f0..063b5747b9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -201,7 +201,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi return false; } if (aMetaTileEntity instanceof MTEHatchMillingBalls) { - log("Found GT_MetaTileEntity_Hatch_MillingBalls"); + log("Found MTEHatchMillingBalls"); return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex); } return super.addToMachineList(aTileEntity, aBaseCasingIndex); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java index 2046de6c1c..5de235982f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java @@ -508,7 +508,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple return false; } if (aMetaTileEntity instanceof MTEHatchCatalysts) { - log("Found GT_MetaTileEntity_Hatch_Catalysts"); + log("Found MTEHatchCatalysts"); return addToMachineListInternal(mCatalystBuses, aMetaTileEntity, aBaseCasingIndex); } return super.addToMachineList(aTileEntity, aBaseCasingIndex); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 69e3580f11..0bd1397137 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -267,7 +267,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT return false; } if (aMetaTileEntity instanceof MTEHatchTurbine aTurbineHatch) { - log("Found GT_MetaTileEntity_Hatch_Turbine"); + log("Found MTEHatchTurbine"); updateTexture(aTileEntity, aBaseCasingIndex); IGregTechTileEntity g = this.getBaseMetaTileEntity(); if (aTurbineHatch.setController(new BlockPos(g.getXCoord(), g.getYCoord(), g.getZCoord(), g.getWorld()))) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index f08457f807..9f66dc394f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -700,8 +700,8 @@ public class GregtechConduits { OrePrefixes.pipeMedium.get(material), new MTEFluid( startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", + "GT_Pipe_" + material.mDefaultLocalName, + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 12, @@ -761,8 +761,8 @@ public class GregtechConduits { OrePrefixes.pipeMedium.get(material), new GTPPMTEFluid( startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", + "GT_Pipe_" + material.mDefaultLocalName, + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 12, |