> cir) {
+ if (!PatcherConfig.tooltipCache) {
+ return;
+ }
+ TooltipHandler.INSTANCE.tooltipCache = cir.getReturnValue();
+ TooltipHandler.INSTANCE.shouldToolTipRender = false;
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/MathHelperMixin_CompactLUT.java b/src/main/java/club/sk1er/patcher/mixins/performance/MathHelperMixin_CompactLUT.java
new file mode 100644
index 000000000..c7ca61bf0
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/MathHelperMixin_CompactLUT.java
@@ -0,0 +1,28 @@
+package club.sk1er.patcher.mixins.performance;
+
+import me.jellysquid.mods.lithium.common.util.math.CompactSineLUT;
+import net.minecraft.util.MathHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(MathHelper.class)
+public class MathHelperMixin_CompactLUT {
+
+ /**
+ * @author Wyvest
+ * @reason Use a compact LUT for sine calculations
+ */
+ @Overwrite
+ public static float sin(float f) {
+ return CompactSineLUT.sin(f);
+ }
+
+ /**
+ * @author Wyvest
+ * @reason Use a compact LUT for cosine calculations
+ */
+ @Overwrite
+ public static float cos(float f) {
+ return CompactSineLUT.cos(f);
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/RenderChunkMixin_OptimizeSpecialTileEntities.java b/src/main/java/club/sk1er/patcher/mixins/performance/RenderChunkMixin_OptimizeSpecialTileEntities.java
new file mode 100644
index 000000000..7589ba8bd
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/RenderChunkMixin_OptimizeSpecialTileEntities.java
@@ -0,0 +1,29 @@
+package club.sk1er.patcher.mixins.performance;
+
+import net.minecraft.client.renderer.chunk.CompiledChunk;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(RenderChunk.class)
+public class RenderChunkMixin_OptimizeSpecialTileEntities {
+//#if MC==10809
+ /**
+ * Minecraft typically renders special tile entities twice per frame. This is noticeable by comparing the opacity
+ * of a beacon beam when the beacon is in view versus when it's out of view (fly 50 blocks above, for instance).
+ *
+ * This fix is based off a Forge PR that was added to 1.11.x:
+ * forge PR
+ */
+ @Redirect(method = "rebuildChunk", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/chunk/CompiledChunk;addTileEntity(Lnet/minecraft/tileentity/TileEntity;)V"))
+ private void patcher$renderSpecialTileEntitiesOnce(CompiledChunk instance, TileEntity tileEntityIn) {
+ TileEntitySpecialRenderer tileentityspecialrenderer = TileEntityRendererDispatcher.instance.getSpecialRenderer(tileEntityIn);
+ if (!tileentityspecialrenderer.forceTileEntityRender()) instance.addTileEntity(tileEntityIn);
+ }
+//#endif
+}
+
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/SimpleReloadableResourceManager_OnlyRefreshNecessaryListeners.java b/src/main/java/club/sk1er/patcher/mixins/performance/SimpleReloadableResourceManager_OnlyRefreshNecessaryListeners.java
new file mode 100644
index 000000000..7b8f32374
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/SimpleReloadableResourceManager_OnlyRefreshNecessaryListeners.java
@@ -0,0 +1,51 @@
+package club.sk1er.patcher.mixins.performance;
+
+import club.sk1er.patcher.hooks.ResourceReloadHooks;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.resources.LanguageManager;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
+import net.minecraft.client.resources.model.ModelManager;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+
+@Mixin(SimpleReloadableResourceManager.class)
+public class SimpleReloadableResourceManager_OnlyRefreshNecessaryListeners {
+
+ @Shadow
+ @Final
+ private List reloadListeners;
+
+ @Inject(method = "registerReloadListener", at = @At("HEAD"))
+ private void onReloadListenerRegister(IResourceManagerReloadListener reloadListener, CallbackInfo ci) {
+ if (reloadListener instanceof LanguageManager) {
+ ResourceReloadHooks.setLanguageManager(reloadListener);
+ } else if (reloadListener instanceof ModelManager) {
+ ResourceReloadHooks.setModelManager(reloadListener);
+ }
+ }
+
+ @Redirect(method = "notifyReloadListeners", at = @At(value = "FIELD", target = "Lnet/minecraft/client/resources/SimpleReloadableResourceManager;reloadListeners:Ljava/util/List;"))
+ private List redirectNotifyReloadListeners(SimpleReloadableResourceManager simpleReloadableResourceManager) {
+ if (ResourceReloadHooks.shouldLoadLanguage()) {
+ return ResourceReloadHooks.getLanguageManager();
+ } else if (ResourceReloadHooks.shouldLoadMipmaps()) {
+ return ResourceReloadHooks.getModelManager();
+ } else {
+ return reloadListeners;
+ }
+ }
+
+ @Inject(method = "notifyReloadListeners", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/ProgressManager;pop(Lnet/minecraftforge/fml/common/ProgressManager$ProgressBar;)V"))
+ private void callOptiFineLanguage(CallbackInfo ci) {
+ if (ResourceReloadHooks.shouldLoadLanguage()) {
+ ResourceReloadHooks.reloadOptiFineLanguage();
+ }
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/TextureManagerMixin_MemoryLeak.java b/src/main/java/club/sk1er/patcher/mixins/performance/TextureManagerMixin_MemoryLeak.java
new file mode 100644
index 000000000..80cc32880
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/TextureManagerMixin_MemoryLeak.java
@@ -0,0 +1,27 @@
+package club.sk1er.patcher.mixins.performance;
+
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ResourceLocation;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Map;
+
+@Mixin(TextureManager.class)
+public class TextureManagerMixin_MemoryLeak {
+ //#if MC==10809
+ @Shadow
+ @Final
+ private Map mapTextureObjects;
+
+ @Inject(method = "deleteTexture", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/texture/TextureUtil;deleteTexture(I)V", shift = At.Shift.BEFORE))
+ private void patcher$removeEntry(ResourceLocation textureLocation, CallbackInfo ci) {
+ this.mapTextureObjects.remove(textureLocation);
+ }
+ //#endif
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/ASMDataTableMixin_ComputeParallel.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ASMDataTableMixin_ComputeParallel.java
new file mode 100644
index 000000000..bd90d4cc6
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ASMDataTableMixin_ComputeParallel.java
@@ -0,0 +1,43 @@
+package club.sk1er.patcher.mixins.performance.forge;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.SetMultimap;
+import net.minecraftforge.fml.common.ModContainer;
+import net.minecraftforge.fml.common.discovery.ASMDataTable;
+import org.apache.commons.lang3.tuple.Pair;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Mixin(value = ASMDataTable.class, remap = false)
+public class ASMDataTableMixin_ComputeParallel {
+ //#if MC==10809
+ @Shadow
+ private Map> containerAnnotationData;
+
+ @Shadow
+ private List containers;
+
+ @Shadow
+ private SetMultimap globalAnnotationData;
+
+ @Inject(method = "getAnnotationsFor", at = @At("HEAD"))
+ private void computeParallel(ModContainer container, CallbackInfoReturnable> cir) {
+ if (containerAnnotationData == null) {
+ //concurrently filter the values to speed this up
+ containerAnnotationData = containers.parallelStream()
+ .map(cont -> Pair.of(cont, ImmutableSetMultimap.copyOf(Multimaps.filterValues(globalAnnotationData, data -> cont.getSource().equals(data.getCandidate().getModContainer())))))
+ .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
+ containerAnnotationData = ImmutableMap.copyOf(containerAnnotationData);
+ }
+ }
+ //#endif
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/FMLControlledNamespacedRegistryMixin_TrimAvailabilityMap.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/FMLControlledNamespacedRegistryMixin_TrimAvailabilityMap.java
new file mode 100644
index 000000000..cfa6b2cd9
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/forge/FMLControlledNamespacedRegistryMixin_TrimAvailabilityMap.java
@@ -0,0 +1,44 @@
+package club.sk1er.patcher.mixins.performance.forge;
+
+//#if MC==10809
+import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry;
+//#endif
+
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.relauncher.ReflectionHelper;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.BitSet;
+
+@Mixin(
+ //#if MC==10809
+ value = FMLControlledNamespacedRegistry.class, remap = false
+ //#else
+ //$$ net.minecraft.client.Minecraft.class
+ //#endif
+)
+public class FMLControlledNamespacedRegistryMixin_TrimAvailabilityMap {
+ //#if MC==10809
+ @Shadow @Final private BitSet availabilityMap;
+
+ @ModifyArg(method = "(Lnet/minecraft/util/ResourceLocation;IILjava/lang/Class;ZLnet/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry$AddCallback;)V", at = @At(value = "NEW", target = "Ljava/util/BitSet;(I)V"), index = 0)
+ public int noPreAllocate(int nbits) {
+ return Math.min(nbits, 0xFFFF);
+ }
+
+ @Inject(method = "validateContent", at = @At("HEAD"))
+ public void trimToSize(ResourceLocation registryName, CallbackInfo ci) {
+ try {
+ ReflectionHelper.findMethod(BitSet.class, this.availabilityMap, new String[]{"trimToSize"}).invoke(this.availabilityMap);
+ } catch (Exception ignored) {
+
+ }
+ }
+ //#endif
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/ItemLayerModelMixin_ReduceQuadCount.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ItemLayerModelMixin_ReduceQuadCount.java
index 048d80a88..64597ed7e 100644
--- a/src/main/java/club/sk1er/patcher/mixins/performance/forge/ItemLayerModelMixin_ReduceQuadCount.java
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ItemLayerModelMixin_ReduceQuadCount.java
@@ -1,5 +1,6 @@
package club.sk1er.patcher.mixins.performance.forge;
+import club.sk1er.patcher.config.PatcherConfig;
import club.sk1er.patcher.hooks.FaceDataHook;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -26,7 +27,7 @@ public abstract class ItemLayerModelMixin_ReduceQuadCount {
//#if MC==10809
@Unique
- private static final EnumFacing[] patcher$HORIZONTALS = new EnumFacing[] { EnumFacing.UP, EnumFacing.DOWN };;
+ private static final EnumFacing[] patcher$HORIZONTALS = new EnumFacing[] { EnumFacing.UP, EnumFacing.DOWN };
@Unique
private static final EnumFacing[] patcher$VERTICALS = new EnumFacing[] { EnumFacing.WEST, EnumFacing.EAST };
@@ -200,12 +201,12 @@ else if (!building && face) {
float u3 = 16.0f * (x2 - dx);
float v2 = 16.0f * (1.0f - y0 - dy);
float v3 = 16.0f * (1.0f - y2 - dy);
- cir.setReturnValue(buildQuad(format, transform, patcher$remap(side), tint, x0, y0, z0, sprite.getInterpolatedU((double)u2), sprite.getInterpolatedV((double)v2), x2, y2, z0, sprite.getInterpolatedU((double)u3), sprite.getInterpolatedV((double)v3), x2, y2, z2, sprite.getInterpolatedU((double)u3), sprite.getInterpolatedV((double)v3), x0, y0, z2, sprite.getInterpolatedU((double)u2), sprite.getInterpolatedV((double)v2)));
+ cir.setReturnValue(buildQuad(format, transform, patcher$remap(side), tint, x0, y0, z0, sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2), x2, y2, z0, sprite.getInterpolatedU(u3), sprite.getInterpolatedV(v3), x2, y2, z2, sprite.getInterpolatedU(u3), sprite.getInterpolatedV(v3), x0, y0, z2, sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)));
}
@Unique
private static EnumFacing patcher$remap(EnumFacing side) {
- return (side.getAxis() == EnumFacing.Axis.Y) ? side.getOpposite() : side;
+ return !PatcherConfig.heldItemLighting || (side.getAxis() == EnumFacing.Axis.Y) ? side.getOpposite() : side;
}
//#endif
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/JarDiscovererMixin_ReplaceRegex.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/JarDiscovererMixin_ReplaceRegex.java
new file mode 100644
index 000000000..573e85bee
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/forge/JarDiscovererMixin_ReplaceRegex.java
@@ -0,0 +1,40 @@
+package club.sk1er.patcher.mixins.performance.forge;
+
+import net.minecraftforge.fml.common.discovery.ITypeDiscoverer;
+import net.minecraftforge.fml.common.discovery.JarDiscoverer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Mixin(value = JarDiscoverer.class, remap = false)
+public class JarDiscovererMixin_ReplaceRegex { // todo i cba to put this in directorydiscoverer as well
+
+ @Unique private static final Matcher patcher$dummyMatcher = ITypeDiscoverer.classFile.matcher("null");
+
+ @Unique
+ private static final String patcher$replaceRegexMethod =
+ //#if MC==10809
+ "discover";
+ //#else
+ //$$ "findClassesASM";
+ //#endif
+
+ @Unique private String patcher$fileName;
+
+ @Redirect(method = patcher$replaceRegexMethod, at = @At(value = "INVOKE", target = "Ljava/util/regex/Pattern;matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;"))
+ private Matcher patcher$replaceRegex(Pattern instance, CharSequence input) {
+ if (input != null) {
+ patcher$fileName = input.toString();
+ }
+ return patcher$dummyMatcher;
+ }
+
+ @Redirect(method = patcher$replaceRegexMethod, at = @At(value = "INVOKE", target = "Ljava/util/regex/Matcher;matches()Z"))
+ private boolean patcher$replaceRegex(Matcher instance) {
+ return patcher$fileName != null && patcher$fileName.endsWith(".class") && !patcher$fileName.startsWith("$") && !patcher$fileName.endsWith("$");
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/ModDiscovererMixin_Logging.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ModDiscovererMixin_Logging.java
new file mode 100644
index 000000000..99b01d97b
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ModDiscovererMixin_Logging.java
@@ -0,0 +1,28 @@
+package club.sk1er.patcher.mixins.performance.forge;
+
+import club.sk1er.patcher.util.forge.EntrypointCaching;
+import net.minecraftforge.fml.common.ModContainer;
+import net.minecraftforge.fml.common.discovery.ModDiscoverer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(value = ModDiscoverer.class, remap = false)
+public class ModDiscovererMixin_Logging {
+ @Unique
+ private long patcher$time;
+
+ @Inject(method = "identifyMods", at = @At("HEAD"))
+ private void patcher$logStart(CallbackInfoReturnable> cir) {
+ patcher$time = System.currentTimeMillis();
+ }
+
+ @Inject(method = "identifyMods", at = @At("TAIL"))
+ private void patcher$logEnd(CallbackInfoReturnable> cir) {
+ EntrypointCaching.INSTANCE.logger.info("ModDiscoverer.identifyMods took " + (System.currentTimeMillis() - patcher$time) + "ms");
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/ModDiscovererMixin_ReplaceRegex.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ModDiscovererMixin_ReplaceRegex.java
new file mode 100644
index 000000000..a03f37fdb
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/forge/ModDiscovererMixin_ReplaceRegex.java
@@ -0,0 +1,42 @@
+package club.sk1er.patcher.mixins.performance.forge;
+
+import net.minecraftforge.fml.common.discovery.ModDiscoverer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Mixin(value = ModDiscoverer.class, remap = false)
+public class ModDiscovererMixin_ReplaceRegex {
+
+ //#if MC<=10809
+ @Shadow
+ private static Pattern zipJar;
+ @Unique
+ private static final Matcher patcher$dummyMatcher = zipJar.matcher("null");
+ @Unique private String patcher$fileName;
+
+ @Redirect(method = "findModDirMods(Ljava/io/File;[Ljava/io/File;)V", at = @At(value = "INVOKE", target = "Ljava/util/regex/Pattern;matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;"))
+ private Matcher patcher$replaceRegex(Pattern instance, CharSequence input) {
+ if (input != null) {
+ patcher$fileName = input.toString();
+ }
+ return patcher$dummyMatcher;
+ }
+
+ @Redirect(method = "findModDirMods(Ljava/io/File;[Ljava/io/File;)V", at = @At(value = "INVOKE", target = "Ljava/util/regex/Matcher;matches()Z"))
+ private boolean patcher$replaceRegex(Matcher instance) {
+ return patcher$fileName != null && (patcher$fileName.endsWith(".jar") || patcher$fileName.endsWith(".zip"));
+ }
+
+ @Redirect(method = "findModDirMods(Ljava/io/File;[Ljava/io/File;)V", at = @At(value = "INVOKE", target = "Ljava/util/regex/Matcher;group(I)Ljava/lang/String;"))
+ private String patcher$replaceRegex(Matcher instance, int group) {
+ return patcher$fileName; // we could cut out the file extension but it's not necessary cause this is just for logging
+ }
+
+ //#endif
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/optifine/GameSettingsMixin_RefreshOFMipmaps.java b/src/main/java/club/sk1er/patcher/mixins/performance/optifine/GameSettingsMixin_RefreshOFMipmaps.java
new file mode 100644
index 000000000..cff425f13
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/optifine/GameSettingsMixin_RefreshOFMipmaps.java
@@ -0,0 +1,25 @@
+package club.sk1er.patcher.mixins.performance.optifine;
+
+import club.sk1er.patcher.hooks.ResourceReloadHooks;
+import net.minecraft.client.settings.GameSettings;
+import org.spongepowered.asm.mixin.Dynamic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GameSettings.class)
+public class GameSettingsMixin_RefreshOFMipmaps {
+
+ @Dynamic("OptiFine")
+ @Inject(method = "setOptionFloatValueOF", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;refreshResources()V"))
+ private void onMipmapTypeChange(GameSettings.Options settingsOption, float value, CallbackInfo ci) {
+ ResourceReloadHooks.setLoadMipmaps(true);
+ }
+
+ @Dynamic("OptiFine")
+ @Inject(method = "setOptionFloatValueOF", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;refreshResources()V", shift = At.Shift.AFTER))
+ private void onMipmapTypeChangeAfter(GameSettings.Options settingsOption, float value, CallbackInfo ci) {
+ ResourceReloadHooks.setLoadMipmaps(false);
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/optifine/MathHelperMixin_OFFastMath.java b/src/main/java/club/sk1er/patcher/mixins/performance/optifine/MathHelperMixin_OFFastMath.java
new file mode 100644
index 000000000..e1f398b20
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/mixins/performance/optifine/MathHelperMixin_OFFastMath.java
@@ -0,0 +1,39 @@
+package club.sk1er.patcher.mixins.performance.optifine;
+
+import me.jellysquid.mods.lithium.common.util.math.CompactSineLUT;
+import net.minecraft.util.MathHelper;
+import org.spongepowered.asm.mixin.*;
+
+@Mixin(MathHelper.class)
+public class MathHelperMixin_OFFastMath {
+
+ @Dynamic("OptiFine")
+ @Shadow
+ private static float[] SIN_TABLE_FAST;
+
+ @Dynamic("OptiFine")
+ @Shadow
+ private static float radToIndex;
+
+ @Dynamic("OptiFine")
+ @Shadow
+ public static boolean fastMath;
+
+ /**
+ * @author Wyvest
+ * @reason Use a compact LUT for sine calculations
+ */
+ @Overwrite
+ public static float sin(float f) {
+ return fastMath ? SIN_TABLE_FAST[(int)(f * radToIndex) & 4095] : CompactSineLUT.sin(f);
+ }
+
+ /**
+ * @author Wyvest
+ * @reason Use a compact LUT for cosine calculations
+ */
+ @Overwrite
+ public static float cos(float f) {
+ return fastMath ? SIN_TABLE_FAST[(int)(f * radToIndex + 1024.0F) & 4095] : CompactSineLUT.cos(f);
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/mixins/plugin/PatcherMixinPlugin.java b/src/main/java/club/sk1er/patcher/mixins/plugin/PatcherMixinPlugin.java
index 70372b3d8..e1900408a 100644
--- a/src/main/java/club/sk1er/patcher/mixins/plugin/PatcherMixinPlugin.java
+++ b/src/main/java/club/sk1er/patcher/mixins/plugin/PatcherMixinPlugin.java
@@ -3,6 +3,7 @@
import club.sk1er.patcher.tweaker.ClassTransformer;
import com.google.common.collect.ArrayListMultimap;
import kotlin.text.StringsKt;
+import org.spongepowered.asm.mixin.MixinEnvironment;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -12,16 +13,26 @@
public class PatcherMixinPlugin implements IMixinConfigPlugin {
private static final String LABYMOD_CLASS = "net/labymod/main/LabyMod.class";
private static final String SMOOTHFONT_CLASS = "bre/smoothfont/mod_SmoothFont.class";
+ private static final String OF_CONFIG_CLASS = "Config.class";
private static final ArrayListMultimap CONFLICTING_CLASSES = ArrayListMultimap.create();
+ private static boolean isEarsMod = false;
static {
+ MixinEnvironment.getDefaultEnvironment().addTransformerExclusion("com.unascribed.ears.asm.PlatformTransformerAdapter");
CONFLICTING_CLASSES.put("GuiContainerMixin_MouseBindFixThatLabyBreaks", LABYMOD_CLASS);
CONFLICTING_CLASSES.put("FontRendererMixin_Optimization", SMOOTHFONT_CLASS);
+ CONFLICTING_CLASSES.put("MathHelperMixin_CompactLUT", OF_CONFIG_CLASS);
}
@Override
public void onLoad(String mixinPackage) {
+ try {
+ Class.forName("com.unascribed.ears.Ears", false, getClass().getClassLoader());
+ isEarsMod = true;
+ } catch (ClassNotFoundException ignored) {
+ isEarsMod = false;
+ }
}
@Override
@@ -31,6 +42,9 @@ public String getRefMapperConfig() {
@Override
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+ if (mixinClassName.endsWith("_EarsMod")) {
+ return isEarsMod;
+ }
String mixinPackage = StringsKt.substringBeforeLast(mixinClassName, '.', mixinClassName);
if (mixinPackage.endsWith("optifine") && "NONE".equals(ClassTransformer.optifineVersion)) {
// OptiFine isn't present, let's not apply this
diff --git a/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java b/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java
index f39c572bd..6dc2bca2d 100644
--- a/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java
+++ b/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java
@@ -203,7 +203,6 @@ public void keyboardInput(GuiScreenEvent.KeyboardInputEvent.Post event) {
if (next > 9) {
next = 0;
tripped = !tripped;
- Patcher.instance.getLogger().info("yep");
}
}
}
diff --git a/src/main/java/club/sk1er/patcher/tweaker/ClassTransformer.java b/src/main/java/club/sk1er/patcher/tweaker/ClassTransformer.java
index 8a00f1f93..3e57c3c4f 100644
--- a/src/main/java/club/sk1er/patcher/tweaker/ClassTransformer.java
+++ b/src/main/java/club/sk1er/patcher/tweaker/ClassTransformer.java
@@ -4,10 +4,7 @@
import club.sk1er.patcher.asm.external.forge.ForgeChunkManagerTransformer;
//#endif
import club.sk1er.patcher.asm.external.forge.ModelLoaderTransformer;
-import club.sk1er.patcher.asm.external.forge.loader.ASMModParserTransformer;
-import club.sk1er.patcher.asm.external.forge.loader.MinecraftForgeTransformer;
-import club.sk1er.patcher.asm.external.forge.loader.ModClassLoaderTransformer;
-import club.sk1er.patcher.asm.external.forge.loader.ModContainerFactoryTransformer;
+import club.sk1er.patcher.asm.external.forge.loader.*;
import club.sk1er.patcher.asm.external.forge.render.ForgeHooksClientTransformer;
import club.sk1er.patcher.asm.external.forge.render.block.BlockInfoTransformer;
import club.sk1er.patcher.asm.external.forge.render.block.ForgeBlockModelRendererTransformer;
@@ -154,7 +151,7 @@ public ClassTransformer() {
registerTransformer(new ModContainerFactoryTransformer());
//#endif
registerTransformer(new GuiIngameForgeTransformer());
- //registerTransformer(new JarDiscovererTransformer());
+ registerTransformer(new JarDiscovererTransformer());
// lwjgl
registerTransformer(new WindowsDisplayTransformer());
diff --git a/src/main/java/club/sk1er/patcher/util/chat/ChatHandler.java b/src/main/java/club/sk1er/patcher/util/chat/ChatHandler.java
index f6594008e..4180ea4cb 100644
--- a/src/main/java/club/sk1er/patcher/util/chat/ChatHandler.java
+++ b/src/main/java/club/sk1er/patcher/util/chat/ChatHandler.java
@@ -10,7 +10,6 @@
import net.minecraft.util.ChatStyle;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.client.event.ClientChatReceivedEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
@@ -46,15 +45,6 @@ public class ChatHandler {
public static int currentMessageHash = -1;
private int ticks;
- //#if MC==10809
- @SubscribeEvent
- public void renderChat(RenderGameOverlayEvent.Chat event) {
- if (event.type == RenderGameOverlayEvent.ElementType.CHAT && PatcherConfig.chatPosition) {
- event.posY -= 12;
- }
- }
- //#endif
-
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onChatMessage(ClientChatReceivedEvent event) {
//#if MC==10809
diff --git a/src/main/java/club/sk1er/patcher/util/forge/EntrypointCaching.java b/src/main/java/club/sk1er/patcher/util/forge/EntrypointCaching.java
index bdc54ac09..47f6d7ae8 100644
--- a/src/main/java/club/sk1er/patcher/util/forge/EntrypointCaching.java
+++ b/src/main/java/club/sk1er/patcher/util/forge/EntrypointCaching.java
@@ -1,6 +1,8 @@
package club.sk1er.patcher.util.forge;
+import cc.polyfrost.oneconfig.utils.Notifications;
import club.sk1er.patcher.config.PatcherConfig;
+import com.google.common.collect.ImmutableList;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
@@ -27,17 +29,17 @@
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
-/*public class EntrypointCaching {
+public class EntrypointCaching {
public static EntrypointCaching INSTANCE = new EntrypointCaching();
- private final Logger logger = LogManager.getLogger("Patcher Entrypoint Cache");
- private final Type mapType = new TypeToken>>() {}.getType();
+ public final Logger logger = LogManager.getLogger("Patcher Entrypoint Cache");
+ private final Type mapType = new TypeToken>>>() {}.getType();
private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
private final File cacheFile = new File("patcher/entrypoint_cache.json");
- private Map> readMap;
- private Map> usedMap = new HashMap<>();
+ private List>> readMap;
+ private List>> usedMap = ImmutableList.of(new HashMap<>(), new HashMap<>());
private Map hashCache = new HashMap<>();
private EntrypointCaching() {
@@ -51,7 +53,7 @@ private EntrypointCaching() {
} catch (Exception e) {
logger.error("Failed to read entrypoint cache", e);
}
- readMap = new HashMap<>();
+ readMap = ImmutableList.of(new HashMap<>(), new HashMap<>());
}
@SuppressWarnings("unused")
@@ -62,28 +64,24 @@ public List discoverCachedEntrypoints(ModCandidate candidate, ASMD
String hash = getHash(modFile);
if (hash == null) return null;
- List modClasses = readMap.get(hash);
- if (modClasses == null) return null;
+ List entryClasses = readMap.get(0).get(hash);
+ List modClasses = readMap.get(1).get(hash);
+ if (entryClasses == null && modClasses == null) return null;
List foundMods = new ArrayList<>();
- List validMods = new ArrayList<>();
-
- for (String modClass : modClasses) {
- ASMModParser modParser;
- try (InputStream is = file.getInputStream(new JarEntry(modClass))) {
- modParser = new ASMModParser(is);
- } catch (Exception e) {
- logger.error("Error parsing mod class " + modClass + " from jar " + modFile, e);
- continue;
+ List validEntries = null;
+ if (entryClasses != null && !entryClasses.isEmpty()) {
+ validEntries = new ArrayList<>(entryClasses.size());
+ for (String modClass : entryClasses) {
+ iterateThroughClass(true, candidate, table, file, mc, modFile, foundMods, validEntries, modClass);
}
- modParser.validate();
- modParser.sendToTable(table, candidate);
- ModContainer container = ModContainerFactory.instance().build(modParser, modFile, candidate);
- if (container != null) {
- table.addContainer(container);
- foundMods.add(container);
- validMods.add(modClass);
- container.bindMetadata(mc);
+ }
+
+ List validClasses = null;
+ if (modClasses != null && !modClasses.isEmpty()) {
+ validClasses = new ArrayList<>(modClasses.size());
+ for (String modClass : modClasses) {
+ iterateThroughClass(false, candidate, table, file, mc, modFile, foundMods, validClasses, modClass);
}
}
@@ -95,11 +93,38 @@ public List discoverCachedEntrypoints(ModCandidate candidate, ASMD
logger.error("Error closing mod jar " + modFile, e);
}
- usedMap.put(hash, validMods);
+ usedMap.get(0).put(hash, (validEntries));
+ usedMap.get(1).put(hash, (validClasses));
return foundMods;
}
+ private void iterateThroughClass(boolean entry, ModCandidate candidate, ASMDataTable table, JarFile file, MetadataCollection mc, File modFile, List foundMods, List validMods, String modClass) {
+ candidate.addClassEntry(modClass);
+
+ if (entry) {
+ try (InputStream is = file.getInputStream(new JarEntry(modClass))) {
+ ASMModParser modParser = new ASMModParser(is);
+ modParser.validate();
+ modParser.sendToTable(table, candidate);
+ ModContainer container = ModContainerFactory.instance().build(modParser, modFile, candidate);
+ if (container != null) {
+ table.addContainer(container);
+ foundMods.add(container);
+ validMods.add(modClass);
+ container.bindMetadata(mc);
+ //#if MC>10809
+ //$$ container.setClassVersion(modParser.getClassVersion());
+ //#endif
+ }
+ } catch (Exception e) {
+ logger.error("Error parsing mod class " + modClass + " from jar " + modFile, e);
+ }
+ } else {
+ validMods.add(modClass);
+ }
+ }
+
@SuppressWarnings("unused")
public void putCachedEntrypoints(ModCandidate candidate, ZipEntry ze) {
if (!PatcherConfig.cacheEntrypoints) return;
@@ -107,7 +132,7 @@ public void putCachedEntrypoints(ModCandidate candidate, ZipEntry ze) {
String modClass = ze.getName();
String hash = hashCache.computeIfAbsent(modFile, this::getHash);
- List modClasses = usedMap.computeIfAbsent(hash, h -> new ArrayList<>());
+ List modClasses = usedMap.get(0).computeIfAbsent(hash, h -> new ArrayList<>());
if (!modClasses.contains(modClass)) {
modClasses.add(modClass);
}
@@ -115,6 +140,20 @@ public void putCachedEntrypoints(ModCandidate candidate, ZipEntry ze) {
logger.info("Added entrypoint {} for mod jar {}", modClass, modFile);
}
+ @SuppressWarnings("unused")
+ public void putCachedClassEntries(ModCandidate candidate, ZipEntry ze) {
+ if (!PatcherConfig.cacheEntrypoints) return;
+
+ File modFile = candidate.getModContainer();
+ String modClass = ze.getName();
+
+ String hash = hashCache.computeIfAbsent(modFile, this::getHash);
+ List modClasses = usedMap.get(1).computeIfAbsent(hash, h -> new ArrayList<>());
+ if (!modClasses.contains(modClass)) {
+ modClasses.add(modClass);
+ }
+ }
+
public void onInit() {
if (!PatcherConfig.cacheEntrypoints) return;
readMap = null;
@@ -166,4 +205,15 @@ private String getHash(File modFile) {
return null;
}
-}*/
+ public void resetCache() {
+ if (cacheFile.exists()) {
+ if (cacheFile.delete()) {
+ Notifications.INSTANCE.send("PolyPatcher", "Deleted entrypoint cache", 5000);
+ logger.info("Deleted entrypoint cache");
+ } else {
+ Notifications.INSTANCE.send("PolyPatcher", "Failed to delete entrypoint cache!", 5000);
+ logger.error("Failed to delete entrypoint cache");
+ }
+ }
+ }
+}
diff --git a/src/main/java/club/sk1er/patcher/util/item/TooltipHandler.java b/src/main/java/club/sk1er/patcher/util/item/TooltipHandler.java
new file mode 100644
index 000000000..41a584dbf
--- /dev/null
+++ b/src/main/java/club/sk1er/patcher/util/item/TooltipHandler.java
@@ -0,0 +1,34 @@
+package club.sk1er.patcher.util.item;
+
+import club.sk1er.patcher.config.PatcherConfig;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+
+import java.util.List;
+
+public class TooltipHandler {
+
+ public static TooltipHandler INSTANCE = new TooltipHandler();
+
+ public boolean shouldToolTipRender = false;
+ private long cacheTime = 0L;
+ public List tooltipCache = null;
+
+ @SubscribeEvent
+ public void onTick(TickEvent.ClientTickEvent event) {
+ if (event.phase == TickEvent.Phase.START) {
+ if (!PatcherConfig.tooltipCache) {
+ return;
+ }
+ if (!shouldToolTipRender || tooltipCache == null) {
+ return;
+ }
+ if ((System.currentTimeMillis() - cacheTime) < 200) {
+ return;
+ }
+ tooltipCache = null;
+ cacheTime = System.currentTimeMillis();
+ }
+ }
+
+}
diff --git a/src/main/java/club/sk1er/patcher/util/world/sound/SoundHandler.java b/src/main/java/club/sk1er/patcher/util/world/sound/SoundHandler.java
index 7982aa703..f718e0cbd 100644
--- a/src/main/java/club/sk1er/patcher/util/world/sound/SoundHandler.java
+++ b/src/main/java/club/sk1er/patcher/util/world/sound/SoundHandler.java
@@ -4,13 +4,11 @@
import club.sk1er.patcher.config.PatcherConfig;
import club.sk1er.patcher.config.PatcherSoundConfig;
import club.sk1er.patcher.mixins.accessors.PositionedSoundAccessor;
+import club.sk1er.patcher.mixins.accessors.RegistrySimpleAccessor;
import club.sk1er.patcher.mixins.accessors.SoundHandlerAccessor;
import club.sk1er.patcher.mixins.accessors.SoundRegistryAccessor;
import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.ISound;
-import net.minecraft.client.audio.SoundCategory;
-import net.minecraft.client.audio.SoundEventAccessorComposite;
-import net.minecraft.client.audio.SoundManager;
+import net.minecraft.client.audio.*;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.client.resources.IResourceManagerReloadListener;
import net.minecraft.util.ResourceLocation;
@@ -22,11 +20,24 @@
import java.util.HashMap;
import java.util.Map;
+//#if MC>10809
+//$$ import net.minecraft.util.SoundCategory;
+//#endif
+
public class SoundHandler implements IResourceManagerReloadListener {
+ private final boolean isLoliASM; // why, why, why
+
public SoundHandler() {
this.previousActive = Display.isActive();
handleFocusChange();
+ boolean isLoliASM = false;
+ try {
+ Class.forName("zone.rong.loliasm.api.mixins.RegistrySimpleExtender", false, getClass().getClassLoader());
+ isLoliASM = true;
+ } catch (ClassNotFoundException ignored) {
+ }
+ this.isLoliASM = isLoliASM;
}
private final Map data = new HashMap<>();
@@ -86,7 +97,8 @@ private float getVolumeMultiplier(ResourceLocation sound) {
@Override
public void onResourceManagerReload(IResourceManager resourceManager) {
- Map soundRegistry = ((SoundRegistryAccessor) ((SoundHandlerAccessor) Minecraft.getMinecraft().getSoundHandler()).getSndRegistry()).getSoundRegistry();
- new PatcherSoundConfig(data, soundRegistry);
+ SoundRegistry soundRegistry = ((SoundHandlerAccessor) Minecraft.getMinecraft().getSoundHandler()).getSndRegistry();
+ Map sounds = isLoliASM ? ((RegistrySimpleAccessor) soundRegistry).getRegistryObjects() : ((SoundRegistryAccessor) soundRegistry).getSoundRegistry();
+ new PatcherSoundConfig(data, sounds);
}
}
diff --git a/src/main/java/club/sk1er/patcher/util/world/sound/audioswitcher/ALCHelper.java b/src/main/java/club/sk1er/patcher/util/world/sound/audioswitcher/ALCHelper.java
index 4d8d9ae1e..0dc8671d6 100644
--- a/src/main/java/club/sk1er/patcher/util/world/sound/audioswitcher/ALCHelper.java
+++ b/src/main/java/club/sk1er/patcher/util/world/sound/audioswitcher/ALCHelper.java
@@ -32,7 +32,11 @@ private String[] getAvailableDevicesString() {
try {
return ALC10.alcGetString(null, ALC11.ALC_ALL_DEVICES_SPECIFIER).split("\0");
} catch (Exception ignored) {
- return ALC10.alcGetString(null, ALC10.ALC_DEVICE_SPECIFIER).split("\0");
+ try {
+ return ALC10.alcGetString(null, ALC10.ALC_DEVICE_SPECIFIER).split("\0");
+ } catch (Exception ignored2) {
+ return null;
+ }
}
}
}
diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/math/CompactSineLUT.java b/src/main/java/me/jellysquid/mods/lithium/common/util/math/CompactSineLUT.java
new file mode 100644
index 000000000..6d1e49468
--- /dev/null
+++ b/src/main/java/me/jellysquid/mods/lithium/common/util/math/CompactSineLUT.java
@@ -0,0 +1,118 @@
+/**
+ * THE FOLLOWING CODE IS LICENSED UNDER THE GNU Lesser General Public License v3.0
+ * This work, "PolyPatcher", uses code from CaffeineMC's "lithium-fabric", licensed under the LGPL-3.0 license. The original license is included in the repository.
+ * https://github.com/CaffeineMC/lithium-fabric/tree/develop
+ * https://github.com/CaffeineMC/lithium-fabric/blob/develop/LICENSE.txt
+ */
+package me.jellysquid.mods.lithium.common.util.math;
+
+import net.minecraft.util.MathHelper;
+
+import java.lang.reflect.Field;
+
+/**
+ * A replacement for the sine angle lookup table used in {@link MathHelper}, both reducing the size of LUT and improving
+ * the access patterns for common paired sin/cos operations.
+ *
+ * sin(-x) = -sin(x)
+ * ... to eliminate negative angles from the LUT.
+ *
+ * sin(x) = sin(pi/2 - x)
+ * ... to eliminate supplementary angles from the LUT.
+ *
+ * Using these identities allows us to reduce the LUT from 64K entries (256 KB) to just 16K entries (64 KB), enabling
+ * it to better fit into the CPU's caches at the expense of some cycles on the fast path. The implementation has been
+ * tightly optimized to avoid branching where possible and to use very quick integer operations.
+ *
+ * Generally speaking, reducing the size of a lookup table is always a good optimization, but since we need to spend
+ * extra CPU cycles trying to maintain parity with vanilla, there is the potential risk that this implementation ends
+ * up being slower than vanilla when the lookup table is able to be kept in cache memory.
+ *
+ * Unlike other "fast math" implementations, the values returned by this class are *bit-for-bit identical* with those
+ * from {@link MathHelper}. Validation is performed during runtime to ensure that the table is correct.
+ *
+ * @author coderbot16 Author of the original (and very clever) implementation in Rust:
+ * https://gitlab.com/coderbot16/i73/-/tree/master/i73-trig/src
+ * @author jellysquid3 Additional optimizations, port to Java
+ * @author Wyvest Port to Minecraft 1.8.9 / 1.12.2 mappings
+ */
+public class CompactSineLUT {
+ private static final int[] SINE_TABLE_INT = new int[16384 + 1];
+ private static final float SINE_TABLE_MIDPOINT;
+
+ static {
+ float[] SINE_TABLE;
+ try {
+ Field field;
+ try {
+ field = MathHelper.class.getDeclaredField("SIN_TABLE");
+ } catch (NoSuchFieldException e) {
+ // 1.17 mappings
+ field = MathHelper.class.getDeclaredField("field_76144_a");
+ }
+ field.setAccessible(true);
+ SINE_TABLE = (float[]) field.get(null);
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ e.printStackTrace();
+ // taking this into our own hands
+ SINE_TABLE = new float[65536];
+ int i;
+ for (i = 0; i < 65536; ++i) {
+ SINE_TABLE[i] = (float)Math.sin((double)i * Math.PI * 2.0 / 65536.0);
+ }
+ }
+ // Copy the sine table, covering to raw int bits
+ for (int i = 0; i < SINE_TABLE_INT.length; i++) {
+ SINE_TABLE_INT[i] = Float.floatToRawIntBits(SINE_TABLE[i]);
+ }
+
+ SINE_TABLE_MIDPOINT = SINE_TABLE[SINE_TABLE.length / 2];
+
+ // Test that the lookup table is correct during runtime
+ for (int i = 0; i < SINE_TABLE.length; i++) {
+ float expected = SINE_TABLE[i];
+ float value = lookup(i);
+
+ if (expected != value) {
+ throw new IllegalArgumentException(String.format("LUT error at index %d (expected: %s, found: %s)", i, expected, value));
+ }
+ }
+ }
+
+ // [VanillaCopy] MathHelper#sin(float)
+ public static float sin(float f) {
+ return lookup((int) (f * 10430.378f) & 0xFFFF);
+ }
+
+ // [VanillaCopy] MathHelper#cos(float)
+ public static float cos(float f) {
+ return lookup((int) (f * 10430.378f + 16384.0f) & 0xFFFF);
+ }
+
+ private static float lookup(int index) {
+ // A special case... Is there some way to eliminate this?
+ if (index == 32768) {
+ return SINE_TABLE_MIDPOINT;
+ }
+
+ // Trigonometric identity: sin(-x) = -sin(x)
+ // Given a domain of 0 <= x <= 2*pi, just negate the value if x > pi.
+ // This allows the sin table size to be halved.
+ int neg = (index & 0x8000) << 16;
+
+ // All bits set if (pi/2 <= x), none set otherwise
+ // Extracts the 15th bit from 'half'
+ int mask = (index << 17) >> 31;
+
+ // Trigonometric identity: sin(x) = sin(pi/2 - x)
+ int pos = (0x8001 & mask) + (index ^ mask);
+
+ // Wrap the position in the table. Moving this down to immediately before the array access
+ // seems to help the Hotspot compiler optimize the bit math better.
+ pos &= 0x7fff;
+
+ // Fetch the corresponding value from the LUT and invert the sign bit as needed
+ // This directly manipulate the sign bit on the float bits to simplify logic
+ return Float.intBitsToFloat(SINE_TABLE_INT[pos] ^ neg);
+ }
+}
diff --git a/src/main/resources/LITHIUM-FABRIC-LICENSE.txt b/src/main/resources/LITHIUM-FABRIC-LICENSE.txt
new file mode 100644
index 000000000..153d416dc
--- /dev/null
+++ b/src/main/resources/LITHIUM-FABRIC-LICENSE.txt
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
\ No newline at end of file
diff --git a/src/main/resources/mixins.patcher.json b/src/main/resources/mixins.patcher.json
index abafa33c6..e91b39c6e 100644
--- a/src/main/resources/mixins.patcher.json
+++ b/src/main/resources/mixins.patcher.json
@@ -2,6 +2,7 @@
"package": "club.sk1er.patcher.mixins",
"refmap": "mixins.patcher.refmap.json",
"compatibilityLevel": "JAVA_8",
+ "minVersion": "0.7",
"plugin": "club.sk1er.patcher.mixins.plugin.PatcherMixinPlugin",
"overwrites": {
"conformVisibility": true
@@ -25,6 +26,7 @@
"accessors.MinecraftAccessor",
"accessors.MinecraftForgeClientAccessor",
"accessors.PositionedSoundAccessor",
+ "accessors.RegistrySimpleAccessor",
"accessors.RenderManagerAccessor",
"accessors.ResourcePackRepositoryAccessor",
"accessors.SoundHandlerAccessor",
@@ -50,12 +52,14 @@
"bugfixes.GuiGameOverMixin_ResolveButtonClick",
"bugfixes.GuiIngameForgeMixin_FixProfilerSection",
"bugfixes.GuiIngameForgeMixin_HotbarAlpha",
+ "bugfixes.GuiIngameMixin_RemoveSpectatorPumpkinOverlay",
"bugfixes.GuiIngameMixin_ScoreboardTextTransparency",
"bugfixes.GuiLanguageMixin_ResetUnicodeFont",
"bugfixes.GuiNewChat_RemoveChatLimit",
"bugfixes.GuiNewChatMixin_ChatComponentBoundary",
"bugfixes.GuiNewChatMixin_NullChatLineFix",
"bugfixes.GuiOptionsMixin_SaveSettings",
+ "bugfixes.GuiScreenBookMixin_AddBackground",
"bugfixes.GuiScreenBookMixin_ResolveRenderLayer",
"bugfixes.GuiScreenMixin_FixWindowsIME",
"bugfixes.GuiScreenOptionsSoundsMixin_PacketSpam",
@@ -147,10 +151,10 @@
"features.GuiMultiplayerMixin_FastServerJoin",
"features.GuiNewChatMixin_ChatDelay",
"features.GuiNewChatMixin_CompactChat",
- "features.GuiNewChatMixin_ExtendChatBackground",
- "features.GuiNewChatMixin_TransparentChat",
"features.GuiScreenMixin_BackgroundRendering",
"features.GuiScreenServerListMixin_FakeServerListDirectConnect",
+ "features.ImageBufferDownload_EarsMod",
+ "features.ImageBufferDownloadMixin_ImprovedHeadRendering",
"features.InventoryPlayerTransformer_HotbarScrolling",
"features.LayerArrowMixin_CancelRender",
"features.LayerCapeMixin_NaturalCapes",
@@ -211,6 +215,7 @@
"performance.BlockRedstoneTorchMixin_MemoryLeak",
"performance.ChunkMixin_Optimization",
"performance.EffectRendererMixin_ParticleCulling",
+ "performance.EnchantmentHelperMixin_MemoryLeak",
"performance.EntityMixin_Capability",
"performance.EntityMixin_DisplayNames",
"performance.EntityOtherPlayerMPMixin_UselessAnimations",
@@ -220,7 +225,11 @@
"performance.EntityRendererMixin_SkipTwitchRendering",
"performance.FontRendererMixin_Optimization",
"performance.GameRulesValueMixin_Optimization",
+ "performance.GameSettingsMixin_RefreshMipmaps",
+ "performance.GuiLanguageMixin_RefreshLanguage",
+ "performance.ItemStackMixin_TooltipCache",
"performance.LoadingScreenRendererMixin_SkipProgress",
+ "performance.MathHelperMixin_CompactLUT",
"performance.MinecraftMixin_MemoryIssues",
"performance.MinecraftMixin_OptimizedWorldSwapping",
"performance.MinecraftMixin_SkipTwitchStuff",
@@ -230,18 +239,26 @@
"performance.NBTTagStringMixin_DataCache",
"performance.NetHandlerPlayClientMixin_InstantDimensionSwapping",
"performance.NodeProcessorMixin_MemoryLeak",
+ "performance.RenderChunkMixin_OptimizeSpecialTileEntities",
"performance.RenderEntityItemMixin_EntityCulling",
"performance.RenderGlobalMixin_LimitVisGraphScan",
"performance.ResourcePackRepositoryMixin_FasterSearching",
+ "performance.SimpleReloadableResourceManager_OnlyRefreshNecessaryListeners",
"performance.TexturedQuadMixin_BatchDraw",
+ "performance.TextureManagerMixin_MemoryLeak",
"performance.TileEntityMobSpawnerRendererMixin_EntityCulling",
"performance.TileEntityRendererDispatcherMixin_BatchDraw",
"performance.VisGraphMixin_LimitScan",
"performance.WorldClientMixin_AnimationTick",
"performance.WorldMixin_Optimization",
+ "performance.forge.ASMDataTableMixin_ComputeParallel",
"performance.forge.FluidRegistryMixin_Optimization",
"performance.forge.FMLClientHandlerMixin_Optimization",
+ "performance.forge.FMLControlledNamespacedRegistryMixin_TrimAvailabilityMap",
"performance.forge.ItemLayerModelMixin_ReduceQuadCount",
+ "performance.forge.JarDiscovererMixin_ReplaceRegex",
+ "performance.forge.ModDiscovererMixin_Logging",
+ "performance.forge.ModDiscovererMixin_ReplaceRegex",
"performance.hudcaching.EntityRendererMixin_HUDCaching",
"performance.hudcaching.FramebufferMixin_HUDCaching",
"performance.hudcaching.GlStateManagerMixin_HUDCaching",
@@ -249,6 +266,8 @@
"performance.hudcaching.GuiIngameMixin_HUDCaching",
"performance.network.packet.C17PacketCustomPayloadMixin_MemoryLeak",
"performance.network.packet.S3FPacketCustomPayloadMixin_MemoryLeak",
+ "performance.optifine.GameSettingsMixin_RefreshOFMipmaps",
+ "performance.optifine.MathHelperMixin_OFFastMath",
"performance.render.item.ItemStackMixin_CacheDisplayName"
]
}
\ No newline at end of file
diff --git a/src/main/resources/patcher18_at.cfg b/src/main/resources/patcher18_at.cfg
index 6cf76b7b5..a902cfe22 100644
--- a/src/main/resources/patcher18_at.cfg
+++ b/src/main/resources/patcher18_at.cfg
@@ -10,4 +10,10 @@ public net.minecraft.client.renderer.tileentity.TileEntityBannerRenderer$TimedBa
public net.minecraft.client.renderer.tileentity.TileEntityBannerRenderer$TimedBannerTexture ()V # constructor
# BlockRedstoneTorch
-public net.minecraft.block.BlockRedstoneTorch$Toggle
\ No newline at end of file
+public net.minecraft.block.BlockRedstoneTorch$Toggle
+
+# EnchantmentHelper
+public net.minecraft.enchantment.EnchantmentHelper$DamageIterator
+public net.minecraft.enchantment.EnchantmentHelper$HurtIterator
+public net.minecraft.enchantment.EnchantmentHelper$ModifierDamage
+public net.minecraft.enchantment.EnchantmentHelper$ModifierLiving
\ No newline at end of file
diff --git a/versions/1.12.2-1.8.9.txt b/versions/1.12.2-1.8.9.txt
index f5fd2adf9..e43924de9 100644
--- a/versions/1.12.2-1.8.9.txt
+++ b/versions/1.12.2-1.8.9.txt
@@ -59,4 +59,5 @@ net.minecraft.client.particle.Particle net.minecraft.client.particle.EntityFX
net.minecraft.client.gui.advancements.GuiAdvancement net.minecraft.client.gui.achievement.GuiAchievement
net.minecraft.client.gui.GuiWorldSelection net.minecraft.client.gui.GuiSelectWorld
net.minecraft.pathfinding.NodeProcessor net.minecraft.world.pathfinder.NodeProcessor
-net.minecraft.util.SoundCategory net.minecraft.client.audio.SoundCategory
\ No newline at end of file
+net.minecraft.util.SoundCategory net.minecraft.client.audio.SoundCategory
+net.minecraft.util.registry.RegistrySimple net.minecraft.util.RegistrySimple
\ No newline at end of file
+