Skip to content

Commit

Permalink
Spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master committed Dec 4, 2022
1 parent 47e4536 commit a05ca41
Show file tree
Hide file tree
Showing 190 changed files with 4,952 additions and 5,072 deletions.
36 changes: 20 additions & 16 deletions src/main/java/com/glodblock/github/FluidCraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;

@Mod(modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, dependencies = "required-after:appliedenergistics2;after:waila")
@Mod(
modid = FluidCraft.MODID,
version = FluidCraft.VERSION,
name = FluidCraft.MODNAME,
dependencies = "required-after:appliedenergistics2;after:waila")
public class FluidCraft {

public static final String MODID = "GRADLETOKEN_MODID";
Expand All @@ -32,7 +36,9 @@ public class FluidCraft {
@Mod.Instance(MODID)
public static FluidCraft INSTANCE;

@SidedProxy(clientSide = "com.glodblock.github.proxy.ClientProxy", serverSide = "com.glodblock.github.proxy.CommonProxy")
@SidedProxy(
clientSide = "com.glodblock.github.proxy.ClientProxy",
serverSide = "com.glodblock.github.proxy.CommonProxy")
public static CommonProxy proxy;

@Mod.EventHandler
Expand Down Expand Up @@ -66,31 +72,29 @@ public static void postInit(FMLPostInitializationEvent event) {
}

if (ModAndClassUtil.isBigInterface) {
Upgrades.PATTERN_CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 3 );
Upgrades.PATTERN_CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 3 );
Upgrades.PATTERN_CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 3);
Upgrades.PATTERN_CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 3);
}
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 1 );
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 1 );
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 1);
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 1);

if (Config.fluidIOBus) {
Upgrades.CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 2 );
Upgrades.CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 2 );
Upgrades.REDSTONE.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1 );
Upgrades.REDSTONE.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 1 );
Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 4 );
Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 4 );
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1 );
Upgrades.CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 2);
Upgrades.CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 2);
Upgrades.REDSTONE.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1);
Upgrades.REDSTONE.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 1);
Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 4);
Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 4);
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1);
}

proxy.postInit(event);
}

@Mod.EventHandler
public void onLoadComplete(FMLLoadCompleteEvent event) {
}
public void onLoadComplete(FMLLoadCompleteEvent event) {}

public static ResourceLocation resource(String path) {
return new ResourceLocation(MODID, path);
}

}
12 changes: 4 additions & 8 deletions src/main/java/com/glodblock/github/client/ClientHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@
public class ClientHelper {

@SubscribeEvent
public void updateTextureSheet( final TextureStitchEvent.Pre ev )
{
if( ev.map.getTextureType() == 0 )
{
for( final FCPartsTexture cb : FCPartsTexture.values() )
{
cb.registerIcon( ev.map );
public void updateTextureSheet(final TextureStitchEvent.Pre ev) {
if (ev.map.getTextureType() == 0) {
for (final FCPartsTexture cb : FCPartsTexture.values()) {
cb.registerIcon(ev.map);
}
}
}
Expand All @@ -25,5 +22,4 @@ public static void register() {
MinecraftForge.EVENT_BUS.register(handler);
FMLCommonHandler.instance().bus().register(handler);
}

}
31 changes: 18 additions & 13 deletions src/main/java/com/glodblock/github/client/gui/FCGuiTextField.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,14 @@ public class FCGuiTextField extends GuiTextField {
* @param width absolute width
* @param height absolute height
*/
public FCGuiTextField(final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, final int height) {
super(fontRenderer, xPos + PADDING, yPos + PADDING, width - 2 * PADDING - fontRenderer.getCharWidth('_'), height - 2 * PADDING);
public FCGuiTextField(
final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, final int height) {
super(
fontRenderer,
xPos + PADDING,
yPos + PADDING,
width - 2 * PADDING - fontRenderer.getCharWidth('_'),
height - 2 * PADDING);

this._xPos = xPos;
this._yPos = yPos;
Expand All @@ -41,12 +47,11 @@ public void drawTextBox() {
super.drawTextBox();
if (this.getBorder() > 0 && this.getVisible()) {
GuiTextField.drawRect(
this._xPos - this.getBorder(),
this._yPos - this.getBorder(),
this._width - 2 * PADDING - this._fontRender.getCharWidth('_') + this.getBorder(),
this._height - 2 * PADDING + this.getBorder(),
this.getColor()
);
this._xPos - this.getBorder(),
this._yPos - this.getBorder(),
this._width - 2 * PADDING - this._fontRender.getCharWidth('_') + this.getBorder(),
this._height - 2 * PADDING + this.getBorder(),
this.getColor());
}
}

Expand Down Expand Up @@ -100,13 +105,11 @@ public boolean isMouseIn(final int xCoord, final int yCoord) {
return withinXRange && withinYRange;
}

public void setMessage(String t)
{
public void setMessage(String t) {
tooltip = t;
}

public class TooltipProvider implements ITooltip
{
public class TooltipProvider implements ITooltip {
@Override
public String getMessage() {
return tooltip;
Expand All @@ -128,7 +131,9 @@ public int getHeight() {
}

@Override
public int getWidth() { return _width; }
public int getWidth() {
return _width;
}

@Override
public boolean isVisible() {
Expand Down
Loading

0 comments on commit a05ca41

Please sign in to comment.