If we say it's thread safe, that makes it true -- right? right?

GTNewHorizons · Feb 29, 2024 · 916016b · 916016b
1 parent 9299673
commit 916016b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 109 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -7,113 +7,48 @@ dependencies {
 
     compile("com.google.code.findbugs:jsr305:3.0.2")
 
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-310-GTNH:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:EnderStorage:1.5.0:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.25:dev") {
-        transitive = false
-    }
-    compile("com.github.GTNewHorizons:ForestryMC:4.8.2:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:Railcraft:9.15.3:dev") {
-        transitive = false
-    }
-    compile("com.github.GTNewHorizons:NotEnoughItems:2.5.3-GTNH:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.4.6:dev") {
-        transitive = false
-    }
-    compile("com.github.GTNewHorizons:CodeChickenLib:1.2.0:dev") {
-        transitive = false
-    }
-    compile("com.github.GTNewHorizons:CodeChickenCore:1.2.0:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:waila:1.6.5:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.1-GTNH:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:TinkersMechworks:0.3.0:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:ProjectRed:4.9.0-GTNH:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.6.1-GTNH:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:ExtraCells2:2.5.34:dev") {
-        transitive = false
-    }
-    compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.8-gtnh:dev') { 
-        transitive = false 
-    }
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-310-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:EnderStorage:1.5.0:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.25:dev") {transitive = false }
+    compile("com.github.GTNewHorizons:ForestryMC:4.8.2:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:Railcraft:9.15.3:dev") {transitive = false }
+    compile("com.github.GTNewHorizons:NotEnoughItems:2.5.3-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.4.6:dev") {transitive = false }
+    compile("com.github.GTNewHorizons:CodeChickenLib:1.2.0:dev") {transitive = false }
+    compile("com.github.GTNewHorizons:CodeChickenCore:1.2.0:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:waila:1.6.5:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.1-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersMechworks:0.3.0:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:ProjectRed:4.9.0-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.6.1-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:ExtraCells2:2.5.34:dev") {transitive = false }
+    compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.8-gtnh:dev') {transitive = false }
     compile("com.github.GTNewHorizons:EnderIO:2.6.1:dev") {
-    compile("com.github.GTNewHorizons:EnderCore:0.3.0:dev")
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.6.0-GTNH:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:gendustry:1.7.0-GTNH:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:WirelessRedstone-CBE:1.5.0:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.38:dev") {
-        transitive = false
-    }
-    compileOnly("appeng:RotaryCraft:V5c:api") {
-        transitive = false
-    }
-    compileOnly("com.bluepowermod:BluePower:0.2.928:deobf") {
-        transitive = false
-    }
-    compileOnly("igwmod:IGW-Mod-1.7.10:1.1.3-18:userdev") {
-        transitive = false
-    }
-    compileOnly("li.cil.tis3d:TIS-3D:MC1.7.10-1.2.4.70:dev") {
-        transitive = false
-    }
-    compileOnly("dev.modwarriors.notenoughkeys:NotEnoughKeys:1.7.10-2.0.0b4:deobf-dev") {
-        transitive = false
-    }
-    compileOnly("qmunity:QmunityLib:0.1.105:deobf") {
-        transitive = false
-    }
-    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
-        transitive = false
-    }
-    compileOnly("curse.maven:mekanism-268560:2475797") {
-        transitive = false
-    }
-    compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") {
-        transitive = false
-    }
-    compileOnly("curse.maven:minefactory-reloaded-66672:2366150") {
-        transitive = false
-    }
-    compileOnly("curse.maven:computercraft-67504:2269339") {
-        transitive = false
-    }
+        compile("com.github.GTNewHorizons:EnderCore:0.3.0:dev")
+        transitive = false
+    }
+    compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.6.0-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:gendustry:1.7.0-GTNH:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:WirelessRedstone-CBE:1.5.0:dev") {transitive = false }
+    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.38:dev") {transitive = false }
+    compileOnly("appeng:RotaryCraft:V5c:api") {transitive = false }
+    compileOnly("com.bluepowermod:BluePower:0.2.928:deobf") {transitive = false }
+    compileOnly("igwmod:IGW-Mod-1.7.10:1.1.3-18:userdev") {transitive = false }
+    compileOnly("li.cil.tis3d:TIS-3D:MC1.7.10-1.2.4.70:dev") {transitive = false }
+    compileOnly("dev.modwarriors.notenoughkeys:NotEnoughKeys:1.7.10-2.0.0b4:deobf-dev") {transitive = false }
+    compileOnly("qmunity:QmunityLib:0.1.105:deobf") {transitive = false }
+    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false }
+    compileOnly("curse.maven:mekanism-268560:2475797") {transitive = false }
+    compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") {transitive = false }
+    compileOnly("curse.maven:minefactory-reloaded-66672:2366150") {transitive = false }
+    compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false }
     compile("curse.maven:cofh-core-69162:2388751")
-    compileOnly("curse.maven:agricraft-225635:2284133") {
-        transitive = false
-    }
-    compileOnly("curse.maven:stargatetech-2-226769:2230351") {
-        transitive = false
-    }
+    compileOnly("curse.maven:agricraft-225635:2284133") {transitive = false }
+    compileOnly("curse.maven:stargatetech-2-226769:2230351") {transitive = false }
+
+    compileOnlyApi("com.github.GTNewHorizons:Angelica:1.0.0-alpha31:api") { transitive = false }
+
     compileOnly(deobf("https://immibis.com/mcmoddl/files/redlogic-59.1.13.jar"))
     compileOnly files("dependencies/ic2classic-api.zip") //curseforge one does NOT work ...
     compileOnly(deobf("https://github.com/purpleposeidon/fz_archive/raw/master/old/Factorization-1.7.10-0.8.108.jar"))

diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ channel = stable
 mappingsVersion = 12
 
 # Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
 # Select a default username for testing your mod. You can always override this per-run by running
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
@@ -61,6 +61,9 @@ gradleTokenModId =
 # [DEPRECATED] Mod name replacement token.
 gradleTokenModName =
 
+# [DEPRECATED] Mod Group replacement token.
+gradleTokenGroupName =
+
 # [DEPRECATED]
 # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
@@ -123,7 +126,7 @@ includeWellKnownRepositories = true
 usesMavenPublishing = true
 
 # Maven repository to publish the mod to.
-# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
 
 # Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
 #
@@ -188,5 +191,4 @@ disableSpotless = true
 # ideaCheckSpotlessOnBuild = true
 
 # Non-GTNH properties
-gradleTokenGroupName = 
 org.gradle.jvmargs = -Xmx2048m
diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14'
 }
 
 
diff --git a/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
@@ -1,5 +1,6 @@
 package li.cil.oc.client.renderer.block
 
+import com.gtnewhorizons.angelica.api.ThreadSafeISBRH
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler
 import li.cil.oc.Settings
 import li.cil.oc.client.renderer.tileentity.RobotRenderer
@@ -13,6 +14,7 @@ import net.minecraft.world.IBlockAccess
 import net.minecraftforge.common.util.ForgeDirection
 import org.lwjgl.opengl.GL11
 
+@ThreadSafeISBRH(perThread = false)
 object BlockRenderer extends ISimpleBlockRenderingHandler {
   def getRenderId = Settings.blockRenderId