aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/forestry
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-05-24 19:04:17 +0100
committerRaven Szewczyk <git@eigenraven.me>2024-05-24 19:04:17 +0100
commit69ce418e29e22391f60cdd55815727762a78c33a (patch)
tree97be683e94b8a541d7578760a154f16d4dea38e2 /src/main/java/gtPlusPlus/xmod/forestry
parent38f38a991e433f6eff30476b87a71eeadee228ce (diff)
downloadGT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.tar.gz
GT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.tar.bz2
GT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.zip
Apply updated GT5u spotless configs
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/forestry')
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java63
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java77
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java74
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java45
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java25
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java144
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java21
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java136
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java9
19 files changed, 369 insertions, 320 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
index 94f61296d6..3c00c79fcb 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -35,35 +35,35 @@ public enum CustomCombs {
SAND("sand", true, Materials.Sand, 100),;
private static final int[][] colours = new int[][] {
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // SILICON
- { Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75) }, // RUBBER
- { Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175) }, // PLASTIC
- { Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75) }, // PTFE
- { Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14) }, // PBS
- // Unused
- { Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14) }, // Biofuel
- { Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32) }, // Ethanol
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150) }, // Fluorine
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5) }, // Force
- { Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170) }, // Nikolite
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
- { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, { 0x666666, 0x525252 },
- { 0x2E8F5B, 0xDCC289 }, { 0x4C4C4C, 0x333333 }, { 0x808080, 0x999999 }, { 0x57CFFB, 0xBBEEFF },
- { 0x7D0F0F, 0xD11919 }, { 0x1947D1, 0x476CDA }, { 0xE6005C, 0xCC0052 }, { 0x0033CC, 0x00248F },
- { 0xCCFFFF, 0xA3CCCC }, { 0x248F24, 0xCCFFCC }, { 0x248F24, 0x2EB82E }, { 0xD4D4D4, 0x58300B },
- { 0xFF6600, 0xE65C00 }, { 0xD4D4D4, 0xDDDDDD }, { 0x666699, 0xA3A3CC }, { 0xDA9147, 0xDE9C59 },
- { 0x808080, 0x999999 }, { 0x8585AD, 0x9D9DBD }, { 0xF0DEF0, 0xF2E1F2 }, { 0xC2C2D6, 0xCECEDE },
- { 0xE6B800, 0xCFA600 }, { 0x008AB8, 0xD6D6FF }, { 0xD5D5D5, 0xAAAAAA }, { 0xCC99FF, 0xDBB8FF },
- { 0xEBA1EB, 0xF2C3F2 }, { 0x62626D, 0x161620 }, { 0xE6E6E6, 0xFFFFCC }, { 0xDADADA, 0xD1D1E0 },
- { 0x19AF19, 0x169E16 }, { 0x335C33, 0x6B8F00 }, { 0x003300, 0x002400 }, };
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // SILICON
+ { Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75) }, // RUBBER
+ { Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175) }, // PLASTIC
+ { Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75) }, // PTFE
+ { Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14) }, // PBS
+ // Unused
+ { Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14) }, // Biofuel
+ { Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32) }, // Ethanol
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150) }, // Fluorine
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5) }, // Force
+ { Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170) }, // Nikolite
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, { 0x666666, 0x525252 },
+ { 0x2E8F5B, 0xDCC289 }, { 0x4C4C4C, 0x333333 }, { 0x808080, 0x999999 }, { 0x57CFFB, 0xBBEEFF },
+ { 0x7D0F0F, 0xD11919 }, { 0x1947D1, 0x476CDA }, { 0xE6005C, 0xCC0052 }, { 0x0033CC, 0x00248F },
+ { 0xCCFFFF, 0xA3CCCC }, { 0x248F24, 0xCCFFCC }, { 0x248F24, 0x2EB82E }, { 0xD4D4D4, 0x58300B },
+ { 0xFF6600, 0xE65C00 }, { 0xD4D4D4, 0xDDDDDD }, { 0x666699, 0xA3A3CC }, { 0xDA9147, 0xDE9C59 },
+ { 0x808080, 0x999999 }, { 0x8585AD, 0x9D9DBD }, { 0xF0DEF0, 0xF2E1F2 }, { 0xC2C2D6, 0xCECEDE },
+ { 0xE6B800, 0xCFA600 }, { 0x008AB8, 0xD6D6FF }, { 0xD5D5D5, 0xAAAAAA }, { 0xCC99FF, 0xDBB8FF },
+ { 0xEBA1EB, 0xF2C3F2 }, { 0x62626D, 0x161620 }, { 0xE6E6E6, 0xFFFFCC }, { 0xDADADA, 0xD1D1E0 },
+ { 0x19AF19, 0x169E16 }, { 0x335C33, 0x6B8F00 }, { 0x003300, 0x002400 }, };
public boolean showInList;
public final Materials material;
public final int chance;
@@ -83,8 +83,9 @@ public enum CustomCombs {
public String getName() {
// return "gt.comb."+this.name;
return GT_LanguageManager.addStringLocalization(
- "comb." + this.name,
- this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
+ "comb." + this.name,
+ this.name.substring(0, 1)
+ .toUpperCase() + this.name.substring(1) + " Comb");
}
public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
index 4c8912b21e..0cdb49a9b5 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -36,7 +36,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
public enum GTPP_Bee_Definition implements IBeeDefinition {
SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
- Utils.rgbtoHexValue(125, 125, 125)) {
+ Utils.rgbtoHexValue(125, 125, 125)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -54,14 +54,14 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(
- getGregtechBeeType("SLIMEBALL"),
- getGregtechBeeType("STICKYRESIN"),
- 10);
+ getGregtechBeeType("SLIMEBALL"),
+ getGregtechBeeType("STICKYRESIN"),
+ 10);
}
},
RUBBER(GTPP_Branch_Definition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
- Utils.rgbtoHexValue(75, 75, 75)) {
+ Utils.rgbtoHexValue(75, 75, 75)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -79,14 +79,14 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(
- getGregtechBeeType("SLIMEBALL"),
- getGregtechBeeType("STICKYRESIN"),
- 10);
+ getGregtechBeeType("SLIMEBALL"),
+ getGregtechBeeType("STICKYRESIN"),
+ 10);
}
},
PLASTIC(GTPP_Branch_Definition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
- Utils.rgbtoHexValue(175, 175, 175)) {
+ Utils.rgbtoHexValue(175, 175, 175)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -108,7 +108,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
},
PTFE(GTPP_Branch_Definition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
- Utils.rgbtoHexValue(75, 75, 75)) {
+ Utils.rgbtoHexValue(75, 75, 75)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -154,7 +154,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
* Fuels
*/
BIOMASS(GTPP_Branch_Definition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
- Utils.rgbtoHexValue(23, 175, 14)) {
+ Utils.rgbtoHexValue(23, 175, 14)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -177,7 +177,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
},
ETHANOL(GTPP_Branch_Definition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
- Utils.rgbtoHexValue(220, 156, 32)) {
+ Utils.rgbtoHexValue(220, 156, 32)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -203,7 +203,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
* Materials
*/
FLUORINE(GTPP_Branch_Definition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
- Utils.rgbtoHexValue(10, 150, 150)) {
+ Utils.rgbtoHexValue(10, 150, 150)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -221,9 +221,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(
- getGregtechBeeType("LAPIS"),
- getGregtechBeeType("SAPPHIRE"),
- 5);
+ getGregtechBeeType("LAPIS"),
+ getGregtechBeeType("SAPPHIRE"),
+ 5);
tMutation.restrictBiomeType(Type.COLD);
}
},
@@ -232,7 +232,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
// Force
FORCE(GTPP_Branch_Definition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
- Utils.rgbtoHexValue(200, 200, 5)) {
+ Utils.rgbtoHexValue(200, 200, 5)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -252,16 +252,16 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(
- getGregtechBeeType("STEEL"),
- getGregtechBeeType("GOLD"),
- 10);
+ getGregtechBeeType("STEEL"),
+ getGregtechBeeType("GOLD"),
+ 10);
tMutation.restrictBiomeType(Type.HOT);
}
},
// Nikolite
NIKOLITE(GTPP_Branch_Definition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
- Utils.rgbtoHexValue(40, 150, 170)) {
+ Utils.rgbtoHexValue(40, 150, 170)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -279,9 +279,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(
- getGregtechBeeType("ALUMINIUM"),
- getGregtechBeeType("SILVER"),
- 8);
+ getGregtechBeeType("ALUMINIUM"),
+ getGregtechBeeType("SILVER"),
+ 8);
tMutation.restrictBiomeType(Type.HOT);
}
},
@@ -483,7 +483,8 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
private IBeeGenome genome;
GTPP_Bee_Definition(GTPP_Branch_Definition branch, String binomial, boolean dominant, int primary, int secondary) {
- String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH);
+ String lowercaseName = this.toString()
+ .toLowerCase(Locale.ENGLISH);
String species = "species" + WordUtils.capitalize(lowercaseName);
String uid = "forestry." + species;
@@ -492,15 +493,15 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
this.branch = branch;
this.species = BeeManager.beeFactory.createSpecies(
- uid,
- dominant,
- "Sengir",
- name,
- description,
- branch.getBranch(),
- binomial,
- primary,
- secondary);
+ uid,
+ dominant,
+ "Sengir",
+ name,
+ description,
+ branch.getBranch(),
+ binomial,
+ primary,
+ secondary);
}
public static void initBees() {
@@ -513,8 +514,10 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
private static IAlleleBeeSpecies getSpecies(String name) {
- return (IAlleleBeeSpecies) AlleleManager.alleleRegistry
- .getAllele((new StringBuilder()).append("forestry.species").append(name).toString());
+ return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(
+ (new StringBuilder()).append("forestry.species")
+ .append(name)
+ .toString());
}
protected abstract void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies);
@@ -536,7 +539,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2,
- int chance) {
+ int chance) {
IAllele[] template = getTemplate();
Logger.DEBUG_BEES("parent1: " + (parent1 != null));
Logger.DEBUG_BEES("parent2: " + (parent2 != null));
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index 9267a32950..4d04e3ad31 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -74,7 +74,7 @@ public class GTPP_Bees {
// Nikolite may not exist, so lets make it.
dropNikoliteDust = ItemUtils
- .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
+ .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) {
new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
@@ -91,8 +91,12 @@ public class GTPP_Bees {
}
private void addExtractorRecipe(ItemStack input, FluidStack output) {
- GT_Values.RA.stdBuilder().itemInputs(input).fluidOutputs(output).duration(1 * SECONDS + 10 * TICKS).eut(8)
- .addTo(fluidExtractionRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(input)
+ .fluidOutputs(output)
+ .duration(1 * SECONDS + 10 * TICKS)
+ .eut(8)
+ .addTo(fluidExtractionRecipes);
}
private static boolean tryGetBeesBoolean() {
@@ -150,7 +154,7 @@ public class GTPP_Bees {
}
} catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException
- | NoSuchMethodException | SecurityException | InvocationTargetException e) {
+ | NoSuchMethodException | SecurityException | InvocationTargetException e) {
Logger.BEES("Bad Reflection. setMaterials()");
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
index 92edae4356..94e6078c49 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
@@ -36,7 +36,7 @@ public enum GTPP_Branch_Definition {
return (IAllele[]) methodMyMethod.invoke(enumA);
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException
- | IllegalArgumentException | InvocationTargetException e) {
+ | IllegalArgumentException | InvocationTargetException e) {
Logger.INFO("[Bees] Bad Reflection. getTemplate()");
e.printStackTrace();
// gregtech.loaders.misc.GT_BranchDefinition.getTemplate()
@@ -57,7 +57,7 @@ public enum GTPP_Branch_Definition {
return (IClassification) methodMyMethod.invoke(enum_MY_SAMPLE_ENUM);
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException
- | IllegalArgumentException | InvocationTargetException e) {
+ | IllegalArgumentException | InvocationTargetException e) {
Logger.INFO("[Bees] Bad Reflection. getBranch()");
e.printStackTrace();
return null;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
index 3ada8ce513..63c0ae53ec 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -131,7 +131,12 @@ public class ItemCustomComb extends Item {
}
public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance) {
- GT_Values.RA.stdBuilder().itemInputs(tComb).itemOutputs(aOutput, ItemList.FR_Wax.get(1))
- .outputChances(chance * 100, 3000).duration(6 * SECONDS + 8 * TICKS).eut(5).addTo(centrifugeRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tComb)
+ .itemOutputs(aOutput, ItemList.FR_Wax.get(1))
+ .outputChances(chance * 100, 3000)
+ .duration(6 * SECONDS + 8 * TICKS)
+ .eut(5)
+ .addTo(centrifugeRecipes);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
index 4bc47fa7bd..31b14ed4e6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
@@ -32,12 +32,15 @@ public enum GTPP_CombType {
GTPP_CombType(int aID, String aName, boolean aShow, int aChance, int... aColour) {
this.mID = aID;
this.mName = aName;
- this.mNameUnlocal = aName.toLowerCase().replaceAll(" ", "");
+ this.mNameUnlocal = aName.toLowerCase()
+ .replaceAll(" ", "");
this.mChance = aChance;
this.mShowInList = aShow;
this.mColour = aColour;
map(aID, this);
- this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+ this.mMaterial = GTPP_Bees.sMaterialMappings.get(
+ aName.toLowerCase()
+ .replaceAll(" ", ""));
GT_LanguageManager.addStringLocalization("gtplusplus.comb." + this.mNameUnlocal, this.mName + " Comb");
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
index 6f43d4a43e..9819c586cd 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
@@ -32,11 +32,14 @@ public enum GTPP_DropType {
private GTPP_DropType(int aID, String aName, boolean aShow, int... aColour) {
this.mID = aID;
this.mName = aName;
- this.mNameUnlocal = aName.toLowerCase().replaceAll(" ", "");
+ this.mNameUnlocal = aName.toLowerCase()
+ .replaceAll(" ", "");
this.mShowInList = aShow;
this.mColour = aColour;
map(aID, this);
- this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+ this.mMaterial = GTPP_Bees.sMaterialMappings.get(
+ aName.toLowerCase()
+ .replaceAll(" ", ""));
GT_LanguageManager.addStringLocalization("gtplusplus.drop." + this.mNameUnlocal, this.mName + " Drop");
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
index acca5b810f..66451c7581 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
@@ -31,11 +31,14 @@ public enum GTPP_PollenType {
private GTPP_PollenType(int aID, String aName, boolean aShow, int... aColour) {
this.mID = aID;
this.mName = aName;
- this.mNameUnlocal = aName.toLowerCase().replaceAll(" ", "");
+ this.mNameUnlocal = aName.toLowerCase()
+ .replaceAll(" ", "");
this.mShowInList = aShow;
this.mColour = aColour;
map(aID, this);
- this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+ this.mMaterial = GTPP_Bees.sMaterialMappings.get(
+ aName.toLowerCase()
+ .replaceAll(" ", ""));
GT_LanguageManager.addStringLocalization("gtplusplus.pollen." + this.mNameUnlocal, this.mName + " Pollen");
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
index b76d79d387..eb3b617077 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
@@ -32,11 +32,14 @@ public enum GTPP_PropolisType {
private GTPP_PropolisType(int aID, String aName, boolean aShow, int aColour) {
this.mID = aID;
this.mName = aName;
- this.mNameUnlocal = aName.toLowerCase().replaceAll(" ", "");
+ this.mNameUnlocal = aName.toLowerCase()
+ .replaceAll(" ", "");
this.mShowInList = aShow;
this.mColour = aColour;
map(aID, this);
- this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
+ this.mMaterial = GTPP_Bees.sMaterialMappings.get(
+ aName.toLowerCase()
+ .replaceAll(" ", ""));
GT_LanguageManager.addStringLocalization("gtplusplus.propolis." + this.mNameUnlocal, this.mName + " Propolis");
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index ab8771e6db..b61a91710e 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -53,63 +53,63 @@ public class FR_ItemRegistry {
// Magic Bee like Frames
hiveFrameVoid = new MB_ItemFrame(
- MB_FrameType.USELESS,
- EnumRarity.common,
- "No more cheaty frames for GTNH players.");
+ MB_FrameType.USELESS,
+ EnumRarity.common,
+ "No more cheaty frames for GTNH players.");
hiveFrameAccelerated = new MB_ItemFrame(
- MB_FrameType.ACCELERATED,
- "Longevity for bees isn't very common, especially if they're working harder.");
+ MB_FrameType.ACCELERATED,
+ "Longevity for bees isn't very common, especially if they're working harder.");
hiveFrameMutagenic = new MB_ItemFrame(
- MB_FrameType.MUTAGENIC,
- EnumRarity.epic,
- "Evolution of the fittest, finest and fastest.");
+ MB_FrameType.MUTAGENIC,
+ EnumRarity.epic,
+ "Evolution of the fittest, finest and fastest.");
hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected.");
ChestGenHooks.addItem(
- ChestGenHooks.STRONGHOLD_CORRIDOR,
- new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
+ ChestGenHooks.STRONGHOLD_CORRIDOR,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
ChestGenHooks.addItem(
- ChestGenHooks.STRONGHOLD_LIBRARY,
- new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 18));
+ ChestGenHooks.STRONGHOLD_LIBRARY,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 18));
ChestGenHooks.addItem(
- ChestGenHooks.DUNGEON_CHEST,
- new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
+ ChestGenHooks.DUNGEON_CHEST,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
ChestGenHooks.addItem(
- ChestGenHooks.MINESHAFT_CORRIDOR,
- new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 9));
+ ChestGenHooks.MINESHAFT_CORRIDOR,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 9));
ChestGenHooks.addItem(
- ChestGenHooks.PYRAMID_DESERT_CHEST,
- new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 1, 9));
+ ChestGenHooks.PYRAMID_DESERT_CHEST,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 1, 9));
ChestGenHooks.addItem(
- ChestGenHooks.PYRAMID_JUNGLE_CHEST,
- new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12));
+ ChestGenHooks.PYRAMID_JUNGLE_CHEST,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12));
ChestGenHooks.addItem(
- ChestGenHooks.MINESHAFT_CORRIDOR,
- new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 8));
+ ChestGenHooks.MINESHAFT_CORRIDOR,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 8));
ChestGenHooks.addItem(
- ChestGenHooks.DUNGEON_CHEST,
- new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12));
+ ChestGenHooks.DUNGEON_CHEST,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12));
// Frame Items added by bartimaeusnek
hiveFrameDecay = new MB_ItemFrame(
- MB_FrameType.DECAYING,
- EnumRarity.uncommon,
- "Who really needs stable genetics?");
+ MB_FrameType.DECAYING,
+ EnumRarity.uncommon,
+ "Who really needs stable genetics?");
hiveFrameSlow = new MB_ItemFrame(MB_FrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
hiveFrameStalilize = new MB_ItemFrame(
- MB_FrameType.STABILIZING,
- EnumRarity.rare,
- "If you wish your bees to keep their form.");
+ MB_FrameType.STABILIZING,
+ EnumRarity.rare,
+ "If you wish your bees to keep their form.");
hiveFrameArborist = new MB_ItemFrame(
- MB_FrameType.ARBORISTS,
- EnumRarity.common,
- "Who need Bees when you can have Trees?");
+ MB_FrameType.ARBORISTS,
+ EnumRarity.common,
+ "Who need Bees when you can have Trees?");
ChestGenHooks.addItem(
- ChestGenHooks.PYRAMID_JUNGLE_CHEST,
- new WeightedRandomChestContent(new ItemStack(hiveFrameArborist), 1, 4, 24));
+ ChestGenHooks.PYRAMID_JUNGLE_CHEST,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameArborist), 1, 4, 24));
ChestGenHooks.addItem(
- ChestGenHooks.STRONGHOLD_LIBRARY,
- new WeightedRandomChestContent(new ItemStack(hiveFrameSlow), 1, 4, 24));
+ ChestGenHooks.STRONGHOLD_LIBRARY,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameSlow), 1, 4, 24));
}
protected static <T extends Item> T registerItem(final T item, final String name) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
index 95049ec5c8..418c05587f 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -44,13 +44,13 @@ public enum MB_FrameType implements IBeeModifier {
private final boolean isHellish;
MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
- final float production, final float geneticDecay) {
+ final float production, final float geneticDecay) {
this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
}
MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
- final float production, final float flowering, final float geneticDecay, final boolean sealed,
- final boolean lit, final boolean sunlit, final boolean hellish) {
+ final float production, final float flowering, final float geneticDecay, final boolean sealed,
+ final boolean lit, final boolean sunlit, final boolean hellish) {
this.frameName = name;
this.maxDamage = damage;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
index 6b075c2b60..7c9cc5a990 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
@@ -81,10 +81,12 @@ public class GTPP_Comb extends Item {
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
- int colour = GTPP_CombType.get(stack.getItemDamage()).getColours()[0];
+ int colour = GTPP_CombType.get(stack.getItemDamage())
+ .getColours()[0];
if (pass >= 1) {
- colour = GTPP_CombType.get(stack.getItemDamage()).getColours()[1];
+ colour = GTPP_CombType.get(stack.getItemDamage())
+ .getColours()[1];