rename main parameters/fields to platform

This commit is contained in:
dfsek committed 2021-09-26 13:22:45 -07:00
1 parent 8f51707505
commit 4945a3bbfa
117 files changed
+535 -516

No files matched your search

@@ -42,16 +42,16 @@ public class LocatorAddon extends TerraAddon {
public static final TypeKey<Supplier<ObjectTemplate<Pattern>>> PATTERN_TOKEN = new TypeKey<>() {
};
@Inject
private Platform main;
private Platform platform;
@Override
public void initialize() {
main.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> {
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<Locator>>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN);
locatorRegistry.register("SURFACE", () -> new SurfaceLocatorTemplate(main));
locatorRegistry.register("SURFACE", () -> new SurfaceLocatorTemplate(platform));
locatorRegistry.register("RANDOM", RandomLocatorTemplate::new);
locatorRegistry.register("PATTERN", PatternLocatorTemplate::new);
locatorRegistry.register("NOISE", NoiseLocatorTemplate::new);
@@ -60,7 +60,7 @@ public class LocatorAddon extends TerraAddon {
locatorRegistry.register("AND", AndLocatorTemplate::new);
locatorRegistry.register("OR", OrLocatorTemplate::new);
})
.then(event -> {
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<Pattern>>> patternRegistry = event.getPack().getOrCreateRegistry(PATTERN_TOKEN);
patternRegistry.register("MATCH_AIR", AirMatchPatternTemplate::new);
patternRegistry.register("MATCH_SOLID", SolidMatchPatternTemplate::new);
@@ -71,6 +71,6 @@ public class LocatorAddon extends TerraAddon {
patternRegistry.register("OR", OrPatternTemplate::new);
patternRegistry.register("NOT", NotPatternTemplate::new);
})
.failThrough();
.failThrough();
}
}
@@ -11,17 +11,17 @@ import com.dfsek.terra.api.util.Range;
public class SurfaceLocatorTemplate implements ObjectTemplate<Locator> {
private final Platform main;
private final Platform platform;
@Value("range")
private @Meta Range range;
public SurfaceLocatorTemplate(Platform main) {
this.main = main;
public SurfaceLocatorTemplate(Platform platform) {
this.platform = platform;
}
@Override
public Locator get() {
return new SurfaceLocator(range, main);
return new SurfaceLocator(range, platform);
}
}
@@ -13,9 +13,9 @@ public class SurfaceLocator implements Locator {
private final BlockState air;
public SurfaceLocator(Range search, Platform main) {
public SurfaceLocator(Range search, Platform platform) {
this.search = search;
this.air = main.getWorldHandle().air();
this.air = platform.getWorldHandle().air();
}
@Override