diff --git a/gradle.properties b/gradle.properties index 3a573b0d5d..918e01b3b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.daemon=false org.gradle.parallel=true JAVA_VERSION=21 -MC_VERSION=1.21.6 +MC_VERSION=1.21.7 MC_NEXT_VERSION=1.22 -MCP_VERSION=20250618.020446 +MCP_VERSION=20250630.104312 MAPPING_CHANNEL=official -MAPPING_VERSION=1.21.6 +MAPPING_VERSION=1.21.7 # Set to true before the first build of a new MC version, so we don't do compatibility checks CHECK_COMPATIBILITY=false diff --git a/patches/minecraft/com/mojang/blaze3d/opengl/GlDevice.java.patch b/patches/minecraft/com/mojang/blaze3d/opengl/GlDevice.java.patch index 4775ae7d81..99f620647b 100644 --- a/patches/minecraft/com/mojang/blaze3d/opengl/GlDevice.java.patch +++ b/patches/minecraft/com/mojang/blaze3d/opengl/GlDevice.java.patch @@ -1,6 +1,6 @@ --- a/com/mojang/blaze3d/opengl/GlDevice.java +++ b/com/mojang/blaze3d/opengl/GlDevice.java -@@ -88,8 +_,15 @@ +@@ -89,8 +_,15 @@ public GpuTexture createTexture( @Nullable Supplier p_397830_, int p_394481_, TextureFormat p_394839_, int p_391831_, int p_395609_, int p_407582_, int p_408928_ ) { @@ -17,7 +17,7 @@ ); } -@@ -97,6 +_,15 @@ +@@ -98,6 +_,15 @@ public GpuTexture createTexture( @Nullable String p_394142_, int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_ ) { @@ -33,7 +33,7 @@ if (p_406483_ < 1) { throw new IllegalArgumentException("mipLevels must be at least 1"); } else if (p_408015_ < 1) { -@@ -147,11 +_,14 @@ +@@ -148,11 +_,14 @@ GlStateManager._texImage2D( k, l, @@ -48,7 +48,7 @@ GlConst.toGlType(p_394951_), null ); -@@ -162,11 +_,14 @@ +@@ -163,11 +_,14 @@ GlStateManager._texImage2D( j, i1, @@ -63,7 +63,7 @@ GlConst.toGlType(p_394951_), null ); -@@ -179,7 +_,7 @@ +@@ -180,7 +_,7 @@ } else if (j1 != 0) { throw new IllegalStateException("OpenGL error " + j1); } else { diff --git a/patches/minecraft/com/mojang/blaze3d/vertex/VertexFormat.java.patch b/patches/minecraft/com/mojang/blaze3d/vertex/VertexFormat.java.patch index ad2bb4c1b3..0df92ce437 100644 --- a/patches/minecraft/com/mojang/blaze3d/vertex/VertexFormat.java.patch +++ b/patches/minecraft/com/mojang/blaze3d/vertex/VertexFormat.java.patch @@ -1,15 +1,15 @@ --- a/com/mojang/blaze3d/vertex/VertexFormat.java +++ b/com/mojang/blaze3d/vertex/VertexFormat.java -@@ -18,7 +_,7 @@ +@@ -20,7 +_,7 @@ @OnlyIn(Dist.CLIENT) @DontObfuscate -public class VertexFormat { +public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat { public static final int UNKNOWN_ELEMENT = -1; - private final List elements; - private final List names; -@@ -29,6 +_,7 @@ + private static final boolean USE_STAGING_BUFFER_WORKAROUND = Util.getPlatform() == Util.OS.WINDOWS && Util.isAarch64(); + @Nullable +@@ -34,6 +_,7 @@ private GpuBuffer immediateDrawVertexBuffer; @Nullable private GpuBuffer immediateDrawIndexBuffer; @@ -17,7 +17,7 @@ VertexFormat(List p_343616_, List p_345241_, IntList p_345522_, int p_344162_) { this.elements = p_343616_; -@@ -41,6 +_,11 @@ +@@ -46,6 +_,11 @@ int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1; this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1; } @@ -29,8 +29,8 @@ } public static VertexFormat.Builder builder() { -@@ -138,6 +_,9 @@ - +@@ -162,6 +_,9 @@ + ); return this.immediateDrawIndexBuffer; } + diff --git a/patches/minecraft/net/minecraft/client/data/models/ItemModelGenerators.java.patch b/patches/minecraft/net/minecraft/client/data/models/ItemModelGenerators.java.patch index a99474621b..3aec965395 100644 --- a/patches/minecraft/net/minecraft/client/data/models/ItemModelGenerators.java.patch +++ b/patches/minecraft/net/minecraft/client/data/models/ItemModelGenerators.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/data/models/ItemModelGenerators.java +++ b/net/minecraft/client/data/models/ItemModelGenerators.java -@@ -870,6 +_,9 @@ +@@ -871,6 +_,9 @@ this.declareCustomModelItem(Items.COD); this.declareCustomModelItem(Items.FEATHER); this.declareCustomModelItem(Items.LEAD); diff --git a/patches/minecraft/net/minecraft/client/gui/Font.java.patch b/patches/minecraft/net/minecraft/client/gui/Font.java.patch index 65dab5b929..7d0721236f 100644 --- a/patches/minecraft/net/minecraft/client/gui/Font.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/Font.java.patch @@ -6,6 +6,6 @@ @OnlyIn(Dist.CLIENT) -public class Font { +public class Font implements net.minecraftforge.client.extensions.IForgeFont { - private static final float EFFECT_DEPTH = 0.001F; - private static final float OVER_EFFECT_DEPTH = 0.001F; - private static final float UNDER_EFFECT_DEPTH = -0.001F; + private static final float EFFECT_DEPTH = 0.01F; + private static final float OVER_EFFECT_DEPTH = 0.01F; + private static final float UNDER_EFFECT_DEPTH = -0.01F; diff --git a/patches/minecraft/net/minecraft/client/gui/GuiGraphics.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiGraphics.java.patch index 4fb3cb3257..9a2857019a 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiGraphics.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiGraphics.java.patch @@ -9,7 +9,7 @@ private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2; private final Minecraft minecraft; private final Matrix3x2fStack pose; -@@ -870,6 +_,7 @@ +@@ -875,6 +_,7 @@ CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item"); CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered"); crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_283653_.getItem())); @@ -17,7 +17,7 @@ crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_283653_.getComponents())); crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_283653_.hasFoil())); throw new ReportedException(crashreport); -@@ -888,6 +_,7 @@ +@@ -893,6 +_,7 @@ this.renderItemCooldown(p_283349_, p_282641_, p_282146_); this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_); this.pose.popMatrix(); @@ -25,7 +25,7 @@ } } -@@ -899,21 +_,30 @@ +@@ -904,21 +_,30 @@ this.setTooltipForNextFrame(this.minecraft.font, p_407686_, DefaultTooltipPositioner.INSTANCE, p_410475_, p_407139_, false); } @@ -58,7 +58,7 @@ this.setTooltipForNextFrameInternal(p_407847_, list, p_409369_, p_407472_, DefaultTooltipPositioner.INSTANCE, p_410303_, false); } -@@ -926,7 +_,22 @@ +@@ -931,7 +_,22 @@ } public void setComponentTooltipForNextFrame(Font p_406239_, List p_410275_, int p_410594_, int p_409343_) { @@ -82,7 +82,7 @@ } public void setComponentTooltipForNextFrame(Font p_408650_, List p_407512_, int p_406019_, int p_408123_, @Nullable ResourceLocation p_409993_) { -@@ -989,11 +_,13 @@ +@@ -994,11 +_,13 @@ ClientTooltipPositioner p_409451_, @Nullable ResourceLocation p_409298_ ) { @@ -97,7 +97,7 @@ if (k > i) { i = k; } -@@ -1003,16 +_,17 @@ +@@ -1008,16 +_,17 @@ int l1 = i; int i2 = j; @@ -118,7 +118,7 @@ j1 += clienttooltipcomponent1.getHeight(p_283128_) + (k1 == 0 ? 2 : 0); } -@@ -1020,7 +_,7 @@ +@@ -1025,7 +_,7 @@ for (int j2 = 0; j2 < p_282716_.size(); j2++) { ClientTooltipComponent clienttooltipcomponent2 = p_282716_.get(j2); @@ -127,7 +127,7 @@ j1 += clienttooltipcomponent2.getHeight(p_283128_) + (j2 == 0 ? 2 : 0); } -@@ -1217,6 +_,14 @@ +@@ -1222,6 +_,14 @@ public void submitProfilerChartRenderState(List p_408565_, int p_410147_, int p_406156_, int p_407365_, int p_408180_) { this.guiRenderState.submitPicturesInPictureState(new GuiProfilerChartRenderState(p_408565_, p_410147_, p_406156_, p_407365_, p_408180_, this.scissorStack.peek())); diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlas.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlas.java.patch index 6c44cb57bf..18ee7f4f66 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlas.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlas.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/renderer/texture/TextureAtlas.java +++ b/net/minecraft/client/renderer/texture/TextureAtlas.java -@@ -88,6 +_,7 @@ +@@ -91,6 +_,7 @@ this.sprites = List.copyOf(list); this.animatedTextures = List.copyOf(list1); } @@ -8,7 +8,7 @@ } @Override -@@ -165,5 +_,10 @@ +@@ -168,5 +_,10 @@ int getHeight() { return this.height; diff --git a/patches/minecraft/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java.patch b/patches/minecraft/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java.patch index 643b30b02c..42b5612db4 100644 --- a/patches/minecraft/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java +++ b/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java -@@ -84,7 +_,7 @@ +@@ -83,7 +_,7 @@ this.timeInOverworld = 0; } @@ -9,7 +9,7 @@ this.playConvertedSound(); this.finishConversion(p_360786_); } -@@ -103,7 +_,10 @@ +@@ -102,7 +_,10 @@ this.convertTo( EntityType.ZOMBIFIED_PIGLIN, ConversionParams.single(this, true, true), diff --git a/patches/minecraft/net/minecraft/world/entity/npc/Villager.java.patch b/patches/minecraft/net/minecraft/world/entity/npc/Villager.java.patch index 03d80b9385..511401dc68 100644 --- a/patches/minecraft/net/minecraft/world/entity/npc/Villager.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/npc/Villager.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java -@@ -321,7 +_,7 @@ +@@ -320,7 +_,7 @@ @Override public InteractionResult mobInteract(Player p_35472_, InteractionHand p_35473_) { ItemStack itemstack = p_35472_.getItemInHand(p_35473_); @@ -9,7 +9,7 @@ return super.mobInteract(p_35472_, p_35473_); } else if (this.isBaby()) { this.setUnhappy(); -@@ -767,7 +_,7 @@ +@@ -766,7 +_,7 @@ @Override public void thunderHit(ServerLevel p_35409_, LightningBolt p_35410_) { diff --git a/patches/minecraft/net/minecraft/world/item/Items.java.patch b/patches/minecraft/net/minecraft/world/item/Items.java.patch index 01f1fada71..44afb6a568 100644 --- a/patches/minecraft/net/minecraft/world/item/Items.java.patch +++ b/patches/minecraft/net/minecraft/world/item/Items.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/item/Items.java +++ b/net/minecraft/world/item/Items.java -@@ -2152,7 +_,25 @@ +@@ -2155,7 +_,25 @@ } public static Item registerBlock(Block p_252092_, Block... p_248886_) { @@ -27,7 +27,7 @@ for (Block block : p_248886_) { Item.BY_BLOCK.put(block, item); -@@ -2191,10 +_,6 @@ +@@ -2194,10 +_,6 @@ public static Item registerItem(ResourceKey p_364577_, Function p_366144_, Item.Properties p_369845_) { Item item = p_366144_.apply(p_369845_.setId(p_364577_)); diff --git a/src/main/generated/pack.mcmeta b/src/main/generated/pack.mcmeta index becb9004cb..37db12f5d3 100644 --- a/src/main/generated/pack.mcmeta +++ b/src/main/generated/pack.mcmeta @@ -3,6 +3,6 @@ "description": { "translate": "pack.forge.description" }, - "pack_format": 80 + "pack_format": 81 } } \ No newline at end of file diff --git a/src/test/generated/closed_module/module-info.dat b/src/test/generated/closed_module/module-info.dat index 50ef464ee2..9c2ea90bb9 100644 Binary files a/src/test/generated/closed_module/module-info.dat and b/src/test/generated/closed_module/module-info.dat differ diff --git a/src/test/generated/mdk_datagen/pack.mcmeta b/src/test/generated/mdk_datagen/pack.mcmeta index e49c14e7f8..cf85c2b634 100644 --- a/src/test/generated/mdk_datagen/pack.mcmeta +++ b/src/test/generated/mdk_datagen/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "${mod_id} resources", - "pack_format": 63 + "pack_format": 64 } } \ No newline at end of file diff --git a/src/test/generated/test_helper_mod/pack.mcmeta b/src/test/generated/test_helper_mod/pack.mcmeta index c551bea013..5bf4542d68 100644 --- a/src/test/generated/test_helper_mod/pack.mcmeta +++ b/src/test/generated/test_helper_mod/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Forge tests resource pack", - "pack_format": 63 + "pack_format": 64 } } \ No newline at end of file