Skip to content

Commit 756c430

Browse files
DaMatrixDaMatrix
committed
reformat everything
(there were a bunch of tabs)
1 parent 8207d31 commit 756c430

File tree

144 files changed

+2293
-2282
lines changed

Some content is hidden

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

144 files changed

+2293
-2282
lines changed

‎src/main/java/net/buildtheearth/terraplusplus/EarthWorldType.java‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,53 +18,53 @@
1818

1919
public class EarthWorldType extends WorldType implements ICubicWorldType {
2020

21-
public static EarthWorldType create() {
22-
return new EarthWorldType();
23-
}
21+
public static EarthWorldType create() {
22+
return new EarthWorldType();
23+
}
2424

25-
public EarthWorldType() {
26-
super("EarthCubic");
27-
}
25+
public EarthWorldType() {
26+
super("EarthCubic");
27+
}
2828

29-
@Override
30-
public ICubeGenerator createCubeGenerator(World world) {
31-
return new EarthGenerator(world);
32-
}
29+
@Override
30+
public ICubeGenerator createCubeGenerator(World world) {
31+
return new EarthGenerator(world);
32+
}
3333

34-
@Override
35-
public BiomeProvider getBiomeProvider(World world) {
36-
return EarthGeneratorSettings.parse(world.getWorldInfo().getGeneratorOptions()).biomeProvider();
37-
}
34+
@Override
35+
public BiomeProvider getBiomeProvider(World world) {
36+
return EarthGeneratorSettings.parse(world.getWorldInfo().getGeneratorOptions()).biomeProvider();
37+
}
3838

39-
@Override
40-
public IntRange calculateGenerationHeightRange(WorldServer world) {
41-
return new IntRange(-12000, 9000);
42-
}
39+
@Override
40+
public IntRange calculateGenerationHeightRange(WorldServer world) {
41+
return new IntRange(-12000, 9000);
42+
}
4343

44-
@Override
45-
public boolean hasCubicGeneratorForWorld(World w) {
46-
return w.provider instanceof WorldProviderSurface; // an even more general way to check if it's overworld (need custom providers)
47-
}
44+
@Override
45+
public boolean hasCubicGeneratorForWorld(World w) {
46+
return w.provider instanceof WorldProviderSurface; // an even more general way to check if it's overworld (need custom providers)
47+
}
4848

49-
@Override
50-
public boolean isCustomizable() {
51-
return true;
52-
}
49+
@Override
50+
public boolean isCustomizable() {
51+
return true;
52+
}
5353

54-
@Override
55-
public float getCloudHeight() {
56-
return 5000;
57-
}
54+
@Override
55+
public float getCloudHeight() {
56+
return 5000;
57+
}
5858

59-
@Override
60-
public double voidFadeMagnitude() {
61-
return 0;
62-
}
59+
@Override
60+
public double voidFadeMagnitude() {
61+
return 0;
62+
}
6363

64-
@Override
65-
@SideOnly(Side.CLIENT)
66-
public void onCustomizeButton(Minecraft mc, GuiCreateWorld guiCreateWorld) {
67-
String sanitized = EarthGeneratorSettings.parse(guiCreateWorld.chunkProviderSettingsJson).toString();
68-
mc.displayGuiScreen(new PresetEarthGui(guiCreateWorld, sanitized, s -> guiCreateWorld.chunkProviderSettingsJson = s));
69-
}
64+
@Override
65+
@SideOnly(Side.CLIENT)
66+
public void onCustomizeButton(Minecraft mc, GuiCreateWorld guiCreateWorld) {
67+
String sanitized = EarthGeneratorSettings.parse(guiCreateWorld.chunkProviderSettingsJson).toString();
68+
mc.displayGuiScreen(new PresetEarthGui(guiCreateWorld, sanitized, s -> guiCreateWorld.chunkProviderSettingsJson = s));
69+
}
7070
}

‎src/main/java/net/buildtheearth/terraplusplus/TerraMod.java‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package net.buildtheearth.terraplusplus;
22

