Skip to content

Commit 75ad130

Browse files
committed
Run through 'astyle' with a set of options that seem to match @jriwanek's preferred style.
1 parent 1db52d4 commit 75ad130

Some content is hidden

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

57 files changed

+5251
-5037
lines changed

src/main/java/com/mcmoddev/orespawn/EventHandlers.java

100755100644
Lines changed: 202 additions & 194 deletions
Large diffs are not rendered by default.

src/main/java/com/mcmoddev/orespawn/OreSpawn.java

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -39,63 +39,63 @@
3939
* @author DShadowWolf <dshadowwolf@gmail.com>
4040
*/
4141

42-
@Mod( modid = Constants.MODID,
43-
name = Constants.NAME,
44-
version = Constants.VERSION,
45-
acceptedMinecraftVersions = "[1.12,)" )
42+
@Mod(modid = Constants.MODID,
43+
name = Constants.NAME,
44+
version = Constants.VERSION,
45+
acceptedMinecraftVersions = "[1.12,)")
4646

4747
public class OreSpawn {
48-
@Instance
49-
public static OreSpawn instance;
50-
51-
public static final Logger LOGGER = LogManager.getFormatterLogger(Constants.MODID);
52-
public static final OS3API API = new OS3APIImpl();
53-
public static final OS3Writer writer = new OS3Writer();
54-
static final EventHandlers eventHandlers = new EventHandlers();
55-
public static final FeatureRegistry FEATURES = new FeatureRegistry();
56-
protected static final Map<Integer, List<SpawnBuilder>> spawns = new HashMap<>();
57-
58-
static final FlatBedrock flatBedrock= new FlatBedrock();
59-
60-
public static Map<Integer, List<SpawnBuilder>> getSpawns() {
61-
return spawns;
62-
}
63-
64-
@EventHandler
65-
public void preInit(FMLPreInitializationEvent ev) {
66-
Config.loadConfig();
67-
68-
PluginLoader.INSTANCE.load(ev);
69-
70-
if( Config.getBoolean(Constants.FLAT_BEDROCK) ) {
71-
GameRegistry.registerWorldGenerator(flatBedrock, 100);
72-
}
73-
74-
if( Config.getBoolean(Constants.RETROGEN_KEY) || Config.getBoolean(Constants.REPLACE_VANILLA_OREGEN) || Config.getBoolean(Constants.RETRO_BEDROCK)) {
75-
MinecraftForge.EVENT_BUS.register(eventHandlers);
76-
MinecraftForge.ORE_GEN_BUS.register(eventHandlers);
77-
}
78-
}
79-
80-
@EventHandler
81-
public void init(FMLInitializationEvent ev) {
82-
PluginLoader.INSTANCE.register();
83-
84-
OS3Reader.loadEntries();
85-
writer.writeSysconfIfNonexistent();
86-
API.registerSpawns();
87-
}
88-
89-
@EventHandler
90-
public void postInit(FMLPostInitializationEvent ev) {
91-
Config.saveConfig();
92-
}
93-
94-
@EventHandler
95-
public void onServerStarting(FMLServerStartingEvent ev) {
96-
ev.registerServerCommand(new ClearChunkCommand());
97-
ev.registerServerCommand(new DumpBiomesCommand());
98-
ev.registerServerCommand(new AddOreCommand());
99-
ev.registerServerCommand(new WriteConfigsCommand());
100-
}
48+
@Instance
49+
public static OreSpawn instance;
50+
51+
public static final Logger LOGGER = LogManager.getFormatterLogger(Constants.MODID);
52+
public static final OS3API API = new OS3APIImpl();
53+
public static final OS3Writer writer = new OS3Writer();
54+
static final EventHandlers eventHandlers = new EventHandlers();
55+
public static final FeatureRegistry FEATURES = new FeatureRegistry();
56+
protected static final Map<Integer, List<SpawnBuilder>> spawns = new HashMap<>();
57+
58+
static final FlatBedrock flatBedrock = new FlatBedrock();
59+
60+
public static Map<Integer, List<SpawnBuilder>> getSpawns() {
61+
return spawns;
62+
}
63+
64+
@EventHandler
65+
public void preInit(FMLPreInitializationEvent ev) {
66+
Config.loadConfig();
67+
68+
PluginLoader.INSTANCE.load(ev);
69+
70+
if (Config.getBoolean(Constants.FLAT_BEDROCK)) {
71+
GameRegistry.registerWorldGenerator(flatBedrock, 100);
72+
}
73+
74+
if (Config.getBoolean(Constants.RETROGEN_KEY) || Config.getBoolean(Constants.REPLACE_VANILLA_OREGEN) || Config.getBoolean(Constants.RETRO_BEDROCK)) {
75+
MinecraftForge.EVENT_BUS.register(eventHandlers);
76+
MinecraftForge.ORE_GEN_BUS.register(eventHandlers);
77+
}
78+
}
79+
80+
@EventHandler
81+
public void init(FMLInitializationEvent ev) {
82+
PluginLoader.INSTANCE.register();
83+
84+
OS3Reader.loadEntries();
85+
writer.writeSysconfIfNonexistent();
86+
API.registerSpawns();
87+
}
88+
89+
@EventHandler
90+
public void postInit(FMLPostInitializationEvent ev) {
91+
Config.saveConfig();
92+
}
93+
94+
@EventHandler
95+
public void onServerStarting(FMLServerStartingEvent ev) {
96+
ev.registerServerCommand(new ClearChunkCommand());
97+
ev.registerServerCommand(new DumpBiomesCommand());
98+
ev.registerServerCommand(new AddOreCommand());
99+
ev.registerServerCommand(new WriteConfigsCommand());
100+
}
101101
}

src/main/java/com/mcmoddev/orespawn/api/BiomeLocation.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import net.minecraftforge.fml.common.registry.ForgeRegistries;
88

99
public interface BiomeLocation {
10-
boolean matches(Biome biome);
10+
boolean matches(Biome biome);
1111

12-
default ImmutableList<Biome> getBiomes() {
13-
return ForgeRegistries.BIOMES.getValues().stream().filter(this::matches).collect(Collectors2.toImmutableList());
14-
}
12+
default ImmutableList<Biome> getBiomes() {
13+
return ForgeRegistries.BIOMES.getValues().stream().filter(this::matches).collect(Collectors2.toImmutableList());
14+
}
1515
}

0 commit comments

Comments
 (0)