aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-09-23 15:54:09 +0900
committerGitHub <noreply@github.com>2023-09-23 15:54:09 +0900
commitbda461c5b589c1dcd002a78ec0e8d3cd895a9bcc (patch)
tree46ce3d83f2fa0d045e6b00ac63bb73fe6fb2c8e6
parent74e1d0964ec002482253384c97fe76de54dc7de1 (diff)
downloadGT5-Unofficial-bda461c5b589c1dcd002a78ec0e8d3cd895a9bcc.tar.gz
GT5-Unofficial-bda461c5b589c1dcd002a78ec0e8d3cd895a9bcc.tar.bz2
GT5-Unofficial-bda461c5b589c1dcd002a78ec0e8d3cd895a9bcc.zip
Cleanup noXXXYYY methods (#96)
* updateBuildScript * Update dependencies * Cleanup noXXXYYY methods * Fix wildcard import
-rw-r--r--build.gradle60
-rw-r--r--dependencies.gradle24
-rw-r--r--src/main/java/kubatech/loaders/RecipeLoader.java18
-rw-r--r--src/main/java/kubatech/standalone.java3
4 files changed, 65 insertions, 40 deletions
diff --git a/build.gradle b/build.gradle
index b894d64772..7ff83a31bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1692122114
+//version: 1695409603
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output')
def projectJavaVersion = JavaLanguageVersion.of(8)
boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
+boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false
+
+final String CHECKSTYLE_CONFIG = """
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+ <module name="TreeWalker">
+ <!-- Use CHECKSTYLE:OFF and CHECKSTYLE:ON comments to suppress checkstyle lints in a block -->
+ <module name="SuppressionCommentFilter"/>
+ <module name="AvoidStarImport">
+ <!-- Allow static wildcard imports for cases like Opcodes and LWJGL classes, these don't get created accidentally by the IDE -->
+ <property name="allowStaticMemberImports" value="true"/>
+ </module>
+ </module>
+</module>
+"""
checkPropertyExists("modName")
checkPropertyExists("modId")
@@ -140,6 +157,17 @@ if (!disableSpotless) {
apply from: Blowdryer.file('spotless.gradle')
}
+if (!disableCheckstyle) {
+ apply plugin: 'checkstyle'
+ tasks.named("checkstylePatchedMc") { enabled = false }
+ tasks.named("checkstyleMcLauncher") { enabled = false }
+ tasks.named("checkstyleIdeVirtualMain") { enabled = false }
+ tasks.named("checkstyleInjectedTags") { enabled = false }
+ checkstyle {
+ config = resources.text.fromString(CHECKSTYLE_CONFIG)
+ }
+}
+
String javaSourceDir = "src/main/java/"
String scalaSourceDir = "src/main/scala/"
String kotlinSourceDir = "src/main/kotlin/"
@@ -600,15 +628,10 @@ repositories {
}
maven {
name = "ic2"
- url = "https://maven.ic2.player.to/"
- metadataSources {
- mavenPom()
- artifact()
+ url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
+ content {
+ includeGroup "net.industrial-craft"
}
- }
- maven {
- name = "ic2-mirror"
- url = "https://maven2.ic2.player.to/"
metadataSources {
mavenPom()
artifact()
@@ -1576,6 +1599,25 @@ def getSecondaryArtifacts() {
return secondaryArtifacts
}
+def getURL(String main, String fallback) {
+ return pingURL(main, 10000) ? main : fallback
+}
+
+// credit: https://stackoverflow.com/a/3584332
+def pingURL(String url, int timeout) {
+ url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates.
+ try {
+ HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection()
+ connection.setConnectTimeout(timeout)
+ connection.setReadTimeout(timeout)
+ connection.setRequestMethod("HEAD")
+ int responseCode = connection.getResponseCode()
+ return 200 <= responseCode && responseCode <= 399
+ } catch (IOException ignored) {
+ return false
+ }
+}
+
// For easier scripting of things that require variables defined earlier in the buildscript
if (file('addon.late.gradle.kts').exists()) {
apply from: 'addon.late.gradle.kts'
diff --git a/dependencies.gradle b/dependencies.gradle
index ec810fc475..2b706826b2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -35,17 +35,17 @@
*/
dependencies {
- api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.187:dev')
+ api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.22:dev')
api("com.github.GTNewHorizons:EnderCore:0.2.17:dev")
- api("com.github.GTNewHorizons:EnderIO:2.4.24:dev")
+ api("com.github.GTNewHorizons:EnderIO:2.5.0:dev")
api("com.github.GTNewHorizons:ForestryMC:4.6.14:dev")
- api("com.github.GTNewHorizons:ModularUI:1.1.16:dev")
+ api("com.github.GTNewHorizons:ModularUI:1.1.18:dev")
api("com.github.GTNewHorizons:Mobs-Info:0.1.6-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev")
//compileOnly("curse.maven:extrautilities-225561:2264384") {
// transitive = false
//}
- compileOnly("com.github.GTNewHorizons:GTplusplus:1.9.83:dev")
+ compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.10:dev")
{
transitive = false
}
@@ -61,15 +61,15 @@ dependencies {
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:bartworks:0.7.39:dev")
+ compileOnly("com.github.GTNewHorizons:bartworks:0.8.5:dev")
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.109:dev")
+ compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.8:dev")
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.4-GTNH:dev")
+ compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.0-GTNH:dev")
{
transitive = false
}
@@ -83,15 +83,15 @@ dependencies {
*/
// For testing
- //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.4-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.9.83:dev")
+ //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.0-GTNH:dev")
+ //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.10.10:dev")
//runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.1-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.109:dev")
+ //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.8:dev")
//runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.7.0-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:bartworks:0.7.39:dev")
+ //runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.5:dev")
//runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev")
//api("com.github.GTNewHorizons:SpecialMobs:3.4.3:dev")
- //api("com.github.GTNewHorizons:twilightforest:2.4.5:dev")
+ //api("com.github.GTNewHorizons:twilightforest:2.5.0:dev")
//api("com.github.GTNewHorizons:EnderZoo:1.0.23:dev")
//runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.1.19-GTNH:dev")
//runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index c98002348c..a2b5c472eb 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -132,7 +132,6 @@ public class RecipeLoader {
.fluidInputs(
FluidRegistry.getFluidStack("molten.indalloy140", 28800),
FluidRegistry.getFluidStack("for.honey", 20000))
- .noFluidOutputs()
.itemOutputs(ExtremeIndustrialApiary.get(1))
.eut(2_048_000)
.duration(5 * MINUTES)
@@ -233,7 +232,6 @@ public class RecipeLoader {
.itemInputs(TeaLeafDehydrated.get(1))
.itemOutputs(SteamedTeaLeaf.get(1))
.fluidInputs(FluidRegistry.getFluidStack("water", 50))
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(sMixerRecipes);
@@ -248,8 +246,6 @@ public class RecipeLoader {
GT_Values.RA.stdBuilder()
.itemInputs(TeaLeafDehydrated.get(1))
.itemOutputs(RolledTeaLeaf.get(1))
- .noFluidInputs()
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(sBenderRecipes);
@@ -264,8 +260,6 @@ public class RecipeLoader {
GT_Values.RA.stdBuilder()
.itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1))
.itemOutputs(OxidizedTeaLeaf.get(1))
- .noFluidInputs()
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(UniversalChemical);
@@ -280,8 +274,6 @@ public class RecipeLoader {
GT_Values.RA.stdBuilder()
.itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(2))
.itemOutputs(FermentedTeaLeaf.get(1))
- .noFluidInputs()
- .noFluidOutputs()
.eut(32)
.duration(10 * SECONDS)
.addTo(UniversalChemical);
@@ -296,16 +288,12 @@ public class RecipeLoader {
GT_Values.RA.stdBuilder()
.itemInputs(TeaLeafDehydrated.get(1))
.itemOutputs(BruisedTeaLeaf.get(1))
- .noFluidInputs()
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(sCutterRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1))
.itemOutputs(PartiallyOxidizedTeaLeaf.get(1))
- .noFluidInputs()
- .noFluidOutputs()
.eut(32)
.duration(2 * SECONDS + 10 * TICKS)
.addTo(UniversalChemical);
@@ -323,8 +311,6 @@ public class RecipeLoader {
GT_Values.RA.stdBuilder()
.itemInputs(BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1))
.itemOutputs(EarlGrayTea.get(1))
- .noFluidInputs()
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(sMixerRecipes);
@@ -333,7 +319,6 @@ public class RecipeLoader {
.itemInputs(BlackTea.get(1))
.itemOutputs(LemonTea.get(1))
.fluidInputs(FluidRegistry.getFluidStack("potion.lemonjuice", 1000))
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(sMixerRecipes);
@@ -341,7 +326,6 @@ public class RecipeLoader {
.itemInputs(BlackTea.get(1))
.itemOutputs(MilkTea.get(1))
.fluidInputs(FluidRegistry.getFluidStack("milk", 1000))
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(sMixerRecipes);
@@ -350,7 +334,6 @@ public class RecipeLoader {
.itemInputs(GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1))
.itemOutputs(PeppermintTea.get(1))
.fluidInputs(FluidRegistry.getFluidStack("water", 1000))
- .noFluidOutputs()
.eut(32)
.duration(5 * SECONDS)
.addTo(sMixerRecipes);
@@ -372,7 +355,6 @@ public class RecipeLoader {
new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L },
new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L })
.fluidInputs(FluidRegistry.getFluidStack("molten.indalloy140", 28800))
- .noFluidOutputs()
.itemOutputs(TeaAcceptor.get(1))
.eut(2_048_000)
.duration(5 * MINUTES)
diff --git a/src/main/java/kubatech/standalone.java b/src/main/java/kubatech/standalone.java
index 4c63a43c7a..8bba56652e 100644
--- a/src/main/java/kubatech/standalone.java
+++ b/src/main/java/kubatech/standalone.java
@@ -1,6 +1,7 @@
package kubatech;
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JOptionPane;
public class standalone {