From a06a46b498bac472685adef9ebbcb95c77c7511f Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Mon, 1 May 2023 20:47:24 -0400 Subject: [PATCH] Spotless --- .../perf/cache_strongholds/ChunkGeneratorMixin.java | 2 -- .../mixin/perf/cache_strongholds/ServerLevelMixin.java | 2 -- .../perf/faster_texture_stitching/StitcherMixin.java | 1 - .../modernfix/dynamicresources/ModelLocationCache.java | 1 - .../modernfix/platform/ModernFixPlatformHooks.java | 6 ------ .../modernfix/structure/CachingStructureManager.java | 1 - .../org/embeddedt/modernfix/textures/StbStitcher.java | 1 - .../modernfix/util/DummyServerConfiguration.java | 1 - .../org/embeddedt/modernfix/util/ItemMesherMap.java | 1 - common/src/main/resources/modernfix.accesswidener | 1 - .../platform/fabric/ModernFixPlatformHooksImpl.java | 5 ----- .../perf/dynamic_resources/ModelBakerImplMixin.java | 2 -- .../mixin/perf/dynamic_resources/ModelBakeryMixin.java | 1 - .../perf/dynamic_resources/ModelManagerMixin.java | 2 -- .../NamespacedHolderHelperMixin.java | 3 --- .../platform/forge/ModernFixPlatformHooksImpl.java | 10 ---------- 16 files changed, 40 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java index cbeeceb0..f9ca5195 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java @@ -4,9 +4,7 @@ import net.minecraft.Util; import net.minecraft.core.Holder; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.ChunkGeneratorStructureState; -import net.minecraft.world.level.levelgen.RandomState; import net.minecraft.world.level.levelgen.structure.StructureSet; import net.minecraft.world.level.levelgen.structure.placement.ConcentricRingsStructurePlacement; import org.embeddedt.modernfix.ModernFix; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java index 23ce98af..0a57a0ff 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java @@ -10,11 +10,9 @@ import net.minecraft.server.level.progress.ChunkProgressListener; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.level.CustomSpawner; import net.minecraft.world.level.Level; -import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.ChunkGeneratorStructureState; import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.dimension.LevelStem; -import net.minecraft.world.level.levelgen.RandomState; import net.minecraft.world.level.storage.DimensionDataStorage; import net.minecraft.world.level.storage.LevelStorageSource; import net.minecraft.world.level.storage.ServerLevelData; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java index 9e1334f9..be34ba9f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java @@ -16,7 +16,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.Comparator; import java.util.List; -import java.util.Set; @Mixin(Stitcher.class) @ClientOnlyMixin diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java index 1b079302..0a97436d 100644 --- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java +++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java @@ -5,7 +5,6 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java b/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java index 4a42a8fa..a5735018 100644 --- a/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java +++ b/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java @@ -1,16 +1,10 @@ package org.embeddedt.modernfix.platform; -import com.mojang.blaze3d.platform.NativeImage; import dev.architectury.injectables.annotations.ExpectPlatform; -import net.minecraft.client.renderer.texture.TextureAtlas; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.packs.resources.Resource; -import net.minecraft.server.packs.resources.ResourceManager; import org.objectweb.asm.tree.ClassNode; -import java.io.IOException; import java.nio.file.Path; public class ModernFixPlatformHooks { diff --git a/common/src/main/java/org/embeddedt/modernfix/structure/CachingStructureManager.java b/common/src/main/java/org/embeddedt/modernfix/structure/CachingStructureManager.java index 849d955e..1da67d26 100644 --- a/common/src/main/java/org/embeddedt/modernfix/structure/CachingStructureManager.java +++ b/common/src/main/java/org/embeddedt/modernfix/structure/CachingStructureManager.java @@ -5,7 +5,6 @@ import net.minecraft.SharedConstants; import net.minecraft.core.HolderGetter; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; -import net.minecraft.nbt.NbtUtils; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.datafix.DataFixTypes; import net.minecraft.world.level.block.Block; diff --git a/common/src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java b/common/src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java index 7e64cb3b..3a011c89 100644 --- a/common/src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java +++ b/common/src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java @@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import net.minecraft.client.renderer.texture.Stitcher; import net.minecraft.client.renderer.texture.StitcherException; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Mth; import org.embeddedt.modernfix.ModernFix; import org.lwjgl.stb.STBRPContext; diff --git a/common/src/main/java/org/embeddedt/modernfix/util/DummyServerConfiguration.java b/common/src/main/java/org/embeddedt/modernfix/util/DummyServerConfiguration.java index 06f2e373..eb188d3b 100644 --- a/common/src/main/java/org/embeddedt/modernfix/util/DummyServerConfiguration.java +++ b/common/src/main/java/org/embeddedt/modernfix/util/DummyServerConfiguration.java @@ -6,7 +6,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.*; import net.minecraft.core.RegistryAccess; import net.minecraft.world.Difficulty; -import net.minecraft.world.level.levelgen.WorldGenSettings; import net.minecraft.world.level.levelgen.WorldOptions; import net.minecraft.world.level.storage.WorldData; import net.minecraft.world.level.storage.ServerLevelData; diff --git a/common/src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java b/common/src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java index 168100f2..e2f61b6a 100644 --- a/common/src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java +++ b/common/src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java @@ -1,7 +1,6 @@ package org.embeddedt.modernfix.util; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/resources/modernfix.accesswidener b/common/src/main/resources/modernfix.accesswidener index 7d149b3e..3c96e1d4 100644 --- a/common/src/main/resources/modernfix.accesswidener +++ b/common/src/main/resources/modernfix.accesswidener @@ -33,7 +33,6 @@ accessible field net/minecraft/server/level/ChunkMap pendingUnloads Lit/unimi/ds accessible method net/minecraft/resources/ResourceKey (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;)V accessible field net/minecraft/client/renderer/block/model/BlockModel GSON Lcom/google/gson/Gson; accessible class net/minecraft/server/level/ChunkMap$DistanceManager -accessible method net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent updateSettings (Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext;)V accessible class net/minecraft/client/resources/model/ModelBakery$BakedCacheKey accessible field net/minecraft/client/resources/model/ModelBakery bakedCache Ljava/util/Map; accessible field net/minecraft/client/resources/model/ModelBakery ITEM_MODEL_GENERATOR Lnet/minecraft/client/renderer/block/model/ItemModelGenerator; diff --git a/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java b/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java index 01b3b444..c9179b95 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java @@ -1,15 +1,10 @@ package org.embeddedt.modernfix.platform.fabric; -import com.mojang.blaze3d.platform.NativeImage; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; -import net.minecraft.client.renderer.texture.TextureAtlas; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.packs.resources.Resource; -import net.minecraft.server.packs.resources.ResourceManager; import org.embeddedt.modernfix.ModernFixFabric; import org.objectweb.asm.tree.*; diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java index 1c922c51..23e1a669 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java @@ -1,12 +1,10 @@ package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources; -import com.mojang.math.Transformation; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.*; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.MinecraftForge; -import org.apache.commons.lang3.tuple.Triple; import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.duck.IExtendedModelBakery; import org.embeddedt.modernfix.dynamicresources.DynamicBakedModelProvider; diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java index af175cab..86460268 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java @@ -30,7 +30,6 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import javax.annotation.Nullable; import java.io.IOException; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java index e0d9621c..4e7cbfd3 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelManagerMixin.java @@ -14,9 +14,7 @@ import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.util.LambdaMap; 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.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.io.IOException; import java.util.*; diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java index 6c494d00..9b0b9e31 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java @@ -6,9 +6,7 @@ import net.minecraft.core.MappedRegistry; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; -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; @@ -16,7 +14,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.Map; -import java.util.function.Function; @Mixin(targets = { "net/minecraftforge/registries/NamespacedWrapper" }) public abstract class NamespacedHolderHelperMixin extends MappedRegistry { diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java index 1a815edb..31fe5505 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java +++ b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java @@ -1,16 +1,10 @@ package org.embeddedt.modernfix.platform.forge; -import com.mojang.blaze3d.platform.NativeImage; import cpw.mods.modlauncher.*; import cpw.mods.modlauncher.api.INameMappingService; -import net.minecraft.client.renderer.texture.TextureAtlas; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.packs.resources.Resource; -import net.minecraft.server.packs.resources.ResourceManager; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.fml.ModLoader; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLPaths; @@ -28,10 +22,6 @@ import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.*; import org.spongepowered.asm.mixin.injection.struct.InjectorGroupInfo; -import java.io.IOException; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.nio.file.Path; import java.util.*;