update

reobf · Aug 21, 2024 · 7f793ea · 7f793ea
1 parent a6ebb8c
commit 7f793ea
Show file tree

Hide file tree

Showing 9 changed files with 258 additions and 325 deletions.
diff --git a/README.md b/README.md
@@ -2,4 +2,6 @@
 see
 https://github.com/reobf/Void-Miner-Tweak-Mod/wiki
 
+for GTNH modpack 2.6.1, use v0.0.2 
+
 
diff --git a/build.gradle b/build.gradle
@@ -372,7 +372,7 @@ catch (Exception ignored) {
 
 // Pulls version first from the VERSION env and then git tag
 String identifiedVersion = null
-String versionOverride = '0.0.1'
+String versionOverride = '0.0.2'
 try {
     // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
     if (versionOverride == null) {

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,80 +1,81 @@
-dependencies { 
-api("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.27:dev")
-    implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.73:dev')
-    implementation('com.github.GTNewHorizons:TinkersConstruct:1.11.11-GTNH:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.21-GTNH:dev')
-    api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
- api('com.github.GTNewHorizons:Galacticraft:3.1.3-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-327-GTNH:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
-
-    compileOnly('curse.maven:cofh-lib-220333:2388748')
-    compileOnly('curse.maven:PlayerAPI-228969:2248928')
-    compileOnly('curse.maven:RenderPlayerAPI-228981:2248933')
-    compileOnly('curse.maven:SmartRender-229857:2248949')
-    compileOnly('curse.maven:mekanism-268560:2475797')
-
-    runtimeOnly('com.github.GTNewHorizons:ironchest:6.0.75:dev')
-
-
-
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.95:dev')
-    api("com.github.GTNewHorizons:TecTech:5.3.32:dev")
-    api("com.github.GTNewHorizons:GalacticGregGT5:1.1.0:dev") 
-    api("com.github.GTNewHorizons:Avaritia:1.49:dev")
-    api("com.github.GTNewHorizons:TinkersConstruct:1.11.11-GTNH:dev")
-
-        compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.25:deobf") {transitive = false}
-    api("com.github.GTNewHorizons:OpenComputers:1.10.7-GTNH:api") {transitive = false}
-
-api('com.github.GTNewHorizons:GTNEIOrePlugin:1.2.0:dev')
-
-api("com.github.GTNewHorizons:StructureLib:1.3.0:dev")
+/*
+ * Add your dependencies here. Supported configurations:
+ *  - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod
+ *       Available at runtime and compiletime for mods depending on this mod
+ *  - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API
+ *       Available at runtime but not compiletime for mods depending on this mod
+ *  - api("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods
+ *       Not available at all for mods depending on this mod, only visible at compiletime for this mod
+ *  - api("g:n:v:c"): like api, but also visible at compiletime for mods depending on this mod
+ *       Available at compiletime but not runtime for mods depending on this mod
+ *  - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency
+ *       Not available at all for mods depending on this mod, only visible at runtime for this mod
+ *  - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and api for dependencies present at both compiletime and runtime,
+ *       but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing
+ *  - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime
+ *       Available at runtime for mods depending on this mod
+ *  - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry
+ *  - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main
+ *
+ *  - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
+ *       Requires you to enable usesShadowedDependencies in gradle.properties
+ *
+ *  - compile("g:n:v:c"): deprecated, replace with "api" (works like the old "compile") or "implementation" (can be more efficient)
+ *
+ * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed,
+ * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful.
+ *
+ * To depend on obfuscated jars you can use `devOnlyNonPublishable(rfg.deobf("dep:spec:1.2.3"))` to fetch an obfuscated jar from maven,
+ * or `devOnlyNonPublishable(rfg.deobf(project.files("libs/my-mod-jar.jar")))` to use a file.
+ *
+ * Gradle names for some of the configuration can be misleading, api and runtimeOnly both get published as dependencies in Maven, but api does not.
+ * The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published.
+ *
+ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
+ */
+dependencies {
+
+api("com.github.GTNewHorizons:NotEnoughEnergistics:1.5.1:dev")
+  api("com.github.GTNewHorizons:StructureLib:1.3.1:dev")
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-    api("com.github.GTNewHorizons:NotEnoughItems:2.5.24-GTNH:dev")
-    api("com.github.GTNewHorizons:GTNHLib:0.2.10:dev")
-    api("com.github.GTNewHorizons:ModularUI:1.1.37:dev")
-    api("com.github.GTNewHorizons:waila:1.7.1:dev")
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-336-GTNH:dev")
-    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.19-gtnh:dev")
-
-api("com.github.GTNewHorizons:bartworks:0.9.16:dev")
-
-
-
-
-    implementation("com.github.GTNewHorizons:Avaritia:1.49:dev")
-
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha34:api') { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.7.1:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.9.5-GTNH:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.8.7:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.6:dev") { transitive = false }
-
-    compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.3-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.11-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
-    compileOnly("curse.maven:cofh-core-69162:2388751") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.1:dev") { transitive = false }
-    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.34:dev") { transitive = false }
-    compileOnly('com.github.GTNewHorizons:Botania:1.10.11-GTNH:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.3-GTNH:dev') { transitive = false }
-    compileOnly('curse.maven:minefactory-reloaded-66672:2366150') { transitive = false }
+    api("com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.2.11:dev")
+    api("com.github.GTNewHorizons:ModularUI:1.1.42:dev")
+    api("com.github.GTNewHorizons:waila:1.7.3:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-356-GTNH:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.29-gtnh:dev")
+
+
+    api("com.github.GTNewHorizons:Avaritia:1.49:dev")
 
-    compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
+    api('com.github.GTNewHorizons:Angelica:1.0.0-alpha42:api') { transitive = false }
+    api("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
+    api("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
+    api("com.github.GTNewHorizons:EnderIO:2.7.4:dev") { transitive = false }
+    api("com.github.GTNewHorizons:bartworks:0.9.26:dev")
+    api("com.github.GTNewHorizons:ForestryMC:4.8.9:dev") { transitive = false }
+    api("com.github.GTNewHorizons:Railcraft:9.15.8:dev") { transitive = false }
+
+    api("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
+    api("com.github.GTNewHorizons:Galacticraft:3.1.5-GTNH:dev") { transitive = false }
+    api("com.github.GTNewHorizons:TinkersConstruct:1.11.15-GTNH:dev") { transitive = true }
+    api("com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev") { transitive = false }
+    api("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
+    api("curse.maven:cofh-core-69162:2388751") { transitive = false }
+    api("com.github.GTNewHorizons:Nuclear-Control:2.6.2:dev") { transitive = false }
+    api("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }    
+	api('com.github.GTNewHorizons:Botania:1.10.12-GTNH:dev') { transitive = false }
+    api('com.github.GTNewHorizons:HoloInventory:2.4.7-GTNH:dev') { transitive = false }
+    api('com.github.GTNewHorizons:BlockRenderer6343:1.1.6:dev')
+	api("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
     annotationProcessor("com.google.auto.value:auto-value:1.10.1")
-
-    // For testing iApiary
-    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.8.7:dev")
-
-    testImplementation(platform('org.junit:junit-bom:5.9.2'))
-    testImplementation('org.junit.jupiter:junit-jupiter')
-    testImplementation("org.mockito:mockito-core:3.+")
-
-   
+	api('com.github.GTNewHorizons:GTplusplus:1.11.58:dev')
+	  
+	api("com.github.GTNewHorizons:OpenComputers:1.9.14-GTNH:dev")    
+	  api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.163:dev')
+	api("com.github.GTNewHorizons:ForgeMultipart:1.4.8:dev") { transitive = false }
+	 api("com.github.GTNewHorizons:ae2stuff:0.8.2-GTNH:dev")
+	api("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev") { transitive = false }
+	api('com.github.GTNewHorizons:GigaGramFab:0.3.19:dev')
+	api('com.github.GTNewHorizons:GTNEIOrePlugin:1.2.0:dev')
 }
diff --git a/dependencies.gradle0 b/dependencies.gradle0
@@ -0,0 +1,80 @@
+dependencies { 
+api("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.27:dev")
+    implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.73:dev')
+    implementation('com.github.GTNewHorizons:TinkersConstruct:1.11.11-GTNH:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.21-GTNH:dev')
+    api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+ api('com.github.GTNewHorizons:Galacticraft:3.1.3-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-327-GTNH:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
+
+    compileOnly('curse.maven:cofh-lib-220333:2388748')
+    compileOnly('curse.maven:PlayerAPI-228969:2248928')
+    compileOnly('curse.maven:RenderPlayerAPI-228981:2248933')
+    compileOnly('curse.maven:SmartRender-229857:2248949')
+    compileOnly('curse.maven:mekanism-268560:2475797')
+
+    runtimeOnly('com.github.GTNewHorizons:ironchest:6.0.75:dev')
+
+
+
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.95:dev')
+    api("com.github.GTNewHorizons:TecTech:5.3.32:dev")
+    api("com.github.GTNewHorizons:GalacticGregGT5:1.1.0:dev") 
+    api("com.github.GTNewHorizons:Avaritia:1.49:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.11.11-GTNH:dev")
+
+        compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.25:deobf") {transitive = false}
+    api("com.github.GTNewHorizons:OpenComputers:1.10.7-GTNH:api") {transitive = false}
+
+api('com.github.GTNewHorizons:GTNEIOrePlugin:1.2.0:dev')
+
+api("com.github.GTNewHorizons:StructureLib:1.3.0:dev")
+    api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
+    api("com.github.GTNewHorizons:NotEnoughItems:2.5.24-GTNH:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.2.10:dev")
+    api("com.github.GTNewHorizons:ModularUI:1.1.37:dev")
+    api("com.github.GTNewHorizons:waila:1.7.1:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-336-GTNH:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.19-gtnh:dev")
+
+api("com.github.GTNewHorizons:bartworks:0.9.16:dev")
+
+
+
+
+    implementation("com.github.GTNewHorizons:Avaritia:1.49:dev")
+
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha34:api') { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.7.1:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.9.5-GTNH:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.8.7:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.6:dev") { transitive = false }
+
+    compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.3-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.11-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
+    compileOnly("curse.maven:cofh-core-69162:2388751") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.1:dev") { transitive = false }
+    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.34:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:Botania:1.10.11-GTNH:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.3-GTNH:dev') { transitive = false }
+    compileOnly('curse.maven:minefactory-reloaded-66672:2366150') { transitive = false }
+
+    compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
+    annotationProcessor("com.google.auto.value:auto-value:1.10.1")
+
+    // For testing iApiary
+    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.8.7:dev")
+
+    testImplementation(platform('org.junit:junit-bom:5.9.2'))
+    testImplementation('org.junit.jupiter:junit-jupiter')
+    testImplementation("org.mockito:mockito-core:3.+")
+
+
+}
diff --git a/src/main/java/reobf/vmtweak/main/Callback.java b/src/main/java/reobf/vmtweak/main/Callback.java
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@
		see
		https://github.com/reobf/Void-Miner-Tweak-Mod/wiki

		for GTNH modpack 2.6.1, use v0.0.2