Skip to content

Commit 12af6c8

Browse files
committed
Run SpotlessCheck/SpotlessApply
1 parent 1089bcd commit 12af6c8

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import gregtech.api.util.Mods;
2020
import gregtech.common.creativetab.GTCreativeTabs;
2121

22-
import morph.avaritia.client.render.item.CosmicHaloItemRender;
23-
2422
import net.minecraft.block.BlockCauldron;
2523
import net.minecraft.block.state.IBlockState;
2624
import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -46,6 +44,7 @@
4644
import morph.avaritia.api.ICosmicRenderItem;
4745
import morph.avaritia.api.IHaloRenderItem;
4846
import morph.avaritia.api.registration.IModelRegister;
47+
import morph.avaritia.client.render.item.CosmicHaloItemRender;
4948
import morph.avaritia.init.AvaritiaTextures;
5049
import org.jetbrains.annotations.NotNull;
5150
import org.jetbrains.annotations.Nullable;

src/main/java/gregtech/api/items/metaitem/MetaItem.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import gregtech.common.covers.filter.IFilter;
3737
import gregtech.common.creativetab.GTCreativeTabs;
3838

39-
import morph.avaritia.client.render.item.CosmicHaloItemRender;
40-
4139
import net.minecraft.client.Minecraft;
4240
import net.minecraft.client.renderer.block.model.IBakedModel;
4341
import net.minecraft.client.renderer.block.model.ModelBakery;
@@ -93,6 +91,7 @@
9391
import morph.avaritia.api.ICosmicRenderItem;
9492
import morph.avaritia.api.IHaloRenderItem;
9593
import morph.avaritia.api.registration.IModelRegister;
94+
import morph.avaritia.client.render.item.CosmicHaloItemRender;
9695
import org.apache.commons.lang3.ArrayUtils;
9796
import org.apache.commons.lang3.Validate;
9897
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -863,7 +862,7 @@ public TextureAtlasSprite getMaskTexture(ItemStack stack, EntityLivingBase playe
863862
@SideOnly(Side.CLIENT)
864863
public float getMaskOpacity(ItemStack stack, EntityLivingBase player) {
865864
T metaValueItem = getItem(stack);
866-
if (metaValueItem.registerMaskTexture(stack) != null){
865+
if (metaValueItem.registerMaskTexture(stack) != null) {
867866
return 1.0f;
868867
} else {
869868
return 0.0f;
@@ -1010,15 +1009,19 @@ public MetaValueItem addComponents(IItemComponent... stats) {
10101009
* "halo".<br>
10111010
* @param haloColour the Colour the Halo will have in the form of a long Hex: Example 0xFFFFFFFFL.<br>
10121011
* If you are unfamiliar with Hex Colors then here is a rundown of how they work
1013-
* The first two characters after 0x represent the alpha channel or the opacity of the color 00 to FF
1012+
* The first two characters after 0x represent the alpha channel or the opacity of the
1013+
* color 00 to FF
10141014
* The second two characters after the alpha channel define the red channel 00 to FF
10151015
* the third two characters after the red channel define the green channel 00 to FF
1016-
* Lastly the last two characters after the green channel define the blue channel 00 to FF
1017-
* All of these can and will control the total color of the Halo and can be used to make all colors
1016+
* Lastly the last two characters after the green channel define the blue channel 00 to
1017+
* FF
1018+
* All of these can and will control the total color of the Halo and can be used to make
1019+
* all colors
10181020
*
10191021
* @param haloSize The size of the halo : Example 10.<br>
10201022
* @param shouldDrawPulse Whether the MetaItem will pulse like Avaritia's Infinity Ingot : Example true.<br>
1021-
* @param maskTexture The String Location of the Mask texture the MetaItem will use as a Cosmic Effect : Example "nan".
1023+
* @param maskTexture The String Location of the Mask texture the MetaItem will use as a Cosmic Effect :
1024+
* Example "nan".
10221025
*/
10231026
@Optional.Method(modid = Mods.Names.AVARITIA)
10241027
public MetaValueItem cosmicProperties(boolean shouldDrawHalo, String haloTexture, long haloColour,

src/main/java/gregtech/api/unification/material/Material.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -841,11 +841,14 @@ public Builder polymer(int harvestLevel) {
841841
* "halo".<br>
842842
* @param haloColour the Colour the Halo will have in the form of a long Hex : Example 0xFFFFFFFFL.<br>
843843
* If you are unfamiliar with Hex Colors then here is a rundown of how they work
844-
* The first two characters after 0x represent the alpha channel or the opacity of the color 00 to FF
844+
* The first two characters after 0x represent the alpha channel or the opacity of the
845+
* color 00 to FF
845846
* The second two characters after the alpha channel define the red channel 00 to FF
846847
* the third two characters after the red channel define the green channel 00 to FF
847-
* Lastly the last two characters after the green channel define the blue channel 00 to FF
848-
* All of these can and will control the total color of the Halo and can be used to make all colors
848+
* Lastly the last two characters after the green channel define the blue channel 00 to
849+
* FF
850+
* All of these can and will control the total color of the Halo and can be used to make
851+
* all colors
849852
*
850853
* @param haloSize The size of the halo : Example 10.<br>
851854
* @param shouldDrawPulse If the Material Item will pulse like Avaritia's Infinity Ingot : Example true.<br>
@@ -854,7 +857,8 @@ public Builder polymer(int harvestLevel) {
854857
* MaterialIconSet the material uses: Example
855858
* "gregtech:textures/items/material_sets/dull/dust_mask
856859
*
857-
* @param maskOpacity The Opacity of the Cosmic Effect, Use in combination with shouldDrawCosmic : Example 1.0F.<br>
860+
* @param maskOpacity The Opacity of the Cosmic Effect, Use in combination with shouldDrawCosmic : Example
861+
* 1.0F.<br>
858862
*/
859863
@Optional.Method(modid = Mods.Names.AVARITIA)
860864
public Builder cosmic(boolean shouldDrawHalo, String haloTexture, long haloColour, int haloSize,
@@ -872,7 +876,8 @@ public Builder cosmic(boolean shouldDrawHalo, String haloTexture, long haloColou
872876
boolean shouldDrawCosmic, float maskOpacity) {
873877
if (Avaritia.isModLoaded()) {
874878
properties.setProperty(PropertyKey.COSMIC,
875-
new CosmicProperty(shouldDrawHalo, haloTexture, (int) haloColour, haloSize, shouldDrawCosmic, maskOpacity));
879+
new CosmicProperty(shouldDrawHalo, haloTexture, (int) haloColour, haloSize, shouldDrawCosmic,
880+
maskOpacity));
876881
}
877882
return this;
878883
}

src/main/java/gregtech/api/unification/material/properties/CosmicProperty.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public CosmicProperty(boolean shouldDrawHalo, String haloTexture, int haloColour
7070
}
7171
}
7272

73-
public CosmicProperty(boolean shouldDrawHalo, String haloTexture, int haloColour, int haloSize, boolean shouldDrawCosmic, float maskOpacity) {
73+
public CosmicProperty(boolean shouldDrawHalo, String haloTexture, int haloColour, int haloSize,
74+
boolean shouldDrawCosmic, float maskOpacity) {
7475
if (Avaritia.isModLoaded()) {
7576
this.shouldDrawHalo = shouldDrawHalo;
7677
this.haloTexture = haloTexture;

0 commit comments

Comments
 (0)