aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-02-27 01:47:11 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-02-27 01:47:11 +1000
commit04210cce5ade5d59182efbe340fa89a9e7ff678d (patch)
tree31d161bbda949feaea63c1d16a1f2c691c09de4f /src/Java/gtPlusPlus
parentfe89a9835edc5b10a052cd58669b1826f5b57abd (diff)
downloadGT5-Unofficial-04210cce5ade5d59182efbe340fa89a9e7ff678d.tar.gz
GT5-Unofficial-04210cce5ade5d59182efbe340fa89a9e7ff678d.tar.bz2
GT5-Unofficial-04210cce5ade5d59182efbe340fa89a9e7ff678d.zip
$ PMD Cleanup.
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java2
-rw-r--r--src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java4
-rw-r--r--src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java12
-rw-r--r--src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java18
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java (renamed from src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerChassis.java)4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java (renamed from src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoil.java)4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java (renamed from src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWire.java)4
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java2
-rw-r--r--src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java14
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java2
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java6
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java2
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java2
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java2
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java2
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/data/LocaleUtils.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/math/MathUtils.java32
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java4
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java8
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java2
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java (renamed from src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java)4
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java (renamed from src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java)4
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java (renamed from src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java)5
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java (renamed from src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java)4
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java (renamed from src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldSludgeFluid.java)12
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java18
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java (renamed from src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java)4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java2
43 files changed, 100 insertions, 115 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index e0baa7d186..b5e1008a8e 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -130,7 +130,7 @@ public class GTplusplus implements ActionListener {
//Used by foreign players to generate .lang files for translation.
if (CORE.ConfigSwitches.dumpItemAndBlockData) {
- LocaleUtils.GenerateFakeLocaleFile();
+ LocaleUtils.generateFakeLocaleFile();
}
}
diff --git a/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java b/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java
index 5d79da2197..d2959df58d 100644
--- a/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java
+++ b/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java
@@ -3,9 +3,9 @@ package gtPlusPlus.api.plugin;
import gtPlusPlus.api.interfaces.IPlugin;
import gtPlusPlus.plugin.manager.Core_Manager;
-public class Sample_Plugin implements IPlugin {
+public final class Sample_Plugin implements IPlugin {
- private Sample_Plugin() {
+ public Sample_Plugin() {
Core_Manager.registerPlugin(this); //This must be called, else it won't load.
}
diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
index 9eb6d1171c..cbc8518fd7 100644
--- a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
@@ -14,12 +14,12 @@ public class RegistrationHandler {
}
private final static void init(){
- RECIPES_Tools.RECIPES_LOAD();
- RECIPES_Machines.RECIPES_LOAD();
- RECIPES_Shapeless.RECIPES_LOAD();
- RECIPES_MachineComponents.RECIPES_LOAD();
- RECIPE_Batteries.RECIPES_LOAD();
- RECIPES_General.RECIPES_LOAD();
+ RECIPES_Tools.loadRecipes();
+ RECIPES_Machines.loadRecipes();
+ RECIPES_Shapeless.loadRecipes();
+ RECIPES_MachineComponents.loadRecipes();
+ RECIPE_Batteries.loadRecipes();
+ RECIPES_General.loadRecipes();
//RECIPES_MTWRAPPER.run();
Logger.INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed);
COMPAT_HANDLER.areInitItemsLoaded = true;
diff --git a/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
index 28d3266407..f1303a3b35 100644
--- a/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
+++ b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
@@ -248,7 +248,7 @@ public class SegmentAnalytics {
}
- public Timer initTimer(EntityPlayer mPlayer) {
+ public final Timer initTimer(EntityPlayer mPlayer) {
Timer timer;
timer = new Timer();
timer.schedule(new initPlayer(mPlayer), 2 * 1000);
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 759cf4d060..37992459a8 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -43,9 +43,9 @@ import gtPlusPlus.core.item.general.ItemLavaFilter;
import gtPlusPlus.core.item.general.RF2EU_Battery;
import gtPlusPlus.core.item.general.books.ItemBaseBook;
import gtPlusPlus.core.item.general.capture.ItemEntityCatcher;
-import gtPlusPlus.core.item.general.chassis.itemBoilerChassis;
-import gtPlusPlus.core.item.general.chassis.itemDehydratorCoil;
-import gtPlusPlus.core.item.general.chassis.itemDehydratorCoilWire;
+import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis;
+import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil;
+import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire;
import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion;
import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion;
import gtPlusPlus.core.item.init.ItemsFoods;
@@ -245,9 +245,9 @@ public final class ModItems {
public static BaseItemPlate itemPlateEuropium;
public static BaseItemPlateDouble itemDoublePlateEuropium;
- public static itemBoilerChassis itemBoilerChassis;
- public static itemDehydratorCoilWire itemDehydratorCoilWire;
- public static itemDehydratorCoil itemDehydratorCoil;
+ public static ItemBoilerChassis itemBoilerChassis;
+ public static ItemDehydratorCoilWire itemDehydratorCoilWire;
+ public static ItemDehydratorCoil itemDehydratorCoil;
public static Item itemLavaFilter;
public static Item itemAirFilter;
@@ -694,9 +694,9 @@ public final class ModItems {
itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Europium));
}
- itemBoilerChassis = new itemBoilerChassis();
- itemDehydratorCoilWire = new itemDehydratorCoilWire();
- itemDehydratorCoil = new itemDehydratorCoil();
+ itemBoilerChassis = new ItemBoilerChassis();
+ itemDehydratorCoilWire = new ItemDehydratorCoilWire();
+ itemDehydratorCoil = new ItemDehydratorCoil();
itemAirFilter = new ItemAirFilter();
itemLavaFilter = new ItemLavaFilter();
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
index c11effde74..3e13fa0b41 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
@@ -15,7 +15,7 @@ public class BaseItemBurnable extends CoreItem {
super(unlocalizedName, creativeTab, stackSize, maxDmg, description);
this.itemName = displayName;
this.meta = meta;
- if (!oredictName.equals("") || oredictName != null){
+ if (oredictName != null && !oredictName.equals("")){
registerOrdictionary(oredictName);
}
registerFuel(burnTime);
@@ -26,7 +26,7 @@ public class BaseItemBurnable extends CoreItem {
CORE.burnables.add(new Pair<Integer, ItemStack>(burn, ItemUtils.getSimpleStack(this, 1)));
}
- public void registerOrdictionary(String name){
+ public final void registerOrdictionary(String name){
ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), name);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
index 04bb1d59d8..eb9fb733ea 100644
--- a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
+++ b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
@@ -241,7 +241,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer
return this.colorSpots;
}
- public void setEntityToSpawnName(final String parEntityToSpawnName){
+ public final void setEntityToSpawnName(final String parEntityToSpawnName){
this.entityToSpawnName = parEntityToSpawnName;
this.entityToSpawnNameFull = this.entityMODID+"."+this.entityToSpawnName;
}
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
index 2062094159..2428224fec 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
@@ -17,7 +17,7 @@ public abstract class BaseItemDustAbstract extends Item{
public BaseItemDustAbstract(final String unlocalizedName, final String materialName, final int colour, final String pileSize) {
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(64);
- if (pileSize.toLowerCase().equals("dust")){
+ if (pileSize.equalsIgnoreCase("dust")){
this.setTextureName(CORE.MODID + ":" + "dust");
}
else{
@@ -37,6 +37,6 @@ public abstract class BaseItemDustAbstract extends Item{
public abstract String getMaterialName();
@Override
- public abstract int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF);
+ public abstract int getColorFromItemStack(ItemStack stack, int hex);
}
diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerChassis.java b/src/Java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
index 85c809a08b..58522b1138 100644
--- a/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerChassis.java
+++ b/src/Java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
@@ -11,11 +11,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
-public class itemBoilerChassis extends Item {
+public class ItemBoilerChassis extends Item {
public IIcon[] icons = new IIcon[1];
- public itemBoilerChassis() {
+ public ItemBoilerChassis() {
super();
this.setHasSubtypes(true);
String unlocalizedName = "itemBoilerChassis";
diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoil.java b/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
index ab103ea9e8..1508da5faf 100644
--- a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoil.java
+++ b/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
@@ -12,11 +12,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
-public class itemDehydratorCoil extends Item {
+public class ItemDehydratorCoil extends Item {
public IIcon[] icons = new IIcon[1];
- public itemDehydratorCoil() {
+ public ItemDehydratorCoil() {
super();
this.setHasSubtypes(true);
String unlocalizedName = "itemDehydratorCoil";
diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWire.java b/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
index 679e358277..634c941db5 100644
--- a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWire.java
+++ b/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
@@ -12,11 +12,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
-public class itemDehydratorCoilWire extends Item {
+public class ItemDehydratorCoilWire extends Item {
public IIcon[] icons = new IIcon[1];
- public itemDehydratorCoilWire() {
+ public ItemDehydratorCoilWire() {
super();
this.setHasSubtypes(true);
String unlocalizedName = "itemDehydratorCoilWire";
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 749431b6de..638852d3b2 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -661,7 +661,7 @@ public class Material {
}
}
}
- return null;
+ return new long[] {};
}
public final String getToolTip(final String chemSymbol, final long aMultiplier, final boolean aShowQuestionMarks) {
diff --git a/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
index 895caabee2..745975c16d 100644
--- a/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -96,8 +96,8 @@ public class LOADER_Machine_Components {
CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
- registerComponent_ULV();
- registerComponent_MAX();
+ registerComponentsULV();
+ registerComponentsMAX();
}
private static void registerGTStandardComponents(){
@@ -134,7 +134,7 @@ public class LOADER_Machine_Components {
CI.sensor_UV = GregtechItemList.Sensor_UV.get(1);
CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
- registerComponent_ULV();
+ registerComponentsULV();
}
private static void registerGTNHComponents(){
@@ -171,11 +171,11 @@ public class LOADER_Machine_Components {
CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
- registerComponent_ULV();
- registerComponent_MAX();
+ registerComponentsULV();
+ registerComponentsMAX();
}
- private static boolean registerComponent_ULV(){
+ private static boolean registerComponentsULV(){
CI.electricMotor_ULV = GregtechItemList.Electric_Motor_ULV.get(1);
CI.electricPump_ULV = GregtechItemList.Electric_Pump_ULV.get(1);
@@ -188,7 +188,7 @@ public class LOADER_Machine_Components {
return true;
}
- private static boolean registerComponent_MAX(){
+ private static boolean registerComponentsMAX(){
//Max Tier Components Blood Never added... Useless, lol.
CI.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
CI.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 4ee7d23dd9..523890c466 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -40,7 +40,7 @@ public class RECIPES_General {
static ItemStack OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench));
static ItemStack RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);
- public static void RECIPES_LOAD(){
+ public static void loadRecipes(){
if (LoadedMods.Gregtech){
RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);
run();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 13c50b6060..bb4924a33a 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -93,7 +93,7 @@ public class RECIPES_MachineComponents {
public static String smallGearTier9 = "gearGtSmallOsmium";
public static String smallGearTier10 = "gearGtSmallNeutronium";
- public static final void RECIPES_LOAD(){
+ public static final void loadRecipes(){
Logger.INFO("Loading Recipes for the Various Circuits and Machine components.");
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
run();
@@ -102,7 +102,7 @@ public class RECIPES_MachineComponents {
onlyULVComponents();
onlyMaxComponents();
}
- GregtechMachinePhase();
+ gregtechMachinePhase();
}
private static void run(){
@@ -381,7 +381,7 @@ public class RECIPES_MachineComponents {
CI.sensor_MAX);
}
- private static void GregtechMachinePhase(){
+ private static void gregtechMachinePhase(){
if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH){
Logger.INFO("Adding Gregtech machine recipes for the circuits.");
GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), 32, 256);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 0a6e6afef8..e1a4cb2157 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -186,7 +186,7 @@ public class RECIPES_Machines {
- public static final void RECIPES_LOAD(){
+ public static final void loadRecipes(){
run();
Logger.INFO("Loading Recipes for the Various machine blocks.");
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
index 55cc086121..fd7db68d46 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
@@ -19,7 +19,7 @@ public class RECIPES_Shapeless {
static String circuitUltimate = "circuitUltimate";
static ItemStack gearboxCasing_Tier_1;
- public static final void RECIPES_LOAD(){
+ public static final void loadRecipes(){
//run();
Logger.INFO("Loading Shapeless Recipes.");
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index d58e241beb..6f79bed373 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -125,7 +125,7 @@ public class RECIPES_Tools {
public static String plateDoubleNiChrome = "plateDoubleNichrome";
public static String plateIridiumAlloy = "plateAlloyIridium";
- public static final void RECIPES_LOAD(){
+ public static final void loadRecipes(){
run();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
index 759aadd7e0..19053ea4be 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
@@ -18,7 +18,7 @@ public class RECIPE_Batteries {
static ItemStack GT_Battery_Lithium = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32538, 1);
static ItemStack machineTransformer_EV;
- public static void RECIPES_LOAD(){
+ public static void loadRecipes(){
if (LoadedMods.Gregtech){
machineTransformer_EV = ItemList.Transformer_EV_HV.get(1);
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
index 1e4488e13e..90c0af9f16 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
@@ -115,7 +115,7 @@ public class TileEntityTradeTable extends TileEntityBase {
@Override
public int[] getAccessibleSlotsFromSide(int p_94128_1_) {
- return null;
+ return new int[] {};
}
@Override
diff --git a/src/Java/gtPlusPlus/core/util/data/LocaleUtils.java b/src/Java/gtPlusPlus/core/util/data/LocaleUtils.java
index 957f7923f8..1b225934fd 100644
--- a/src/Java/gtPlusPlus/core/util/data/LocaleUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/LocaleUtils.java
@@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack;
public class LocaleUtils {
- public static boolean GenerateFakeLocaleFile() {
+ public static boolean generateFakeLocaleFile() {
for (ModContainer modcontainer : Loader.instance().getModList()){
if (modcontainer.getModId().toLowerCase().equals("miscutils")) {
String S = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~";
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 6d61335fe8..4d5e5eb626 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -27,14 +27,11 @@ public class MathUtils {
public static int randInt(final int min, final int max) {
// nextInt is normally exclusive of the top value,
// so add 1 to make it inclusive
- final int randomNum = rand.nextInt((max - min) + 1) + min;
-
- return randomNum;
+ return rand.nextInt((max - min) + 1) + min;
}
public static double getChanceOfXOverYRuns(final double x, final double y){
- final double z = (1-Math.pow((1-x), y));
- return z;
+ return (1-Math.pow((1-x), y));
}
@@ -51,9 +48,7 @@ public class MathUtils {
public static long randLong(final long min, final long max) {
// nextInt is normally exclusive of the top value,
// so add 1 to make it inclusive
- final long randomNum = MathUtils.nextLong(rand,(max - min) + 1) + min;
-
- return randomNum;
+ return MathUtils.nextLong(rand,(max - min) + 1) + min;
}
private static long nextLong(final Random rng, final long n) {
// error checking and 2^x checking removed for simplicity.
@@ -79,8 +74,7 @@ public class MathUtils {
public static double randDouble(final double min, final double max) {
// nextInt is normally exclusive of the top value,
// so add 1 to make it inclusive
- final double randomNum = MathUtils.nextDouble(rand,(max - min) + 1) + min;
- return randomNum;
+ return MathUtils.nextDouble(rand,(max - min) + 1) + min;
}
private static double nextDouble(final Random rng, final double n) {
@@ -106,8 +100,7 @@ public class MathUtils {
public static float randFloat(final float min, final float max) {
// nextInt is normally exclusive of the top value,
// so add 1 to make it inclusive
- final float randomNum = MathUtils.nextFloat(rand,(max - min) + 1) + min;
- return randomNum;
+ return MathUtils.nextFloat(rand,(max - min) + 1) + min;
}
private static float nextFloat(final Random rng, final float n) {
@@ -131,9 +124,7 @@ public class MathUtils {
* @return double between min and max, inclusive.
*/
public static double findPercentage(final double current, final double max){
- final double c = (current / max) * 100;
- final double roundOff = Math.round(c * 100.00) / 100.00;
- return roundOff;
+ return Math.round(((current / max) * 100) * 100.00) / 100.00;
}
public static int findPercentageOfInt(long input, float percentage){
@@ -284,8 +275,7 @@ public class MathUtils {
* @return hexInteger between min and max, inclusive.
*/
public static int generateRandomHexValue(final int min, final int max){
- final int result = getHexNumberFromInt(randInt(min, max));
- return result;
+ return getHexNumberFromInt(randInt(min, max));
}
@@ -327,7 +317,7 @@ public class MathUtils {
if (outputArray.length > 0) {
return outputArray;
}
- return null;
+ return new long[] {};
}
private static long gcd(long a, long b){
@@ -349,12 +339,8 @@ public class MathUtils {
}
final public static int getRgbAsHex(final short[] RGBA){
-
final int returnValue = Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
- if (returnValue == 0){
- return 0;
- }
- return Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
+ return (returnValue == 0) ? 0 : returnValue;
}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java
index 854f813d2b..70d90001c5 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java
@@ -47,7 +47,7 @@ class LibProxy1 extends LibraryProxy {
@Override
public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) {
try {
- Logger.INFO("Trying with Gt 5.7/5.8 Method.");
+ //Logger.INFO("Trying with Gt 5.7/5.8 Method.");
return (boolean) this.m1.invoke(null, aInput, aOutput);
} catch (final Exception e) {
throw new RuntimeException(e);
@@ -65,7 +65,7 @@ class LibProxy2 extends LibraryProxy {
@Override
public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) {
try {
- Logger.INFO("Trying with Gt 5.9 Method.");
+ //Logger.INFO("Trying with Gt 5.9 Method.");
return (boolean) this.m2.invoke(null, aInput, aOutput, true);
} catch (final Exception e) {
throw new RuntimeException(e);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
index 6ad9a60a5a..33881c1e21 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
@@ -1,8 +1,8 @@
package gtPlusPlus.core.world.darkworld;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.world.darkworld.block.blockDarkWorldPortal;
-import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger;
+import gtPlusPlus.core.world.darkworld.block.BlockDarkWorldPortal;
+import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger;
import gtPlusPlus.core.world.darkworld.world.WorldProviderMod;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
@@ -12,8 +12,8 @@ public class Dimension_DarkWorld {
public Object instance;
public static int DIMID = CORE.DARKWORLD_ID;
- public static blockDarkWorldPortal portalBlock;
- public static itemDarkWorldPortalTrigger portalItem;
+ public static BlockDarkWorldPortal portalBlock;
+ public static ItemDarkWorldPortalTrigger portalItem;
public static Block blockTopLayer;
public static Block blockSecondLayer;
public static Block blockMainFiller = Blocks.stone;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java
index 481b16c6ee..1b7ab242e8 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java
@@ -25,6 +25,6 @@ public class GenLayerDarkWorld extends GenLayer {
@Override
public int[] getInts(int p_75904_1_, int p_75904_2_, int p_75904_3_, int p_75904_4_) {
- return null;
+ return new int[] {};
}
} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java
index ccfb1b0595..a16836bce0 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java
@@ -5,9 +5,9 @@ import gtPlusPlus.api.interfaces.ITileTooltip;
import gtPlusPlus.core.creative.AddToCreativeTab;
import net.minecraft.block.BlockGrass;
-public class blockDarkWorldGround extends BlockGrass implements ITileTooltip{
+public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip{
- public blockDarkWorldGround() {
+ public BlockDarkWorldGround() {
this.setCreativeTab(AddToCreativeTab.tabBOP);
this.setBlockName("blockDarkWorldGround");
this.setHardness(1.0F);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java
index ee5a106bd3..d8a05e9612 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java
@@ -9,9 +9,9 @@ import net.minecraft.block.BlockDirt;
import net.minecraft.world.ColorizerGrass;
import net.minecraft.world.IBlockAccess;
-public class blockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip{
+public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip{
- public blockDarkWorldPollutedDirt() {
+ public BlockDarkWorldPollutedDirt() {
this.setCreativeTab(AddToCreativeTab.tabBOP);
this.setBlockName("blockDarkWorldGround2");
this.setHardness(0.5F);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java
index eab52a4183..74bf034cf7 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java
@@ -24,17 +24,16 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-public class blockDarkWorldPortal extends BlockBreakable implements ITileTooltip{
+public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip{
IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null;
- public blockDarkWorldPortal() {
+ public BlockDarkWorldPortal() {
super("portal", Material.portal, false);
this.setTickRandomly(true);
this.setHardness(-1.0F);
this.setLightLevel(0.75F);
this.setCreativeTab(CreativeTabs.tabBlock);
this.setBlockName("blockDarkWorldPortal");
- LanguageRegistry.addName(this, "A Glimpse of the Toxic Everglades");
}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java
index ef6f2b0c7d..1ab195d1aa 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java
@@ -7,9 +7,9 @@ import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
-public class blockDarkWorldPortalFrame extends Block implements ITileTooltip{
+public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip{
- public blockDarkWorldPortalFrame() {
+ public BlockDarkWorldPortalFrame() {
super(Material.iron);
this.setCreativeTab(AddToCreativeTab.tabBOP);
this.setBlockName("blockDarkWorldPortalFrame");
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldSludgeFluid.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java
index c3c9beddc8..9f8ed377bc 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldSludgeFluid.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.world.darkworld.block;
import net.minecraft.block.material.*;
import net.minecraftforge.fluids.Fluid;
-public class blockDarkWorldSludgeFluid extends Fluid {
+public class BlockDarkWorldSludgeFluid extends Fluid {
public static final Material SLUDGE = new MaterialLiquid(MapColor.dirtColor);
@@ -15,11 +15,11 @@ public class blockDarkWorldSludgeFluid extends Fluid {
protected static Material material = SLUDGE;
- public blockDarkWorldSludgeFluid(String fluidName, int rgbColour) {
+ public BlockDarkWorldSludgeFluid(String fluidName, int rgbColour) {
this(fluidName, rgbColour, null);
}
- public blockDarkWorldSludgeFluid(String fluidName, int rgbColour, Float overlayAlpha) {
+ public BlockDarkWorldSludgeFluid(String fluidName, int rgbColour, Float overlayAlpha) {
super(fluidName);
setColor(rgbColour);
if (overlayAlpha != null){
@@ -36,7 +36,7 @@ public class blockDarkWorldSludgeFluid extends Fluid {
return mapColor;
}
- public blockDarkWorldSludgeFluid setColor(int parColor)
+ public BlockDarkWorldSludgeFluid setColor(int parColor)
{
mapColor = parColor;
return this;
@@ -47,7 +47,7 @@ public class blockDarkWorldSludgeFluid extends Fluid {
return overlayAlpha;
}
- public blockDarkWorldSludgeFluid setAlpha(float parOverlayAlpha)
+ public BlockDarkWorldSludgeFluid setAlpha(float parOverlayAlpha)
{
overlayAlpha = parOverlayAlpha;
return this;
@@ -77,7 +77,7 @@ public class blockDarkWorldSludgeFluid extends Fluid {
return fillSound;
}*/
- public blockDarkWorldSludgeFluid setMaterial(Material parMaterial)
+ public BlockDarkWorldSludgeFluid setMaterial(Material parMaterial)
{
material = parMaterial;
return this;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
index 1908eeb11e..94e35a97ed 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
@@ -7,14 +7,14 @@ import gtPlusPlus.core.block.base.BlockBaseFluid;
import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTooltip;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.world.darkworld.item.ItemBlockToxicEverglades;
-import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger;
+import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger;
import net.minecraft.init.Blocks;
import net.minecraftforge.fluids.FluidRegistry;
public class DarkWorldContentLoader {
//Static Vars
- public static blockDarkWorldSludgeFluid SLUDGE;
+ public static BlockDarkWorldSludgeFluid SLUDGE;
public synchronized static void run() {
@@ -26,7 +26,7 @@ public class DarkWorldContentLoader {
public synchronized static boolean initMisc(){
//Fluids
- SLUDGE = (blockDarkWorldSludgeFluid) new blockDarkWorldSludgeFluid(
+ SLUDGE = (BlockDarkWorldSludgeFluid) new BlockDarkWorldSludgeFluid(
"sludge",
Utils.rgbtoHexValue(30, 130, 30))
.setDensity(1800)
@@ -40,7 +40,7 @@ public class DarkWorldContentLoader {
}
public synchronized static boolean initItems(){
- portalItem = (itemDarkWorldPortalTrigger) (new itemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger"));
+ portalItem = (ItemDarkWorldPortalTrigger) (new ItemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger"));
GameRegistry.registerItem(portalItem, "everglades.trigger");
return true;
}
@@ -48,11 +48,11 @@ public class DarkWorldContentLoader {
public synchronized static boolean initBlocks(){
//Create Block Instances
- blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, blockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge");
- portalBlock = new blockDarkWorldPortal();
- blockTopLayer = new blockDarkWorldGround();
- blockSecondLayer = new blockDarkWorldPollutedDirt();
- blockPortalFrame = new blockDarkWorldPortalFrame();
+ blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge");
+ portalBlock = new BlockDarkWorldPortal();
+ blockTopLayer = new BlockDarkWorldGround();
+ blockSecondLayer = new BlockDarkWorldPollutedDirt();
+ blockPortalFrame = new BlockDarkWorldPortalFrame();
//Registry
GameRegistry.registerBlock(portalBlock, ItemBlockToxicEverglades.class, "dimensionDarkWorld_portal");
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java
index fa85cbe4a3..f3fd499ce4 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java
@@ -14,8 +14,8 @@ import net.minecraft.item.*;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
-public class itemDarkWorldPortalTrigger extends Item {
- public itemDarkWorldPortalTrigger() {
+public class ItemDarkWorldPortalTrigger extends Item {
+ public ItemDarkWorldPortalTrigger() {
super();
this.maxStackSize = 1;
setMaxDamage(64);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
index 16123ce70d..732e0e6ae9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
@@ -232,7 +232,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements
return new Long[]{aNBT.getLong("MaxCharge"), aNBT.getLong("Voltage"), aNBT.getLong("Tier"), aNBT.getLong("SpecialData")};
}
}
- return null;
+ return new Long[] {};
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index 177034b0a5..31cde41a37 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -330,7 +330,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
&& ((tTileEntity instanceof IDigitalChest))) {
return ((IDigitalChest) tTileEntity).getStoredItemData();
}
- return null;
+ return new ItemStack[] {};
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
index 870d3bd0b3..91d176d877 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
@@ -83,7 +83,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
@Override
public ITexture[][][] getTextureSet(ITexture[] pTextures) {
- return null;
+ return new ITexture[0][0][0];
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
index c04213a252..c9ed8e7b62 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
@@ -236,7 +236,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
@Override
public int[] getAccessibleSlotsFromSide(final int p_94128_1_) {
- return null;
+ return new int[] {};
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
index 00428eb9b8..b6e83fcdb3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
@@ -229,7 +229,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
@Override
public int[] getAccessibleSlotsFromSide(final int p_94128_1_) {
- return null;
+ return new int[] {};
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
index 297db1d7a0..8bb8d9d2fc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
@@ -180,7 +180,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_TieredM
@Override
public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
- return null;
+ return new ITexture[0][0][0];
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index 954d81a3fc..b2a8412a32 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -267,7 +267,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
@Override
public int[] getAccessibleSlotsFromSide(final int p_94128_1_) {
- return null;
+ return new int[] {};
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java
index a6342f505a..a35f86ff47 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java
@@ -92,7 +92,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase {
"1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)"};
}
- private void initFields() {
+ private final void initFields() {
casingBlock = ModBlocks.blockCasings2Misc;
casingMeta = getCasingBlockItem().get(0).getItemDamage();
int frameId = 4096 + getFrameMaterial().mMetaItemSubID;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
index 697b3d0e83..61075cfccd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
@@ -298,7 +298,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
@Override
public int[] getAccessibleSlotsFromSide(final int p_94128_1_) {
- return null;
+ return new int[] {};
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 0ab5cb477c..2f48dd73da 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -38,7 +38,7 @@ public class GregtechConduits {
try {
cableGt16=(OrePrefixes) GT_Utility.getField(OrePrefixes.class,"cableGt16").get(null);
}catch (IllegalAccessException | NullPointerException e){
- throw new Error(e);
+ e.printStackTrace();
}
}
}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
index db608e25b2..8e5815febc 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
@@ -55,7 +55,7 @@ extends BlockMultiID
}
catch (final Exception e)
{
- throw new RuntimeException(e);
+ e.printStackTrace();
}
return null;
}