aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 18:39:10 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 18:39:10 -0800
commitb846f1dc3a502d157ecf871e2a4a1ff49915f871 (patch)
tree4a86feaaddd8d00d32f7cc093736d02be92bf358
parent3194d4cbab82e336ecb82b5a2dc80153ed9b1b81 (diff)
downloadGT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.gz
GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.bz2
GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.zip
[ci skip] spotlessApply with the new settings
-rw-r--r--dependencies.gradle6
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java6
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java6
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Casing.java10
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java6
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Frame.java6
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java3
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java34
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java18
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java677
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java288
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java23
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java2
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java30
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java199
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java114
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java159
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java9
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java85
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java186
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java180
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java202
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java42
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java42
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java42
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java84
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java90
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java9
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java224
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java204
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java175
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java64
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java143
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java328
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java228
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LongPowerUsageBase.java85
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java11
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java580
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java572
-rw-r--r--src/main/java/goodgenerator/client/ClientProxy.java1
-rw-r--r--src/main/java/goodgenerator/client/GUI/GG_UITextures.java12
-rw-r--r--src/main/java/goodgenerator/client/render/BlockRenderHandler.java68
-rw-r--r--src/main/java/goodgenerator/common/CommonProxy.java1
-rw-r--r--src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java16
-rw-r--r--src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java8
-rw-r--r--src/main/java/goodgenerator/crossmod/nei/NEI_Config.java8
-rw-r--r--src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java14
-rw-r--r--src/main/java/goodgenerator/crossmod/thaumcraft/Research.java896
-rw-r--r--src/main/java/goodgenerator/items/DepletedFuelRod.java9
-rw-r--r--src/main/java/goodgenerator/items/FuelRod.java87
-rw-r--r--src/main/java/goodgenerator/items/MyItemBlocks.java44
-rw-r--r--src/main/java/goodgenerator/items/MyItems.java10
-rw-r--r--src/main/java/goodgenerator/items/MyMaterial.java475
-rw-r--r--src/main/java/goodgenerator/items/RadioactiveItem.java5
-rw-r--r--src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java96
-rw-r--r--src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java344
-rw-r--r--src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java156
-rw-r--r--src/main/java/goodgenerator/items/nuclear/NuclearTextures.java44
-rw-r--r--src/main/java/goodgenerator/loader/AchievementLoader.java3
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java379
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java98
-rw-r--r--src/main/java/goodgenerator/loader/FuelRecipeLoader.java80
-rw-r--r--src/main/java/goodgenerator/loader/FuelRodLoader.java85
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java406
-rw-r--r--src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java491
-rw-r--r--src/main/java/goodgenerator/loader/NeutronActivatorLoader.java24
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader.java1003
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader_02.java1334
-rw-r--r--src/main/java/goodgenerator/main/GG_Config_Loader.java126
-rw-r--r--src/main/java/goodgenerator/main/GoodGenerator.java11
-rw-r--r--src/main/java/goodgenerator/network/MessageMTEBase.java41
-rw-r--r--src/main/java/goodgenerator/tabs/MyTabs.java4
-rw-r--r--src/main/java/goodgenerator/util/CharExchanger.java40
-rw-r--r--src/main/java/goodgenerator/util/CrackRecipeAdder.java417
-rw-r--r--src/main/java/goodgenerator/util/DescTextLocalization.java9
-rw-r--r--src/main/java/goodgenerator/util/ItemRefer.java5
-rw-r--r--src/main/java/goodgenerator/util/Log.java1
-rw-r--r--src/main/java/goodgenerator/util/MaterialFix.java158
-rw-r--r--src/main/java/goodgenerator/util/MyRecipeAdder.java425
-rw-r--r--src/main/java/goodgenerator/util/StackUtils.java21
-rw-r--r--src/main/java/goodgenerator/util/StructureHelper.java48
81 files changed, 5386 insertions, 7289 deletions
diff --git a/dependencies.gradle b/dependencies.gradle
index 52a8f46500..c1cc6c5390 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -25,9 +25,9 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.24-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {transitive = false}
- runtime('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.132:dev')
- runtime('com.github.GTNewHorizons:ForestryMC:4.5.6:dev')
- runtime('com.github.GTNewHorizons:GTplusplus:1.7.176:dev')
+ runtimeOnly('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.132:dev')
+ runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev')
+ runtimeOnly('com.github.GTNewHorizons:GTplusplus:1.7.176:dev')
//compileOnly('com.github.GTNewHorizons:Avaritia:1.31)
}
diff --git a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
index 078012e64c..47f73b186b 100644
--- a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
@@ -2,8 +2,6 @@ package goodgenerator.blocks.myFluids;
import static goodgenerator.main.GoodGenerator.MOD_ID;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
@@ -11,7 +9,11 @@ import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class BaseFluid extends BlockFluidClassic {
+
@SideOnly(Side.CLIENT)
protected IIcon stillIcon;
diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
index 87466ea26a..720d782538 100644
--- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
@@ -1,11 +1,13 @@
package goodgenerator.blocks.myFluids;
-import cpw.mods.fml.common.registry.GameRegistry;
-import goodgenerator.crossmod.nei.NEI_Config;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.common.registry.GameRegistry;
+import goodgenerator.crossmod.nei.NEI_Config;
+
public class FluidsBuilder {
+
public FluidsBuilder() {}
public static void Register() {
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
index 8808abd169..9e01d783d2 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
@@ -1,10 +1,7 @@
package goodgenerator.blocks.regularBlock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import goodgenerator.main.GoodGenerator;
-import gregtech.api.GregTech_API;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -17,6 +14,11 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import goodgenerator.main.GoodGenerator;
+import gregtech.api.GregTech_API;
+
public class Casing extends Block {
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
index 149a1b2bfb..0a0169d0b4 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
@@ -1,14 +1,16 @@
package goodgenerator.blocks.regularBlock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class ComplexTextureCasing extends Casing {
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
index f5a62bed4f..b4acb03518 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
@@ -1,11 +1,13 @@
package goodgenerator.blocks.regularBlock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class Frame extends Casing {
+
public Frame(String name, String[] texture) {
super(name, texture, Material.iron);
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
index 914552ad8d..fb98b6adc8 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
@@ -1,9 +1,10 @@
package goodgenerator.blocks.regularBlock;
-import gregtech.api.interfaces.ITexture;
import net.minecraft.block.Block;
import net.minecraft.world.IBlockAccess;
+import gregtech.api.interfaces.ITexture;
+
public interface ITextureBlock {
default ITexture[] getTexture(Block aBlock, byte aSide) {
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
index df98dc67dd..afaca2e834 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
@@ -1,14 +1,7 @@
package goodgenerator.blocks.regularBlock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import goodgenerator.blocks.tileEntity.EssentiaHatch;
-import goodgenerator.blocks.tileEntity.EssentiaOutputHatch;
-import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME;
-import goodgenerator.main.GoodGenerator;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -24,8 +17,17 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.IEssentiaContainerItem;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import goodgenerator.blocks.tileEntity.EssentiaHatch;
+import goodgenerator.blocks.tileEntity.EssentiaOutputHatch;
+import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME;
+import goodgenerator.main.GoodGenerator;
+import gregtech.api.GregTech_API;
+import gregtech.api.util.GT_Utility;
public class TEBlock extends BlockContainer {
@@ -153,8 +155,8 @@ public class TEBlock extends BlockContainer {
}
@Override
- public boolean onBlockActivated(
- World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) {
+ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7,
+ float par8, float par9) {
if (world.isRemote) {
return false;
} else {
@@ -166,12 +168,8 @@ public class TEBlock extends BlockContainer {
Item tItem = tItemStack.getItem();
if (tItem instanceof IEssentiaContainerItem
&& ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null
- && ((IEssentiaContainerItem) tItem)
- .getAspects(player.getHeldItem())
- .size()
- > 0) {
- Aspect tLocked = ((IEssentiaContainerItem) tItem)
- .getAspects(player.getHeldItem())
+ && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) {
+ Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem())
.getAspects()[0];
((EssentiaHatch) tile).setLockedAspect(tLocked);
GT_Utility.sendChatToPlayer(
@@ -192,8 +190,8 @@ public class TEBlock extends BlockContainer {
ItemStack tItemStack = player.getHeldItem();
if (tItemStack == null) {
((EssentiaOutputHatch) tile).clear();
- GT_Utility.sendChatToPlayer(
- player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
+ GT_Utility
+ .sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
}
return true;
} else return false;
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
index b07d173491..95358505f6 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
@@ -1,5 +1,9 @@
package goodgenerator.blocks.regularBlock;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+
import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase;
import goodgenerator.client.render.BlockRenderHandler;
import goodgenerator.main.GoodGenerator;
@@ -8,9 +12,6 @@ import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.render.TextureFactory;
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
public class TurbineCasing extends Casing implements ITextureBloc