mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-02-16 02:20:57 +00:00
Reformat code
This commit is contained in:
@@ -1,15 +1,15 @@
|
||||
dependencies {
|
||||
api(project(":common:api"))
|
||||
api(project(":common:implementation:bootstrap-addon-loader"))
|
||||
|
||||
|
||||
testImplementation("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
|
||||
|
||||
|
||||
implementation("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
|
||||
|
||||
|
||||
implementation("org.apache.commons", "commons-text", Versions.Libraries.Internal.apacheText)
|
||||
implementation("com.dfsek.tectonic", "yaml", Versions.Libraries.tectonic)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
implementation("com.dfsek", "paralithic", Versions.Libraries.paralithic)
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@ public abstract class AbstractPlatform implements Platform {
|
||||
bootstrapAddonLoader.loadAddons(addonsFolder, bootstrapAddonClassLoader)
|
||||
.forEach(bootstrapAddon -> {
|
||||
platformInjector.inject(bootstrapAddon);
|
||||
|
||||
|
||||
bootstrapAddon.loadAddons(addonsFolder, bootstrapAddonClassLoader)
|
||||
.forEach(addonList::add);
|
||||
});
|
||||
|
||||
@@ -33,6 +33,7 @@ import com.dfsek.terra.api.config.ConfigPack;
|
||||
import com.dfsek.terra.api.config.Loader;
|
||||
import com.dfsek.terra.api.properties.Properties;
|
||||
|
||||
|
||||
/*
|
||||
* @deprecated Use the Image and ImageLoader class provided by the library-image addon instead. This is subject to removal in v7.
|
||||
*/
|
||||
@@ -45,7 +46,7 @@ public class BufferedImageLoader implements TypeLoader<BufferedImage> {
|
||||
public BufferedImageLoader(Loader files, ConfigPack pack) {
|
||||
this.files = files;
|
||||
this.pack = pack;
|
||||
if (!pack.getContext().has(ImageCache.class))
|
||||
if(!pack.getContext().has(ImageCache.class))
|
||||
pack.getContext().put(new ImageCache(new ConcurrentHashMap<>()));
|
||||
}
|
||||
|
||||
|
||||
@@ -68,7 +68,8 @@ public class MetaListLikePreprocessor extends MetaPreprocessor<Meta> {
|
||||
|
||||
if(!(metaValue instanceof List)) {
|
||||
throw new LoadException(
|
||||
"Meta list / set injection (via <<) must point to a list. '" + meta + "' points to type " + metaValue.getClass().getCanonicalName(),
|
||||
"Meta list / set injection (via <<) must point to a list. '" + meta + "' points to type " +
|
||||
metaValue.getClass().getCanonicalName(),
|
||||
depthTracker);
|
||||
}
|
||||
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
# wiki for information regarding config pack development.
|
||||
|
||||
debug:
|
||||
commands: false
|
||||
log: false
|
||||
profiler: false
|
||||
script: false
|
||||
commands: false
|
||||
log: false
|
||||
profiler: false
|
||||
script: false
|
||||
dump-default: true
|
||||
biome-search-resolution: 4
|
||||
cache:
|
||||
structure: 32
|
||||
sampler: 128
|
||||
biome-provider: 32
|
||||
structure: 32
|
||||
sampler: 128
|
||||
biome-provider: 32
|
||||
script:
|
||||
max-recursion: 1000
|
||||
max-recursion: 1000
|
||||
@@ -50,7 +50,7 @@ public class RegistryTest {
|
||||
test.registerChecked(RegistryKey.parse("test:test"), "bazinga2");
|
||||
fail("Shouldn't be able to re-register with #registerChecked!");
|
||||
} catch(DuplicateEntryException ignore) {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ public class RegistryTest {
|
||||
test.register(RegistryKey.parse("test:test"), "bazinga2");
|
||||
fail("Shouldn't be able to re-register in CheckedRegistry!");
|
||||
} catch(DuplicateEntryException ignore) {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ public class RegistryTest {
|
||||
test.getByID("test");
|
||||
fail("Shouldn't be able to get with ambiguous ID!");
|
||||
} catch(IllegalArgumentException ignore) {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@ dimensions: 2
|
||||
type: Cellular
|
||||
frequency: 0.01
|
||||
cellular:
|
||||
return: Distance3Div
|
||||
return: Distance3Div
|
||||
normalize:
|
||||
type: LINEAR
|
||||
linear:
|
||||
min: -1
|
||||
max: 0
|
||||
type: LINEAR
|
||||
linear:
|
||||
min: -1
|
||||
max: 0
|
||||
@@ -1,18 +1,18 @@
|
||||
list:
|
||||
- ONE
|
||||
- "<< metaTarget.yml:list"
|
||||
- FOUR
|
||||
- FIVE
|
||||
- SIX
|
||||
- "<< metaTarget.yml:list2"
|
||||
- NINE
|
||||
- TEN
|
||||
- ONE
|
||||
- "<< metaTarget.yml:list"
|
||||
- FOUR
|
||||
- FIVE
|
||||
- SIX
|
||||
- "<< metaTarget.yml:list2"
|
||||
- NINE
|
||||
- TEN
|
||||
map:
|
||||
"<<":
|
||||
- metaTarget.yml:map1
|
||||
- metaTarget.yml:map2
|
||||
one: ONE
|
||||
two: TWO
|
||||
"<<":
|
||||
- metaTarget.yml:map1
|
||||
- metaTarget.yml:map2
|
||||
one: ONE
|
||||
two: TWO
|
||||
string: "one-${metaTarget.yml:string.two}-${metaTarget.yml:string.three}-four-five-${metaTarget.yml:string.six}"
|
||||
int: 2 + 4
|
||||
double: ${metaTarget.yml:double} + 5.6
|
||||
@@ -1,17 +1,17 @@
|
||||
list:
|
||||
- TWO
|
||||
- THREE
|
||||
- TWO
|
||||
- THREE
|
||||
list2:
|
||||
- SEVEN
|
||||
- EIGHT
|
||||
- SEVEN
|
||||
- EIGHT
|
||||
map1:
|
||||
three: THREE
|
||||
four: FOUR
|
||||
five: FIVE
|
||||
three: THREE
|
||||
four: FOUR
|
||||
five: FIVE
|
||||
map2:
|
||||
six: SIX
|
||||
six: SIX
|
||||
string:
|
||||
two: two
|
||||
three: three
|
||||
six: six
|
||||
two: two
|
||||
three: three
|
||||
six: six
|
||||
double: 1
|
||||
Reference in New Issue
Block a user