Skip to content

Update to 26.4-snapshot-1 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
james090500 wants to merge 2 commits into from
Closed

Update to 26.4-snapshot-1 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fb4889
Update to 26.4-snapshot-1
james090500 Sep 22, 2026
6ddae3c
Push correct patches
james090500 Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

neoForm {
minecraftVersion = '26.3'
minecraftVersion = '26.4-snapshot-1'

additionalCompileDependencies = [
'net.neoforged:mergetool:2.0.7:api',
Expand Down
154 changes: 154 additions & 0 deletions src/patches/com/mojang/renderpearl/backend/opengl/GlCommandEncoder.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
--- a/com/mojang/renderpearl/backend/opengl/GlCommandEncoder.java
+++ b/com/mojang/renderpearl/backend/opengl/GlCommandEncoder.java
@@ -559,119 +_,38 @@
Uniform var5 = dirtyUniform;
byte var6 = 0;

- while (true) {
- switch (SwitchBootstraps.typeSwitch<"typeSwitch",Uniform.Ubo,Uniform.Utb,Uniform.Sampler>(var5, var6)) {
- case 0:
- Uniform.Ubo var7 = (Uniform.Ubo)var5;
- Uniform.Ubo var41 = var7;
-
- try {
- var42 = var41.blockBinding();
- } catch (Throwable var19) {
- throw new MatchException(var19.toString(), var19);
- }
-
- int var26 = var42;
- if (true) {
- int blockBinding = var26;
- GpuBufferSlice var27 = (GpuBufferSlice)renderPass.uniforms.get(i);
- GL33C.glBindBufferRange(35345, blockBinding, ((GlBuffer)var27.buffer()).handle(), var27.offset(), var27.length());
- continue label133;
- }
-
- var6 = 1;
- break;
- case 1:
- Uniform.Utb bufferView = (Uniform.Utb)var5;
- Uniform.Utb var34 = bufferView;
-
- try {
- var34.stateManager();
- } catch (Throwable var24) {
- throw new MatchException(var24.toString(), var24);
- }
-
- var34 = bufferView;
-
- try {
- var36 = var34.samplerIndex();
- } catch (Throwable var23) {
- throw new MatchException(var23.toString(), var23);
- }
-
- int var28 = var36;
- if (true) {
- int samplerIndex = var28;
- var34 = bufferView;
-
- try {
- var38 = var34.format();
- } catch (Throwable var22) {
- throw new MatchException(var22.toString(), var22);
- }
-
- GpuFormat var29 = var38;
- GpuFormat format = var29;
- var34 = bufferView;
-
- try {
- var40 = var34.texture();
- } catch (Throwable var21) {
- throw new MatchException(var21.toString(), var21);
- }
-
- var28 = var40;
- if (true) {
- int texture = var28;
- this.stateManager._activeTexture(33984 + samplerIndex);
- GL33C.glBindTexture(35882, texture);
- GpuBufferSlice var31 = (GpuBufferSlice)renderPass.uniforms.get(i);
- GL33C.glTexBuffer(35882, GlConst.toGlInternalId(format), ((GlBuffer)var31.buffer()).handle());
- continue label133;
- }
- }
-
- var6 = 2;
- break;
- case 2:
- Uniform.Sampler bufferView = (Uniform.Sampler)var5;
- Uniform.Sampler var10000 = bufferView;
-
- try {
- var33 = var10000.samplerIndex();
- } catch (Throwable var20) {
- throw new MatchException(var20.toString(), var20);
- }
-
- int viewAndSampler = var33;
- if (true) {
- int samplerIndex = viewAndSampler;
- TextureViewAndSampler viewAndSamplerx = (TextureViewAndSampler)renderPass.uniforms.get(i);
- if (viewAndSamplerx != null) {
- GlTextureView textureView = (GlTextureView)viewAndSamplerx.view();
- this.stateManager._activeTexture(33984 + samplerIndex);
- GlTexture texture = textureView.texture();
- int target;
- if ((texture.usage() & 16) != 0) {
- target = 34067;
- GL33C.glBindTexture(34067, texture.id);
- } else {
- target = 3553;
- this.stateManager._bindTexture(texture.id);
- }
-
- GL33C.glBindSampler(samplerIndex, ((GlSampler)viewAndSamplerx.sampler()).getId());
- GL33C.glTexParameteri(target, 33084, textureView.baseMipLevel());
- GL33C.glTexParameteri(target, 33085, textureView.baseMipLevel() + textureView.mipLevels() - 1);
- }
- continue label133;
- }
-
- var6 = 3;
- break;
- default:
- throw new MatchException(null, null);
- }
+ switch (dirtyUniform) {
+ case Uniform.Ubo(int blockBinding):
+ GpuBufferSlice var27 = (GpuBufferSlice)renderPass.uniforms.get(i);
+ GL33C.glBindBufferRange(35345, blockBinding, ((GlBuffer)var27.buffer()).handle(), var27.offset(), var27.length());
+ break;
+ case Uniform.Utb(GlStateManager stateManager, int samplerIndex, GpuFormat format, int texture):
+ this.stateManager._activeTexture(33984 + samplerIndex);
+ GL33C.glBindTexture(35882, texture);
+ GpuBufferSlice var31 = (GpuBufferSlice)renderPass.uniforms.get(i);
+ GL33C.glTexBuffer(35882, GlConst.toGlInternalId(format), ((GlBuffer)var31.buffer()).handle());
+ break;
+ case Uniform.Sampler(int samplerIndex):
+ TextureViewAndSampler viewAndSamplerx = (TextureViewAndSampler)renderPass.uniforms.get(i);
+ if (viewAndSamplerx != null) {
+ GlTextureView textureView = (GlTextureView)viewAndSamplerx.view();
+ this.stateManager._activeTexture(33984 + samplerIndex);
+ GlTexture texture = textureView.texture();
+ int target;
+ if ((texture.usage() & 16) != 0) {
+ target = 34067;
+ GL33C.glBindTexture(34067, texture.id);
+ } else {
+ target = 3553;
+ this.stateManager._bindTexture(texture.id);
+ }
+
+ GL33C.glBindSampler(samplerIndex, ((GlSampler)viewAndSamplerx.sampler()).getId());
+ GL33C.glTexParameteri(target, 33084, textureView.baseMipLevel());
+ GL33C.glTexParameteri(target, 33085, textureView.baseMipLevel() + textureView.mipLevels() - 1);
+ }
+ default:
+ throw new MatchException(null, null);
}
}
}
8 changes: 4 additions & 4 deletions src/patches/com/mojang/renderpearl/backend/opengl/GlPipelineRecompiler.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/com/mojang/renderpearl/backend/opengl/GlPipelineRecompiler.java
+++ b/com/mojang/renderpearl/backend/opengl/GlPipelineRecompiler.java
@@ -144,7 +_,7 @@
@@ -146,7 +_,7 @@
int binding = Spvc.spvc_compiler_get_decoration(compiler, resource.id(), 33);
switch (resourceType) {
case 1:
Expand All @@ -9,15 +9,15 @@
String blockName = String.format(Locale.ROOT, "_uniform_instance_%02d_%02d", descriptorSet, binding);
if (SHADER_DEBUG_MODE) {
String existingBlockName = Spvc.spvc_compiler_get_name(compiler, resource.base_type_id());
@@ -155,6 +_,7 @@
@@ -157,6 +_,7 @@

Spvc.spvc_compiler_set_name(compiler, resource.id(), blockName);
Spvc.spvc_compiler_set_name(compiler, resource.base_type_id(), String.format(Locale.ROOT, "_uniform_%02d_%02d", descriptorSet, binding));
+ }
case 3:
case 4:
case 5:
@@ -167,7 +_,7 @@
@@ -169,7 +_,7 @@
case 11:
Spvc.spvc_compiler_set_name(compiler, resource.id(), String.format(Locale.ROOT, "_uniform_%02d_%02d", descriptorSet, binding));
break;
Expand All @@ -26,7 +26,7 @@
String blockName = "_push_constants_instance";
if (SHADER_DEBUG_MODE) {
String existingBlockName = Spvc.spvc_compiler_get_name(compiler, resource.base_type_id());
@@ -178,6 +_,7 @@
@@ -180,6 +_,7 @@

Spvc.spvc_compiler_set_name(compiler, resource.id(), blockName);
Spvc.spvc_compiler_set_name(compiler, resource.base_type_id(), "_push_constants");
Expand Down
12 changes: 6 additions & 6 deletions src/patches/com/mojang/renderpearl/frontend/FrontendRenderPass.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/com/mojang/renderpearl/frontend/FrontendRenderPass.java
+++ b/com/mojang/renderpearl/frontend/FrontendRenderPass.java
@@ -583,30 +_,10 @@
@@ -599,30 +_,10 @@

throw new IllegalArgumentException("UTB value must be GpuBufferSlice");
case COMBINED_IMAGE_SAMPLER:
Expand All @@ -12,23 +12,23 @@
- TextureViewAndSampler var10000 = var9;
-
- try {
- var30 = var10000.view();
- var32 = var10000.view();
- } catch (Throwable var18) {
- throw new MatchException(var18.toString(), var18);
- }
-
- GpuTextureView length = var30;
- GpuTextureView length = var32;
- GpuTextureView textureView = length;
- var10000 = var9;
-
- try {
- var32 = var10000.sampler();
- var34 = var10000.sampler();
- } catch (Throwable var17) {
- throw new MatchException(var17.toString(), var17);
- }
-
- GpuSampler var26 = var32;
- GpuSampler sampler = var26;
- GpuSampler var28 = var34;
- GpuSampler sampler = var28;
if (textureView.isClosed()) {
throw new IllegalStateException(
"Texture view " + uniform.name() + " (" + textureView.texture().getLabel() + ") has been closed!"
2 changes: 1 addition & 1 deletion src/patches/net/minecraft/client/Minecraft.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/Minecraft.java
+++ b/net/minecraft/client/Minecraft.java
@@ -2569,7 +_,7 @@
@@ -2555,7 +_,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
2 changes: 1 addition & 1 deletion src/patches/net/minecraft/resources/RegistryDataLoader.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
+ private static final Comparator<ResourceKey<?>> ERROR_KEY_COMPARATOR = Comparator.<ResourceKey<?>, Identifier>comparing(ResourceKey::registry).thenComparing(ResourceKey::identifier);
public static final List<RegistryDataLoader.RegistryData<?>> WORLD_REGISTRIES = List.of(
new RegistryDataLoader.RegistryData<>(Registries.DIMENSION_TYPE, DimensionType.DIRECT_CODEC),
new RegistryDataLoader.RegistryData<>(Registries.BIOME, Biome.DIRECT_CODEC),
new RegistryDataLoader.RegistryData<>(Registries.BIOME, Biome.DIRECT_CODEC, Biome::validateRegistry),
2 changes: 1 addition & 1 deletion src/patches/net/minecraft/util/Util.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/util/Util.java
+++ b/net/minecraft/util/Util.java
@@ -627,7 +_,7 @@
@@ -624,7 +_,7 @@
public static <K extends Enum<K>, V> Map<K, V> makeEnumMap(Class<K> keyType, Function<K, V> function) {
EnumMap<K, V> map = new EnumMap<>(keyType);

Expand Down
4 changes: 2 additions & 2 deletions src/patches/net/minecraft/util/datafix/DataFixers.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/util/datafix/DataFixers.java
+++ b/net/minecraft/util/datafix/DataFixers.java
@@ -1189,7 +_,7 @@
@@ -1191,7 +_,7 @@
);
Schema v3086 = fixerUpper.addSchema(3086, SAME_NAMESPACED);
fixerUpper.addFixer(
Expand All @@ -9,7 +9,7 @@
m.defaultReturnValue("minecraft:tabby");
m.put(0, "minecraft:tabby");
m.put(1, "minecraft:black");
@@ -1225,7 +_,7 @@
@@ -1227,7 +_,7 @@
Schema v3087 = fixerUpper.addSchema(3087, SAME_NAMESPACED);
fixerUpper.addFixer(
new EntityVariantFix(
Expand Down
4 changes: 2 additions & 2 deletions src/patches/net/minecraft/util/datafix/fixes/EntitySpawnerItemVariantComponentFix.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/util/datafix/fixes/EntitySpawnerItemVariantComponentFix.java
+++ b/net/minecraft/util/datafix/fixes/EntitySpawnerItemVariantComponentFix.java
@@ -32,9 +_,9 @@
@@ -31,9 +_,9 @@
String id = input.getOptional(idFinder).map(Pair::getSecond).orElse("");

return switch (id) {
Expand All @@ -12,4 +12,4 @@
+ case "minecraft:tropical_fish_bucket" -> input.updateTyped(componentsFinder, (Fixer)EntitySpawnerItemVariantComponentFix::fixTropicalFishBucket);
case "minecraft:painting" -> input.updateTyped(
componentsFinder,
components -> Util.writeAndReadTypedOrThrow(components, components.getType(), EntitySpawnerItemVariantComponentFix::fixPainting)
components -> ExtraDataFixUtils.writeAndReadTypedOrThrow(
2 changes: 1 addition & 1 deletion src/patches/net/minecraft/world/entity/Entity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -4232,6 +_,7 @@
@@ -4236,6 +_,7 @@

@Retention(RetentionPolicy.CLASS)
@Target(ElementType.TYPE_USE)
Expand Down
4 changes: 2 additions & 2 deletions src/patches/net/minecraft/world/entity/animal/armadillo/Armadillo.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
@@ -62,7 +_,7 @@
@@ -60,7 +_,7 @@
private static final double SCARE_DISTANCE_HORIZONTAL = 7.0;
private static final double SCARE_DISTANCE_VERTICAL = 2.0;
private static final EntityDimensions BABY_DIMENSIONS = EntityTypes.ARMADILLO.getDimensions().scale(0.6F).withEyeHeight(0.21875F);
Expand All @@ -9,7 +9,7 @@
List.of(
SensorType.NEAREST_LIVING_ENTITIES, SensorType.HURT_BY, SensorType.FOOD_TEMPTATIONS, SensorType.NEAREST_ADULT, SensorType.ARMADILLO_SCARE_DETECTED
),
@@ -135,7 +_,7 @@
@@ -133,7 +_,7 @@

@Override
public Brain<Armadillo> getBrain() {
Expand Down
4 changes: 2 additions & 2 deletions src/patches/net/minecraft/world/entity/animal/axolotl/Axolotl.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -76,7 +_,7 @@
@@ -73,7 +_,7 @@
public class Axolotl extends Animal implements Bucketable {
public static final int TOTAL_PLAYDEAD_TIME = 200;
private static final int POSE_ANIMATION_TICKS = 10;
Expand All @@ -9,7 +9,7 @@
List.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_ADULT, SensorType.HURT_BY, SensorType.AXOLOTL_ATTACKABLES, SensorType.FOOD_TEMPTATIONS),
var0 -> AxolotlAi.getActivities()
);
@@ -531,7 +_,7 @@
@@ -528,7 +_,7 @@

@Override
public Brain<Axolotl> getBrain() {
Expand Down
4 changes: 2 additions & 2 deletions src/patches/net/minecraft/world/entity/animal/sniffer/Sniffer.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -61,7 +_,7 @@
@@ -59,7 +_,7 @@
import net.minecraft.world.phys.Vec3;

public class Sniffer extends Animal {
Expand All @@ -9,7 +9,7 @@
List.of(MemoryModuleType.SNIFFER_EXPLORED_POSITIONS),
List.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.HURT_BY, SensorType.NEAREST_PLAYERS, SensorType.FOOD_TEMPTATIONS),
var0 -> SnifferAi.getActivities()
@@ -445,7 +_,7 @@
@@ -443,7 +_,7 @@

@Override
public Brain<Sniffer> getBrain() {
Expand Down
2 changes: 1 addition & 1 deletion src/patches/net/minecraft/world/level/biome/Climate.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/biome/Climate.java
+++ b/net/minecraft/world/level/biome/Climate.java
@@ -259,7 +_,7 @@
@@ -296,7 +_,7 @@
}

List<Climate.RTree.Leaf<T>> leaves = values.stream()
Expand Down
4 changes: 2 additions & 2 deletions src/patches/net/minecraft/world/level/block/Block.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/Block.java
+++ b/net/minecraft/world/level/block/Block.java
@@ -578,7 +_,7 @@
@@ -573,7 +_,7 @@
}

private static <S extends StateHolder<?, S>, T extends Comparable<T>> S setValueHelper(S state, Property<T> property, Object value) {
Expand All @@ -9,7 +9,7 @@
}

@Deprecated
@@ -607,6 +_,7 @@
@@ -602,6 +_,7 @@

@Retention(RetentionPolicy.CLASS)
@Target(ElementType.TYPE_USE)
Expand Down
2 changes: 1 addition & 1 deletion src/patches/net/minecraft/world/level/block/entity/TestInstanceBlockEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/entity/TestInstanceBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/TestInstanceBlockEntity.java
@@ -107,7 +_,7 @@
@@ -105,7 +_,7 @@
}

public Component getTestName() {
Expand Down
Loading
Loading