From 94b42387dbd1e45f27a8cf89108892c7c3f08822 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Mon, 10 Apr 2023 15:43:14 +0200 Subject: Cleanup (#308) * switch to GT mod enum instead * move to GT5U Mods enum even more * yeet recipes loaded when used outside NH * buildscript update + GT5U version bump * fix build * spotless apply * optimize import * split recipes in different files * remove newStuff config option * load recipe files * break down BioRecipeLoader into several files Former-commit-id: 3ac362e197682f3db007d8b87f2341d777c6bdc0 --- build.gradle | 65 +- dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 61608 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 +- .../bartworks/API/BioObjectAdder.java | 4 +- .../bartworks/API/BioVatLogicAdder.java | 13 +- .../bartworks/API/BorosilicateGlass.java | 14 +- .../bartworks/API/LoaderReference.java | 86 -- .../bartimaeusnek/bartworks/API/package-info.java | 3 +- .../github/bartimaeusnek/bartworks/ASM/BWCore.java | 12 +- .../bartworks/ASM/BWCoreTransformer.java | 41 +- .../github/bartimaeusnek/bartworks/MainMod.java | 71 +- .../client/renderer/BW_GT_ItemRenderer.java | 9 - .../client/renderer/BW_Renderer_Block_Ores.java | 7 +- .../client/renderer/RendererGlasBlock.java | 2 - .../bartworks/common/configs/ConfigHandler.java | 14 - .../bartworks/common/items/LabParts.java | 4 +- .../common/loaders/ArtificialMicaLine.java | 17 +- .../bartworks/common/loaders/BeforeGTPreload.java | 6 +- .../bartworks/common/loaders/BioRecipeLoader.java | 274 +---- .../ElectricImplosionCompressorRecipes.java | 57 +- .../bartworks/common/loaders/FluidLoader.java | 7 +- .../bartworks/common/loaders/GTNHBlocks.java | 174 ++- .../bartworks/common/loaders/ItemRegistry.java | 396 +++---- .../common/loaders/RadioHatchMaterialLoader.java | 14 +- .../bartworks/common/loaders/RecipeLoader.java | 1120 +------------------- .../common/loaders/RegisterServerCommands.java | 7 +- .../common/loaders/StaticRecipeChangeLoaders.java | 26 +- .../common/loaders/recipes/Assembler.java | 224 ++++ .../common/loaders/recipes/AssemblyLine.java | 69 ++ .../common/loaders/recipes/Autoclave.java | 36 + .../common/loaders/recipes/Centrifuge.java | 177 ++++ .../common/loaders/recipes/ChemicalBath.java | 85 ++ .../common/loaders/recipes/ChemicalReactor.java | 24 + .../common/loaders/recipes/CraftingRecipes.java | 519 +++++++++ .../common/loaders/recipes/Electrolyzer.java | 170 +++ .../common/loaders/recipes/Extractor.java | 37 + .../common/loaders/recipes/FakeRecipes.java | 11 + .../common/loaders/recipes/FluidHeater.java | 22 + .../common/loaders/recipes/FluidSolidifier.java | 80 ++ .../common/loaders/recipes/FormingPress.java | 60 ++ .../common/loaders/recipes/LaserEngraver.java | 24 + .../bartworks/common/loaders/recipes/Mixer.java | 64 ++ .../common/loaders/recipes/Pulverizer.java | 82 ++ .../common/loaders/recipes/PyrolyseOven.java | 24 + .../bartworks/common/net/RendererPacket.java | 15 - .../BW_TileEntity_ExperimentalFloodGate.java | 6 +- .../classic/BW_TileEntity_HeatedWaterPump.java | 8 +- .../classic/BW_TileEntity_InfinityTank.java | 7 +- .../classic/BW_TileEntity_LESU_Redux.java | 488 --------- .../tileentities/multis/GT_TileEntity_BioVat.java | 18 +- .../multis/GT_TileEntity_CircuitAssemblyLine.java | 11 +- .../GT_TileEntity_ElectricImplosionCompressor.java | 10 +- .../tileentities/multis/GT_TileEntity_HTGR.java | 103 +- .../multis/GT_TileEntity_ManualTrafo.java | 9 +- .../tileentities/multis/GT_TileEntity_THTR.java | 106 +- .../multis/GT_TileEntity_Windmill.java | 7 +- .../mega/GT_TileEntity_MegaBlastFurnace.java | 41 +- .../mega/GT_TileEntity_MegaChemicalReactor.java | 29 +- .../mega/GT_TileEntity_MegaDistillTower.java | 24 +- .../mega/GT_TileEntity_MegaMultiBlockBase.java | 37 +- .../multis/mega/GT_TileEntity_MegaOilCracker.java | 29 +- .../mega/GT_TileEntity_MegaVacuumFreezer.java | 27 +- .../tiered/GT_MetaTileEntity_BioLab.java | 13 +- .../bartworks/neiHandler/BW_NEI_BioVatHandler.java | 1 - .../bartworks/neiHandler/IMCForNEI.java | 6 +- .../system/material/BW_GT_MaterialReference.java | 818 +------------- .../system/material/BW_MetaGenerated_Items.java | 3 - .../material/CircuitGeneration/BW_Meta_Items.java | 24 +- .../CircuitGeneration/CircuitPartLoader.java | 79 +- .../material/GT_Enhancement/BWGTMetaItems.java | 8 +- .../GT_Enhancement/GTMetaItemEnhancer.java | 18 +- .../material/GT_Enhancement/LuVTierEnhancer.java | 25 +- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 81 +- .../bartworks/system/material/Werkstoff.java | 29 +- .../bartworks/system/material/WerkstoffLoader.java | 99 +- .../processingLoaders/AdditionalRecipes.java | 32 +- .../werkstoff_loaders/recipe/AspectLoader.java | 8 +- .../werkstoff_loaders/recipe/BlockLoader.java | 5 +- .../werkstoff_loaders/recipe/CasingLoader.java | 9 +- .../werkstoff_loaders/recipe/CellLoader.java | 29 +- .../recipe/CraftingMaterialLoader.java | 24 +- .../werkstoff_loaders/recipe/CrushedLoader.java | 12 +- .../werkstoff_loaders/recipe/DustLoader.java | 12 +- .../werkstoff_loaders/recipe/GemLoader.java | 14 +- .../werkstoff_loaders/recipe/MoltenCellLoader.java | 30 +- .../recipe/MultipleMetalLoader.java | 5 +- .../werkstoff_loaders/recipe/OreLoader.java | 6 +- .../recipe/SimpleMetalLoader.java | 10 +- .../werkstoff_loaders/recipe/ToolLoader.java | 21 +- .../registration/BridgeMaterialsLoader.java | 37 +- .../bartworks/system/object/AbstractedStack.java | 7 +- .../bartworks/system/oregen/BW_OreLayer.java | 6 +- .../system/oregen/BW_WorldGenRoss128b.java | 35 +- .../system/oregen/BW_WorldGenRoss128ba.java | 31 +- .../bartimaeusnek/bartworks/util/BWRecipes.java | 8 +- .../bartworks/util/BW_Tooltip_Reference.java | 5 +- .../bartimaeusnek/bartworks/util/BW_Util.java | 23 +- .../bartimaeusnek/bartworks/util/BioCulture.java | 7 - .../bartworks/util/NoiseUtil/BartsNoise.java | 50 - .../accessprioritylist/AccessPriorityList.java | 8 +- .../bartimaeusnek/bartworks/util/package-info.java | 4 +- .../bartimaeusnek/crossmod/BartWorksCrossmod.java | 53 +- .../crossmod/GTpp/loader/RadioHatchCompat.java | 14 +- .../crossmod/ae2/ItemSingleItemStorageCell.java | 126 --- .../galacticgreg/GT_TileEntity_VoidMiner_Base.java | 6 +- .../galacticraft/UniversalTeleportType.java | 6 +- .../atmosphere/BWAtmosphereManager.java | 6 +- .../planets/ross128b/ChunkProviderRoss128b.java | 4 +- .../solarsystems/Ross128SolarSystem.java | 12 +- .../tileEntity/DysonSwarmSunReplacement.java | 15 +- .../openComputers/TileEntity_GTDataServer.java | 9 +- .../crossmod/tectech/TecTechResearchLoader.java | 36 +- .../crossmod/tgregworks/MaterialsInjector.java | 5 +- .../crossmod/thaumcraft/CustomAspects.java | 46 - 116 files changed, 3251 insertions(+), 3863 deletions(-) delete mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FakeRecipes.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java create mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java delete mode 100644 src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_LESU_Redux.java delete mode 100644 src/main/java/com/github/bartimaeusnek/crossmod/ae2/ItemSingleItemStorageCell.java delete mode 100644 src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/CustomAspects.java diff --git a/build.gradle b/build.gradle index 7b1f6c4507..055dcee435 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1679040806 +//version: 1680120787 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -65,7 +65,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false - id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle + id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle id 'com.github.johnrengelman.shadow' version '7.1.2' apply false id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version id 'de.undercouch.download' version '5.3.0' @@ -73,7 +73,7 @@ plugins { id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.3' + id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -160,6 +160,14 @@ java { } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" +} + +tasks.withType(ScalaCompile).configureEach { + options.encoding = "UTF-8" +} + pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { // If Kotlin is enabled in the project kotlin { @@ -397,8 +405,6 @@ minecraft { extraRunJvmArguments.add("-ea:${modGroup}") if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") - if (usesMixinDebug.toBoolean()) { extraRunJvmArguments.addAll([ "-Dmixin.debug.countInjections=true", @@ -513,14 +519,6 @@ repositories { url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - if (usesMixinDebug.toBoolean()) { - maven { - name = "Fabric Maven" - url = "https://maven.fabricmc.net/" - } - } - } maven { name 'sonatype' url 'https://oss.sonatype.org/content/repositories/snapshots/' @@ -559,29 +557,49 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.6" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.13:processor') + annotationProcessor(mixinProviderSpec) if (usesMixinDebug.toBoolean()) { runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16') } } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - implementation('com.gtnewhorizon:gtnhmixins:2.1.13') + if (usesMixins.toBoolean()) { + implementation(mixinProviderSpec) + } else if (forceEnableMixins.toBoolean()) { + runtimeOnlyNonPublishable(mixinProviderSpec) } } pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { if (usesMixins.toBoolean()) { dependencies { - kapt('com.gtnewhorizon:gtnhmixins:2.1.13:processor') + kapt(mixinProviderSpec) } } } +// Replace old mixin mods with unimixins +// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + } +} + apply from: 'dependencies.gradle' def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' @@ -695,13 +713,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.2.2' + def lwjgl3ifyVersion = '1.3.3' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.1.0') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -793,10 +811,6 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 } this.classpath(project.java17DependenciesCfg) - - if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) { - this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") - } } } @@ -1006,6 +1020,7 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] @@ -1125,7 +1140,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "project", "gtnhmixins") + addModrinthDep("required", "project", "unimixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) @@ -1169,7 +1184,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null } } if (usesMixins.toBoolean()) { - addCurseForgeRelation("requiredDependency", "gtnhmixins") + addCurseForgeRelation("requiredDependency", "unimixins") } tasks.curseforge.dependsOn(build) tasks.publish.dependsOn(tasks.curseforge) diff --git a/dependencies.gradle b/dependencies.gradle index 6a8c26e2e6..487bb6661a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.43:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.47:dev") api("com.github.GTNewHorizons:TecTech:5.0.85:dev") implementation("com.github.GTNewHorizons:TinkersConstruct:1.9.23-GTNH:dev") api("com.github.GTNewHorizons:Galacticraft:3.0.64-GTNH:dev") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa7..ccebba7710 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b601f7..bdc9a83b1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d65..79a61d421c 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java index a4a2c1b799..fb1e8c085f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java @@ -13,6 +13,8 @@ package com.github.bartimaeusnek.bartworks.API; +import static gregtech.api.enums.Mods.Gendustry; + import java.awt.*; import net.minecraft.item.EnumRarity; @@ -164,7 +166,7 @@ public final class BioObjectAdder { * postinit Phase) execute this. */ public static void regenerateBioFluids() { - FluidStack dnaFluid = LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 100) + FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 100) : Materials.Biomass.getFluid(100L); for (BioCulture B : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (B.getFluidNotSet()) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java index 9202be7d18..fdfb020919 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java @@ -14,6 +14,7 @@ package com.github.bartimaeusnek.bartworks.API; import static cpw.mods.fml.common.registry.GameRegistry.findBlock; +import static gregtech.api.enums.Mods.IndustrialCraft2; import java.util.HashMap; import java.util.HashSet; @@ -79,33 +80,33 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Depleted_Naquadah_4.get(1), Materials.Naquadah, 12, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorMOXSimpledepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), Materials.Plutonium, 3, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorMOXDualdepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), Materials.Plutonium, 6, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorMOXQuaddepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), Materials.Plutonium, 12, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorUraniumSimpledepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), Materials.Uranium, 3, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorUraniumDualdepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), Materials.Uranium, 6, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorUraniumQuaddepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), Materials.Uranium, 12, 10); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java index 0242fd3650..3076455c70 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java @@ -1,6 +1,10 @@ package com.github.bartimaeusnek.bartworks.API; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAdder; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; +import static gregtech.api.enums.Mods.BartWorks; import java.util.ArrayList; import java.util.List; @@ -44,12 +48,16 @@ public class BorosilicateGlass { } private static Block getGlassBlock() { - if (block == null) block = GameRegistry.findBlock("bartworks", "BW_GlasBlocks"); + if (block == null) { + block = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks"); + } return block; } private static Block getGlassBlock2() { - if (block2 == null) block2 = GameRegistry.findBlock("bartworks", "BW_GlasBlocks2"); + if (block2 == null) { + block2 = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks2"); + } return block2; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java deleted file mode 100644 index acc2da9ede..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.API; - -import cpw.mods.fml.common.Loader; - -/** - * DO NOT CALL THIS IN THE CORE MOD! IT WILL __NOT__ WORK AND FUCK EVERYTHING UP! - */ -public class LoaderReference { - - private LoaderReference() {} - - public static boolean Natura; - public static boolean RandomThings; - public static boolean TConstruct; - public static boolean chisel; - public static boolean Railcraft; - public static boolean Ztones; - public static boolean witchery; - public static boolean GalaxySpace; - public static boolean GalacticraftCore; - public static boolean GalacticraftMars; - public static boolean Thaumcraft; - public static boolean miscutils; - public static boolean tectech; - public static boolean ExtraUtilities; - public static boolean RWG; - public static boolean galacticgreg; - public static boolean gendustry; - public static boolean croploadcore; - public static boolean Forestry; - public static boolean berriespp; - public static boolean dreamcraft; - public static boolean BloodArsenal; - public static boolean Botany; - public static boolean EnderIO; - public static boolean HardcoreEnderExpension; - public static boolean betterloadingscreen; - public static boolean TGregworks; - public static boolean ProjRedIllumination; - public static boolean Botania; - - public static void init() { - Natura = Loader.isModLoaded("Natura"); - RandomThings = Loader.isModLoaded("RandomThings"); - TConstruct = Loader.isModLoaded("TConstruct"); - chisel = Loader.isModLoaded("chisel"); - Railcraft = Loader.isModLoaded("Railcraft"); - Ztones = Loader.isModLoaded("Ztones"); - witchery = Loader.isModLoaded("witchery"); - GalaxySpace = Loader.isModLoaded("GalaxySpace"); - GalacticraftCore = Loader.isModLoaded("GalacticraftCore"); - GalacticraftMars = Loader.isModLoaded("GalacticraftMars"); - Thaumcraft = Loader.isModLoaded("Thaumcraft"); - miscutils = Loader.isModLoaded("miscutils"); - tectech = Loader.isModLoaded("tectech"); - ExtraUtilities = Loader.isModLoaded("ExtraUtilities"); - RWG = Loader.isModLoaded("RWG"); - galacticgreg = Loader.isModLoaded("galacticgreg"); - gendustry = Loader.isModLoaded("gendustry"); - croploadcore = Loader.isModLoaded("croploadcore"); - Forestry = Loader.isModLoaded("Forestry"); - berriespp = Loader.isModLoaded("berriespp"); - dreamcraft = Loader.isModLoaded("dreamcraft"); - BloodArsenal = Loader.isModLoaded("BloodArsenal"); - Botany = Loader.isModLoaded("Botany"); - EnderIO = Loader.isModLoaded("EnderIO"); - HardcoreEnderExpension = Loader.isModLoaded("HardcoreEnderExpension"); - betterloadingscreen = Loader.isModLoaded("betterloadingscreen"); - TGregworks = Loader.isModLoaded("TGregworks"); - ProjRedIllumination = Loader.isModLoaded("ProjRed|Illumination"); - Botania = Loader.isModLoaded("Botania"); - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java index bf495440e5..4bef7a0cad 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java @@ -10,7 +10,8 @@ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -@API(owner = "bartworks", apiVersion = API_REFERENCE.VERSION, provides = "bartworks API") +@API(owner = Mods.Names.BART_WORKS, apiVersion = API_REFERENCE.VERSION, provides = "bartworks API") package com.github.bartimaeusnek.bartworks.API; import cpw.mods.fml.common.API; +import gregtech.api.enums.Mods; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java index a747c95f7f..60202e102e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java @@ -14,6 +14,10 @@ package com.github.bartimaeusnek.bartworks.ASM; import static com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer.shouldTransform; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.RWG; +import static gregtech.api.enums.Mods.Thaumcraft; import java.util.ArrayList; import java.util.List; @@ -68,10 +72,10 @@ public class BWCore extends DummyModContainer { @Override public List getDependants() { List ret = new ArrayList<>(); - ret.add(new DefaultArtifactVersion("ExtraUtilities", true)); - ret.add(new DefaultArtifactVersion("Thaumcraft", true)); - ret.add(new DefaultArtifactVersion("miscutils", true)); - ret.add(new DefaultArtifactVersion("RWG", true)); + ret.add(new DefaultArtifactVersion(ExtraUtilities.ID, true)); + ret.add(new DefaultArtifactVersion(Thaumcraft.ID, true)); + ret.add(new DefaultArtifactVersion(GTPlusPlus.ID, true)); + ret.add(new DefaultArtifactVersion(RWG.ID, true)); ret.add(new DefaultArtifactVersion(MainMod.MOD_ID, true)); ret.add(new DefaultArtifactVersion(BartWorksCrossmod.MOD_ID, true)); return ret; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java index 58d65ddec5..1605192572 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java @@ -13,7 +13,26 @@ package com.github.bartimaeusnek.bartworks.ASM; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFNE; +import static org.objectweb.asm.Opcodes.IF_ICMPGE; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INSTANCEOF; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IREM; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.SIPUSH; import java.util.Arrays; import java.util.List; @@ -22,7 +41,19 @@ import net.minecraft.launchwrapper.IClassTransformer; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.IntInsnNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; public class BWCoreTransformer implements IClassTransformer { @@ -351,12 +382,6 @@ public class BWCoreTransformer implements IClassTransformer { } } - // case 6: { - // BWCore.BWCORE_LOG.info("Could find: " + - // BWCoreTransformer.CLASSESBEEINGTRANSFORMED[id]); - // ((IntInsnNode) methods.get(11).instructions.get(10)).operand = 10000; - // break scase; - // } default: { BWCore.BWCORE_LOG.info("Could not find: " + BWCoreTransformer.CLASSESBEEINGTRANSFORMED[id]); return basicClass; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 2a873977a9..f157c6c0e7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -16,6 +16,8 @@ package com.github.bartimaeusnek.bartworks; import static com.github.bartimaeusnek.bartworks.common.loaders.BioRecipeLoader.runOnServerStarted; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.removeIC2Recipes; import static gregtech.api.enums.GT_Values.VN; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.io.IOException; import java.util.Map; @@ -27,14 +29,28 @@ import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.github.bartimaeusnek.bartworks.API.*; +import com.github.bartimaeusnek.bartworks.API.API_ConfigValues; +import com.github.bartimaeusnek.bartworks.API.API_REFERENCE; +import com.github.bartimaeusnek.bartworks.API.BioObjectAdder; +import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder; +import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.client.ClientEventHandler.TooltipEventHandler; import com.github.bartimaeusnek.bartworks.client.creativetabs.BioTab; import com.github.bartimaeusnek.bartworks.client.creativetabs.GT2Tab; import com.github.bartimaeusnek.bartworks.client.creativetabs.bartworksTab; import com.github.bartimaeusnek.bartworks.client.textures.PrefixTextureLinker; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -import com.github.bartimaeusnek.bartworks.common.loaders.*; +import com.github.bartimaeusnek.bartworks.common.loaders.ArtificialMicaLine; +import com.github.bartimaeusnek.bartworks.common.loaders.BeforeGTPreload; +import com.github.bartimaeusnek.bartworks.common.loaders.BioCultureLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.BioLabLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.GTNHBlocks; +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.common.loaders.LocalisationLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.RadioHatchMaterialLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.RecipeLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.RegisterServerCommands; +import com.github.bartimaeusnek.bartworks.common.loaders.StaticRecipeChangeLoaders; import com.github.bartimaeusnek.bartworks.common.net.BW_Network; import com.github.bartimaeusnek.bartworks.neiHandler.IMCForNEI; import com.github.bartimaeusnek.bartworks.server.EventHandler.ServerEventHandler; @@ -49,10 +65,16 @@ import com.github.bartimaeusnek.bartworks.util.log.DebugLog; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import gregtech.api.GregTech_API; +import gregtech.api.enums.Mods; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; @@ -74,12 +96,12 @@ public final class MainMod { public static final String NAME = "BartWorks"; public static final String VERSION = "GRADLETOKEN_VERSION"; - public static final String MOD_ID = "bartworks"; + public static final String MOD_ID = Mods.Names.BART_WORKS; public static final String APIVERSION = "11"; public static final Logger LOGGER = LogManager.getLogger(MainMod.NAME); public static final CreativeTabs GT2 = new GT2Tab("GT2C"); public static final CreativeTabs BIO_TAB = new BioTab("BioTab"); - public static final CreativeTabs BWT = new bartworksTab("bartworks"); + public static final CreativeTabs BWT = new bartworksTab(BartWorks.ID); public static final IGuiHandler GH = new GuiHandler(); @Mod.Instance(MainMod.MOD_ID) @@ -98,16 +120,10 @@ public final class MainMod { MainMod.LOGGER.error("Something has loaded an old API. Please contact the Mod authors to update!"); } - LoaderReference.init(); // Check for ALL the mods. - - if (LoaderReference.miscutils) { + if (GTPlusPlus.isModLoaded()) { MainMod.LOGGER.info("Found GT++, continuing"); } - if (LoaderReference.dreamcraft) ConfigHandler.hardmode = true; - - ConfigHandler.hardmode = ConfigHandler.ezmode != ConfigHandler.hardmode; - if (API_ConfigValues.debugLog) { try { DebugLog.initDebugLog(preinit); @@ -116,21 +132,18 @@ public final class MainMod { } } - if (ConfigHandler.newStuff) { - WerkstoffLoader.setUp(); - } - - if (ConfigHandler.hardmode) MainMod.LOGGER.info(". . . ACTIVATED HARDMODE."); + WerkstoffLoader.setUp(); if (ConfigHandler.BioLab) { BioCultureLoader.run(); } - if (ConfigHandler.newStuff) { - Werkstoff.init(); - GregTech_API.sAfterGTPostload.add(new CircuitPartLoader()); - if (SideReference.Side.Client) GregTech_API.sBeforeGTLoad.add(new PrefixTextureLinker()); + Werkstoff.init(); + GregTech_API.sAfterGTPostload.add(new CircuitPartLoader()); + if (SideReference.Side.Client) { + GregTech_API.sBeforeGTLoad.add(new PrefixTextureLinker()); } + } @Mod.EventHandler @@ -142,10 +155,12 @@ public final class MainMod { MinecraftForge.EVENT_BUS.register(serverEventHandler); } FMLCommonHandler.instance().bus().register(serverEventHandler); - if (ConfigHandler.BioLab) BioLabLoader.run(); - if (ConfigHandler.newStuff) { - WerkstoffLoader.runInit(); + if (ConfigHandler.BioLab) { + BioLabLoader.run(); } + + WerkstoffLoader.runInit(); + ItemRegistry.run(); RecipeLoader.run(); IMCForNEI.IMCSender(); @@ -165,10 +180,10 @@ public final class MainMod { } ArtificialMicaLine.runArtificialMicaRecipe(); BioObjectAdder.regenerateBioFluids(); - if (ConfigHandler.newStuff) { - WerkstoffLoader.run(); - LocalisationLoader.localiseAll(); - } + + WerkstoffLoader.run(); + LocalisationLoader.localiseAll(); + RadioHatchMaterialLoader.run(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java index b375a1c1b0..4a6561f9ef 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java @@ -112,15 +112,6 @@ public class BW_GT_ItemRenderer implements IItemRenderer { tIcon.getIconWidth(), tIcon.getIconHeight(), 0.0625F); - // else { - // for (int i = 0; i < 4; i++) { - // ItemRenderer.renderItemIn2D(Tessellator.instance, - // 0.0F+i*2F,0.0F+i*2F,10.0F+i*2F,10.0F+i*2F, tIcon.getIconWidth(), tIcon.getIconHeight(),0.0625F); - // } - // } - // ItemRenderer.renderItemIn2D(Tessellator.instance, tIcon.getMaxU(), - // tIcon.getMinV(), tIcon.getMinU(), tIcon.getMaxV(), tIcon.getIconWidth(), tIcon.getIconHeight(), - // 0.0625F); } IIcon tOverlay = (IIcon) BW_Util.get2DCoordFrom1DArray(aMetaData, 1, 2, aItem.mIconList); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java index c298b6a321..9e25535970 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java @@ -13,7 +13,12 @@ package com.github.bartimaeusnek.bartworks.client.renderer; -import static gregtech.common.render.GT_Renderer_Block.*; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeXFacing; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeYFacing; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeZFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveXFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveYFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveZFacing; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java index 244d7e5c7c..de1d90a3f4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java @@ -72,8 +72,6 @@ public class RendererGlasBlock implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - // renderer.setRenderBounds(0.001,0.001,0.001,0.999,0.999,0.999); - // renderer.setRenderBounds(0,0,0,1,1,1); if (block instanceof BW_GlasBlocks) { renderer.renderStandardBlock(ItemRegistry.bw_fake_glasses, x, y, z); renderer.renderStandardBlockWithColorMultiplier( diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 8d5e071bd3..46e63a89ec 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -53,8 +53,6 @@ public class ConfigHandler { public static boolean DEHPDirectSteam; public static boolean teslastaff; public static boolean classicMode; - public static boolean hardmode; - public static boolean ezmode; public static boolean GTppLogDisabler; public static boolean tooltips = true; @@ -131,23 +129,11 @@ public class ConfigHandler { "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") .getInt(12600); - ConfigHandler.ezmode = ConfigHandler.c - .get( - "System", - "Mode switch", - false, - "If GTNH is Loaded, this will enable easy recipes, if not, it will enable harder recipes.") - .getBoolean(false); ConfigHandler.teslastaff = ConfigHandler.c.get( "System", "Enable Teslastaff", false, "Enables the Teslastaff, an Item used to destroy Electric Armors").getBoolean(false); - ConfigHandler.newStuff = !ConfigHandler.c.get( - "System", - "Disable non-original-GT-stuff", - false, - "This switch disables my new content, that is not part of the GT2 compat").getBoolean(false); ConfigHandler.BioLab = !ConfigHandler.c.get( "System", "Disable BioLab", diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java index 3ae2981575..e8632c574c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java @@ -13,7 +13,9 @@ package com.github.bartimaeusnek.bartworks.common.items; -import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.*; +import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.getAllDNASampleFlasks; +import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.getAllPetriDishes; +import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.getAllPlasmidCells; import java.util.List; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java index 60f7b1f30e..afc306280f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java @@ -1,9 +1,10 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.system.material.BW_GT_MaterialReference; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; @@ -184,11 +185,13 @@ public class ArtificialMicaLine { 120, 0)); // Fluorophlogopite = 4Insulator Foil - if (LoaderReference.dreamcraft) GT_Values.RA.addBenderRecipe( - WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), - GT_Utility.getIntegratedCircuit(1), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 4), - 10, - 600); + if (NewHorizonsCoreMod.isModLoaded()) { + GT_Values.RA.addBenderRecipe( + WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), + GT_Utility.getIntegratedCircuit(1), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4), + 10, + 600); + } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java index 7f10a18de0..cb08db3ba8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java @@ -13,6 +13,8 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static gregtech.api.enums.Mods.BartWorks; + import java.lang.reflect.Field; import net.minecraft.block.Block; @@ -52,7 +54,7 @@ public class BeforeGTPreload implements Runnable { ModContainer gregtech = Loader.instance().activeModContainer(); boolean switchback = false; LoadController modController = null; - if (!Loader.instance().activeModContainer().getModId().equals("bartworks")) { + if (!Loader.instance().activeModContainer().getModId().equals(BartWorks.ID)) { Field fieldModController = FieldUtils.getDeclaredField(Loader.class, "modController", true); try { modController = (LoadController) fieldModController.get(Loader.instance()); @@ -63,7 +65,7 @@ public class BeforeGTPreload implements Runnable { assert modController != null; for (ModContainer mod : modController.getActiveModList()) { - if (mod.getModId().equals("bartworks")) { + if (mod.getModId().equals(BartWorks.ID)) { bartworks = mod; } if (bartworks != null) break; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java index d51b0f3c04..54e0d4633e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java @@ -13,247 +13,32 @@ package com.github.bartimaeusnek.bartworks.common.loaders; -import java.util.List; +import static gregtech.api.enums.Mods.CropsPlusPlus; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_BioVat; -import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_BioLab; -import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_RadioHatch; import com.github.bartimaeusnek.bartworks.util.BWRecipes; import com.github.bartimaeusnek.bartworks.util.BW_Util; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; public class BioRecipeLoader { - @SuppressWarnings("deprecation") public static void run() { + registerWaterBasedBioLabIncubations(); + registerBacterialVatRecipes(); + } - // DNAExtractionModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[0], - RecipeLoader.BITSD, - new Object[] { "TET", "CFC", "TST", 'T', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'E', - ItemList.Emitter_EV.get(1L), 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', - ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); - - // PCRThermoclyclingModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[1], - RecipeLoader.BITSD, - new Object[] { "NEN", "CFC", "NSN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'E', - ItemList.Emitter_EV.get(1L), 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', - ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); - - // PlasmidSynthesisModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[2], - RecipeLoader.BITSD, - new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', - "circuit" + Materials.Data, 'F', ItemList.Field_Generator_EV.get(1L), 'E', - ItemList.Emitter_EV.get(1L), 'S', ItemList.Sensor_EV.get(1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), }); - // TransformationModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[3], - RecipeLoader.BITSD, - new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 1L), }); - - // ClonalCellularSynthesisModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[4], - RecipeLoader.BITSD, - new Object[] { "FEF", "CPC", "FSF", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 1L), }); - - List oreCropVine = OreDictionary.getOres("cropVine", false); - if (LoaderReference.croploadcore && !oreCropVine.isEmpty()) for (ItemStack stack : oreCropVine) { - GT_Values.RA.addExtractorRecipe( - BW_Util.setStackSize(stack, 12), - BioItemList.getOther(1), - 500, - BW_Util.getMachineVoltageFromTier(3)); - } - else GT_Values.RA.addExtractorRecipe( - new ItemStack(Blocks.vine, 12), - BioItemList.getOther(1), - 500, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addExtractorRecipe( - ItemList.Circuit_Chip_Stemcell.get(1L), - BioItemList.getOther(4), - 500, - BW_Util.getMachineVoltageFromTier(6)); - - FluidStack dnaFluid = LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 1000) - : Materials.Biomass.getFluid(1000L); - GT_Values.RA.addMixerRecipe( - GT_Utility.getIntegratedCircuit(17), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), - null, - null, - dnaFluid, - new FluidStack(FluidLoader.BioLabFluidMaterials[0], 2000), - Materials.Empty.getCells(1), - 500, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(17), - null, - new FluidStack(BioCultureLoader.eColi.getFluid(), 1000), - new FluidStack(FluidLoader.BioLabFluidMaterials[1], 10), - BioItemList.getOther(4), - null, - null, - null, - null, - null, - new int[] { 1000 }, - 60 * 20, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(17), - null, - new FluidStack(FluidLoader.BioLabFluidMaterials[1], 1000), - new FluidStack(FluidLoader.BioLabFluidMaterials[3], 250), - null, - null, - null, - null, - null, - null, - null, - 60 * 20, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(17), - null, - new FluidStack(BioCultureLoader.CommonYeast.getFluid(), 1000), - new FluidStack(FluidLoader.BioLabFluidMaterials[2], 10), - null, - null, - null, - null, - null, - null, - null, - 60 * 20, - BW_Util.getMachineVoltageFromTier(3)); - - ItemStack[] Pistons = { ItemList.Electric_Piston_HV.get(1L), ItemList.Electric_Piston_EV.get(1L), - ItemList.Electric_Piston_IV.get(1L), ItemList.Electric_Piston_LuV.get(1L), - ItemList.Electric_Piston_ZPM.get(1L), ItemList.Electric_Piston_UV.get(1L) }; - ItemStack[] BioLab = new ItemStack[GT_Values.VN.length - 3]; - ItemStack[] RadioHatch = new ItemStack[GT_Values.VN.length - 3]; - Materials[] cables = { Materials.Gold, Materials.Aluminium, Materials.Tungsten, Materials.VanadiumGallium, - Materials.Naquadah, Materials.NaquadahAlloy, Materials.Superconductor }; - Materials[] hulls = { Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, - Materials.Iridium, Materials.Osmium, Materials.Naquadah }; - Materials[] wireMat = { Materials.Kanthal, Materials.Nichrome, Materials.TungstenSteel, Materials.Naquadah, - Materials.NaquadahAlloy, Materials.Superconductor }; - Materials[] circuits = { Materials.Advanced, Materials.Data, Materials.Elite, Materials.Master, - Materials.Ultimate, Materials.Superconductor }; - for (int i = 3; i < GT_Values.VN.length - 1; i++) { - // 12625 - BioLab[(i - 3)] = new GT_MetaTileEntity_BioLab( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, - "bw.biolab" + GT_Values.VN[i], - GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"), - i).getStackForm(1L); - RadioHatch[(i - 3)] = new GT_MetaTileEntity_RadioHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, - "bw.radiohatch" + GT_Values.VN[i], - GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"), - i).getStackForm(1L); - try { - ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L); - GT_ModHandler.addCraftingRecipe( - BioLab[(i - 3)], - RecipeLoader.BITSD, - new Object[] { "PFP", "WCW", "OGO", 'F', - GT_OreDictUnificator.get(OrePrefixes.frameGt, hulls[(i - 3)], 1L), 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt01, wireMat[(i - 3)], 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', - "circuit" + circuits[(i - 3)], 'C', machinehull }); - GT_ModHandler.addCraftingRecipe( - RadioHatch[(i - 3)], - RecipeLoader.BITSD, - new Object[] { "DPD", "DCD", "DKD", 'D', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C', machinehull, - 'K', GT_OreDictUnificator.get(OrePrefixes.cableGt08, cables[(i - 3)], 1L), 'P', - Pistons[(i - 3)] }); - } catch (ArrayIndexOutOfBoundsException e) { - // e.printStackTrace(); - } - } - GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_BioVat( - ConfigHandler.IDOffset + GT_Values.VN.length * 7, - "bw.biovat", - StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', - "circuit" + Materials.Data, 'K', - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), 'H', - ItemList.MACHINE_HULLS[3].get(1L) }); - - Materials[] sterilizers = { Materials.Ammonia, Materials.Chlorine, Materials.Ethanol, Materials.Methanol }; - for (Materials used : sterilizers) { - GT_Values.RA.addAutoclaveRecipe( - ItemList.Circuit_Parts_PetriDish.get(1L), - used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), - BioItemList.getPetriDish(null), - 10000, - 100, - BW_Util.getMachineVoltageFromTier(1)); - - GT_Values.RA.addAutoclaveRecipe( - new ItemStack(Items.glass_bottle), - used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), - BioItemList.getDNASampleFlask(null), - 10000, - 100, - BW_Util.getMachineVoltageFromTier(1)); - } - - GT_Values.RA.addLaserEngraverRecipe( - new ItemStack(Items.emerald), - GT_Utility.getIntegratedCircuit(17), - BioItemList.getPlasmidCell(null), - 100, - BW_Util.getMachineVoltageFromTier(1)); - + public static void registerWaterBasedBioLabIncubations() { FluidStack[] easy