aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/bop/blocks
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-05-24 19:04:17 +0100
committerRaven Szewczyk <git@eigenraven.me>2024-05-24 19:04:17 +0100
commit69ce418e29e22391f60cdd55815727762a78c33a (patch)
tree97be683e94b8a541d7578760a154f16d4dea38e2 /src/main/java/gtPlusPlus/xmod/bop/blocks
parent38f38a991e433f6eff30476b87a71eeadee228ce (diff)
downloadGT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.tar.gz
GT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.tar.bz2
GT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.zip
Apply updated GT5u spotless configs
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/bop/blocks')
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java116
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java14
6 files changed, 79 insertions, 77 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
index e8c50641aa..4a3c91e9cb 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
@@ -69,38 +69,37 @@ public class BOP_Block_Registrator {
public static void addLogRecipes(final ItemStack aStack) {
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { aStack },
- ItemUtils.getSimpleStack(
- Item.getItemFromBlock(Blocks.planks),
- GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4));
+ new ItemStack[] { aStack },
+ ItemUtils
+ .getSimpleStack(Item.getItemFromBlock(Blocks.planks), GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4));
RecipeUtils.recipeBuilder(
- CI.craftingToolSaw,
- null,
- null,
- aStack,
- null,
- null,
- null,
- null,
- null,
- ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4));
+ CI.craftingToolSaw,
+ null,
+ null,
+ aStack,
+ null,
+ null,
+ null,
+ null,
+ null,
+ ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4));
GT_ModHandler.addCraftingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L),
- GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) });
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L),
+ GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) });
final short aMeta = (short) aStack.getItemDamage();
if (GT_Utility.areStacksEqual(
- GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
- new ItemStack(Items.coal, 1, 1))) {
+ GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
+ new ItemStack(Items.coal, 1, 1))) {
addPyrolyeOvenRecipes(aStack);
GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
}
if (aMeta == 32767) {
for (int i = 0; i < 32767; ++i) {
if (GT_Utility.areStacksEqual(
- GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null),
- new ItemStack(Items.coal, 1, 1))) {
+ GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null),
+ new ItemStack(Items.coal, 1, 1))) {
addPyrolyeOvenRecipes(aStack);
GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i));
}
@@ -112,26 +111,28 @@ public class BOP_Block_Registrator {
} else {
final ItemStack tPlanks = GT_Utility.copy(tStack);
tPlanks.stackSize = tPlanks.stackSize * 3 / 2;
- GT_Values.RA.stdBuilder().itemInputs(new ItemStack(aStack.getItem(), 1, i))
- .itemOutputs(
- GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize)
- : (((long) tStack.stackSize) * 5L / 4),
- tStack),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
- .duration(10 * SECONDS).eut(8).addTo(cutterRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(aStack.getItem(), 1, i))
+ .itemOutputs(
+ GT_Utility.copyAmount(
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize)
+ : (((long) tStack.stackSize) * 5L / 4),
+ tStack),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+ .duration(10 * SECONDS)
+ .eut(8)
+ .addTo(cutterRecipes);
GT_ModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i));
GT_ModHandler.addCraftingRecipe(
- GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize)
- : (((long) tStack.stackSize) * 5L / 4),
- tStack),
- new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) });
+ GT_Utility.copyAmount(
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize)
+ : (((long) tStack.stackSize) * 5L / 4),
+ tStack),
+ new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) });
GT_ModHandler.addShapelessCraftingRecipe(
- GT_Utility.copyAmount(
- tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1),
- tStack),
- new Object[] { new ItemStack(aStack.getItem(), 1, i) });
+ GT_Utility
+ .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
+ new Object[] { new ItemStack(aStack.getItem(), 1, i) });
}
}
} else {
@@ -139,31 +140,32 @@ public class BOP_Block_Registrator {
if (tStack2 != null) {
final ItemStack tPlanks2 = GT_Utility.copy(tStack2);
tPlanks2.stackSize = tPlanks2.stackSize * 3 / 2;
- GT_Values.RA.stdBuilder().itemInputs(GT_Utility.copyAmount(1L, aStack))
- .itemOutputs(
- GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize)
- : (((long) tStack2.stackSize) * 5L / 4),
- tStack2),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
- .duration(10 * SECONDS).eut(8).addTo(cutterRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1L, aStack))
+ .itemOutputs(
+ GT_Utility.copyAmount(
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize)
+ : (((long) tStack2.stackSize) * 5L / 4),
+ tStack2),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L))
+ .duration(10 * SECONDS)
+ .eut(8)
+ .addTo(cutterRecipes);
GT_ModHandler.removeRecipe(GT_Utility.copyAmount(1L, aStack));
GT_ModHandler.addCraftingRecipe(
- GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize)
- : (((long) tStack2.stackSize) * 5L / 4),
- tStack2),
- new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) });
+ GT_Utility.copyAmount(
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize)
+ : (((long) tStack2.stackSize) * 5L / 4),
+ tStack2),
+ new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) });
GT_ModHandler.addShapelessCraftingRecipe(
- GT_Utility.copyAmount(
- tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1),
- tStack2),
- new Object[] { GT_Utility.copyAmount(1L, aStack) });
+ GT_Utility.copyAmount(tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2),
+ new Object[] { GT_Utility.copyAmount(1L, aStack) });
}
}
if (GT_Utility.areStacksEqual(
- GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
- new ItemStack(Items.coal, 1, 1))) {
+ GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
+ new ItemStack(Items.coal, 1, 1))) {
addPyrolyeOvenRecipes(aStack);
GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
index 3e7a6a0105..171bb9a58c 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
@@ -78,7 +78,7 @@ public class LeavesBase extends BlockLeaves {
@SideOnly(Side.CLIENT)
public IIcon getIcon(int ordinalSide, int metaID) {
return (metaID & 3) == 1 ? this.leafTextures[this.field_150127_b][1]
- : this.leafTextures[this.field_150127_b][0];
+ : this.leafTextures[this.field_150127_b][0];
}
@Override
@@ -93,7 +93,7 @@ public class LeavesBase extends BlockLeaves {
this.leafTextures[i] = new IIcon[leafType[i].length];
for (int j = 0; j < leafType[i].length; ++j) {
this.leafTextures[i][j] = iIcon
- .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]);
+ .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]);
}
}
setVanillaVariable(this.field_150129_M, this.leafTextures);
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
index 3270fea55b..2cf8ba1fbc 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
@@ -32,9 +32,9 @@ public abstract class LogBase extends BlockLog {
GameRegistry.registerBlock(this, ItemBlock.class, blockName);
this.setBlockName(blockName);
ItemUtils.addItemToOreDictionary(
- ItemUtils.getSimpleStack(this),
- "log" + Utils.sanitizeString(blockNameLocalized),
- true);
+ ItemUtils.getSimpleStack(this),
+ "log" + Utils.sanitizeString(blockNameLocalized),
+ true);
ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "logWood", true);
this.setCreativeTab(AddToCreativeTab.tabBOP);
Blocks.fire.setFireInfo(this, 20, 100);
@@ -76,7 +76,7 @@ public abstract class LogBase extends BlockLog {
for (int i = 0; i < this.textureSide.length; ++i) {
this.textureSide[i] = iIcon.registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i]);
this.textureTop[i] = iIcon
- .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top");
+ .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top");
}
setVanillaVariable(this.field_150167_a, this.textureSide);
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
index 51dd580ab4..ff5c8770d4 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
@@ -133,7 +133,7 @@ public class SaplingBase extends BlockSapling {
@Override
public boolean func_149880_a(World world, int p_149880_2_, int p_149880_3_, int p_149880_4_, int p_149880_5_) {
return world.getBlock(p_149880_2_, p_149880_3_, p_149880_4_) == this
- && (world.getBlockMetadata(p_149880_2_, p_149880_3_, p_149880_4_) & 7) == p_149880_5_;
+ && (world.getBlockMetadata(p_149880_2_, p_149880_3_, p_149880_4_) & 7) == p_149880_5_;
}
/**
@@ -160,7 +160,7 @@ public class SaplingBase extends BlockSapling {
public void registerBlockIcons(IIconRegister iIcon) {
for (int i = 0; i < saplingTextures.length; ++i) {
saplingTextures[i] = iIcon
- .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]);
+ .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
index d03473d0f7..93f7e59a1e 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
@@ -31,11 +31,11 @@ public class LeavesPineTree extends LeavesBase {
Logger.INFO("Dropping Bonus Drops");
if (MathUtils.randInt(0, 10) >= 9) {
this.dropBlockAsItem(
- world,
- x,
- y,
- z,
- ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, MathUtils.randInt(1, 4)));
+ world,
+ x,
+ y,
+ z,
+ ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, MathUtils.randInt(1, 4)));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
index bc5cadc4bb..362eb2f541 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
@@ -43,13 +43,13 @@ public class SaplingRainforestTree extends SaplingBase {
world.setBlock(x, y, z, block, 0, 4);
}
Object o = new WorldGenRainForestTree_Ex(
- BOP_Block_Registrator.log_Rainforest,
- BOP_Block_Registrator.leaves_Rainforest,
- 0,
- 0,
- true,
- 50,
- 75);
+ BOP_Block_Registrator.log_Rainforest,
+ BOP_Block_Registrator.leaves_Rainforest,
+ 0,
+ 0,
+ true,
+ 50,
+ 75);
if (!((WorldGenerator) o).generate(world, rand, x + i1, y, z + j1)) {
if (flag) {