R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.2 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-11-23 10:12:19 -05:00
commit 7c57ffd2c6
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/buffer_builder_leak/BufferBuilderMixin.java
View File

@ -2,6 +2,7 @@ package org.embeddedt.modernfix.common.mixin.bugfix.buffer_builder_leak;
import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferBuilder;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
import org.embeddedt.modernfix.render.UnsafeBufferHelper; import org.embeddedt.modernfix.render.UnsafeBufferHelper;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -12,6 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@Mixin(BufferBuilder.class) @Mixin(BufferBuilder.class)
@ClientOnlyMixin
public class BufferBuilderMixin { public class BufferBuilderMixin {
@Shadow private ByteBuffer buffer; @Shadow private ByteBuffer buffer;

7
common/src/main/java/org/embeddedt/modernfix/resources/CachedResourcePath.java
View File

@ -61,6 +61,13 @@ public class CachedResourcePath {
* DOES NOT INTERN! * DOES NOT INTERN!
*/ */
public CachedResourcePath(String[] pathComponents) { public CachedResourcePath(String[] pathComponents) {
for(String s : pathComponents) {
if(s.length() == 0) {
// reconstruct the whole array skipping blanks. inefficient, but should not be the common case
pathComponents = Arrays.stream(pathComponents).filter(comp -> comp.length() > 0).toArray(String[]::new);
break;
}
}
this.pathComponents = pathComponents; this.pathComponents = pathComponents;
} }

5
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/forge_registry_lambda/RegistryObjectMixin.java
View File

@ -1,8 +1,7 @@
package org.embeddedt.modernfix.forge.mixin.perf.forge_registry_lambda; package org.embeddedt.modernfix.forge.mixin.perf.forge_registry_lambda;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.registries.IForgeRegistryEntry;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -10,7 +9,7 @@ import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@Mixin(value = RegistryObject.class, remap = false) @Mixin(value = RegistryObject.class, remap = false)
public class RegistryObjectMixin<T extends IForgeRegistryEntry<? super T>> { public class RegistryObjectMixin<T> {
@Shadow private @Nullable T value; @Shadow private @Nullable T value;
@Shadow @Final private ResourceLocation name; @Shadow @Final private ResourceLocation name;