aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-05-25 13:32:28 +0100
committerRaven Szewczyk <git@eigenraven.me>2024-05-25 13:32:28 +0100
commitec910ff188fe0600182e00f3c279c37998ebaf4b (patch)
tree7886ce61cb8ad65d670e8ee4c7b996e75268b483 /src/main/java
parent2cac4baea3a0e6c671dc44cd3199cf476a6eec94 (diff)
downloadGT5-Unofficial-ec910ff188fe0600182e00f3c279c37998ebaf4b.tar.gz
GT5-Unofficial-ec910ff188fe0600182e00f3c279c37998ebaf4b.tar.bz2
GT5-Unofficial-ec910ff188fe0600182e00f3c279c37998ebaf4b.zip
Update formatting to GT5u spotless config
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/client/gui/KT_UITextures.java6
-rw-r--r--src/main/java/common/CommonProxy.java6
-rw-r--r--src/main/java/common/Recipes.java132
-rw-r--r--src/main/java/common/Researches.java69
-rw-r--r--src/main/java/common/blocks/Block_IchorJar.java25
-rw-r--r--src/main/java/common/blocks/Block_LargeHexPlate.java6
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageField.java6
-rw-r--r--src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java25
-rw-r--r--src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java147
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageField.java27
-rw-r--r--src/main/java/common/recipeLoaders/AlloySmelter.java12
-rw-r--r--src/main/java/common/recipeLoaders/Assembler.java345
-rw-r--r--src/main/java/common/recipeLoaders/AssemblyLine.java321
-rw-r--r--src/main/java/common/recipeLoaders/ChemicalReactor.java11
-rw-r--r--src/main/java/common/recipeLoaders/Crafting.java42
-rw-r--r--src/main/java/common/recipeLoaders/FormingPress.java12
-rw-r--r--src/main/java/common/recipeLoaders/Mixer.java25
-rw-r--r--src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java190
-rw-r--r--src/main/java/common/recipeLoaders/Unpackager.java277
-rw-r--r--src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java640
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java92
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java95
-rw-r--r--src/main/java/common/tileentities/GTMTE_TFFT.java249
-rw-r--r--src/main/java/common/tileentities/GTMTE_TFFTHatch.java29
-rw-r--r--src/main/java/kekztech/Items.java6
-rw-r--r--src/main/java/kekztech/KekzCore.java32
-rw-r--r--src/main/java/util/Util.java5
27 files changed, 1532 insertions, 1300 deletions
diff --git a/src/main/java/client/gui/KT_UITextures.java b/src/main/java/client/gui/KT_UITextures.java
index 5e7cf2981a..6f28a0280b 100644
--- a/src/main/java/client/gui/KT_UITextures.java
+++ b/src/main/java/client/gui/KT_UITextures.java
@@ -7,11 +7,11 @@ import kekztech.KekzCore;
public class KT_UITextures {
public static final UITexture OVERLAY_BUTTON_WIRELESS_ON = UITexture
- .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_on");
+ .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_on");
public static final UITexture OVERLAY_BUTTON_WIRELESS_OFF = UITexture
- .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off");
+ .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off");
public static final UITexture OVERLAY_BUTTON_WIRELESS_OFF_DISABLED = UITexture
- .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off_disabled");
+ .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off_disabled");
}
diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java
index 540e6ced89..777a8af268 100644
--- a/src/main/java/common/CommonProxy.java
+++ b/src/main/java/common/CommonProxy.java
@@ -13,8 +13,10 @@ public class CommonProxy {
public void preInit(final FMLPreInitializationEvent e) {
// Items
- ErrorItem.getInstance().registerItem();
- MetaItem_CraftingComponent.getInstance().registerItem();
+ ErrorItem.getInstance()
+ .registerItem();
+ MetaItem_CraftingComponent.getInstance()
+ .registerItem();
Items.registerOreDictNames();
// Blocks
Blocks.preInit();
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 5efcae6c59..2560e8dc37 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -54,78 +54,88 @@ public class Recipes {
// Thaumium Reinforced Jar
final ItemStack[] recipe_jarthaumiumreinforced = {
- GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane), };
- final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 64).add(Aspect.ORDER, 32)
- .add(Aspect.WATER, 32).add(Aspect.GREED, 16).add(Aspect.VOID, 16).add(Aspect.AIR, 8);
+ GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane), };
+ final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 64)
+ .add(Aspect.ORDER, 32)
+ .add(Aspect.WATER, 32)
+ .add(Aspect.GREED, 16)
+ .add(Aspect.VOID, 16)
+ .add(Aspect.AIR, 8);
infusionRecipes.put(
+ "THAUMIUMREINFORCEDJAR",
+ ThaumcraftApi.addInfusionCraftingRecipe(
"THAUMIUMREINFORCEDJAR",
- ThaumcraftApi.addInfusionCraftingRecipe(
- "THAUMIUMREINFORCEDJAR",
- new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
- 5,
- aspects_jarthaumiumreinforced,
- ItemApi.getBlock("blockJar", 0),
- recipe_jarthaumiumreinforced));
+ new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
+ 5,
+ aspects_jarthaumiumreinforced,
+ ItemApi.getBlock("blockJar", 0),
+ recipe_jarthaumiumreinforced));
// Thaumium Reinforced Void Jar
final ItemStack[] recipe_voidjarupgrade = {
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 1),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1), ItemApi.getItem("itemNugget", 5) };
- final AspectList aspects_voidjarupgrade = new AspectList().add(Aspect.VOID, 14).add(Aspect.MAGIC, 14)
- .add(Aspect.ENTROPY, 14).add(Aspect.WATER, 14);
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 1),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1), ItemApi.getItem("itemNugget", 5) };
+ final AspectList aspects_voidjarupgrade = new AspectList().add(Aspect.VOID, 14)
+ .add(Aspect.MAGIC, 14)
+ .add(Aspect.ENTROPY, 14)
+ .add(Aspect.WATER, 14);
infusionRecipes.put(
- "THAUMIUMREINFORCEDVOIDJAR",
- ThaumcraftApi.addInfusionCraftingRecipe(
- "THAUMIUMREINFORCEDJAR",
- new ItemStack(Blocks.jarThaumiumReinforced, 1, 3),
- 2,
- aspects_voidjarupgrade,
- new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
- recipe_voidjarupgrade));
+ "THAUMIUMREINFORCEDVOIDJAR",
+ ThaumcraftApi.addInfusionCraftingRecipe(
+ "THAUMIUMREINFORCEDJAR",
+ new ItemStack(Blocks.jarThaumiumReinforced, 1, 3),
+ 2,
+ aspects_voidjarupgrade,
+ new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
+ recipe_voidjarupgrade));
final ItemStack[] recipe_jarichor = { GT_ModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane),
- GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
- new ItemStack(net.minecraft.init.Blocks.glass_pane), };
- final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 256).add(Aspect.ELDRITCH, 128)
- .add(Aspect.ORDER, 128).add(Aspect.WATER, 128).add(Aspect.GREED, 64).add(Aspect.VOID, 64)
- .add(Aspect.AIR, 32);
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane),
+ GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane), };
+ final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 256)
+ .add(Aspect.ELDRITCH, 128)
+ .add(Aspect.ORDER, 128)
+ .add(Aspect.WATER, 128)
+ .add(Aspect.GREED, 64)
+ .add(Aspect.VOID, 64)
+ .add(Aspect.AIR, 32);
infusionRecipes.put(
+ "ICHORJAR",
+ ThaumcraftApi.addInfusionCraftingRecipe(
"ICHORJAR",
- ThaumcraftApi.addInfusionCraftingRecipe(
- "ICHORJAR",
- new ItemStack(Blocks.jarIchor, 1, 0),
- 15,
- aspects_jarichor,
- ItemApi.getBlock("blockJar", 0),
- recipe_jarichor));
+ new ItemStack(Blocks.jarIchor, 1, 0),
+ 15,
+ aspects_jarichor,
+ ItemApi.getBlock("blockJar", 0),
+ recipe_jarichor));
// Ichor Void Jar
infusionRecipes.put(
- "ICHORVOIDJAR",
- ThaumcraftApi.addInfusionCraftingRecipe(
- "ICHORJAR",
- new ItemStack(Blocks.jarIchor, 1, 3),
- 5,
- aspects_voidjarupgrade,
- new ItemStack(Blocks.jarIchor, 1, 0),
- recipe_voidjarupgrade));
+ "ICHORVOIDJAR",
+ ThaumcraftApi.addInfusionCraftingRecipe(
+ "ICHORJAR",
+ new ItemStack(Blocks.jarIchor, 1, 3),
+ 5,
+ aspects_voidjarupgrade,
+ new ItemStack(Blocks.jarIchor, 1, 0),
+ recipe_voidjarupgrade));
}
}
diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java
index 853b9dba6b..0ebe161da4 100644
--- a/src/main/java/common/Researches.java
+++ b/src/main/java/common/Researches.java
@@ -23,40 +23,49 @@ public class Researches {
}
public static void postInit() {
- final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 3).add(Aspect.WATER, 3)
- .add(Aspect.GREED, 3).add(Aspect.VOID, 3);
+ final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 3)
+ .add(Aspect.WATER, 3)
+ .add(Aspect.GREED, 3)
+ .add(Aspect.VOID, 3);
@SuppressWarnings("unused")
final ResearchItem jar_thaumiumreinforced = new ResearchItem(
- "THAUMIUMREINFORCEDJAR",
- "ALCHEMY",
- aspects_jarthaumiumreinforced,
- 3,
- -4,
- 2,
- new ItemStack(Blocks.jarThaumiumReinforced, 1))
- .setPages(
- new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"),
- new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")),
- new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")),
- new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1"))
- .setConcealed().setParents("JARLABEL").registerResearchItem();
+ "THAUMIUMREINFORCEDJAR",
+ "ALCHEMY",
+ aspects_jarthaumiumreinforced,
+ 3,
+ -4,
+ 2,
+ new ItemStack(Blocks.jarThaumiumReinforced, 1))
+ .setPages(
+ new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"),
+ new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")),
+ new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")),
+ new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1"))
+ .setConcealed()
+ .setParents("JARLABEL")
+ .registerResearchItem();
- final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 3).add(Aspect.ELDRITCH, 3)
- .add(Aspect.WATER, 3).add(Aspect.GREED, 5).add(Aspect.VOID, 5);
+ final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 3)
+ .add(Aspect.ELDRITCH, 3)
+ .add(Aspect.WATER, 3)
+ .add(Aspect.GREED, 5)
+ .add(Aspect.VOID, 5);
@SuppressWarnings("unused")
final ResearchItem jar_ichor = new ResearchItem(
- "ICHORJAR",
- "ALCHEMY",
- aspects_jarichor,
- 2,
- -5,
- 3,
- new ItemStack(Blocks.jarIchor, 1))
- .setPages(
- new ResearchPage("kekztech.research_page.ICHORJAR.0"),
- new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")),
- new ResearchPage(Recipes.infusionRecipes.get("ICHORVOIDJAR")))
- .setConcealed().setParents("THAUMIUMREINFORCEDJAR").setParentsHidden("ICHOR")
- .registerResearchItem();
+ "ICHORJAR",
+ "ALCHEMY",
+ aspects_jarichor,
+ 2,
+ -5,
+ 3,
+ new ItemStack(Blocks.jarIchor, 1))
+ .setPages(
+ new ResearchPage("kekztech.research_page.ICHORJAR.0"),
+ new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")),
+ new ResearchPage(Recipes.infusionRecipes.get("ICHORVOIDJAR")))
+ .setConcealed()
+ .setParents("THAUMIUMREINFORCEDJAR")
+ .setParentsHidden("ICHOR")
+ .registerResearchItem();
}
}
diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index 7a8596eb0d..a82f9862f0 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -80,7 +80,7 @@ public class Block_IchorJar extends BlockJar {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2,
- float f3) {
+ float f3) {
// Call parent method to handle jar emptying, labels stuff etc
super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
// Interact with Essentia Phials if the player holds one
@@ -129,12 +129,7 @@ public class Block_IchorJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(filledPhial)) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- filledPhial));
+ new EntityItem(world, (float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F, filledPhial));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -159,12 +154,12 @@ public class Block_IchorJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- new ItemStack(ConfigItems.itemEssence, 1, 0)));
+ new EntityItem(
+ world,
+ (float) x + 0.5F,
+ (float) y + 0.5F,
+ (float) z + 0.5F,
+ new ItemStack(ConfigItems.itemEssence, 1, 0)));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -192,7 +187,7 @@ public class Block_IchorJar extends BlockJar {
}
private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations,
- float explosionStrength) {
+ float explosionStrength) {
if (fillAmount > 0) {
// Create a decent explosion in the center of the block (TNT has strength 4.0F)
world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
@@ -226,7 +221,7 @@ public class Block_IchorJar extends BlockJar {
@Override
public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5,
- EntityPlayer par6EntityPlayer) {}
+ EntityPlayer par6EntityPlayer) {}
@Override
public boolean canDropFromExplosion(Explosion e) {
diff --git a/src/main/java/common/blocks/Block_LargeHexPlate.java b/src/main/java/common/blocks/Block_LargeHexPlate.java
index 9af1d22bc4..ac8174ff34 100644
--- a/src/main/java/common/blocks/Block_LargeHexPlate.java
+++ b/src/main/java/common/blocks/Block_LargeHexPlate.java
@@ -43,11 +43,11 @@ public class Block_LargeHexPlate extends Block {
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
final int xMod = x >= 0 ? Math.abs(x % BATCH_SIZE)
- : Math.abs((Math.abs(x) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ : Math.abs((Math.abs(x) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
final int yMod = y >= 0 ? Math.abs(y % BATCH_SIZE)
- : Math.abs((Math.abs(y) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ : Math.abs((Math.abs(y) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
final int zMod = z >= 0 ? Math.abs(z % BATCH_SIZE)
- : Math.abs((Math.abs(z) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ : Math.abs((Math.abs(z) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
if (side == 0 || side == 1) {
return parts[xMod][zMod];
diff --git a/src/main/java/common/blocks/Block_TFFTStorageField.java b/src/main/java/common/blocks/Block_TFFTStorageField.java
index 46ecd8ee62..069dd40dca 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageField.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageField.java
@@ -51,10 +51,8 @@ public class Block_TFFTStorageField extends BaseGTUpdateableBlock {
// I guess glodblock won't mind
static {
GT_Utility.addTexturePage((byte) 12);
- Textures.BlockIcons.setCasingTexture(
- (byte) 12,
- (byte) 127,
- TextureFactory.of(Block_TFFTStorageField.TFFTCasingIcon.INSTANCE));
+ Textures.BlockIcons
+ .setCasingTexture((byte) 12, (byte) 127, TextureFactory.of(Block_TFFTStorageField.TFFTCasingIcon.INSTANCE));
}
private Block_TFFTStorageField() {
diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index e089e2a1c2..3c91ac6d0d 100644
--- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -92,7 +92,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
}
private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations,
- float explosionStrength) {
+ float explosionStrength) {
if (fillAmount > 0) {
// Create a decent explosion in the center of the block (TNT has strength 4.0F)
world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
@@ -121,7 +121,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2,
- float f3) {
+ float f3) {
// Call parent method to handle jar emptying, labels stuff etc
super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
// Interact with Essentia Phials if the player holds one
@@ -170,12 +170,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(filledPhial)) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- filledPhial));
+ new EntityItem(world, (float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F, filledPhial));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -200,12 +195,12 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- new ItemStack(ConfigItems.itemEssence, 1, 0)));
+ new EntityItem(
+ world,
+ (float) x + 0.5F,
+ (float) y + 0.5F,
+ (float) z + 0.5F,
+ new ItemStack(ConfigItems.itemEssence, 1, 0)));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -248,7 +243,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
@Override
public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5,
- EntityPlayer par6EntityPlayer) {}
+ EntityPlayer par6EntityPlayer) {}
@Override
public boolean canDropFromExplosion(Explosion e) {
diff --git a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
index 1b074241de..971aac494a 100644
--- a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
+++ b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
@@ -44,28 +44,28 @@ public class IB_LapotronicEnergyUnit extends ItemBlock {
// 10 Billion EU/t
private static final BigInteger UHV_cap_eu_per_tick = LSC_wireless_eu_cap
- .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
+ .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
// 6 Quadrillion EU.
public static BigInteger UEV_wireless_eu_cap = BigInteger.valueOf(100 * 60 * pow(10, 12));
// 1 Trillion EU/t
private static final BigInteger UEV_cap_eu_per_tick = UEV_wireless_eu_cap
- .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
+ .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
// 600 Quadrillion EU.
public static BigInteger UIV_wireless_eu_cap = BigInteger.valueOf(60 * pow(10, 16));
// 100 Trillion EU/t
private static final BigInteger UIV_cap_eu_per_tick = UIV_wireless_eu_cap
- .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
+ .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
// 60 Quintillion EU.
public static BigInteger UMV_wireless_eu_cap = UIV_wireless_eu_cap.multiply(BigInteger.valueOf(100));
// 10 Quadrillion EU/t
private static final BigInteger UMV_cap_eu_per_tick = UMV_wireless_eu_cap
- .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
+ .divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
public static long EV_cap_storage = 60_000_000L;
public static long IV_cap_storage = 600_000_000L;
@@ -75,7 +75,8 @@ public class IB_LapotronicEnergyUnit extends ItemBlock {
public static long UHV_cap_storage = Long.MAX_VALUE;
public static long UEV_cap_storage = Long.MAX_VALUE;
public static long UIV_cap_storage = Long.MAX_VALUE;
- public static BigInteger UMV_cap_storage = BigInteger.valueOf(UIV_cap_storage).pow(2);
+ public static BigInteger UMV_cap_storage = BigInteger.valueOf(UIV_cap_storage)
+ .pow(2);
@SuppressWarnings("unchecked")
@Override
@@ -84,105 +85,105 @@ public class IB_LapotronicEnergyUnit extends ItemBlock {
switch (stack.getItemDamage()) {
case 1:
lines.add(
- "Capacity: " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(IV_cap_storage)
- + EnumChatFormatting.GRAY
- + "EU");
+ "Capacity: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(IV_cap_storage)
+ + EnumChatFormatting.GRAY
+ + "EU");
break;
case 2:
lines.add(
- "Capacity: " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(LuV_cap_storage)
- + EnumChatFormatting.GRAY
- + "EU");
+ "Capacity: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(LuV_cap_storage)
+ + EnumChatFormatting.GRAY
+ + "EU");
break;
case 3:
lines.add(
- "Capacity: " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(ZPM_cap_storage)
- + EnumChatFormatting.GRAY
- + "EU");
+ "Capacity: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(ZPM_cap_storage)
+ + EnumChatFormatting.GRAY
+ + "EU");
break;
case 4:
lines.add(
- "Capacity: " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(UV_cap_storage)
- + EnumChatFormatting.GRAY
- + "EU");
+ "Capacity: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(UV_cap_storage)
+ + EnumChatFormatting.GRAY
+ + "EU");
break;
case 5:
lines.add(
- "Capacity: " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(UHV_cap_storage)
- + EnumChatFormatting.GRAY
- + "EU");
+ "Capacity: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(UHV_cap_storage)
+ + EnumChatFormatting.GRAY
+ + "EU");
lines.add(
- "Supports up to " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(UHV_cap_eu_per_tick)
- + EnumChatFormatting.GRAY
- + "EU/t of wireless transfer per "
- + GT_Values.TIER_COLORS[9]
- + GT_Values.VN[9]
- + EnumChatFormatting.GRAY
- + " capacitor.");
+ "Supports up to " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(UHV_cap_eu_per_tick)
+ + EnumChatFormatting.GRAY
+ + "EU/t of wireless transfer per "
+ + GT_Values.TIER_COLORS[9]
+ + GT_Values.VN[9]
+ + EnumChatFormatting.GRAY
+ + " capacitor.");
break;
case 6:
lines.add("Capacity: None");
break;
case 7:
lines.add(
- "Capacity: " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(EV_cap_storage)
- + EnumChatFormatting.GRAY
- + " EU");
+ "Capacity: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(EV_cap_storage)
+ + EnumChatFormatting.GRAY
+ + " EU");
break;
case 8:
lines.add(
- "Capacity: " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(UEV_cap_storage)
- + EnumChatFormatting.GRAY
- + "EU");
+