aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2020-05-03 11:02:55 +0200
committerTec <daniel112092@gmail.com>2020-05-03 11:02:55 +0200
commitf072d69ee5dbbef49e46e4c2357b985f86d202a3 (patch)
tree8aea434dbae3597f27fc4d0d1a96aa08327b4af9
parent132765721d820021e594fe417ee7bbb6180df970 (diff)
downloadGT5-Unofficial-f072d69ee5dbbef49e46e4c2357b985f86d202a3.tar.gz
GT5-Unofficial-f072d69ee5dbbef49e46e4c2357b985f86d202a3.tar.bz2
GT5-Unofficial-f072d69ee5dbbef49e46e4c2357b985f86d202a3.zip
Defer get icons
-rw-r--r--src/main/java/com/github/technus/tectech/loader/MainLoader.java2
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index f8fbcda2da..bab6c6d092 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -157,7 +157,7 @@ public final class MainLoader {
fixBlocks();
TecTech.LOGGER.info("Blocks nerf done");
- progressBarPostLoad.step("Initialize more constructable stuff");
+ progressBarPostLoad.step("Constructable stuff");
new ConstructableLoader().run();
TecTech.LOGGER.info("Constructable initialized");
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java b/src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java
index 2177d1a00e..00bdcdb1ad 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java
@@ -142,7 +142,7 @@ public class StructureUtility {
* @param <T>
* @return
*/
- public static <T> IStructureElementNoPlacement<T> ofHint(IIcon[] icons) {
+ public static <T> IStructureElementNoPlacement<T> ofHintDeferred(Supplier<IIcon[]> icons) {
return new IStructureElementNoPlacement<T>() {
@Override
public boolean check(T t, World world, int x, int y, int z) {
@@ -151,7 +151,7 @@ public class StructureUtility {
@Override
public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
- TecTech.proxy.hint_particle(world, x, y, z, icons);
+ TecTech.proxy.hint_particle(world, x, y, z, icons.get());
return false;
}
};
@@ -165,7 +165,7 @@ public class StructureUtility {
* @param <T>
* @return
*/
- public static <T> IStructureElementNoPlacement<T> ofHint(IIcon[] icons,short[] RGBa) {
+ public static <T> IStructureElementNoPlacement<T> ofHintDeferred(Supplier<IIcon[]> icons,short[] RGBa) {
return new IStructureElementNoPlacement<T>() {
@Override
public boolean check(T t, World world, int x, int y, int z) {
@@ -174,7 +174,7 @@ public class StructureUtility {
@Override
public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
- TecTech.proxy.hint_particle_tinted(world, x, y, z, icons,RGBa);
+ TecTech.proxy.hint_particle_tinted(world, x, y, z, icons.get(),RGBa);
return false;
}
};