3-
import org.apache.logging.log4j.Level;
4-
import org.apache.logging.log4j.Logger;
5-
import org.apache.logging.log4j.simple.SimpleLogger;
6-
import org.apache.logging.log4j.util.PropertiesUtil;
7-
83
import io.github.opencubicchunks.cubicchunks.core.CubicChunks;
94
import net.buildtheearth.terraplusplus.control.AdvancedEarthGui;
105
import net.buildtheearth.terraplusplus.control.PresetEarthGui;
@@ -25,13 +20,17 @@
2520
import net.minecraftforge.fml.relauncher.Side;
2621
import net.minecraftforge.server.permission.DefaultPermissionLevel;
2722
import net.minecraftforge.server.permission.PermissionAPI;
23+
import org.apache.logging.log4j.Level;
24+
import org.apache.logging.log4j.Logger;
25+
import org.apache.logging.log4j.simple.SimpleLogger;
26+
import org.apache.logging.log4j.util.PropertiesUtil;
2827

2928
@Mod(modid = TerraConstants.MODID,
30-
dependencies = "required-after:cubicchunks; required-after:cubicgen",
31-
acceptableRemoteVersions = "*",
32-
useMetadata = true)
29+
dependencies = "required-after:cubicchunks; required-after:cubicgen",
30+
acceptableRemoteVersions = "*",
31+
useMetadata = true)
3332
public class TerraMod {
34-
public static Logger LOGGER = new SimpleLogger("[terra++ bootstrap]", Level.INFO, true, false, true, false, "[yyyy/MM/dd HH:mm:ss:SSS]", null, new PropertiesUtil("log4j2.simplelog.properties"), System.out);
33+
public static Logger LOGGER = new SimpleLogger("[terra++ bootstrap]", Level.INFO, true, false, true, false, "[yyyy/MM/dd HH:mm:ss:SSS]", null, new PropertiesUtil("log4j2.simplelog.properties"), System.out);
3534

3635
@EventHandler
3736
public void construction(FMLConstructionEvent event) {
@@ -43,34 +42,34 @@ public void construction(FMLConstructionEvent event) {
4342
TerraConstants.CC_VERSION = Loader.instance().getIndexedModList().get(CubicChunks.MODID).getVersion();
4443
}
4544

46-
@EventHandler
47-
public void preInit(FMLPreInitializationEvent event) {
48-
LOGGER = event.getModLog();
49-
EarthWorldType.create();
50-
}
45+
@EventHandler
46+
public void preInit(FMLPreInitializationEvent event) {
47+
LOGGER = event.getModLog();
48+
EarthWorldType.create();
49+
}
5150

52-
@EventHandler
53-
public void init(FMLInitializationEvent event) {
54-
if (TerraConfig.threeWater) {
55-
MinecraftForge.EVENT_BUS.register(WaterDenier.class);
56-
}
57-
MinecraftForge.TERRAIN_GEN_BUS.register(GenerationEventDenier.class);
51+
@EventHandler
52+
public void init(FMLInitializationEvent event) {
53+
if (TerraConfig.threeWater) {
54+
MinecraftForge.EVENT_BUS.register(WaterDenier.class);
55+
}
56+
MinecraftForge.TERRAIN_GEN_BUS.register(GenerationEventDenier.class);
5857

59-
PermissionAPI.registerNode(TerraConstants.othersCommandNode, DefaultPermissionLevel.OP, "Allows a player to control another player in terra commands");
60-
}
58+
PermissionAPI.registerNode(TerraConstants.othersCommandNode, DefaultPermissionLevel.OP, "Allows a player to control another player in terra commands");
59+
}
6160

62-
@EventHandler
63-
public void postInit(FMLPostInitializationEvent event) {
64-
if(event.getSide() == Side.CLIENT) {
65-
// Force the static resources to load here so the GUI doesn't freeze for 5s when first opened
66-
AdvancedEarthGui.DIRECTIONS_TEXTURE.hashCode();
67-
PresetEarthGui.DEFAULT_PRESETS.hashCode();
68-
}
69-
}
61+
@EventHandler
62+
public void postInit(FMLPostInitializationEvent event) {
63+
if (event.getSide() == Side.CLIENT) {
64+
// Force the static resources to load here so the GUI doesn't freeze for 5s when first opened
65+
AdvancedEarthGui.DIRECTIONS_TEXTURE.hashCode();
66+
PresetEarthGui.DEFAULT_PRESETS.hashCode();
67+
}
68+
}
7069

71-
@EventHandler
72-
public void serverLoad(FMLServerStartingEvent event) {
73-
event.registerServerCommand(new TerraTeleport());
74-
event.registerServerCommand(new TerraCommand());
75-
}
70+
@EventHandler
71+
public void serverLoad(FMLServerStartingEvent event) {
72+
event.registerServerCommand(new TerraTeleport());
73+
event.registerServerCommand(new TerraCommand());
74+
}
7675
}

‎src/main/java/net/buildtheearth/terraplusplus/config/GlobalParseRegistries.java‎

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

33
import com.google.common.collect.BiMap;
44
import com.google.common.collect.HashBiMap;
5+
import lombok.NonNull;
6+
import lombok.RequiredArgsConstructor;
7+
import lombok.experimental.UtilityClass;
58
import net.buildtheearth.terraplusplus.config.condition.AndDC;
69
import net.buildtheearth.terraplusplus.config.condition.DoubleCondition;
710
import net.buildtheearth.terraplusplus.config.condition.EqualDC;
@@ -17,6 +20,7 @@
1720
import net.buildtheearth.terraplusplus.config.scalarparse.i.AddISP;
1821
import net.buildtheearth.terraplusplus.config.scalarparse.i.AndISP;
1922
import net.buildtheearth.terraplusplus.config.scalarparse.i.FlipXISP;
23+
import net.buildtheearth.terraplusplus.config.scalarparse.i.FlipZISP;
2024
import net.buildtheearth.terraplusplus.config.scalarparse.i.GrayscaleExtractISP;
2125
import net.buildtheearth.terraplusplus.config.scalarparse.i.IntScalarParser;
2226
import net.buildtheearth.terraplusplus.config.scalarparse.i.ParseJpgISP;
@@ -25,25 +29,21 @@
2529
import net.buildtheearth.terraplusplus.config.scalarparse.i.RGBExtractISP;
2630
import net.buildtheearth.terraplusplus.config.scalarparse.i.RequireOpaqueISP;
2731
import net.buildtheearth.terraplusplus.config.scalarparse.i.SwapAxesISP;
28-
import net.buildtheearth.terraplusplus.config.scalarparse.i.FlipZISP;
29-
import net.buildtheearth.terraplusplus.projection.mercator.CenteredMercatorProjection;
3032
import net.buildtheearth.terraplusplus.projection.EqualEarthProjection;
3133
import net.buildtheearth.terraplusplus.projection.EquirectangularProjection;
3234
import net.buildtheearth.terraplusplus.projection.GeographicProjection;
3335
import net.buildtheearth.terraplusplus.projection.SinusoidalProjection;
34-
import net.buildtheearth.terraplusplus.projection.mercator.WebMercatorProjection;
35-
import net.buildtheearth.terraplusplus.projection.mercator.TransverseMercatorProjection;
36-
import net.buildtheearth.terraplusplus.projection.dymaxion.DymaxionProjection;
37-
import net.buildtheearth.terraplusplus.projection.dymaxion.ConformalDynmaxionProjection;
3836
import net.buildtheearth.terraplusplus.projection.dymaxion.BTEDymaxionProjection;
37+
import net.buildtheearth.terraplusplus.projection.dymaxion.ConformalDynmaxionProjection;
38+
import net.buildtheearth.terraplusplus.projection.dymaxion.DymaxionProjection;
39+
import net.buildtheearth.terraplusplus.projection.mercator.CenteredMercatorProjection;
40+
import net.buildtheearth.terraplusplus.projection.mercator.TransverseMercatorProjection;
41+
import net.buildtheearth.terraplusplus.projection.mercator.WebMercatorProjection;
3942
import net.buildtheearth.terraplusplus.projection.transform.FlipHorizontalProjectionTransform;
4043
import net.buildtheearth.terraplusplus.projection.transform.FlipVerticalProjectionTransform;
4144
import net.buildtheearth.terraplusplus.projection.transform.OffsetProjectionTransform;
4245
import net.buildtheearth.terraplusplus.projection.transform.ScaleProjectionTransform;
4346
import net.buildtheearth.terraplusplus.projection.transform.SwapAxesProjectionTransform;
44-
import lombok.NonNull;
45-
import lombok.RequiredArgsConstructor;
46-
import lombok.experimental.UtilityClass;
4747

4848
/**
4949
* Identifies implementation classes by their type names.

‎src/main/java/net/buildtheearth/terraplusplus/config/TypedDeserializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
public abstract class TypedDeserializer<T> extends JsonDeserializer<T> {
1818
@Override
19-
public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
19+
public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
2020
String name = p.nextFieldName();
2121
if (name == null) {
2222
throw JsonMappingException.from(p, "expected type name, found: " + p.currentToken());

‎src/main/java/net/buildtheearth/terraplusplus/config/TypedSerializer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public void serialize(T value, JsonGenerator gen, SerializerProvider serializers
3535
}
3636

3737
protected abstract Map<Class<? extends T>, String> registry();
38-
38+
3939
@JsonSerialize
4040
private class MixIn {} // Have this here to avoid a bug in forge gradle (https://forums.minecraftforge.net/topic/40670-build-terminates-at-extractrangemapreplacedmain/)
41-
41+
4242
}

‎src/main/java/net/buildtheearth/terraplusplus/config/condition/AndDC.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonValue;
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
6-
import net.buildtheearth.terraplusplus.config.SingleProperty;
76
import lombok.Getter;
87
import lombok.NonNull;
98
import lombok.RequiredArgsConstructor;
9+
import net.buildtheearth.terraplusplus.config.SingleProperty;
1010

1111
/**
1212
* @author DaPorkchop_

‎src/main/java/net/buildtheearth/terraplusplus/config/condition/EqualDC.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonValue;
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
6-
import net.buildtheearth.terraplusplus.config.SingleProperty;
76
import lombok.Getter;
87
import lombok.RequiredArgsConstructor;
8+
import net.buildtheearth.terraplusplus.config.SingleProperty;
99

1010
/**
1111
* @author DaPorkchop_

‎src/main/java/net/buildtheearth/terraplusplus/config/condition/GreaterThanDC.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonValue;
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
6-
import net.buildtheearth.terraplusplus.config.SingleProperty;
76
import lombok.Getter;
87
import lombok.RequiredArgsConstructor;
8+
import net.buildtheearth.terraplusplus.config.SingleProperty;
99

1010
/**
1111
* @author DaPorkchop_

‎src/main/java/net/buildtheearth/terraplusplus/config/condition/LessThanDC.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonValue;
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
6-
import net.buildtheearth.terraplusplus.config.SingleProperty;
76
import lombok.Getter;
87
import lombok.RequiredArgsConstructor;
8+
import net.buildtheearth.terraplusplus.config.SingleProperty;
99

1010
/**
1111
* @author DaPorkchop_

‎src/main/java/net/buildtheearth/terraplusplus/config/condition/OrDC.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonValue;
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
6-
import net.buildtheearth.terraplusplus.config.SingleProperty;
76
import lombok.Getter;
87
import lombok.NonNull;
98
import lombok.RequiredArgsConstructor;
9+
import net.buildtheearth.terraplusplus.config.SingleProperty;
1010

1111
/**
1212
* @author DaPorkchop_

0 commit comments

Comments
 (0)