Skip to content

Commit 2a7395d

Browse files
committed
spotless
1 parent 064464d commit 2a7395d

12 files changed

+49
-32
lines changed

src/main/java/climateControl/DimensionManager.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public class DimensionManager {
6262
public static Logger logger = new Zeno410Logger("DimensionManager").logger();
6363

6464
private Accessor<GenLayerRiverMix, GenLayerPack> riverMixBiome = new Accessor<>(
65-
"field_75910_b", "biomePatternGeneratorChain");
65+
"field_75910_b",
66+
"biomePatternGeneratorChain");
6667

6768
private final ClimateControlSettings newSettings;
6869
private final CCDimensionSettings dimensionSettings;
@@ -401,14 +402,14 @@ public void onWorldLoad(World world) {
401402
// lock manually
402403
LockGenLayers biomeLocker = new LockGenLayers();
403404
WorldChunkManager chunkGenerator = world.getWorldChunkManager();
404-
Accessor<WorldChunkManager, GenLayer> worldGenLayer = new Accessor<>(
405-
"field_76944_d", "genBiomes");
405+
Accessor<WorldChunkManager, GenLayer> worldGenLayer = new Accessor<>("field_76944_d", "genBiomes");
406406
GenLayer toLock = worldGenLayer.get(chunkGenerator);
407407
if (toLock instanceof GenLayerRiverMixWrapper) {
408408
toLock = original;
409409
}
410410
Accessor<GenLayerRiverMix, GenLayer> riverMixBiome = new Accessor<>(
411-
"field_75910_b", "biomePatternGeneratorChain");
411+
"field_75910_b",
412+
"biomePatternGeneratorChain");
412413
toLock = riverMixBiome.get((GenLayerRiverMix) toLock);
413414
biomeLocker.lock(toLock, dimension, world, currentSettings);
414415
}

src/main/java/climateControl/GenLayerUpdater.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
public class GenLayerUpdater {
1616

1717
public static final Accessor<WorldChunkManager, GenLayer> accessGenLayer = new Accessor<>(
18-
"field_76944_d", "genBiomes");
18+
"field_76944_d",
19+
"genBiomes");
1920

2021
public static final Accessor<WorldChunkManager, GenLayer> accessBiomeIndex = new Accessor<WorldChunkManager, GenLayer>(
21-
"field_76945_e", "biomeIndexLayer");
22+
"field_76945_e",
23+
"biomeIndexLayer");
2224

2325
public void update(GenLayerRiverMixWrapper riverMix, WorldProvider provider) {
2426
accessGenLayer.setField(provider.worldChunkMgr, riverMix);

src/main/java/climateControl/LockGenLayer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public class LockGenLayer extends SavedNumberedItems<PlaneLocated<Integer>> {
2626

2727
public static Logger logger = new Zeno410Logger("LockedBiomes").logger();
2828

29-
private static Accessor<GenLayerPack, GenLayerPack> genLayerPackParent = new Accessor<>(
30-
"field_75909_a", "parent");
29+
private static Accessor<GenLayerPack, GenLayerPack> genLayerPackParent = new Accessor<>("field_75909_a", "parent");
3130

3231
private static Accessor<GenLayer, GenLayer> genLayerParent = new Accessor<>("field_75909_a", "parent");
3332

src/main/java/climateControl/Myst10GenLayerUpdater.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,20 @@
2323
public class Myst10GenLayerUpdater {
2424

2525
private Accessor<WorldProviderMyst, AgeController> ageControllerAccess = new Accessor<WorldProviderMyst, AgeController>(
26-
"controller", "controller");
26+
"controller",
27+
"controller");
2728

2829
private Accessor<AgeController, IBiomeController> biomeControllerAccess = new Accessor<AgeController, IBiomeController>(
29-
"biomeController", "biomeController");
30+
"biomeController",
31+
"biomeController");
3032

3133
private Accessor<SymbolBiomeControllerNative, GenLayer> genLayerAccess = new Accessor<SymbolBiomeControllerNative, GenLayer>(
32-
"genBiomes", "genBiomes");
34+
"genBiomes",
35+
"genBiomes");
3336

3437
private Accessor<SymbolBiomeControllerNative, GenLayer> biomeIndexAccess = new Accessor<SymbolBiomeControllerNative, GenLayer>(
35-
"biomeIndexLayer", "biomeIndexLayer");
38+
"biomeIndexLayer",
39+
"biomeIndexLayer");
3640

3741
public void update(GenLayerRiverMixWrapper riverMix, WorldProvider provider) {
3842
DimensionManager.logger.info(" provider " + provider.toString());

src/main/java/climateControl/Myst11GenLayerUpdater.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,20 @@
2222
public class Myst11GenLayerUpdater {
2323

2424
private Accessor<WorldProviderMyst, AgeController> ageControllerAccess = new Accessor<WorldProviderMyst, AgeController>(
25-
"controller", "controller");
25+
"controller",
26+
"controller");
2627

2728
private Accessor<AgeController, IBiomeController> biomeControllerAccess = new Accessor<AgeController, IBiomeController>(
28-
"biomeController", "biomeController");
29+
"biomeController",
30+
"biomeController");
2931

3032
private Accessor<SymbolBiomeControllerNative, GenLayer> genLayerAccess = new Accessor<SymbolBiomeControllerNative, GenLayer>(
31-
"genBiomes", "genBiomes");
33+
"genBiomes",
34+
"genBiomes");
3235

