Format code

Author: RuiXuqi

src/main/java/team/chisel/ctm/CTM.java

@@ -5,7 +5,6 @@
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -22,15 +21,16 @@
         version = Tags.VERSION,
         dependencies = "required-after:mixinbooter@[8.0,);before:chisel;after:forge@[14.23.5.2807,)",
         clientSideOnly = true,
-        acceptableRemoteVersions = "*"
+        acceptableRemoteVersions = "*",
+        customProperties = {
+                @Mod.CustomProperty(k = "license", v = "GPL-2.0"),
+                @Mod.CustomProperty(k = "issueTrackerUrl", v = "https://github.com/RuiXuqi/CTM-Vintage/issues")
+        }
 )
 public class CTM {
     public static final Logger logger = LogManager.getLogger("CTM");
 
-    @Mod.Instance(Tags.MOD_ID)
-    public static CTM instance;
-
-    @EventHandler
+    @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         TextureTypeRegistry.preInit(event);
 

src/main/java/team/chisel/ctm/Configurations.java

@@ -7,7 +7,6 @@
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import org.jetbrains.annotations.NotNull;
 import team.chisel.ctm.client.model.AbstractCTMBakedModel;
 
 @Config(modid = Tags.MOD_ID)
@@ -24,7 +23,7 @@ public class Configurations {
     public static boolean connectInsideCTM = false;
 
     @SubscribeEvent
-    public static void onConfigChange(@NotNull ConfigChangedEvent event) {
+    public static void onConfigChange(ConfigChangedEvent event) {
         if (event.getModID().equals(Tags.MOD_ID)) {
             ConfigManager.sync(Tags.MOD_ID, Type.INSTANCE);
             AbstractCTMBakedModel.invalidateCaches();

src/main/java/team/chisel/ctm/client/asm/CTMCorePlugin.java

@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Map;
 
+@IFMLLoadingPlugin.Name("EarlyMixin")
 @IFMLLoadingPlugin.MCVersion("1.12.2")
 public class CTMCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
     @Override

src/main/java/team/chisel/ctm/client/mixin/BlockMixin.java

@@ -5,7 +5,6 @@
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,7 +15,7 @@
 @Mixin(Block.class)
 public class BlockMixin {
     @Inject(method = "getExtendedState", at = @At("RETURN"), cancellable = true, remap = false)
-    private void wrapExtendedState(IBlockState state, IBlockAccess world, BlockPos pos, @NotNull CallbackInfoReturnable<IBlockState> cir) {
+    private void wrapExtendedState(IBlockState state, IBlockAccess world, BlockPos pos, CallbackInfoReturnable<IBlockState> cir) {
         cir.setReturnValue(new CTMExtendedState(cir.getReturnValue(), world, pos));
     }
 

src/main/java/team/chisel/ctm/client/mixin/TextureMapMixin.java

@@ -3,7 +3,6 @@
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,7 +12,7 @@
 @Mixin(TextureMap.class)
 public class TextureMapMixin {
     @Inject(method = "registerSprite(Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;", at = @At("RETURN"))
-    private void onSpriteRegister(ResourceLocation location, @NotNull CallbackInfoReturnable<TextureAtlasSprite> cir) {
+    private void onSpriteRegister(ResourceLocation location, CallbackInfoReturnable<TextureAtlasSprite> cir) {
         CTMCoreMethods.onSpriteRegister((TextureMap) (Object) this, cir.getReturnValue());
     }
 }

src/main/java/team/chisel/ctm/client/model/parsing/ModelLoaderCTM.java

@@ -29,9 +29,8 @@
 import java.util.Map;
 import java.util.Set;
 
-public enum ModelLoaderCTM implements ICustomModelLoader {
-
-    INSTANCE;
+public class ModelLoaderCTM implements ICustomModelLoader {
+    public static final ModelLoaderCTM INSTANCE = new ModelLoaderCTM();
 
     private static final Map<Integer, IModelParser> parserVersions = ImmutableMap.of(1, new ModelParserV1());
 

src/main/java/team/chisel/ctm/client/newctm/json/CTMDefinitionManager.java

@@ -31,8 +31,8 @@
 import java.util.function.Predicate;
 
 @Log4j2
-public enum CTMDefinitionManager implements ISelectiveResourceReloadListener {
-    INSTANCE;
+public class CTMDefinitionManager implements ISelectiveResourceReloadListener {
+    public static final CTMDefinitionManager INSTANCE = new CTMDefinitionManager();
 
     private final Gson gson = new Gson();
     private final Map<String, ICTMLogic> logicDefinitions = new HashMap<>();

src/main/java/team/chisel/ctm/client/texture/ctx/OffsetProviderRegistry.java

@@ -9,9 +9,9 @@
 import java.util.List;
 
 @ParametersAreNonnullByDefault
-public enum OffsetProviderRegistry {
+public class OffsetProviderRegistry {
 
-    INSTANCE;
+    public static final OffsetProviderRegistry INSTANCE = new OffsetProviderRegistry();
 
     private final List<IOffsetProvider> providers = new ArrayList<>();
 

src/main/java/team/chisel/ctm/client/texture/type/TextureTypeNormal.java

@@ -14,10 +14,10 @@
 /**
  * Normal Block Render Type
  */
-public enum TextureTypeNormal implements ITextureType {
+public class TextureTypeNormal implements ITextureType {
 
     @TextureType("normal")
-    INSTANCE;
+    public static final TextureTypeNormal INSTANCE = new TextureTypeNormal();
 
     @NotNull
     private static final ITextureContext EMPTY_CONTEXT = () -> 0L;

src/main/java/team/chisel/ctm/client/util/CTMPackReloadListener.java

@@ -9,8 +9,8 @@
 
 import java.util.function.Predicate;
 
-public enum CTMPackReloadListener implements ISelectiveResourceReloadListener {
-    INSTANCE;
+public class CTMPackReloadListener implements ISelectiveResourceReloadListener {
+    public static final CTMPackReloadListener INSTANCE = new CTMPackReloadListener();
 
     @Override
     public void onResourceManagerReload(@NotNull IResourceManager resourceManager, @NotNull Predicate<IResourceType> resourcePredicate) {