From 18d72ee94c18a8b6e330c255bb6ca650e6220196 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Tue, 9 Aug 2022 04:41:27 +0200 Subject: fix(warnings): remove broad wanings suppression (#1223) * fix(warnings): remove broad wanings suppression This shell script was applied to remove all instances of `@SuppressWarnings("ALL")`: ```sh grep -lr '@SuppressWarnings([[:space:]]*"ALL"[[:space:]]*)' src/ | xargs -l1 \ sed -n -i.bak '/@SuppressWarnings([[:space:]]*"ALL"[[:space:]]*)/!p' ``` * nuke @SuppressWarnings("all") in GT_NEI_DefaultHandler Case insensitive: ```sh grep -lr '@SuppressWarnings([[:space:]]*"[Aa][Ll][Ll]"[[:space:]]*)' src/ | xargs -l1 \ sed -n -i.bak '/@SuppressWarnings([[:space:]]*"[Aa][Ll][Ll]"[[:space:]]*)/!p' find src -type f -name '*.bak' -delete ``` * fix(warnings): GT_NEI_DefaultHandler * fix(warnings): GT_Mod * fix(warnings): GT_Values * fix(warnings): Materials * fix(warnings): GT_BeeDefinition * fix(warnings): GT_PostLoad * fix(warnings): GT_Worldgenloader * fix(warnings): GT_PreLoad --- .../gregtech/loaders/misc/GT_BeeDefinition.java | 61 +++++++++------------- 1 file changed, 24 insertions(+), 37 deletions(-) (limited to 'src/main/java/gregtech/loaders/misc') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 526ede3215..7228c52292 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -48,7 +48,6 @@ import static gregtech.api.enums.GT_Values.MOD_ID; import static gregtech.api.enums.GT_Values.MOD_ID_DC; import static gregtech.loaders.misc.GT_BeeDefinitionReference.*; -@SuppressWarnings("ALL") /** * Bride Class for Lambdas */ @@ -669,9 +668,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, GOLD, 10); - } + dis -> dis.registerMutation(REDSTONE, GOLD, 10) ), SUNNARIUM(GT_BranchDefinition.RAREMETAL, "Sunnarium", false, new Color(0xFFBC5E), new Color(0xE5CA2A), beeSpecies -> { @@ -824,9 +821,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, SPEED, Speed.NORMAL), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(ASH, PEAT, 15); - } + dis -> dis.registerMutation(ASH, PEAT, 15) ), //IC2 @@ -1400,9 +1395,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, FLOWERING, Flowering.SLOW); AlleleHelper.instance.set(template, NOCTURNAL, true); }, - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, DIVIDED, 10); - } + dis -> dis.registerMutation(DIAMOND, DIVIDED, 10) ), SPARKELING(GT_BranchDefinition.THAUMIC, "NetherStar", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> { @@ -3046,9 +3039,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), - dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, MYSTERIOUSCRYSTAL, 5); - } + dis -> dis.registerMutation(INFINITYCATALYST, MYSTERIOUSCRYSTAL, 5) ), //Endgame bees JAEGERMEISTER(GT_BranchDefinition.ENDGAME, "JaegerMeister", false, new Color(0x05AD18), new Color(0xE7DAC3), @@ -3106,7 +3097,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { } } - protected static IAlleleBeeEffect getEffect(byte modid, String name) { + static IAlleleBeeEffect getEffect(byte modid, String name) { String s; switch (modid) { case EXTRABEES: @@ -3129,7 +3120,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { return (IAlleleBeeEffect) AlleleManager.alleleRegistry.getAllele(s); } - protected static IAlleleFlowers getFlowers(byte modid, String name) { + static IAlleleFlowers getFlowers(byte modid, String name) { String s; switch (modid) { case EXTRABEES: @@ -3152,7 +3143,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { return (IAlleleFlowers) AlleleManager.alleleRegistry.getAllele(s); } - protected static IAlleleBeeSpecies getSpecies(byte modid, String name) { + private static IAlleleBeeSpecies getSpecies(byte modid, String name) { String s; switch (modid) { case EXTRABEES: @@ -3181,15 +3172,15 @@ public enum GT_BeeDefinition implements IBeeDefinition { } - protected final void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + private void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { this.mSpeciesProperties.accept(beeSpecies); } - protected final void setAlleles(IAllele[] template) { + private void setAlleles(IAllele[] template) { this.mAlleles.accept(template); } - protected final void registerMutations() { + private void registerMutations() { this.mMutations.accept(this); } @@ -3205,40 +3196,40 @@ public enum GT_BeeDefinition implements IBeeDefinition { BeeManager.beeRoot.registerTemplate(template); } - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) { + private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } - protected final IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) { + private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance) { + private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } - protected final IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance) { + private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } /** - * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die Mutationsrate als Bruch mit chance / chancedivider - * This new function allows Mutation percentages under 1%. Set them as a fraction with chance / chancedivider + * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die Mutationsrate als Bruch mit chance / chanceDivider + * This new function allows Mutation percentages under 1%. Set them as a fraction with chance / chanceDivider */ - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) { - return new GT_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chancedivider); + private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chanceDivider) { + return new GT_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chanceDivider); } - protected final IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) { - return registerMutation(parent1.species, parent2, chance, chancedivider); + private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, float chanceDivider) { + return registerMutation(parent1.species, parent2, chance, chanceDivider); } - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance, float chancedivider) { - return registerMutation(parent1, parent2.species, chance, chancedivider); + private IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GT_BeeDefinition parent2, int chance, float chanceDivider) { + return registerMutation(parent1, parent2.species, chance, chanceDivider); } - protected final IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance, float chancedivider) { - return registerMutation(parent1.species, parent2, chance, chancedivider); + private IBeeMutationCustom registerMutation(GT_BeeDefinition parent1, GT_BeeDefinition parent2, int chance, float chanceDivider) { + return registerMutation(parent1.species, parent2, chance, chanceDivider); } @Override @@ -3260,8 +3251,4 @@ public enum GT_BeeDefinition implements IBeeDefinition { public final ItemStack getMemberStack(EnumBeeType beeType) { return BeeManager.beeRoot.getMemberStack(getIndividual(), beeType.ordinal()); } - - public final IBeeDefinition getRainResist() { - return new BeeVariation.RainResist(this); - } } -- cgit