From b62743983528ae3a4b2a2aa8173f082f6767aa1c Mon Sep 17 00:00:00 2001 From: Discreater Date: Sat, 21 Aug 2021 14:58:30 +0800 Subject: [PATCH] Clean up --- .../towdium/jecalculation/JecaTranslator.java | 15 ----- .../jecalculation/polyfill/ClickType.java | 11 ---- .../towdium/jecalculation/polyfill/Event.java | 32 ---------- .../jecalculation/polyfill/Loader.java | 44 -------------- .../utils/IllegalPositionException.java | 15 ----- .../jecalculation/utils/OptionalEither.java | 59 ------------------- .../utils/function/TriConsumer.java | 5 -- .../utils/function/TriFunction.java | 6 -- 8 files changed, 187 deletions(-) delete mode 100644 src/main/java/me/towdium/jecalculation/JecaTranslator.java delete mode 100644 src/main/java/me/towdium/jecalculation/polyfill/ClickType.java delete mode 100644 src/main/java/me/towdium/jecalculation/polyfill/Event.java delete mode 100644 src/main/java/me/towdium/jecalculation/polyfill/Loader.java delete mode 100644 src/main/java/me/towdium/jecalculation/utils/IllegalPositionException.java delete mode 100644 src/main/java/me/towdium/jecalculation/utils/OptionalEither.java delete mode 100644 src/main/java/me/towdium/jecalculation/utils/function/TriConsumer.java delete mode 100644 src/main/java/me/towdium/jecalculation/utils/function/TriFunction.java diff --git a/src/main/java/me/towdium/jecalculation/JecaTranslator.java b/src/main/java/me/towdium/jecalculation/JecaTranslator.java deleted file mode 100644 index 46dfd54..0000000 --- a/src/main/java/me/towdium/jecalculation/JecaTranslator.java +++ /dev/null @@ -1,15 +0,0 @@ -package me.towdium.jecalculation; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.resources.I18n; -import org.apache.commons.lang3.StringEscapeUtils; - -@SideOnly(Side.CLIENT) -public class JecaTranslator { - public static String format(String translateKey, Object... parameters){ - String buffer = I18n.format(translateKey, parameters); - buffer = StringEscapeUtils.unescapeJava(buffer); - return buffer.replace("\t", " "); - } -} diff --git a/src/main/java/me/towdium/jecalculation/polyfill/ClickType.java b/src/main/java/me/towdium/jecalculation/polyfill/ClickType.java deleted file mode 100644 index 8fa0bd5..0000000 --- a/src/main/java/me/towdium/jecalculation/polyfill/ClickType.java +++ /dev/null @@ -1,11 +0,0 @@ -package me.towdium.jecalculation.polyfill; - -public class ClickType { - public static final int PICKUP = 0; - public static final int QUICK_MOVE = 1; - public static final int SWAP = 2; - public static final int CLONE = 3; - public static final int THROW = 4; - public static final int QUICK_CRAFT = 5; - public static final int PICKUP_ALL = 6; -} diff --git a/src/main/java/me/towdium/jecalculation/polyfill/Event.java b/src/main/java/me/towdium/jecalculation/polyfill/Event.java deleted file mode 100644 index e1e8af6..0000000 --- a/src/main/java/me/towdium/jecalculation/polyfill/Event.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.towdium.jecalculation.polyfill; - -import cpw.mods.fml.relauncher.Side; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@Deprecated -public @interface Event { - - /** - * A class which will be subscribed to {@link net.minecraftforge.common.MinecraftForge.EVENT_BUS} at mod construction time. - */ - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.TYPE) - @Deprecated - @interface EventBusSubscriber { - Side[] value() default {Side.CLIENT, Side.SERVER}; - - /** - * Optional value, only nessasary if tis annotation is not on the same class that has a @Mod annotation. - * Needed to prevent early classloading of classes not owned by your mod. - * - * @return mod id - */ - String modid() default ""; - } -} diff --git a/src/main/java/me/towdium/jecalculation/polyfill/Loader.java b/src/main/java/me/towdium/jecalculation/polyfill/Loader.java deleted file mode 100644 index ba21b0e..0000000 --- a/src/main/java/me/towdium/jecalculation/polyfill/Loader.java +++ /dev/null @@ -1,44 +0,0 @@ -package me.towdium.jecalculation.polyfill; - - -import cpw.mods.fml.common.eventhandler.EventBus; -import me.towdium.jecalculation.JustEnoughCalculation; -import net.minecraftforge.common.MinecraftForge; -import org.reflections.Reflections; -import org.reflections.scanners.ResourcesScanner; -import org.reflections.scanners.SubTypesScanner; -import org.reflections.util.ClasspathHelper; -import org.reflections.util.ConfigurationBuilder; -import org.reflections.util.FilterBuilder; - -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -@Deprecated -public class Loader { - - public static void subscribeToEventBus() { - Set> classes = getAllClasses("me.towdium.jecalculation"); - classes.stream().filter((cls) -> cls.isAnnotationPresent(Event.EventBusSubscriber.class)).forEach((cls) -> { - JustEnoughCalculation.logger.info("loading class" + cls.getName()); - try { - MinecraftForge.EVENT_BUS.register(cls.newInstance()); - } catch (InstantiationException | IllegalAccessException e) { - e.printStackTrace(); - } - }); - } - - private static Set> getAllClasses(String packageName) { - List classLoadersList = new LinkedList(); - classLoadersList.add(ClasspathHelper.contextClassLoader()); - classLoadersList.add(ClasspathHelper.staticClassLoader()); - - Reflections reflections = new Reflections(new ConfigurationBuilder().setScanners( - new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner()).setUrls( - ClasspathHelper.forClassLoader(classLoadersList.toArray(new ClassLoader[0]))).filterInputsBy( - new FilterBuilder().include(FilterBuilder.prefix(packageName)))); - return reflections.getSubTypesOf(Object.class); - } -} diff --git a/src/main/java/me/towdium/jecalculation/utils/IllegalPositionException.java b/src/main/java/me/towdium/jecalculation/utils/IllegalPositionException.java deleted file mode 100644 index 56a0dcb..0000000 --- a/src/main/java/me/towdium/jecalculation/utils/IllegalPositionException.java +++ /dev/null @@ -1,15 +0,0 @@ -package me.towdium.jecalculation.utils; - -/** - * Author: towdium - * Date: 8/10/17. - */ -public class IllegalPositionException extends RuntimeException { - public IllegalPositionException() { - super(); - } - - public IllegalPositionException(String message) { - super(message); - } -} diff --git a/src/main/java/me/towdium/jecalculation/utils/OptionalEither.java b/src/main/java/me/towdium/jecalculation/utils/OptionalEither.java deleted file mode 100644 index 7dba8f9..0000000 --- a/src/main/java/me/towdium/jecalculation/utils/OptionalEither.java +++ /dev/null @@ -1,59 +0,0 @@ -package me.towdium.jecalculation.utils; - -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.Optional; -import java.util.function.Consumer; -import java.util.function.Function; - -@ParametersAreNonnullByDefault -final public class OptionalEither { - public static OptionalEither left(L value) { - return new OptionalEither<>(Optional.of(value), Optional.empty()); - } - - public static OptionalEither right(R value) { - return new OptionalEither<>(Optional.empty(), Optional.of(value)); - } - - public static OptionalEither empty() { - return new OptionalEither<>(Optional.empty(), Optional.empty()); - } - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - private final Optional left; - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - private final Optional right; - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - private OptionalEither(Optional l, Optional r) { - left = l; - right = r; - } - - public Optional map(Function lFunc, Function rFunc) { - if(left.isPresent()){ - return left.map(lFunc); - } else if(right.isPresent()){ - return right.map(rFunc); - } else { - return Optional.empty(); - } - } - - public OptionalEither mapLeft(Function lFunc) { - return new OptionalEither<>(left.map(lFunc), right); - } - - public OptionalEither mapRight(Function rFunc) { - return new OptionalEither<>(left, right.map(rFunc)); - } - - public void apply(Consumer lFunc, Consumer rFunc) { - left.ifPresent(lFunc); - right.ifPresent(rFunc); - } - - public boolean isPresent() { - return left.isPresent() || right.isPresent(); - } -} diff --git a/src/main/java/me/towdium/jecalculation/utils/function/TriConsumer.java b/src/main/java/me/towdium/jecalculation/utils/function/TriConsumer.java deleted file mode 100644 index 2bccc74..0000000 --- a/src/main/java/me/towdium/jecalculation/utils/function/TriConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.towdium.jecalculation.utils.function; - -public interface TriConsumer { - void accept(T t, U u, V v); -} diff --git a/src/main/java/me/towdium/jecalculation/utils/function/TriFunction.java b/src/main/java/me/towdium/jecalculation/utils/function/TriFunction.java deleted file mode 100644 index fbcb646..0000000 --- a/src/main/java/me/towdium/jecalculation/utils/function/TriFunction.java +++ /dev/null @@ -1,6 +0,0 @@ -package me.towdium.jecalculation.utils.function; - -public interface TriFunction { - R apply(T t, U u, V v); -} -