diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
6 files changed, 18 insertions, 27 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java index 2721dc437e..6a3856aba3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java @@ -26,7 +26,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.random.XSTR; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! @@ -448,7 +447,7 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank { if (getDrainableStack() == null) setDrainableStack(mOutputFluid.copy()); else if (mOutputFluid.isFluidEqual(getDrainableStack())) getDrainableStack().amount += mOutputFluid.amount; - for (int i = 0; i < mOutputItems.length; i++) mOutputItems[i] = null; + Arrays.fill(mOutputItems, null); mOutputFluid = null; mEUt = 0; mProgresstime = 0; @@ -458,12 +457,6 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank { endProcess(); } if (mProgresstime > 5) mStuttering = false; - XSTR aXSTR = new XSTR(); - // Dumb April Fools Shit - // if(GT_Mod.gregtechproxy.mAprilFool && - // aXSTR.nextInt(5000)==0)GT_Utility.sendSoundToPlayers(aBaseMetaTileEntity.getWorld(), - // GregTech_API.sSoundList.get(5), 10.0F, -1.0F, aBaseMetaTileEntity.getXCoord(), - // aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord()); } else { if (!mStuttering) { stutterProcess(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 1a7a9738fd..5ac2b9c53b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1992,12 +1992,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex * * @param maxMeta exclusive */ - public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheFuckingMeta, - Function<T, Integer> aGetTheFuckingMeta, int maxMeta) { + public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheMeta, + Function<T, Integer> aGetTheMeta, int maxMeta) { return addTieredBlock(aBlock, (t, i) -> { - aSetTheFuckingMeta.accept(t, i); + aSetTheMeta.accept(t, i); return true; - }, aGetTheFuckingMeta, 0, maxMeta); + }, aGetTheMeta, 0, maxMeta); } /** @@ -2005,12 +2005,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex * @param minMeta inclusive * @param maxMeta exclusive */ - public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheFuckingMeta, - Function<T, Integer> aGetTheFuckingMeta, int minMeta, int maxMeta) { + public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheMeta, + Function<T, Integer> aGetTheMeta, int minMeta, int maxMeta) { return addTieredBlock(aBlock, (t, i) -> { - aSetTheFuckingMeta.accept(t, i); + aSetTheMeta.accept(t, i); return true; - }, aGetTheFuckingMeta, minMeta, maxMeta); + }, aGetTheMeta, minMeta, maxMeta); } /** @@ -2018,8 +2018,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex * @param minMeta inclusive * @param maxMeta exclusive */ - public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheFuckingMeta, - Function<T, Integer> aGetTheFuckingMeta, int minMeta, int maxMeta) { + public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheMeta, + Function<T, Integer> aGetTheMeta, int minMeta, int maxMeta) { return new IStructureElement<T>() { @@ -2027,11 +2027,11 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public boolean check(T t, World world, int x, int y, int z) { Block tBlock = world.getBlock(x, y, z); if (aBlock == tBlock) { - Integer currentMeta = aGetTheFuckingMeta.apply(t); + Integer currentMeta = aGetTheMeta.apply(t); int newMeta = tBlock.getDamageValue(world, x, y, z) + 1; if (newMeta > maxMeta || newMeta < minMeta + 1) return false; if (currentMeta == 0) { - return aSetTheFuckingMeta.test(t, newMeta); + return aSetTheMeta.test(t, newMeta); } else { return currentMeta == newMeta; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index d7508b7152..1c9d0b3ae3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -91,7 +91,6 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends @Override protected IAlignmentLimits getInitialAlignmentLimits() { - // fuck return (d, r, f) -> d.offsetY == 0 && r.isNotRotated() && !f.isVerticallyFliped(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java index f2fa9d8bc7..f8d9ca8963 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java @@ -157,7 +157,6 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt @Override protected IAlignmentLimits getInitialAlignmentLimits() { - // fuck return (d, r, f) -> d.offsetY == 0 && r.isNotRotated() && !f.isVerticallyFliped(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index 58f8d3e349..b072f7ee21 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -63,8 +63,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { final boolean doTest = true; tMaterial = M.getComposites(); - // This Bad boy here is what dictates unique recipes. Fuck life, right? - ItemStack circuitGT = ItemUtils.getGregtechCircuit(0); + // This Bad boy here is what dictates unique recipes. + ItemStack circuitGT; // Set a duration - OLD /* @@ -103,7 +103,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { Logger.WARNING("[BAS] Size: " + mMaterialListSize); - // Make a simple one Material Materialstack[] and log it for validity. + // Make a simple one Material MaterialStack[] and log it for validity. circuitGT = ItemUtils.getGregtechCircuit(1); final ItemStack[] tItemStackTest = new ItemStack[] { circuitGT, tStack }; inputStackCount = 1; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index f276ea218f..fdbeea89cf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -125,11 +125,11 @@ public class RecipeGen_Ore extends RecipeGen_Base { bonusB = amJ.get(1); } - // Default out if it's made of fluids or some shit. + // Default out if it's made of fluids or some stuff. if (bonusA == null) { bonusA = tVoltageMultiplier > 100 ? material : mStone; } - // Default out if it's made of fluids or some shit. + // Default out if it's made of fluids or some stuff. if (allFailed || bonusB == null) { bonusB = tVoltageMultiplier > 100 ? material : mStone; } |