mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sneaky listeners

Browse source 
- Fix visuals being registered to create's registrate and getting ignored
- Fix wildcards with things that use Glob#toRegexPattern
This commit is contained in:
IThundxr 2025-01-29 16:43:02 -05:00
parent 9d8db56e3d
commit 1941b8ac43
Failed to generate hash of commit
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.md
View file

@ -65,6 +65,7 @@ _Now using Flywheel 1.0_
- Implemented a system for generating certain recipes at runtime to improve mod compat
- Boiler gauge now disappears when blocks are clipping into it
- Added a keybind that opens a radial menu for rotating blocks with the wrench
- Wood cutting recipes in mechanical saws
- Added pressing recipes for coarse dirt and rooted dirt which both produce dirt paths (#7186)
- Updated JEI integration and added potion fluids to the JEI sidebar (#6934)

2
gradle.properties
View file

@ -25,7 +25,7 @@ jei_minecraft_version = 1.20.1
jei_version = 15.19.0.85
curios_minecraft_version = 1.20.1
curios_version = 5.3.1
ponder_version = 1.0.24
ponder_version = 1.0.30
mixin_extras_version = 0.4.1
cc_tweaked_enable = true

8
src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java
View file

@ -6,7 +6,6 @@ import java.util.function.Supplier;
import javax.annotation.Nullable;
import com.simibubi.create.Create;
import com.tterrag.registrate.AbstractRegistrate;
import com.tterrag.registrate.builders.BlockEntityBuilder;
import com.tterrag.registrate.builders.BuilderCallback;
@ -17,6 +16,7 @@ import dev.engine_room.flywheel.lib.visualization.SimpleBlockEntityVisualizer;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.util.NonNullPredicate;
import net.minecraftforge.fml.DistExecutor;
@ -32,12 +32,12 @@ public class CreateBlockEntityBuilder<T extends BlockEntity, P> extends BlockEnt
new ArrayList<>();
public static <T extends BlockEntity, P> BlockEntityBuilder<T, P> create(AbstractRegistrate<?> owner, P parent,
String name, BuilderCallback callback, BlockEntityFactory<T> factory) {
String name, BuilderCallback callback, BlockEntityFactory<T> factory) {
return new CreateBlockEntityBuilder<>(owner, parent, name, callback, factory);
}
protected CreateBlockEntityBuilder(AbstractRegistrate<?> owner, P parent, String name, BuilderCallback callback,
BlockEntityFactory<T> factory) {
BlockEntityFactory<T> factory) {
super(owner, parent, name, callback, factory);
}
@ -81,7 +81,7 @@ public class CreateBlockEntityBuilder<T extends BlockEntity, P> extends BlockEnt
}
protected void registerVisualizer() {
OneTimeEventReceiver.addModListener(Create.REGISTRATE, FMLClientSetupEvent.class, $ -> {
OneTimeEventReceiver.addModListener(getOwner(), FMLClientSetupEvent.class, $ -> {
var visualFactory = this.visualFactory;
if (visualFactory != null) {
NonNullPredicate<T> renderNormally = this.renderNormally;

4
src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java
View file

@ -3,7 +3,6 @@ package com.simibubi.create.foundation.data;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import com.simibubi.create.Create;
import com.tterrag.registrate.AbstractRegistrate;
import com.tterrag.registrate.builders.BuilderCallback;
import com.tterrag.registrate.builders.EntityBuilder;
@ -14,6 +13,7 @@ import dev.engine_room.flywheel.lib.visualization.SimpleEntityVisualizer;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.util.NonNullPredicate;
import net.minecraftforge.fml.DistExecutor;
@ -54,7 +54,7 @@ public class CreateEntityBuilder<T extends Entity, P> extends EntityBuilder<T, P
}
protected void registerVisualizer() {
OneTimeEventReceiver.addModListener(Create.REGISTRATE, FMLClientSetupEvent.class, $ -> {
OneTimeEventReceiver.addModListener(getOwner(), FMLClientSetupEvent.class, $ -> {
var visualFactory = this.visualFactory;
if (visualFactory != null) {
NonNullPredicate<T> renderNormally = this.renderNormally;