Skip to content

Commit 1994e21

Browse files
maximumpower55TropheusJ
authored andcommitted
fix visual registration
1 parent 49449a7 commit 1994e21

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java

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

33
import java.util.ArrayList;
44
import java.util.Collection;
5+
import java.util.Objects;
56
import java.util.function.Predicate;
67
import java.util.function.Supplier;
78

@@ -99,13 +100,13 @@ public CreateBlockEntityBuilder<T, P> visual(
99100
}
100101

101102
protected void registerVisualizer() {
102-
var visualFactory = this.visualFactory;
103-
if (visualFactory != null) {
103+
this.onRegister((entry) -> {
104+
Objects.requireNonNull(this.visualFactory);
104105
Predicate<T> renderNormally = this.renderNormally;
105-
SimpleBlockEntityVisualizer.builder(getEntry())
106-
.factory(visualFactory.get())
107-
.skipVanillaRender(be -> !renderNormally.test(be))
108-
.apply();
109-
}
106+
SimpleBlockEntityVisualizer.builder(this.getEntry())
107+
.factory(this.visualFactory.get())
108+
.skipVanillaRender(be -> !renderNormally.test(be))
109+
.apply();
110+
});
110111
}
111112
}

src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.simibubi.create.foundation.data;
22

3+
import java.util.Objects;
34
import java.util.function.Predicate;
45

56
import javax.annotation.Nullable;
@@ -11,6 +12,7 @@
1112
import com.tterrag.registrate.fabric.EnvExecutor;
1213
import com.tterrag.registrate.util.nullness.NonNullSupplier;
1314

15+
import dev.engine_room.flywheel.lib.visualization.SimpleBlockEntityVisualizer;
1416
import dev.engine_room.flywheel.lib.visualization.SimpleEntityVisualizer;
1517
import net.minecraft.world.entity.Entity;
1618
import net.minecraft.world.entity.EntityType;
@@ -53,13 +55,13 @@ public CreateEntityBuilder<T, P> visual(NonNullSupplier<SimpleEntityVisualizer.F
5355
}
5456

5557
protected void registerVisualizer() {
56-
var visualFactory = this.visualFactory;
57-
if (visualFactory != null) {
58+
this.onRegister((entry) -> {
59+
Objects.requireNonNull(this.visualFactory);
5860
Predicate<T> renderNormally = this.renderNormally;
59-
SimpleEntityVisualizer.builder(getEntry())
60-
.factory(visualFactory.get())
61-
.skipVanillaRender(entity -> !renderNormally.test(entity))
62-
.apply();
63-
}
61+
SimpleEntityVisualizer.builder(this.getEntry())
62+
.factory(this.visualFactory.get())
63+
.skipVanillaRender(entity -> !renderNormally.test(entity))
64+
.apply();
65+
});
6466
}
6567
}

0 commit comments

Comments
 (0)