diff --git a/build.gradle b/build.gradle
index bd6289c..8507c7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1689409577
+//version: 1701530445
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit
buildscript {
repositories {
- mavenCentral()
-
- maven {
- name 'forge'
- url 'https://maven.minecraftforge.net'
- }
maven {
// GTNH RetroFuturaGradle and ASM Fork
name "GTNH Maven"
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
allowInsecureProtocol = true
}
- maven {
- name 'sonatype'
- url 'https://oss.sonatype.org/content/repositories/snapshots/'
- }
- maven {
- name 'Scala CI dependencies'
- url 'https://repo1.maven.org/maven2/'
- }
-
mavenLocal()
}
}
@@ -69,7 +54,7 @@ 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.19'
+ id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
}
print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -89,6 +74,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 = """
+
+
+
+
+
+
+
+
+
+
+
+"""
checkPropertyExists("modName")
checkPropertyExists("modId")
@@ -140,6 +142,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/"
@@ -274,7 +287,7 @@ if (apiPackage) {
}
if (accessTransformersFile) {
- for (atFile in accessTransformersFile.split(",")) {
+ for (atFile in accessTransformersFile.split(" ")) {
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
if (!getFile(targetFile).exists()) {
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
@@ -401,9 +414,13 @@ if (identifiedVersion == versionOverride) {
group = "com.github.GTNewHorizons"
if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
- archivesBaseName = customArchiveBaseName
+ base {
+ archivesName = customArchiveBaseName
+ }
} else {
- archivesBaseName = modId
+ base {
+ archivesName = modId
+ }
}
@@ -558,9 +575,6 @@ repositories {
maven {
name 'Overmind forge repo mirror'
url 'https://gregtech.overminddl1.com/'
- mavenContent {
- excludeGroup("net.minecraftforge") // missing the `universal` artefact
- }
}
maven {
name = "GTNH Maven"
@@ -575,24 +589,34 @@ repositories {
}
}
if (includeWellKnownRepositories.toBoolean()) {
- maven {
- name "CurseMaven"
- url "https://cursemaven.com"
- content {
+ exclusiveContent {
+ forRepository {
+ maven {
+ name "CurseMaven"
+ url "https://cursemaven.com"
+ }
+ }
+ filter {
includeGroup "curse.maven"
}
}
+ exclusiveContent {
+ forRepository {
+ maven {
+ name = "Modrinth"
+ url = "https://api.modrinth.com/maven"
+ }
+ }
+ filter {
+ includeGroup "maven.modrinth"
+ }
+ }
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()
@@ -607,11 +631,13 @@ repositories {
def mixinProviderGroup = "io.github.legacymoddingmc"
def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.7.1"
+def mixinProviderVersion = "0.1.13"
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
ext.mixinProviderSpec = mixinProviderSpec
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+
dependencies {
if (usesMixins.toBoolean()) {
annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
@@ -623,7 +649,7 @@ dependencies {
}
}
if (usesMixins.toBoolean()) {
- implementation(mixinProviderSpec)
+ implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap))
} else if (forceEnableMixins.toBoolean()) {
runtimeOnlyNonPublishable(mixinProviderSpec)
}
@@ -676,11 +702,6 @@ if (file('dependencies.gradle.kts').exists()) {
throw new RuntimeException("Missing dependencies.gradle[.kts]")
}
-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
-def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"
-
tasks.register('generateAssets') {
group = "GTNH Buildscript"
description = "Generates a mixin config file at /src/main/resources/mixins.modid.json if needed"
@@ -711,46 +732,17 @@ tasks.register('generateAssets') {
}
if (usesMixins.toBoolean()) {
- tasks.named("reobfJar", ReobfuscatedJar).configure {
- extraSrgFiles.from(mixinSrg)
- }
-
tasks.named("processResources").configure {
dependsOn("generateAssets")
}
tasks.named("compileJava", JavaCompile).configure {
- doFirst {
- new File(mixinTmpDir).mkdirs()
- }
options.compilerArgs += [
- "-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}",
- "-AoutSrgFile=${mixinSrg}",
- "-AoutRefMapFile=${refMap}",
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
"-XDenableSunApiLintControl",
"-XDignore.symbol.file"
]
}
-
- pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
- kapt {
- correctErrorTypes = true
- javacOptions {
- option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}")
- option("-AoutSrgFile=$mixinSrg")
- option("-AoutRefMapFile=$refMap")
- }
- }
- tasks.configureEach { task ->
- if (task.name == "kaptKotlin") {
- task.doFirst {
- new File(mixinTmpDir).mkdirs()
- }
- }
- }
- }
-
}
tasks.named("processResources", ProcessResources).configure {
@@ -768,7 +760,6 @@ tasks.named("processResources", ProcessResources).configure {
}
if (usesMixins.toBoolean()) {
- from refMap
dependsOn("compileJava", "compileScala")
}
}
@@ -787,23 +778,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}
dependencies {
- def lwjgl3ifyVersion = '1.4.0'
- def asmVersion = '9.4'
+ def lwjgl3ifyVersion = '1.5.7'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
- java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19')
+ java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
}
- java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
- java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
- java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
- java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
}
@@ -1166,7 +1148,10 @@ tasks.named("processIdeaSettings").configure {
tasks.named("ideVirtualMainClasses").configure {
// Make IntelliJ "Build project" build the mod jars
- dependsOn("jar", "reobfJar", "spotlessCheck")
+ dependsOn("jar", "reobfJar")
+ if (!disableSpotless) {
+ dependsOn("spotlessCheck")
+ }
}
// workaround variable hiding in pom processing
@@ -1187,9 +1172,8 @@ publishing {
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
}
}
-
repositories {
- if (usesMavenPublishing.toBoolean()) {
+ if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
maven {
url = mavenPublishUrl
allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
@@ -1311,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) {
// Updating
-def buildscriptGradleVersion = "8.1.1"
+def buildscriptGradleVersion = "8.5"
tasks.named('wrapper', Wrapper).configure {
gradleVersion = buildscriptGradleVersion
@@ -1590,6 +1574,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 2313d71..59e61aa 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -4,6 +4,7 @@ dependencies {
compile('com.github.GTNewHorizons:ForestryMC:4.6.13:dev')
compileOnly('com.github.GTNewHorizons:BloodMagic:1.4.2:dev')
+ compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.4.0:dev')
compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Botania:1.9.23-GTNH:api') {transitive = false}
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
diff --git a/repositories.gradle b/repositories.gradle
index 89056c8..c227b16 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,26 +1,4 @@
// Add any additional repositories for your dependencies here
repositories {
- maven {
- name 'GTNH Maven'
- url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
- allowInsecureProtocol
- }
- maven {
- name 'ic2'
- url 'https://maven.ic2.player.to/'
- metadataSources {
- mavenPom()
- artifact()
- }
- }
- maven {
- url 'https://jitpack.io'
- }
- maven {
- url 'https://cursemaven.com'
- content {
- includeGroup 'curse.maven'
- }
- }
}
diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java
index e9377e3..b4ed045 100644
--- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java
+++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java
@@ -2,7 +2,11 @@ package magicbees.bees.allele.effect;
import static magicbees.main.utils.compat.thaumcraft.NodeHelper.updateNode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java
index 840e258..bbae998 100644
--- a/src/main/java/magicbees/main/Config.java
+++ b/src/main/java/magicbees/main/Config.java
@@ -27,7 +27,24 @@ import magicbees.block.BlockMagicApiary;
import magicbees.block.BlockManaAuraProvider;
import magicbees.block.BlockVisAuraProvider;
import magicbees.block.types.HiveType;
-import magicbees.item.*;
+import magicbees.item.ItemCapsule;
+import magicbees.item.ItemComb;
+import magicbees.item.ItemDrop;
+import magicbees.item.ItemMagicHive;
+import magicbees.item.ItemMagicHiveFrame;
+import magicbees.item.ItemManasteelGrafter;
+import magicbees.item.ItemManasteelScoop;
+import magicbees.item.ItemMiscResources;
+import magicbees.item.ItemMoonDial;
+import magicbees.item.ItemMysteriousMagnet;
+import magicbees.item.ItemNugget;
+import magicbees.item.ItemPollen;
+import magicbees.item.ItemPropolis;
+import magicbees.item.ItemThaumiumGrafter;
+import magicbees.item.ItemThaumiumScoop;
+import magicbees.item.ItemVoidGrafter;
+import magicbees.item.ItemVoidScoop;
+import magicbees.item.ItemWax;
import magicbees.item.types.CapsuleType;
import magicbees.item.types.HiveFrameType;
import magicbees.item.types.NuggetType;
@@ -80,6 +97,7 @@ public class Config {
public static boolean extraBeesActive;
public static boolean redstoneArsenalActive;
public static boolean thaumcraftActive;
+ public static boolean thaumicHorizonsActive;
public static boolean thermalFoundationActive;
public static boolean botaniaActive;
public static boolean ae2Active;
@@ -249,6 +267,9 @@ public class Config {
p = configuration.get(CATEGORY_MODULES, "Thaumcraft", true);
thaumcraftActive = p.getBoolean();
+ p = configuration.get(CATEGORY_MODULES, "ThaumicHorizons", true);
+ thaumicHorizonsActive = p.getBoolean();
+
p = configuration.get(CATEGORY_MODULES, "ThermalExpansion", true);
thermalFoundationActive = p.getBoolean();
diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
index 7920acd..4f40b45 100644
--- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
+++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
@@ -41,5 +41,6 @@ public class ModHelperManager {
helpers.add(new AppliedEnergisticsHelper());
helpers.add(new BaublesHelper());
helpers.add(new BloodHelper());
+ helpers.add(new ThaumicHorizonsHelper());
}
}
diff --git a/src/main/java/magicbees/main/utils/compat/ThaumicHorizonsHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumicHorizonsHelper.java
new file mode 100644
index 0000000..12653a7
--- /dev/null
+++ b/src/main/java/magicbees/main/utils/compat/ThaumicHorizonsHelper.java
@@ -0,0 +1,24 @@
+package magicbees.main.utils.compat;
+
+import cpw.mods.fml.common.Loader;
+import magicbees.main.Config;
+
+public class ThaumicHorizonsHelper implements IModHelper {
+
+ private static boolean isTHorizonsActive = false;
+ public static final String Name = "ThaumicHorizons";
+
+ public static boolean isActive() {
+ return isTHorizonsActive;
+ }
+
+ public void preInit() {
+ if (Loader.isModLoaded(Name) && Config.thaumicHorizonsActive) {
+ isTHorizonsActive = true;
+ }
+ }
+
+ public void init() {}
+
+ public void postInit() {}
+}
diff --git a/src/main/java/magicbees/main/utils/compat/baubles/RingHousing.java b/src/main/java/magicbees/main/utils/compat/baubles/RingHousing.java
index 10f6663..737cdac 100644
--- a/src/main/java/magicbees/main/utils/compat/baubles/RingHousing.java
+++ b/src/main/java/magicbees/main/utils/compat/baubles/RingHousing.java
@@ -14,7 +14,13 @@ import net.minecraft.world.biome.BiomeGenBase;
import com.google.common.collect.ImmutableSet;
import com.mojang.authlib.GameProfile;
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.DefaultBeeListener;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeHousingInventory;
+import forestry.api.apiculture.IBeeListener;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IBeekeepingLogic;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IErrorLogic;
diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java
index c27cfa6..58dae53 100644
--- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java
+++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java
@@ -12,7 +12,11 @@ import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IHiveFrame;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java
index 4b1ff25..83e2166 100644
--- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java
+++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java
@@ -12,7 +12,11 @@ import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IHiveFrame;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java
index 37fb6a2..075d8cc 100644
--- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java
+++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java
@@ -12,7 +12,11 @@ import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IHiveFrame;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
diff --git a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java
index c782531..3108946 100644
--- a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java
+++ b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java
@@ -13,7 +13,10 @@ import net.minecraft.world.ChunkPosition;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
+import com.kentington.thaumichorizons.common.tiles.TileSyntheticNode;
+
import magicbees.main.Config;
+import magicbees.main.utils.compat.ThaumicHorizonsHelper;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.nodes.INode;
@@ -41,6 +44,9 @@ public class NodeHelper {
((Map) chunk.chunkTileEntityMap).values());
Collections.shuffle(tileEntities);
for (TileEntity entity : tileEntities) {
+ if (ThaumicHorizonsHelper.isActive() && entity instanceof TileSyntheticNode) {
+ continue;
+ }
if (entity instanceof INode) {
Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord);
Vec3 result = apiaryPos.subtract(tePos);
@@ -61,6 +67,9 @@ public class NodeHelper {
List tileEntities = new ArrayList(
((Map) chunk.chunkTileEntityMap).values());
for (TileEntity entity : tileEntities) {
+ if (ThaumicHorizonsHelper.isActive() && entity instanceof TileSyntheticNode) {
+ continue;
+ }
if (entity instanceof INode) {
Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord);
Vec3 result = apiaryPos.subtract(tePos);