From d147681c26f84da1efb4a573a5c492c995e60b4e Mon Sep 17 00:00:00 2001 From: chill Date: Sat, 20 May 2023 18:55:27 +0200 Subject: [PATCH] Refactoring (#30) * update buildscript * address gradle warning about insecure connection * simplify bit shift * nested enums are implicitly static See https://stackoverflow.com/questions/663834/in-java-are-enum-types-inside-a-class-static * enum constructors are private by design See https://stackoverflow.com/questions/36286178/java-enum-constructors-private * semicolon not needed * replace anonymous class with standard init The anonymous init takes more space and is harder to understand. * improve javadoc * remove duplicate case in switch * improve javadoc * simplify float * simplify init * remove redundant casts * minor nitpick on a comment * rename BACKGROUND to lowercase * put on separate lines * remove reduntant semicolons * simplify isEmpty * remove commented code, improve javadocs * spotless * gradle update buildscript * explain why >> 0 stays * Revert "remove redundant casts" This reverts commit e7bf60e1d2f64b42431f9757e7be148f1d64af3d. * suppress the inspection for redundant casts They are kept to clarify what the functions accepts. * spotless vs intellij Our battle will be legendary! --- build.gradle | 29 +++++++++++---- gradle/wrapper/gradle-wrapper.jar | Bin 61608 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 +-- repositories.gradle | 2 +- .../client/gui/GuiAdvancedMemoryCard.kt | 4 +-- .../betterp2p/client/gui/InfoFilter.kt | 8 ++--- .../betterp2p/client/gui/InfoList.kt | 11 +++--- .../client/gui/widget/WidgetButton.kt | 2 +- .../client/gui/widget/WidgetP2PColumn.kt | 10 +----- .../client/gui/widget/WidgetP2PDevice.kt | 4 +-- .../client/render/OutlineRenderer.java | 16 +++------ .../client/render/ShadowRenderer.java | 32 +++++------------ .../betterp2p/client/render/WorldRenderer.kt | 1 - .../network/ServerTransportHandler.kt | 2 +- .../betterp2p/util/GlStateManager.java | 34 +++++++++--------- .../betterp2p/util/p2p/P2PStatus.kt | 1 - .../betterp2p/util/p2p/P2PUtil.kt | 9 ++--- 18 files changed, 78 insertions(+), 93 deletions(-) diff --git a/build.gradle b/build.gradle index 6243482..a8b7532 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1683056771 +//version: 1684218858 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -69,10 +69,10 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14' } -print("You might want to check out './gradlew :faq' if your build fails.") +print("You might want to check out './gradlew :faq' if your build fails.\n") boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -222,6 +222,8 @@ if (enableModernJavaSyntax.toBoolean()) { dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } @@ -567,9 +569,10 @@ repositories { def mixinProviderGroup = "io.github.legacymoddingmc" def mixinProviderModule = "unimixins" -def mixinProviderVersion = "0.1.6" +def mixinProviderVersion = "0.1.7.1" def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" +ext.mixinProviderSpec = mixinProviderSpec dependencies { if (usesMixins.toBoolean()) { @@ -727,7 +730,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -820,6 +823,18 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { } this.classpath(project.java17DependenciesCfg) } + + public void setup(Project project) { + super.setup(project) + if (project.usesMixins.toBoolean()) { + this.extraJvmArgs.addAll(project.provider(() -> { + def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec)) + mixinCfg.canBeConsumed = false + mixinCfg.transitive = false + enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : [] + })) + } + } } def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") @@ -1264,7 +1279,9 @@ tasks.register('faq') { print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " + "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + "The links can be found in repositories.gradle and build.gradle:repositories, " + - "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.") + "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7710deaf9f98673a68957ea02138b60d0a..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 5107 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 I6Xdi10eY*&F8}}l delta 5094 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/repositories.gradle b/repositories.gradle index 1f88140..6b18906 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -4,7 +4,7 @@ repositories { maven { name 'GTNH Maven' url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/' - allowInsecureProtocol + allowInsecureProtocol = true } maven { url 'https://cursemaven.com' diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt index 387f1f1..3f26403 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt @@ -86,7 +86,7 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { ) } - val BACKGROUND: ResourceLocation = ResourceLocation(MODID, "textures/gui/advanced_memory_card.png") + val background: ResourceLocation = ResourceLocation(MODID, "textures/gui/advanced_memory_card.png") private val selectedInfo: InfoWrapper? get() = infos.selectedInfo @@ -522,7 +522,7 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { } private fun drawBackground() { - bindTexture(BACKGROUND) + bindTexture(background) val tessellator = Tessellator.instance // Draw the top part drawTexturedQuad(tessellator, diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoFilter.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoFilter.kt index da59cb5..443adcc 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoFilter.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoFilter.kt @@ -69,8 +69,8 @@ class InfoFilter { } /** - * The different filter types. Probably will let these be adjustable in the - * config. + * Holds different filter types. + * TODO they will probably be adjustable in the config. */ enum class Filter(val pattern: Regex, val filter: (InfoWrapper, List?) -> Boolean) { INPUT("\\A@in\\z".toRegex(), { it, _ -> !it.output }), @@ -89,7 +89,7 @@ enum class Filter(val pattern: Regex, val filter: (InfoWrapper, List?) - NAME("\"?.+\"?".toRegex(), filter@{ it, strs -> val name = it.name.lowercase() for (f in strs!!) { - // Ppl better not troll and use double quotes in their P2P tunnel names + // Double quotes will likely break P2P tunneling val query = f.removeSurrounding("\"") if (name.contains(query)) { return@filter true @@ -99,7 +99,7 @@ enum class Filter(val pattern: Regex, val filter: (InfoWrapper, List?) - }); } -// I spent 10 minutes on this until I gave up... regex wtf +// Splitting a string with regex is hard. // https://stackoverflow.com/questions/366202/regex-for-splitting-a-string-using-space-when-not-surrounded-by-single-or-double val SEARCH_REGEX = "[^\\s\"']+|\"([^\"]*)\"|'([^']*)'".toRegex() diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoList.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoList.kt index 39e36e1..8f05c0b 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoList.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoList.kt @@ -53,12 +53,12 @@ class InfoList (initList: Collection, fun resort() { sorted.sortBy { if (it.code == selectedEntry) { - -2 // Put the selected p2p in the front + -2 // Put the selected p2p at the front // Non-Zero frequencies } else if (it.frequency != 0L && it.frequency == selectedInfo?.frequency && !it.output) { - -3 // Put input in the beginning + -3 // Put input at the beginning } else if (it.frequency != 0.toLong() && it.frequency == selectedInfo?.frequency) { - -1 // Put same frequency in the front + -1 // Put same frequency at the front } else { // Frequencies from lowest to highest it.frequency + Short.MAX_VALUE @@ -85,7 +85,8 @@ class InfoList (initList: Collection, when { it.code == selectedEntry -> Long.MIN_VALUE + 1 it.frequency != 0L && it.frequency == selectedInfo?.frequency && !it.output -> Long.MIN_VALUE - it.frequency != 0.toLong() && it.frequency == selectedInfo?.frequency -> Long.MIN_VALUE + 2 // Put same frequency in the front + // Put the same frequency to the front + it.frequency != 0.toLong() && it.frequency == selectedInfo?.frequency -> Long.MIN_VALUE + 2 filter.activeFilters.containsKey(Filter.NAME) -> { var hits = 0L var name = it.name @@ -126,7 +127,7 @@ class InfoList (initList: Collection, } /** - * Update the master list, and send the changes downstream to sorted/filtered + * Updates the master list and sends the changes downstream to sorted/filtered. */ fun update(updateList: Collection) { updateList.forEach { masterMap[it.code] = it } diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetButton.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetButton.kt index d7f90e1..2eb37ff 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetButton.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetButton.kt @@ -38,7 +38,7 @@ abstract class WidgetButton(val gui: GuiAdvancedMemoryCard, x: Int, y: Int, widt } open fun drawBG(tessellator: Tessellator, mouseX: Int, mouseY: Int, partialTicks: Float) { - gui.bindTexture(gui.BACKGROUND) + gui.bindTexture(gui.background) GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f) field_146123_n = mouseX >= xPosition && mouseY >= yPosition && mouseX < xPosition + width && mouseY < yPosition + height val k = getHoverState(field_146123_n) diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt index 68db094..928a509 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PColumn.kt @@ -58,7 +58,7 @@ class WidgetP2PColumn(private val gui: GuiAdvancedMemoryCard, for (widget in entries){ widget.renderNameTextField = true } - if(renameBar.info != null && !renameBar.text.isEmpty() && renameBar.info.name != renameBar.text){ + if(renameBar.info != null && renameBar.text.isNotEmpty() && renameBar.info.name != renameBar.text){ val info:InfoWrapper = renameBar.info renameBar.text = renameBar.text.trim() ModNetwork.channel.sendToServer(C2SP2PTunnelInfo(P2PTunnelInfo(info.posX,info.posY,info.posZ,info.dim, ForgeDirection.valueOf(info.facing.name).ordinal,renameBar.text))) @@ -69,19 +69,11 @@ class WidgetP2PColumn(private val gui: GuiAdvancedMemoryCard, renameBar.info = null } -//private fun transportPlayer(info: InfoWrapper){ -// Minecraft.getMinecraft().thePlayer.closeScreen() -// ModNetwork.channel.sendToServer(C2STransportPlayer(P2PTunnelInfo(info.posX,info.posY,info.posZ,info.dim,0))) -//} - /** * Called when rename button "area" is clicked. Rename text bar must be * visible after this is called. */ private fun onRenameButtonClicked(info:InfoWrapper, index: Int) { -// if (GuiScreen.isShiftKeyDown()) { -// transportPlayer(info) -// } renameBar.isVisible = true renameBar.y = (this.y) + index * (P2PEntryConstants.HEIGHT + 1) + 1 renameBar.x = this.x + 50 diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt index f917abe..29f9f9c 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt @@ -82,9 +82,9 @@ class WidgetP2PDevice(private val selectedInfoProperty: KProperty0 GuiScreen.drawRect(x, y, x + P2PEntryConstants.WIDTH, y + P2PEntryConstants.HEIGHT, P2PEntryConstants.OUTPUT_COLOR) } GL11.glColor3f(255f, 255f, 255f) - // Draw our icons... + // Draw our icons drawBlockIcon(gui.mc, info.icon, info.overlay, x + 3, y + 3) - gui.bindTexture(gui.BACKGROUND) + gui.bindTexture(gui.background) if (info.output) { drawTexturedQuad(Tessellator.instance, x.toDouble(), y + 4.0, x + 16.0, y + 20.0, 144.0 / GUI_WIDTH, 200.0 / GUI_TEX_HEIGHT, 160.0 / GUI_WIDTH, 216.0 / GUI_TEX_HEIGHT) diff --git a/src/main/java/com/projecturanus/betterp2p/client/render/OutlineRenderer.java b/src/main/java/com/projecturanus/betterp2p/client/render/OutlineRenderer.java index 86cb570..ec3a7d0 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/render/OutlineRenderer.java +++ b/src/main/java/com/projecturanus/betterp2p/client/render/OutlineRenderer.java @@ -15,14 +15,10 @@ import com.projecturanus.betterp2p.util.GlStateManager; import kotlin.Pair; /** - * Everything in this inner class is From a mod that has MIT license owned by romelo333 and maintained by McJty - * - * License is here: https://github.com/romelo333/notenoughwands1.8.8/blob/master/LICENSE - * - * Specific source of code from the GenericWand class: - * https://github.com/romelo333/notenoughwands1.8.8/blob/20952f50e7c1ab3fd676ed3da302666295e3cac8/src/main/java/romelo333/notenoughwands/Items/GenericWand.java - * - * Version 1.1: Edited to support rotation + * This class is based on the GenericWand + * class from a mod with MIT license. + * Source license */ public class OutlineRenderer { @@ -49,10 +45,7 @@ public class OutlineRenderer { private static void renderOutlines(Collection> coordinates, int r, int g, int b, int thickness) { Tessellator tessellator = Tessellator.instance; - // net.minecraft.client.renderer.VertexBuffer - // BufferBuilder buffer = tessellator.getBuffer(); tessellator.startDrawing(GL11.GL_LINES); - // GlStateManager.color(r / 255.0f, g / 255.0f, b / 255.0f); GL11.glLineWidth(thickness); for (List coordinate : coordinates) { float x = coordinate.get(0); @@ -115,7 +108,6 @@ public class OutlineRenderer { private static void renderOutlinesWithFacing(Collection, ForgeDirection>> coordinates, double x, double y, double z, int r, int g, int b, int thickness) { Tessellator tessellator = Tessellator.instance; - // BufferBuilder buffer = tessellator.getBuffer(); for (Pair, ForgeDirection> coordinate : coordinates) { List pos = coordinate.component1(); diff --git a/src/main/java/com/projecturanus/betterp2p/client/render/ShadowRenderer.java b/src/main/java/com/projecturanus/betterp2p/client/render/ShadowRenderer.java index 4f2e69e..e1edabb 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/render/ShadowRenderer.java +++ b/src/main/java/com/projecturanus/betterp2p/client/render/ShadowRenderer.java @@ -15,19 +15,11 @@ import org.lwjgl.opengl.GL11; import com.projecturanus.betterp2p.util.GlStateManager; /** - * Functions from this inner class are not authored by me (Sam Bassett aka Lothrazar) they are from BuildersGuides by - * - * @author Ipsis - * - * All credit goes to author for this - * - * Source code: https://github.com/Ipsis/BuildersGuides Source License - * https://github.com/Ipsis/BuildersGuides/blob/master/COPYING.LESSER - * - * I used and modified two functions from this library - * https://github.com/Ipsis/BuildersGuides/blob/master/src/main/java/ipsis/buildersguides/util/RenderUtils.java - * - * + * This class uses the code from BuildersGuides. Source code + * Source license In particular, two + * functions of RenderUtils + * were used. */ @SuppressWarnings("serial") public class ShadowRenderer { @@ -37,12 +29,9 @@ public class ShadowRenderer { if (p == null) { return; } - renderBlockList(new ArrayList>() { - - { - add(p); - } - }, center, relX, relY, relZ, red, green, blue); + ArrayList> blockPosList = new ArrayList<>(); + blockPosList.add(p); + renderBlockList(blockPosList, center, relX, relY, relZ, red, green, blue); } public static void renderBlockPhantom(World world, final List pos, ItemStack stack, final double relX, @@ -58,9 +47,7 @@ public class ShadowRenderer { int xOffset = target.get(0) - pos.get(0); int yOffset = target.get(1) - pos.get(1); int zOffset = target.get(2) - pos.get(2); - // final BlockRendererDispatcher blockRenderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); Tessellator tessellator = Tessellator.instance; - // BufferBuilder bufferBuilder = tessellator.getBuffer(); GlStateManager.pushMatrix(); // this first translate is to make relative to TE and everything GlStateManager.translate(relX + 0.5F, relY + 0.5F, relZ + 0.5F); @@ -113,9 +100,8 @@ public class ShadowRenderer { } private static void shadedCube(float scale) { - float size = 1.0F * scale; + float size = scale; Tessellator tessellator = Tessellator.instance; - // BufferBuilder worldRenderer = tessellator.getBuffer(); // Front - anticlockwise vertices // Back - clockwise vertices tessellator.startDrawing(GL11.GL_QUADS); diff --git a/src/main/java/com/projecturanus/betterp2p/client/render/WorldRenderer.kt b/src/main/java/com/projecturanus/betterp2p/client/render/WorldRenderer.kt index 66023d5..4f46406 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/render/WorldRenderer.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/render/WorldRenderer.kt @@ -44,7 +44,6 @@ object WorldRenderer { fun shadedCube(scale: Float) { val size = 1.0 * scale val tessellator = Tessellator.instance - //val worldRenderer = tessellator.buffer // Front - anticlockwise vertices // Back - clockwise vertices tessellator.startDrawing(GL11.GL_QUADS) diff --git a/src/main/java/com/projecturanus/betterp2p/network/ServerTransportHandler.kt b/src/main/java/com/projecturanus/betterp2p/network/ServerTransportHandler.kt index 2a8d23c..76be13e 100644 --- a/src/main/java/com/projecturanus/betterp2p/network/ServerTransportHandler.kt +++ b/src/main/java/com/projecturanus/betterp2p/network/ServerTransportHandler.kt @@ -1,4 +1,4 @@ -package com.projecturanus.betterp2p.network; +package com.projecturanus.betterp2p.network import cpw.mods.fml.common.network.simpleimpl.IMessage diff --git a/src/main/java/com/projecturanus/betterp2p/util/GlStateManager.java b/src/main/java/com/projecturanus/betterp2p/util/GlStateManager.java index 8912311..dad27b7 100644 --- a/src/main/java/com/projecturanus/betterp2p/util/GlStateManager.java +++ b/src/main/java/com/projecturanus/betterp2p/util/GlStateManager.java @@ -18,6 +18,8 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Copied from forge 1.12.2-14.23.5.2847 net.minecraft.client.renderer.GlStateManager */ +// We keep the redundant casts to clarify what the function accepts as an input +@SuppressWarnings("RedundantCast") @SideOnly(Side.CLIENT) public class GlStateManager { @@ -184,6 +186,8 @@ public class GlStateManager { public static void enableOutlineMode(int color) { BUF_FLOAT_4.put(0, (float) (color >> 16 & 255) / 255.0F); BUF_FLOAT_4.put(1, (float) (color >> 8 & 255) / 255.0F); + // We keep ">> 0" to convey that we extract the LSB + // noinspection PointlessBitwiseExpression BUF_FLOAT_4.put(2, (float) (color >> 0 & 255) / 255.0F); BUF_FLOAT_4.put(3, (float) (color >> 24 & 255) / 255.0F); glTexEnv(8960, 8705, BUF_FLOAT_4); @@ -335,8 +339,6 @@ public class GlStateManager { private static GlStateManager.TexGenCoord texGenCoord(GlStateManager.TexGen texGen) { switch (texGen) { - case S: - return texGenState.s; case T: return texGenState.t; case R: @@ -815,10 +817,6 @@ public class GlStateManager { } public Color(float redIn, float greenIn, float blueIn, float alphaIn) { - this.red = 1.0F; - this.green = 1.0F; - this.blue = 1.0F; - this.alpha = 1.0F; this.red = redIn; this.green = greenIn; this.blue = blueIn; @@ -869,7 +867,7 @@ public class GlStateManager { } @SideOnly(Side.CLIENT) - public static enum CullFace { + public enum CullFace { FRONT(1028), BACK(1029), @@ -877,7 +875,7 @@ public class GlStateManager { public final int mode; - private CullFace(int modeIn) { + CullFace(int modeIn) { this.mode = modeIn; } } @@ -909,7 +907,7 @@ public class GlStateManager { } @SideOnly(Side.CLIENT) - public static enum DestFactor { + public enum DestFactor { CONSTANT_ALPHA(32771), CONSTANT_COLOR(32769), @@ -928,13 +926,13 @@ public class GlStateManager { public final int factor; - private DestFactor(int factorIn) { + DestFactor(int factorIn) { this.factor = factorIn; } } @SideOnly(Side.CLIENT) - public static enum FogMode { + public enum FogMode { LINEAR(9729), EXP(2048), @@ -943,7 +941,7 @@ public class GlStateManager { /** The capability ID of this {@link FogMode} */ public final int capabilityId; - private FogMode(int capabilityIn) { + FogMode(int capabilityIn) { this.capabilityId = capabilityIn; } } @@ -966,7 +964,7 @@ public class GlStateManager { } @SideOnly(Side.CLIENT) - public static enum LogicOp { + public enum LogicOp { AND(5377), AND_INVERTED(5380), @@ -987,7 +985,7 @@ public class GlStateManager { public final int opcode; - private LogicOp(int opcodeIn) { + LogicOp(int opcodeIn) { this.opcode = opcodeIn; } } @@ -1007,7 +1005,7 @@ public class GlStateManager { } @SideOnly(Side.CLIENT) - public static enum SourceFactor { + public enum SourceFactor { CONSTANT_ALPHA(32771), CONSTANT_COLOR(32769), @@ -1027,7 +1025,7 @@ public class GlStateManager { public final int factor; - private SourceFactor(int factorIn) { + SourceFactor(int factorIn) { this.factor = factorIn; } } @@ -1063,11 +1061,11 @@ public class GlStateManager { } @SideOnly(Side.CLIENT) - public static enum TexGen { + public enum TexGen { S, T, R, - Q; + Q } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PStatus.kt b/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PStatus.kt index d91de87..cd5dda9 100644 --- a/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PStatus.kt +++ b/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PStatus.kt @@ -25,7 +25,6 @@ class P2PStatus(val grid: IGrid, val player: EntityPlayer, type: Int) { */ var lastP2PType: Int = type - /** * Refreshes the p2p list */ diff --git a/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PUtil.kt b/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PUtil.kt index 046c4f8..14db77c 100644 --- a/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PUtil.kt +++ b/src/main/java/com/projecturanus/betterp2p/util/p2p/P2PUtil.kt @@ -48,7 +48,7 @@ fun linkP2P(player: EntityPlayer, inputIndex: Long, outputIndex: Long, status: P if (input.frequency == 0L || input.isOutput) { frequency = System.currentTimeMillis() } - // If tunnel was already bound, unbind that one. + // If tunnel was already bound, unbind that one if (cache.getInput(frequency) != null) { val originalInput = cache.getInput(frequency) if (originalInput != input) { @@ -59,7 +59,8 @@ fun linkP2P(player: EntityPlayer, inputIndex: Long, outputIndex: Long, status: P val outputResult: PartP2PTunnel<*> = updateP2P(output, frequency, true, player, input.customName) if (input is PartP2PInterface && output is PartP2PInterface) { // For input and output, retain upgrades, items, and settings. - inputResult as PartP2PInterface; outputResult as PartP2PInterface + inputResult as PartP2PInterface + outputResult as PartP2PInterface val upgradesIn = input.interfaceDuality.getInventoryByName("upgrades") as UpgradeInventory upgradesIn.forEachIndexed { index, stack -> (inputResult.interfaceDuality.getInventoryByName("upgrades") as UpgradeInventory).setInventorySlotContents(index, stack) @@ -85,12 +86,12 @@ fun linkP2P(player: EntityPlayer, inputIndex: Long, outputIndex: Long, status: P outputResult.configManager.putSetting(it, settingsOut.getSetting(it)) } - // For input, just copy the patterns over. + // For input, just copy the patterns over val patternsIn = input.interfaceDuality.patterns as AppEngInternalInventory patternsIn.forEachIndexed { index, stack -> (inputResult.interfaceDuality.patterns as AppEngInternalInventory).setInventorySlotContents(index, stack) } - // For output, drop items. + // For output, drop items val dropItems = mutableListOf() val patternsOut = output.interfaceDuality.patterns as AppEngInternalInventory dropItems.addAll(patternsOut)