Skip to content

Commit 4830614

Browse files
committed
spotless
1 parent d57ec8d commit 4830614

File tree

210 files changed

+7346
-5943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+7346
-5943
lines changed

src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@
2020
import cpw.mods.fml.common.network.NetworkRegistry;
2121
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
2222
import cpw.mods.fml.relauncher.Side;
23-
import net.minecraftforge.common.MinecraftForge;
24-
2523
import java.io.File;
24+
import net.minecraftforge.common.MinecraftForge;
2625

27-
@Mod(modid = StorageDrawers.MOD_ID, name = StorageDrawers.MOD_NAME, version = StorageDrawers.MOD_VERSION, dependencies = "after:waila;", guiFactory = StorageDrawers.SOURCE_PATH + "core.ModGuiFactory")
28-
public class StorageDrawers
29-
{
26+
@Mod(
27+
modid = StorageDrawers.MOD_ID,
28+
name = StorageDrawers.MOD_NAME,
29+
version = StorageDrawers.MOD_VERSION,
30+
dependencies = "after:waila;",
31+
guiFactory = StorageDrawers.SOURCE_PATH + "core.ModGuiFactory")
32+
public class StorageDrawers {
3033
public static final String MOD_ID = "StorageDrawers";
3134
public static final String MOD_NAME = "Storage Drawers";
3235
public static final String MOD_VERSION = "GRADLETOKEN_VERSION";
@@ -56,16 +59,15 @@ public class StorageDrawers
5659
public static CommonProxy proxy;
5760

5861
@Mod.EventHandler
59-
public void preInit (FMLPreInitializationEvent event) {
62+
public void preInit(FMLPreInitializationEvent event) {
6063
config = new ConfigManager(new File(event.getModConfigurationDirectory(), MOD_ID + ".cfg"));
6164

6265
network = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID);
6366
network.registerMessage(BlockClickMessage.Handler.class, BlockClickMessage.class, 0, Side.SERVER);
6467

6568
if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
6669
network.registerMessage(CountUpdateMessage.Handler.class, CountUpdateMessage.class, 1, Side.CLIENT);
67-
}
68-
else {
70+
} else {
6971
network.registerMessage(CountUpdateMessage.HandlerStub.class, CountUpdateMessage.class, 1, Side.CLIENT);
7072
}
7173

@@ -82,7 +84,7 @@ public void preInit (FMLPreInitializationEvent event) {
8284
}
8385

8486
@Mod.EventHandler
85-
public void init (FMLInitializationEvent event) {
87+
public void init(FMLInitializationEvent event) {
8688
proxy.registerRenderers();
8789

8890
NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
@@ -93,7 +95,7 @@ public void init (FMLInitializationEvent event) {
9395
}
9496

9597
@Mod.EventHandler
96-
public void postInit (FMLPostInitializationEvent event) {
98+
public void postInit(FMLPostInitializationEvent event) {
9799
recipes.init();
98100

99101
IntegrationRegistry.instance().postInit();
@@ -102,8 +104,7 @@ public void postInit (FMLPostInitializationEvent event) {
102104
}
103105

104106
@SubscribeEvent
105-
public void onConfigChanged (ConfigChangedEvent.OnConfigChangedEvent event) {
106-
if (event.modID.equals(MOD_ID))
107-
config.syncConfig();
107+
public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
108+
if (event.modID.equals(MOD_ID)) config.syncConfig();
108109
}
109110
}

src/main/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,22 @@
77
import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry;
88
import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry;
99

10-
public interface IStorageDrawersApi
11-
{
10+
public interface IStorageDrawersApi {
1211
/**
1312
* Recipe handlers are used to make custom recipes compatible with compacting drawers.
1413
*/
15-
IRecipeHandlerRegistry recipeHandlerRegistry ();
14+
IRecipeHandlerRegistry recipeHandlerRegistry();
1615

17-
IRenderRegistry renderRegistry ();
16+
IRenderRegistry renderRegistry();
1817

19-
IWailaRegistry wailaRegistry ();
18+
IWailaRegistry wailaRegistry();
2019

21-
IPackBlockFactory packFactory ();
20+
IPackBlockFactory packFactory();
2221

2322
/**
2423
* User-managed configuration for the Storage Drawers mod.
2524
*/
26-
IUserConfig userConfig ();
25+
IUserConfig userConfig();
2726

28-
void registerStandardPackRecipes (IExtendedDataResolver resolver);
27+
void registerStandardPackRecipes(IExtendedDataResolver resolver);
2928
}

src/main/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
/**
44
* Entry point for the public API.
55
*/
6-
public class StorageDrawersApi
7-
{
6+
public class StorageDrawersApi {
87
private static IStorageDrawersApi instance;
98

109
public static final String VERSION = "1.7.10-1.2.0";
@@ -14,13 +13,12 @@ public class StorageDrawersApi
1413
*
1514
* @return The {@link IStorageDrawersApi} instance or null if the API or Storage Drawers is unavailable.
1615
*/
17-
public static IStorageDrawersApi instance () {
16+
public static IStorageDrawersApi instance() {
1817
if (instance == null) {
1918
try {
20-
Class classApi = Class.forName( "com.jaquadro.minecraft.storagedrawers.core.Api" );
19+
Class classApi = Class.forName("com.jaquadro.minecraft.storagedrawers.core.Api");
2120
instance = (IStorageDrawersApi) classApi.getField("instance").get(null);
22-
}
23-
catch (Throwable t) {
21+
} catch (Throwable t) {
2422
return null;
2523
}
2624
}
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
package com.jaquadro.minecraft.storagedrawers.api.config;
22

3-
public interface IAddonConfig
4-
{
3+
public interface IAddonConfig {
54
/**
65
* Gets whether the user has configured a preference for addon packs to hide their blocks and items from Vanilla
76
* creative tabs.
87
*/
9-
boolean showAddonItemsNEI ();
8+
boolean showAddonItemsNEI();
109

1110
/**
1211
* Gets whether the user has configured a preference for addon packs to hide their blocks and items from NEI.
1312
*/
14-
boolean showAddonItemsVanilla ();
13+
boolean showAddonItemsVanilla();
1514

1615
/**
1716
* Gets whether the user has configured a preference for addon packs to provide their blocks and items through
1817
* their own vanilla tab.
1918
*/
20-
boolean addonItemsUseSeparateTab ();
19+
boolean addonItemsUseSeparateTab();
2120
}

src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
44

5-
public interface IBlockConfig
6-
{
7-
String getBlockConfigName (BlockConfiguration blockConfig);
5+
public interface IBlockConfig {
6+
String getBlockConfigName(BlockConfiguration blockConfig);
87

9-
boolean isBlockEnabled (String blockConfigName);
8+
boolean isBlockEnabled(String blockConfigName);
109

11-
int getBlockRecipeOutput (String blockConfigName);
10+
int getBlockRecipeOutput(String blockConfigName);
1211

13-
int getBaseCapacity (String blockConfigName);
12+
int getBaseCapacity(String blockConfigName);
1413
}
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.jaquadro.minecraft.storagedrawers.api.config;
22

3-
public interface IIntegrationConfig
4-
{
5-
boolean isRefinedRelocationEnabled ();
6-
boolean isChiselEnabled ();
7-
boolean isGTNHEnabled ();
3+
public interface IIntegrationConfig {
4+
boolean isRefinedRelocationEnabled();
5+
6+
boolean isChiselEnabled();
7+
8+
boolean isGTNHEnabled();
89
}

src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
/**
44
* The main hub for user-managed mod configuration.
55
*/
6-
public interface IUserConfig
7-
{
6+
public interface IUserConfig {
87
/**
98
* Configuration options related to third party addon packs for Storage Drawers.
109
*/
11-
IAddonConfig addonConfig ();
10+
IAddonConfig addonConfig();
1211

1312
/**
1413
* Configuration options related to individual blocks.
1514
*/
16-
IBlockConfig blockConfig ();
15+
IBlockConfig blockConfig();
1716

1817
/**
1918
* Configuration options related to third party mod integration.
2019
*/
21-
IIntegrationConfig integrationConfig ();
20+
IIntegrationConfig integrationConfig();
2221
}

src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
package com.jaquadro.minecraft.storagedrawers.api.config;
33

44
import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
5-
import cpw.mods.fml.common.API;
5+
import cpw.mods.fml.common.API;

src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
*
1010
* This event is also called when the drawer is changed to empty.
1111
*/
12-
public class DrawerPopulatedEvent extends Event
13-
{
12+
public class DrawerPopulatedEvent extends Event {
1413
public final IDrawer drawer;
1514

16-
public DrawerPopulatedEvent (IDrawer drawer) {
15+
public DrawerPopulatedEvent(IDrawer drawer) {
1716
this.drawer = drawer;
1817
}
1918
}

src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
package com.jaquadro.minecraft.storagedrawers.api.event;
33

44
import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
5-
import cpw.mods.fml.common.API;
5+
import cpw.mods.fml.common.API;

0 commit comments

Comments
 (0)