Skip to content

Commit bd548b8

Browse files
committed
clean up code
1 parent 9d1733b commit bd548b8

File tree

11 files changed

+15
-26
lines changed

11 files changed

+15
-26
lines changed

common/src/main/kotlin/org/valkyrienskies/kelvin/api/edges/AllInOneDuctEdge.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ class AllInOneDuctEdge(
1616
override var aperture: Double = 0.0,
1717
override var reversed: Boolean = false, override val filter: HashSet<GasType> = HashSet(), override var blacklist: Boolean = false,
1818
override var unloaded: Boolean = false
19-
) : DuctEdge, ApertureEdge, OneWayEdge, FilteredEdge {
20-
}
19+
) : DuctEdge, ApertureEdge, OneWayEdge, FilteredEdge

common/src/main/kotlin/org/valkyrienskies/kelvin/api/edges/ApertureDuctEdge.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ class ApertureDuctEdge(
1414
override var radius: Double = 0.125, override var length: Double = 0.5, override var currentFlowRate: Double = 0.0,
1515
override var aperture: Double = 0.0,
1616
override var unloaded: Boolean = false
17-
) : DuctEdge, ApertureEdge {
18-
}
17+
) : DuctEdge, ApertureEdge

common/src/main/kotlin/org/valkyrienskies/kelvin/api/edges/ApertureFilteredDuctEdge.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.valkyrienskies.kelvin.api.edges
22

33
import org.valkyrienskies.kelvin.api.ConnectionType
4-
import org.valkyrienskies.kelvin.api.DuctEdge
54
import org.valkyrienskies.kelvin.api.DuctNodePos
65
import org.valkyrienskies.kelvin.api.GasType
76

@@ -17,7 +16,4 @@ class ApertureFilteredDuctEdge(
1716
override var blacklist: Boolean = false,
1817
override var aperture: Double = 0.0,
1918
override var unloaded: Boolean = false
20-
) : ApertureEdge, FilteredEdge {
21-
22-
23-
}
19+
) : ApertureEdge, FilteredEdge

common/src/main/kotlin/org/valkyrienskies/kelvin/api/edges/ApertureOneWayDuctEdge.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ class ApertureOneWayDuctEdge(
1515
override var aperture: Double = 0.0,
1616
override var reversed: Boolean = false,
1717
override var unloaded: Boolean = false
18-
) : DuctEdge, ApertureEdge, OneWayEdge {
19-
}
18+
) : DuctEdge, ApertureEdge, OneWayEdge

common/src/main/kotlin/org/valkyrienskies/kelvin/api/edges/FilteredDuctEdge.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.valkyrienskies.kelvin.api.edges
22

3-
import org.valkyrienskies.kelvin.api.*
3+
import org.valkyrienskies.kelvin.api.ConnectionType
4+
import org.valkyrienskies.kelvin.api.DuctNodePos
5+
import org.valkyrienskies.kelvin.api.GasType
46

57
/**
68
* A default edge type that has a filter which only allows certain gas types to flow through it. Its filter can either be a Whitelist or a Blacklist.
@@ -13,6 +15,4 @@ class FilteredDuctEdge(
1315
override val filter: HashSet<GasType> = HashSet(),
1416
override var blacklist: Boolean = false,
1517
override var unloaded: Boolean = false
16-
) : FilteredEdge {
17-
18-
}
18+
) : FilteredEdge

common/src/main/kotlin/org/valkyrienskies/kelvin/api/edges/PipeDuctEdge.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ class PipeDuctEdge(
1010
override val nodeB: DuctNodePos,
1111
override var radius: Double = 0.125, override var length: Double = 0.5, override var currentFlowRate: Double = 0.0,
1212
override var unloaded: Boolean = false
13-
) : DuctEdge {
14-
}
13+
) : DuctEdge

common/src/main/kotlin/org/valkyrienskies/kelvin/impl/client/ClientKelvinInfo.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ package org.valkyrienskies.kelvin.impl.client
33
import org.valkyrienskies.kelvin.api.DuctNodePos
44
import org.valkyrienskies.kelvin.impl.DuctNodeInfo
55

6-
data class ClientKelvinInfo(val nodes: HashMap<DuctNodePos, DuctNodeInfo>) {
7-
}
6+
data class ClientKelvinInfo(val nodes: HashMap<DuctNodePos, DuctNodeInfo>)

common/src/main/kotlin/org/valkyrienskies/kelvin/integration/jei/ImageDrawable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ImageDrawable(private val width: Int, private val height: Int, private val
1919

2020
override fun draw(stack: PoseStack, xOffset: Int, yOffset: Int) {
2121
RenderSystem.setShaderTexture(0, location)
22-
GuiComponent.blit(stack, xOffset, yOffset, 0, 0f, 0f, width, height, height, width);
22+
GuiComponent.blit(stack, xOffset, yOffset, 0, 0f, 0f, width, height, height, width)
2323

2424
}
2525
}

common/src/main/kotlin/org/valkyrienskies/kelvin/integration/jei/KelvinGasIngredient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class GasIngredientRenderer: IIngredientRenderer<KelvinGasIngredient> {
6161

6262
override fun render(stack: PoseStack, ingredient: KelvinGasIngredient) {
6363
RenderSystem.setShaderTexture(0, ingredient.gasType.iconLocation)
64-
GuiComponent.blit(stack, 0, 0, 0, 0f, 0f, 16, 16, 16, 16);
64+
GuiComponent.blit(stack, 0, 0, 0, 0f, 0f, 16, 16, 16, 16)
6565

6666
super.render(stack, ingredient)
6767
}

common/src/main/kotlin/org/valkyrienskies/kelvin/util/GasHeatLevel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ enum class GasHeatLevel: StringRepresentable {
1616
}
1717

1818
override fun getSerializedName(): String {
19-
return name.toLowerCase(Locale.ROOT)
19+
return name.lowercase(Locale.ROOT)
2020
}
2121

2222
companion object {
2323
fun byIndex(index: Int): GasHeatLevel {
24-
return values()[index]
24+
return entries[index]
2525
}
2626
}
2727
}

0 commit comments

Comments
 (0)