From d19ca0689a0ef67aa6980645451a0f736ebbb007 Mon Sep 17 00:00:00 2001 From: ChampionAsh5357 Date: Wed, 23 Oct 2024 19:13:11 -0400 Subject: [PATCH 1/4] Add new MobEffect constructor that allows specifying a particle factory (#1578) --- .../minecraft/world/effect/MobEffect.java.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/patches/net/minecraft/world/effect/MobEffect.java.patch b/patches/net/minecraft/world/effect/MobEffect.java.patch index 135584ef6b..1daf7ed3ab 100644 --- a/patches/net/minecraft/world/effect/MobEffect.java.patch +++ b/patches/net/minecraft/world/effect/MobEffect.java.patch @@ -9,6 +9,23 @@ public static final Codec> CODEC = BuiltInRegistries.MOB_EFFECT.holderByNameCodec(); public static final StreamCodec> STREAM_CODEC = ByteBufCodecs.holderRegistry(Registries.MOB_EFFECT); private static final int AMBIENT_ALPHA = Mth.floor(38.25F); +@@ -65,6 +_,16 @@ + this.particleFactory = p_333515_ -> p_333716_; + } + ++ /** ++ * Neo: Constructor that can take in the particle factory as a function of the {@link MobEffectInstance}. ++ * This should be used if the desired {@link ParticleOptions} depends on the presence of other registry entries. ++ */ ++ protected MobEffect(MobEffectCategory category, int color, Function particleFactory) { ++ this.category = category; ++ this.color = color; ++ this.particleFactory = particleFactory; ++ } ++ + public int getBlendDurationTicks() { + return this.blendDurationTicks; + } @@ -133,6 +_,18 @@ return this; } From 3f10254f1a4190263c7203a157c2ae12622453fc Mon Sep 17 00:00:00 2001 From: Matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:58:50 +0300 Subject: [PATCH 2/4] Fix mod logos not being rendered in the mod list (#1615) --- .../neoforge/client/extensions/IGuiGraphicsExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/neoforged/neoforge/client/extensions/IGuiGraphicsExtension.java b/src/main/java/net/neoforged/neoforge/client/extensions/IGuiGraphicsExtension.java index d6b1da00e0..3d4d365b1f 100644 --- a/src/main/java/net/neoforged/neoforge/client/extensions/IGuiGraphicsExtension.java +++ b/src/main/java/net/neoforged/neoforge/client/extensions/IGuiGraphicsExtension.java @@ -143,7 +143,7 @@ default void blitInscribed(ResourceLocation texture, int x, int y, int boundsWid if (centerX) x += (w - boundsWidth) / 2; } - self().blit(RenderType::guiTextured, texture, x, y, boundsWidth, boundsHeight, 0, 0, rectWidth, rectHeight, rectWidth, rectHeight); + self().blit(RenderType::guiTextured, texture, x, y, 0, 0, boundsWidth, boundsHeight, rectWidth, rectHeight, rectWidth, rectHeight); } // TODO: 1.20.2: do we need to fix these or can we just remove them? From bd1804b00c7722db5dc5b2fc7e7f797478720287 Mon Sep 17 00:00:00 2001 From: ChampionAsh5357 Date: Fri, 25 Oct 2024 13:46:52 -0400 Subject: [PATCH 3/4] [1.21.3] Expose RecipeManager#recipes via new getter function (#1620) --- .../world/item/crafting/RecipeManager.java.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 patches/net/minecraft/world/item/crafting/RecipeManager.java.patch diff --git a/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch b/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch new file mode 100644 index 0000000000..e1cbdae41d --- /dev/null +++ b/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch @@ -0,0 +1,14 @@ +--- a/net/minecraft/world/item/crafting/RecipeManager.java ++++ b/net/minecraft/world/item/crafting/RecipeManager.java +@@ -260,6 +_,11 @@ + : Optional.empty(); + } + ++ // Neo: expose recipe map ++ public RecipeMap recipeMap() { ++ return this.recipes; ++ } ++ + public interface CachedCheck> { + Optional> getRecipeFor(I p_344938_, ServerLevel p_379487_); + } From 5a82cc609ae8b355396721cf5679e1cfca5ddc4a Mon Sep 17 00:00:00 2001 From: "neoforged-renovate[bot]" <174042230+neoforged-renovate[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 10:12:23 +0100 Subject: [PATCH 4/4] Update fancy_mod_loader_version to v4.0.31 (1.21.x) (#1635) Co-authored-by: neoforged-renovate[bot] <174042230+neoforged-renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bd49179e04..b2c2ca42a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ jetbrains_annotations_version=24.0.1 slf4j_api_version=2.0.7 apache_maven_artifact_version=3.8.5 jarjar_version=0.4.1 -fancy_mod_loader_version=4.0.29 +fancy_mod_loader_version=4.0.31 mojang_logging_version=1.1.1 log4j_version=2.22.1 guava_version=31.1.2-jre