From 1941b8ac43fc7679c699c1c53a93e16cdcef92e6 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Wed, 29 Jan 2025 16:43:02 -0500 Subject: [PATCH] Sneaky listeners - Fix visuals being registered to create's registrate and getting ignored - Fix wildcards with things that use Glob#toRegexPattern --- changelog.md | 1 + gradle.properties | 2 +- .../create/foundation/data/CreateBlockEntityBuilder.java | 8 ++++---- .../create/foundation/data/CreateEntityBuilder.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changelog.md b/changelog.md index d4a6a5c531..a8010ac4f8 100644 --- a/changelog.md +++ b/changelog.md @@ -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) diff --git a/gradle.properties b/gradle.properties index f8e9e59018..4827aad346 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java b/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java index 8f61275bdc..0052c859d7 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java @@ -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 extends BlockEnt new ArrayList<>(); public static BlockEntityBuilder create(AbstractRegistrate owner, P parent, - String name, BuilderCallback callback, BlockEntityFactory factory) { + String name, BuilderCallback callback, BlockEntityFactory factory) { return new CreateBlockEntityBuilder<>(owner, parent, name, callback, factory); } protected CreateBlockEntityBuilder(AbstractRegistrate owner, P parent, String name, BuilderCallback callback, - BlockEntityFactory factory) { + BlockEntityFactory factory) { super(owner, parent, name, callback, factory); } @@ -81,7 +81,7 @@ public class CreateBlockEntityBuilder extends BlockEnt } protected void registerVisualizer() { - OneTimeEventReceiver.addModListener(Create.REGISTRATE, FMLClientSetupEvent.class, $ -> { + OneTimeEventReceiver.addModListener(getOwner(), FMLClientSetupEvent.class, $ -> { var visualFactory = this.visualFactory; if (visualFactory != null) { NonNullPredicate renderNormally = this.renderNormally; diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java b/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java index 944508939c..38a39b3217 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java @@ -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 extends EntityBuilder { + OneTimeEventReceiver.addModListener(getOwner(), FMLClientSetupEvent.class, $ -> { var visualFactory = this.visualFactory; if (visualFactory != null) { NonNullPredicate renderNormally = this.renderNormally;