aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/bop/blocks/base
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-10-18 17:03:23 +0100
committerGitHub <noreply@github.com>2023-10-18 18:03:23 +0200
commitfbdbb388c369fae549cfde3eed38b536f7461d90 (patch)
treeb46f7fc949d7e4c6e3be910b81ed725e6dc1648e /src/main/java/gtPlusPlus/xmod/bop/blocks/base
parentb670446fdf49991093b485f0aa14050039632775 (diff)
downloadGT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.gz
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.bz2
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.zip
Cleaning up (#767)
* Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso <colen@CONNORSPC>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/bop/blocks/base')
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java27
3 files changed, 8 insertions, 29 deletions
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 3fb8229b7f..3e7a6a0105 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
@@ -40,7 +40,7 @@ public class LeavesBase extends BlockLeaves {
Blocks.fire.setFireInfo(this, 80, 150);
}
- private final void setVanillaVariable(Object toSet, Object value) {
+ private void setVanillaVariable(Object toSet, Object value) {
toSet = value;
}
@@ -52,9 +52,9 @@ public class LeavesBase extends BlockLeaves {
@Override // Drops when Leaf is broken
protected void func_150124_c(World world, int x, int y, int z, int meta, int randomChance) {
Logger.INFO("Dropping Bonus Drops");
- for (int i = 0; i < this.bonusDrops.length; ++i) {
- if (this.bonusDrops[i] != null && world.rand.nextInt(randomChance) == 0) {
- this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(this.bonusDrops[i], 1));
+ for (ItemStack bonusDrop : this.bonusDrops) {
+ if (bonusDrop != null && world.rand.nextInt(randomChance) == 0) {
+ this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(bonusDrop, 1));
}
}
}
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 6c4ea6a556..3270fea55b 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
@@ -40,7 +40,7 @@ public abstract class LogBase extends BlockLog {
Blocks.fire.setFireInfo(this, 20, 100);
}
- private final void setVanillaVariable(Object toSet, Object value) {
+ private void setVanillaVariable(Object toSet, Object value) {
toSet = value;
}
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 1c1cd515bb..51dd580ab4 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
@@ -48,7 +48,7 @@ public class SaplingBase extends BlockSapling {
this.setCreativeTab(AddToCreativeTab.tabBOP);
}
- private final void setVanillaVariable(Object toSet, Object value) {
+ private void setVanillaVariable(Object toSet, Object value) {
toSet = value;
}
@@ -121,33 +121,12 @@ public class SaplingBase extends BlockSapling {
int j1 = 0;
boolean flag = false;
- switch (l) {
- case 0:
- default:
- Logger.WARNING("Case 0 - Grow Tree");
- break;
- }
-
Block block = Blocks.air;
- if (flag) {
- world.setBlock(x + i1, y, z + j1, block, 0, 4);
- world.setBlock(x + i1 + 1, y, z + j1, block, 0, 4);
- world.setBlock(x + i1, y, z + j1 + 1, block, 0, 4);
- world.setBlock(x + i1 + 1, y, z + j1 + 1, block, 0, 4);
- } else {
- world.setBlock(x, y, z, block, 0, 4);
- }
+ world.setBlock(x, y, z, block, 0, 4);
if (!((WorldGenerator) object).generate(world, rand, x + i1, y, z + j1)) {
- if (flag) {
- world.setBlock(x + i1, y, z + j1, this, l, 4);
- world.setBlock(x + i1 + 1, y, z + j1, this, l, 4);
- world.setBlock(x + i1, y, z + j1 + 1, this, l, 4);
- world.setBlock(x + i1 + 1, y, z + j1 + 1, this, l, 4);
- } else {
- world.setBlock(x, y, z, this, l, 4);
- }
+ world.setBlock(x, y, z, this, l, 4);
}
}