From 13244d53664043d5862c5fc7b281de4791c341ca Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Fri, 9 Feb 2024 21:27:29 -0800 Subject: [PATCH] Clean up code --- logs/debug-1.log.gz | Bin 2553 -> 0 bytes logs/debug-2.log.gz | Bin 2270 -> 0 bytes logs/debug-3.log.gz | Bin 206 -> 0 bytes logs/debug.log | 204 ------------------ logs/latest.log | 0 .../jade/InfestedLeavesComponentProvider.java | 1 - .../exdeorum/compat/jei/ClientJeiUtil.java | 9 + .../exdeorum/compat/jei/CrookCategory.java | 2 +- .../exdeorum/compat/jei/SieveCategory.java | 23 +- .../compat/kubejs/ExDeorumKubeJsBindings.java | 2 - .../compat/top/ExDeorumInfoProvider.java | 1 - .../exdeorum/data/BlockLoot.java | 3 - .../exdeorum/event/EventHandler.java | 1 - .../exdeorum/loot/CrookLootModifier.java | 1 - .../exdeorum/recipe/RecipeUtilTest.java | 5 - 15 files changed, 16 insertions(+), 236 deletions(-) delete mode 100644 logs/debug-1.log.gz delete mode 100644 logs/debug-2.log.gz delete mode 100644 logs/debug-3.log.gz delete mode 100644 logs/debug.log delete mode 100644 logs/latest.log diff --git a/logs/debug-1.log.gz b/logs/debug-1.log.gz deleted file mode 100644 index fd8e792ef8b558121400eb47cccc82b36026fd54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2553 zcmVg zwji=)!6peVKsxar_P1|?pd?x%C0UjfZw8k{20(lt8r=<${78Oux~DK`I1SgTH~Ws; zcU{u!_C8x5L&~Ce$0vukzu_N@lL(UJiKGb&2#XRB5e-Pd@9tQ1N6zwsbNm~`DfJRA zp5A@#TelLct?Tns_q|1>m5jjhVMx;;vGQZBp`amr;o{-PA3m0m>9rS=xdO>k;lVl3 zhhs=UVJqnU<4L<2A6J&2Rc zA+KN>-|19r{21@DG|;6;#K4@aR^RC*tY)Sywalid(-~ z-?RSvG3#yL<6+37eV5cpw?R&s>hqq8ezD;5LI(53sw27KCP?Ib@#?eQPd(8jJj%~GP@&*@o2AkcI=F*7)#GTuC+Snqx2QEjOyu-0>*J zTy^qTjb(2uBr5}WQUGN+W@!XFTXBp^&{cW0-JR0%)W5j5(-XOro!iv&r6ETc?Y)jD?NA^PN|zW(%1c1StT{FIoC z7@iReZ-iUffZU7(|Dud@q)yk=Np)^(uuH1+j;UF)VahqZaKE&Q>1J)V)M6XU#H+BI z7;7P^db9iXNVV7Jw32K6!ToI7Zm4`12SCp3N?lBlxJwA0YHj;j!+djBU*E^xqTg@Q zVBIot#cItiuP9;Qot(Wr1E+%AW z{s%(Pr*kF~f=8WDZ)8tP#yO?F^kTxIL0r=ia8`l(zZZ(t2=o?%i)#>%%!7Q%ItT)L z^<(rFa~Dy(c20ir?0j$0WOA~}$tEY8oNRLP+leNVlTA)GIeEi8R!@;K9fT}-X-;i! zdjM4|CPuAnpzk|wJ6h-9iXCd9@--EA#t>^5R+4H5L<}9aJy2sci#V;%w6>e}{Czw}4xxzF%jkh|@ zr9t~zX2)7Fdp<54vzaZ|#;JdE3dLJ4+hTC7^mja}O?4^DxaCJ|kz$T;3E~R=ouXsR zQL1jCy{Bw1w1kz%!%Qg<1ngeZYmxW2>c2A|s9IF6(kMa%nNX4c{tE-|K-@{YwBhW^ z*xDCK2K!4Hq^iq|^1PSY6~sU>wrlmt=*w`5TdgH9(|dy&P<188FhpcO?B|7fL?{S` z;QxBfKuQf*I;7UhL(+iREL^MJv5Oc7LIvc>@F4QD3j0|beFLo7cnyw{>6Y}`Dkonm z_w8*;X3P>vQf$cXBJc|`rJrsfj4eBx zEj&yguytMomR#WZP~U31maQg7ZIg+QtVoFEK_!8;Uox)Cf7`(6+!F`6$QSdgI>D189{7q*6_Hh6vwsu-#nkv7-KY2bNsMW{d%BIiw?f#h z{d)hoZx&n%KyYpTgo*(l_px=1A# z!>#cRio&Ni&N=nLpL}kktaaa7-s7(g$AO{K8dR`su9{uO-w4r{DzY?oLF3uf_pB0^ zcY(Xe!;}SnCNRpP;~K-GZ{Z0?#YZ&S%~b>P^^`DIXgaRbYgf^!eo!g*h|5x8{|pa0 z5&TDK_&d<}KtM#%g_?~W0_)J+J#x#mSU}2V$9%-=H&$kYL!SFN%1KimagH%E`4X0dSW1W!Y;vK-oIZRz)vJH}#=n^U- zvjwMF!Ngt4B=1o@`%(#?JjLkw`e~~z02S7;{Nye>LdRRxJii7I%~@Djk497!5$hPr P807y0ZOqX0fNTH&;|vrC diff --git a/logs/debug-2.log.gz b/logs/debug-2.log.gz deleted file mode 100644 index e0b304662837b6e45169a4f584dc5851f53f93ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2270 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 diff --git a/logs/debug-3.log.gz b/logs/debug-3.log.gz deleted file mode 100644 index f7778419e324af3341174b92ee7400900f6d2046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmV;<05Sg`iwFP!00000|E-Qe4uUWcMfWD$VJ=_=#Hd{w#AsM)ToD%)25cy;X$K9r z7ZT!1UAcVo|K$D5UnO`A{V)Q5%>$p$1GZSKFOW4t>RG(qoOeA)!!#0gtR<(PlatformDependent0.java:282) ~[netty-common-4.1.82.Final.jar:4.1.82.Final] - at io.netty.util.internal.PlatformDependent.isAndroid(PlatformDependent.java:333) ~[netty-common-4.1.82.Final.jar:4.1.82.Final] - at io.netty.util.internal.PlatformDependent.(PlatformDependent.java:88) ~[netty-common-4.1.82.Final.jar:4.1.82.Final] - at io.netty.buffer.UnpooledByteBufAllocator.(UnpooledByteBufAllocator.java:37) ~[netty-buffer-4.1.82.Final.jar:4.1.82.Final] - at io.netty.buffer.Unpooled.(Unpooled.java:75) ~[netty-buffer-4.1.82.Final.jar:4.1.82.Final] - at thedarkcolour.exdeorum.recipe.BlockPredicateTest.networkTest(BlockPredicateTest.java:44) ~[test/:?] - at jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:?] - at jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) ~[?:?] - at jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:?] - at java.lang.reflect.Method.invoke(Method.java:568) ~[?:?] - at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:727) ~[junit-platform-commons-1.9.2.jar:1.9.2] - at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:156) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:147) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:86) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(InterceptingExecutableInvoker.java:103) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.lambda$invoke$0(InterceptingExecutableInvoker.java:93) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:64) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:45) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:37) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:92) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:86) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$7(TestMethodTestDescriptor.java:217) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:213) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:138) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:68) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:151) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at java.util.ArrayList.forEach(ArrayList.java:1511) ~[?:?] - at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at java.util.ArrayList.forEach(ArrayList.java:1511) ~[?:?] - at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:35) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:54) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:147) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:127) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:90) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:55) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:102) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:54) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:114) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:86) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.DefaultLauncherSession$DelegatingLauncher.execute(DefaultLauncherSession.java:86) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.SessionPerRequestLauncher.execute(SessionPerRequestLauncher.java:53) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:57) ~[junit5-rt.jar:?] - at com.intellij.rt.junit.IdeaTestRunner$Repeater$1.execute(IdeaTestRunner.java:38) ~[junit-rt.jar:?] - at com.intellij.rt.execution.junit.TestsRepeater.repeat(TestsRepeater.java:11) ~[idea_rt.jar:?] - at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:35) ~[junit-rt.jar:?] - at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:232) ~[junit-rt.jar:?] - at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:55) ~[junit-rt.jar:?] -[08Feb2024 13:05:39.596] [main/DEBUG] [io.netty.util.internal.PlatformDependent0/]: java.nio.Bits.unaligned: available, true -[08Feb2024 13:05:39.597] [main/DEBUG] [io.netty.util.internal.PlatformDependent0/]: jdk.internal.misc.Unsafe.allocateUninitializedArray(int): unavailable -java.lang.IllegalAccessException: class io.netty.util.internal.PlatformDependent0$7 cannot access class jdk.internal.misc.Unsafe (in module java.base) because module java.base does not export jdk.internal.misc to unnamed module @c33b74f - at jdk.internal.reflect.Reflection.newIllegalAccessException(Reflection.java:392) ~[?:?] - at java.lang.reflect.AccessibleObject.checkAccess(AccessibleObject.java:674) ~[?:?] - at java.lang.reflect.Method.invoke(Method.java:560) ~[?:?] - at io.netty.util.internal.PlatformDependent0$7.run(PlatformDependent0.java:410) ~[netty-common-4.1.82.Final.jar:4.1.82.Final] - at java.security.AccessController.doPrivileged(AccessController.java:318) ~[?:?] - at io.netty.util.internal.PlatformDependent0.(PlatformDependent0.java:401) ~[netty-common-4.1.82.Final.jar:4.1.82.Final] - at io.netty.util.internal.PlatformDependent.isAndroid(PlatformDependent.java:333) ~[netty-common-4.1.82.Final.jar:4.1.82.Final] - at io.netty.util.internal.PlatformDependent.(PlatformDependent.java:88) ~[netty-common-4.1.82.Final.jar:4.1.82.Final] - at io.netty.buffer.UnpooledByteBufAllocator.(UnpooledByteBufAllocator.java:37) ~[netty-buffer-4.1.82.Final.jar:4.1.82.Final] - at io.netty.buffer.Unpooled.(Unpooled.java:75) ~[netty-buffer-4.1.82.Final.jar:4.1.82.Final] - at thedarkcolour.exdeorum.recipe.BlockPredicateTest.networkTest(BlockPredicateTest.java:44) ~[test/:?] - at jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:?] - at jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) ~[?:?] - at jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:?] - at java.lang.reflect.Method.invoke(Method.java:568) ~[?:?] - at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:727) ~[junit-platform-commons-1.9.2.jar:1.9.2] - at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:156) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:147) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:86) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(InterceptingExecutableInvoker.java:103) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.lambda$invoke$0(InterceptingExecutableInvoker.java:93) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:64) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:45) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:37) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:92) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:86) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$7(TestMethodTestDescriptor.java:217) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:213) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:138) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:68) ~[junit-jupiter-engine-5.9.2.jar:5.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:151) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at java.util.ArrayList.forEach(ArrayList.java:1511) ~[?:?] - at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at java.util.ArrayList.forEach(ArrayList.java:1511) ~[?:?] - at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:41) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:155) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:141) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$9(NodeTestTask.java:139) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:138) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:95) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:35) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:54) ~[junit-platform-engine-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:147) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:127) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:90) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:55) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:102) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:54) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:114) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:86) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.DefaultLauncherSession$DelegatingLauncher.execute(DefaultLauncherSession.java:86) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at org.junit.platform.launcher.core.SessionPerRequestLauncher.execute(SessionPerRequestLauncher.java:53) ~[junit-platform-launcher-1.9.2.jar:1.9.2] - at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:57) ~[junit5-rt.jar:?] - at com.intellij.rt.junit.IdeaTestRunner$Repeater$1.execute(IdeaTestRunner.java:38) ~[junit-rt.jar:?] - at com.intellij.rt.execution.junit.TestsRepeater.repeat(TestsRepeater.java:11) ~[idea_rt.jar:?] - at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:35) ~[junit-rt.jar:?] - at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:232) ~[junit-rt.jar:?] - at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:55) ~[junit-rt.jar:?] -[08Feb2024 13:05:39.601] [main/DEBUG] [io.netty.util.internal.PlatformDependent0/]: java.nio.DirectByteBuffer.(long, int): unavailable -[08Feb2024 13:05:39.601] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: sun.misc.Unsafe: available -[08Feb2024 13:05:39.601] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: maxDirectMemory: 8417968128 bytes (maybe) -[08Feb2024 13:05:39.601] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: -Dio.netty.tmpdir: C:\Users\Max\AppData\Local\Temp (java.io.tmpdir) -[08Feb2024 13:05:39.602] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: -Dio.netty.bitMode: 64 (sun.arch.data.model) -[08Feb2024 13:05:39.602] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: Platform: Windows -[08Feb2024 13:05:39.603] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: -Dio.netty.maxDirectMemory: -1 bytes -[08Feb2024 13:05:39.603] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: -Dio.netty.uninitializedArrayAllocationThreshold: -1 -[08Feb2024 13:05:39.604] [main/DEBUG] [io.netty.util.internal.CleanerJava9/]: java.nio.ByteBuffer.cleaner(): available -[08Feb2024 13:05:39.605] [main/DEBUG] [io.netty.util.internal.PlatformDependent/]: -Dio.netty.noPreferDirect: false -[08Feb2024 13:05:39.611] [main/DEBUG] [io.netty.buffer.AbstractByteBuf/]: -Dio.netty.buffer.checkAccessible: true -[08Feb2024 13:05:39.611] [main/DEBUG] [io.netty.buffer.AbstractByteBuf/]: -Dio.netty.buffer.checkBounds: true -[08Feb2024 13:05:39.612] [main/DEBUG] [io.netty.util.ResourceLeakDetectorFactory/]: Loaded default ResourceLeakDetector: io.netty.util.ResourceLeakDetector@200ef05b -[08Feb2024 13:05:39.627] [main/DEBUG] [io.netty.util.internal.InternalThreadLocalMap/]: -Dio.netty.threadLocalMap.stringBuilder.initialSize: 1024 -[08Feb2024 13:05:39.628] [main/DEBUG] [io.netty.util.internal.InternalThreadLocalMap/]: -Dio.netty.threadLocalMap.stringBuilder.maxSize: 4096 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.numHeapArenas: 32 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.numDirectArenas: 32 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.pageSize: 8192 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.maxOrder: 9 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.chunkSize: 4194304 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.smallCacheSize: 256 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.normalCacheSize: 64 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.maxCachedBufferCapacity: 32768 -[08Feb2024 13:05:39.632] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.cacheTrimInterval: 8192 -[08Feb2024 13:05:39.633] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.cacheTrimIntervalMillis: 0 -[08Feb2024 13:05:39.633] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.useCacheForAllThreads: false -[08Feb2024 13:05:39.633] [main/DEBUG] [io.netty.buffer.PooledByteBufAllocator/]: -Dio.netty.allocator.maxCachedByteBuffersPerChunk: 1023 -[08Feb2024 13:05:39.642] [main/DEBUG] [io.netty.buffer.ByteBufUtil/]: -Dio.netty.allocator.type: pooled -[08Feb2024 13:05:39.643] [main/DEBUG] [io.netty.buffer.ByteBufUtil/]: -Dio.netty.threadLocalDirectBufferSize: 0 -[08Feb2024 13:05:39.643] [main/DEBUG] [io.netty.buffer.ByteBufUtil/]: -Dio.netty.maxThreadLocalCharBufferSize: 16384 diff --git a/logs/latest.log b/logs/latest.log deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jade/InfestedLeavesComponentProvider.java b/src/main/java/thedarkcolour/exdeorum/compat/jade/InfestedLeavesComponentProvider.java index d12d4db9..cffe0873 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jade/InfestedLeavesComponentProvider.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jade/InfestedLeavesComponentProvider.java @@ -18,7 +18,6 @@ package thedarkcolour.exdeorum.compat.jade; -import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import snownee.jade.api.BlockAccessor; diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/ClientJeiUtil.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/ClientJeiUtil.java index fbdf6adb..3fb88a84 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/ClientJeiUtil.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/ClientJeiUtil.java @@ -68,7 +68,9 @@ import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; import org.joml.Vector3f; import thedarkcolour.exdeorum.compat.ModIds; +import thedarkcolour.exdeorum.data.TranslationKeys; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -80,6 +82,7 @@ class ClientJeiUtil { // From https://github.com/The-Aether-Team/Nitrogen/blob/1.20.1-develop/src/main/java/com/aetherteam/nitrogen/integration/jei/BlockStateRenderer.java private static final Vector3f L1 = new Vector3f(0.4F, 0.0F, 1.0F).normalize(); private static final Vector3f L2 = new Vector3f(-0.4F, 1.0F, -0.2F).normalize(); + static final DecimalFormat FORMATTER = new DecimalFormat(); // https://github.com/way2muchnoise/JustEnoughResources/blob/89ee40ff068c8d6eb6ab103f76381445691cffc9/Common/src/main/java/jeresources/util/RenderHelper.java#L100 static void renderBlock(GuiGraphics guiGraphics, BlockState block, float x, float y, float z, float scale, RenderBlockFn renderFunction) { @@ -214,6 +217,12 @@ class ClientJeiUtil { } } + // Takes a decimal probability and returns a user-friendly percentage value + public static Component formatChance(double probability) { + var chance = FORMATTER.format(probability * 100); + return Component.translatable(TranslationKeys.SIEVE_RECIPE_CHANCE, chance).withStyle(ChatFormatting.GRAY); + } + @FunctionalInterface interface RenderBlockFn { void renderBlock(BlockState block, PoseStack poseStack, MultiBufferSource.BufferSource buffers); diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/CrookCategory.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/CrookCategory.java index 5d25089c..eabaa1db 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/CrookCategory.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/CrookCategory.java @@ -101,7 +101,7 @@ public class CrookCategory implements IRecipeCategory { public void setRecipe(IRecipeLayoutBuilder builder, CrookJeiRecipe recipe, IFocusGroup focuses) { recipe.addIngredients(builder); builder.addSlot(RecipeIngredientRole.OUTPUT, 80, 18).addItemStack(new ItemStack(recipe.result)).addTooltipCallback((recipeSlotView, tooltip) -> { - tooltip.add(SieveCategory.formatChance(recipe.chance)); + tooltip.add(ClientJeiUtil.formatChance(recipe.chance)); }); } diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/SieveCategory.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/SieveCategory.java index 2d162854..6d27db2a 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/SieveCategory.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/SieveCategory.java @@ -32,7 +32,6 @@ import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.storage.loot.providers.number.BinomialDistributionGenerator; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; @@ -44,18 +43,15 @@ import thedarkcolour.exdeorum.data.TranslationKeys; import thedarkcolour.exdeorum.recipe.RecipeUtil; import thedarkcolour.exdeorum.registry.EBlocks; -import java.text.DecimalFormat; - class SieveCategory implements IRecipeCategory { - private static final DecimalFormat FORMATTER = new DecimalFormat(); private static final Component BY_HAND_ONLY_LABEL = Component.translatable(TranslationKeys.SIEVE_RECIPE_BY_HAND_ONLY).withStyle(ChatFormatting.RED); public static final int WIDTH = 162; public static final int ROW_START = 28; static { - FORMATTER.setMinimumFractionDigits(0); - FORMATTER.setMaximumFractionDigits(3); + ClientJeiUtil.FORMATTER.setMinimumFractionDigits(0); + ClientJeiUtil.FORMATTER.setMaximumFractionDigits(3); } private final Lazy background; @@ -105,13 +101,6 @@ class SieveCategory implements IRecipeCategory { } } - // Takes a decimal probability and returns a user-friendly percentage value - // todo move into JeiUtil - public static Component formatChance(double probability) { - var chance = FORMATTER.format(probability * 100); - return Component.translatable(TranslationKeys.SIEVE_RECIPE_CHANCE, chance).withStyle(ChatFormatting.GRAY); - } - public static void addTooltips(IRecipeSlotBuilder slot, boolean byHandOnly, NumberProvider provider) { var tooltipLines = new ImmutableList.Builder(); @@ -121,7 +110,7 @@ class SieveCategory implements IRecipeCategory { } if (provider instanceof BinomialDistributionGenerator binomial) { if (binomial.n instanceof ConstantValue constant && constant.value == 1) { - var chanceLabel = formatChance(RecipeUtil.getExpectedValue(binomial.p)); + var chanceLabel = ClientJeiUtil.formatChance(RecipeUtil.getExpectedValue(binomial.p)); tooltipLines.add(chanceLabel); } else { addAvgOutput(tooltipLines, RecipeUtil.getExpectedValue(provider)); @@ -146,14 +135,14 @@ class SieveCategory implements IRecipeCategory { } private static void addAvgOutput(ImmutableList.Builder tooltipLines, double avgValue) { - String avgOutput = FORMATTER.format(avgValue); + String avgOutput = ClientJeiUtil.FORMATTER.format(avgValue); tooltipLines.add(Component.translatable(TranslationKeys.SIEVE_RECIPE_AVERAGE_OUTPUT, avgOutput).withStyle(ChatFormatting.GRAY)); } // when the player holds shift, they can see the min/max amounts of a drop private static void addMinMaxes(ImmutableList.Builder tooltipLines, NumberProvider min, NumberProvider max) { - var minFormatted = FORMATTER.format(RecipeUtil.getExpectedValue(min)); - var maxFormatted = FORMATTER.format(RecipeUtil.getExpectedValue(max)); + var minFormatted = ClientJeiUtil.FORMATTER.format(RecipeUtil.getExpectedValue(min)); + var maxFormatted = ClientJeiUtil.FORMATTER.format(RecipeUtil.getExpectedValue(max)); tooltipLines.add(Component.translatable(TranslationKeys.SIEVE_RECIPE_MIN_OUTPUT, minFormatted).withStyle(ChatFormatting.GRAY)); tooltipLines.add(Component.translatable(TranslationKeys.SIEVE_RECIPE_MAX_OUTPUT, maxFormatted).withStyle(ChatFormatting.GRAY)); diff --git a/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java b/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java index 4e421139..eb7e9e4b 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java @@ -28,7 +28,6 @@ import dev.latvian.mods.rhino.util.HideFromJS; import net.minecraft.advancements.critereon.StatePropertiesPredicate; import net.minecraft.commands.arguments.blocks.BlockStateParser; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.util.StringRepresentable; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; @@ -39,7 +38,6 @@ import thedarkcolour.exdeorum.recipe.BlockPredicate; import thedarkcolour.exdeorum.recipe.crucible.FinishedCrucibleHeatRecipe; import thedarkcolour.exdeorum.registry.ERecipeTypes; -import java.util.Comparator; import java.util.function.Consumer; @SuppressWarnings("unused") diff --git a/src/main/java/thedarkcolour/exdeorum/compat/top/ExDeorumInfoProvider.java b/src/main/java/thedarkcolour/exdeorum/compat/top/ExDeorumInfoProvider.java index 56480e1f..5687af0f 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/top/ExDeorumInfoProvider.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/top/ExDeorumInfoProvider.java @@ -19,7 +19,6 @@ package thedarkcolour.exdeorum.compat.top; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import kroppeb.stareval.element.token.BinaryOperatorToken; import mcjty.theoneprobe.api.*; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/src/main/java/thedarkcolour/exdeorum/data/BlockLoot.java b/src/main/java/thedarkcolour/exdeorum/data/BlockLoot.java index 6a778aa9..0d022b78 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/BlockLoot.java +++ b/src/main/java/thedarkcolour/exdeorum/data/BlockLoot.java @@ -21,7 +21,6 @@ package thedarkcolour.exdeorum.data; import net.minecraft.core.registries.Registries; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; -import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.storage.loot.BuiltInLootTables; import net.minecraft.world.level.storage.loot.LootPool; @@ -29,10 +28,8 @@ import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import thedarkcolour.exdeorum.ExDeorum; -import thedarkcolour.exdeorum.block.MechanicalHammerBlock; import thedarkcolour.exdeorum.loot.MachineLootFunction; import thedarkcolour.exdeorum.registry.EBlocks; -import thedarkcolour.exdeorum.registry.EItems; import thedarkcolour.modkit.MKUtils; import java.util.ArrayList; diff --git a/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java b/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java index acb5cc3b..2018dd78 100644 --- a/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java +++ b/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java @@ -56,7 +56,6 @@ import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLEnvironment; import thedarkcolour.exdeorum.ExDeorum; -import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity; import thedarkcolour.exdeorum.blockentity.helper.ItemHelper; import thedarkcolour.exdeorum.client.CompostColors; import thedarkcolour.exdeorum.compat.ModIds; diff --git a/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java index b554269b..4cdbb809 100644 --- a/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java +++ b/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java @@ -36,7 +36,6 @@ import net.minecraftforge.common.loot.LootModifier; import org.jetbrains.annotations.NotNull; import thedarkcolour.exdeorum.recipe.RecipeUtil; import thedarkcolour.exdeorum.recipe.crook.CrookRecipe; -import thedarkcolour.exdeorum.registry.EItems; import java.util.List; diff --git a/src/test/java/thedarkcolour/exdeorum/recipe/RecipeUtilTest.java b/src/test/java/thedarkcolour/exdeorum/recipe/RecipeUtilTest.java index bf8486ce..5e86d255 100644 --- a/src/test/java/thedarkcolour/exdeorum/recipe/RecipeUtilTest.java +++ b/src/test/java/thedarkcolour/exdeorum/recipe/RecipeUtilTest.java @@ -19,17 +19,12 @@ package thedarkcolour.exdeorum.recipe; import net.minecraft.SharedConstants; -import net.minecraft.WorldVersion; import net.minecraft.server.Bootstrap; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraftforge.common.Tags; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import thedarkcolour.exdeorum.recipe.RecipeUtil; - -import java.io.IOException; import static org.junit.jupiter.api.Assertions.*;