3336
private Accessor<SymbolBiomeControllerNative, GenLayer> biomeIndexAccess = new Accessor<SymbolBiomeControllerNative, GenLayer>(
34-
"biomeIndexLayer", "biomeIndexLayer");
37+
"biomeIndexLayer",
38+
"biomeIndexLayer");
3539

3640
public void update(GenLayerRiverMixWrapper riverMix, WorldProvider provider) {
3741
if (provider instanceof WorldProviderMyst) {

src/main/java/climateControl/customGenLayer/GenLayerRiverMixWrapper.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public class GenLayerRiverMixWrapper extends GenLayerRiverMix {
2424
private GenLayer voronoi;
2525
private LockableRiverMix original;
2626
private Accessor<GenLayerRiverMix, GenLayer> riverMixBiome = new Accessor<GenLayerRiverMix, GenLayer>(
27-
"field_75910_b", "biomePatternGeneratorChain");
27+
"field_75910_b",
28+
"biomePatternGeneratorChain");
2829

2930
private LockGenLayers biomeLocker = new LockGenLayers();
3031

src/main/java/climateControl/generator/TestGeneratorPair.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public class TestGeneratorPair {
1717
private GenLayer newGen;
1818

1919
private Accessor<GenLayerPack, GenLayerPack> genLayerPackParent = new Accessor<GenLayerPack, GenLayerPack>(
20-
"field_75909_a", "parent");
20+
"field_75909_a",
21+
"parent");
2122

2223
private Accessor<GenLayer, GenLayer> genLayerParent = new Accessor<GenLayer, GenLayer>("field_75909_a", "parent");
2324

src/main/java/climateControl/utils/AccessLong.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
package climateControl.utils;
33

4-
import net.minecraft.launchwrapper.Launch;
5-
64
import java.lang.reflect.Field;
75

6+
import net.minecraft.launchwrapper.Launch;
7+
88
/**
99
*
1010
* @author Zeno410

src/main/java/climateControl/utils/Accessor.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package climateControl.utils;
22

3-
import net.minecraft.launchwrapper.Launch;
4-
53
import java.lang.reflect.Field;
64
import java.util.logging.Logger;
75

6+
import net.minecraft.launchwrapper.Launch;
7+
88
/**
99
*
1010
* @author Zeno410
@@ -16,11 +16,9 @@ public class Accessor<ObjectType, FieldType> {
1616
private final String fieldName;
1717
static final boolean isDevEnv = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
1818

19-
public Accessor(String _fieldName, String _deobfName){
20-
if (isDevEnv)
21-
fieldName = _deobfName;
22-
else
23-
fieldName = _fieldName;
19+
public Accessor(String _fieldName, String _deobfName) {
20+
if (isDevEnv) fieldName = _deobfName;
21+
else fieldName = _fieldName;
2422
}
2523

2624
private Field field(ObjectType example) {

src/main/java/climateControl/utils/ChunkGeneratorExtractor.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ public class ChunkGeneratorExtractor {
2121
private AccessChunkProviderServer accessChunkProviderServer = new AccessChunkProviderServer();
2222

2323
private Accessor<ChunkProviderServer, IChunkProvider> providerFromChunkServer = new Accessor<ChunkProviderServer, IChunkProvider>(
24-
"field_73246_d", "serverChunkGenerator");
24+
"field_73246_d",
25+
"serverChunkGenerator");
2526

2627
private Accessor<ChunkProviderGenerate, MapGenVillage> villageGeneratorFromVillage = new Accessor<ChunkProviderGenerate, MapGenVillage>(
27-
"field_73224_v", "villageGenerator");
28+
"field_73224_v",
29+
"villageGenerator");
2830

2931
public IChunkProvider extractFrom(WorldServer world) {
3032
ChunkProviderServer server = accessChunkProviderServer.chunkProviderServer(world);

src/main/java/climateControl/utils/Savee.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public void accept(Type accepted) {
3838
};
3939

4040
private static Accessor<MapStorage, ISaveHandler> saveHandlerAccess = new Accessor<>(
41-
"field_75751_a", "saveHandler");
41+
"field_75751_a",
42+
"saveHandler");
4243

4344
private static Accessor<MapStorage, Map> loadedMapAccess = new Accessor<>("field_75749_b", "loadedDataMap");
4445

src/main/java/climateControl/utils/Saver.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ public class Saver<Type extends SelfTrackable<Type>> {
2222
// private final Maker<Type> maker;
2323
public static Logger logger = new Zeno410Logger("Saver").logger();
2424
private final Streamer<Type> streamer;
25-
private Accessor<MapStorage, HashMap> mapAccess = new Accessor<MapStorage, HashMap>("field_75749_b", "loadedDataMap");
25+
private Accessor<MapStorage, HashMap> mapAccess = new Accessor<MapStorage, HashMap>(
26+
"field_75749_b",
27+
"loadedDataMap");
2628
private Accessor<MapStorage, List> listAccess = new Accessor<MapStorage, List>("field_75750_c", "loadedDataList");
27-
private Accessor<MapStorage, ISaveHandler> handlerAccess = new Accessor<MapStorage, ISaveHandler>("field_75751_a", "saveHandler");
29+
private Accessor<MapStorage, ISaveHandler> handlerAccess = new Accessor<MapStorage, ISaveHandler>(
30+
"field_75751_a",
31+
"saveHandler");
2832

2933
public Saver(Streamer<Type> streamer) {
3034
this.streamer = streamer;

0 commit comments

Comments
 (0)