From 336c4cd54d3fba5bf3f83f76135d3e5c62dac055 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Tue, 22 Mar 2022 13:47:23 +0100 Subject: [PATCH] more code cleanup --- .../mixins/client/vanilla/ChunkMixin.java | 3 ++- .../mixin/plugin/MinecraftURLClassPath.java | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/ChunkMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/ChunkMixin.java index d0aabec..360d7a5 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/ChunkMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/ChunkMixin.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.Map; -@SideOnly(Side.CLIENT) +@SuppressWarnings({"rawtypes", "WhileLoopReplaceableByForEach", "unchecked"}) @Mixin(Chunk.class) public abstract class ChunkMixin { @Shadow public Map chunkTileEntityMap; @@ -44,6 +44,7 @@ public abstract class ChunkMixin { * @author FalsePattern * @reason Direct port from dumped code */ + @SideOnly(Side.CLIENT) @Overwrite public void fillChunk(byte[] var1, int var2, int var3, boolean var4) { Iterator var5 = this.chunkTileEntityMap.values().iterator(); diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/MinecraftURLClassPath.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/MinecraftURLClassPath.java index bf02e27..ac8abf0 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/MinecraftURLClassPath.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/MinecraftURLClassPath.java @@ -1,17 +1,13 @@ package com.falsepattern.endlessids.mixin.plugin; -import com.google.common.io.Files; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModClassLoader; -import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; import sun.misc.URLClassPath; import java.io.File; -import java.io.IOException; import java.lang.reflect.Field; import java.nio.file.Path; - /** * Backport from spongemixins 1.3 */ @@ -51,21 +47,6 @@ public final class MinecraftURLClassPath { } } - /** - * Get a jar within the minecraft mods directory - */ - public static File getJarInModPath(final String jarname) { - try { - return java.nio.file.Files.walk(new File(Launch.minecraftHome, "mods/").toPath()).filter( p -> { - final String filename = p.toString(); - return Files.getNameWithoutExtension(filename).contains(jarname) && Files.getFileExtension(filename).equals("jar"); - }).map(Path::toFile).findFirst().orElse(null); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } - /** * Adds a Jar to the Minecraft URL ClassPath * - Needed when using mixins on classes outside of Minecraft or other coremods