Cleanup (#2803)

* remove dead code

* use proper materials for tiered circuits

* remove yet another RA1 call

* remove deprecated usage

* small step toward Research station assline recipes migration

* remove dead code

* remove dead code

* remove dead code

* migrate BW recipes

* remove some more RA1 code

* remove bad search and replace + spotlessapply

* yeet deprecated code and change how sieverts for recipes are computed

* fix loading

* fix bad replacements

* spotless apply

2 files changed, 44 insertions, 52 deletions

diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java
index bd0df8652b..674c1dd799 100644
--- a/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java
+++ b/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java
@@ -29,9 +29,9 @@ public class ModDBMDef {
 
     /**
      * Internal function
-     * 
+     *
      * Check if the given Block is equal to the block in this instance
-     * 
+     *
      * @param pBlock the Block in question
      * @return
      */
@@ -45,9 +45,9 @@ public class ModDBMDef {
 
     /**
      * Internal function
-     * 
+     *
      * Check if the given Block is equal to the block in this instance and matches the metadata
-     * 
+     *
      * @param pBlock the block in question
      * @param pMeta  the metadata in question
      * @return
@@ -73,7 +73,7 @@ public class ModDBMDef {
 
     /**
      * Create a new "Block that can be replaced by ores" definition. Meta defaults to 0 here
-     * 
+     *
      * @param pTargetBlockName The unlocalizedName of the block
      */
     public ModDBMDef(String pTargetBlockName) {
@@ -82,7 +82,7 @@ public class ModDBMDef {
 
     /**
      * Create a new "Block that can be replaced by ores" definition
-     * 
+     *
      * @param pTargetBlockName The unlocalizedName of the block
      * @param pMetaData        The blocks metadata
      */
@@ -92,7 +92,7 @@ public class ModDBMDef {
 
     /**
      * Create a new "Block that can be replaced by ores" definition
-     * 
+     *
      * @param pTargetBlock The instance of the block that can be replaced
      * @param pMetaData    The blocks metadata
      */
@@ -102,7 +102,7 @@ public class ModDBMDef {
 
     /**
      * Create a new "Block that can be replaced by ores" definition. Meta defaults to 0 here
-     * 
+     *
      * @param pTargetBlock The instance of the block that can be replaced
      */
     public ModDBMDef(Block pTargetBlock) {
@@ -111,7 +111,7 @@ public class ModDBMDef {
 
     /**
      * Create a new "Block that can be replaced by ores" definition
-     * 
+     *
      * @param pTargetBlock
      * @param pCanAlwaysReplace set to true if this block can always be replaced, regardless of it's metavalue. Like:
      *                          [block]:*
@@ -122,7 +122,7 @@ public class ModDBMDef {
 
     /**
      * Create a new "Block that can be replaced by ores" definition
-     * 
+     *
      * @param pTargetBlockName  The unlocalizedName of the block
      * @param pCanAlwaysReplace set to true if this block can always be replaced, regardless of it's metavalue. Like:
      *                          [block]:*
@@ -133,7 +133,7 @@ public class ModDBMDef {
 
     /**
      * Create a new "Block that can be replaced by ores" definition
-     * 
+     *
      * @param pTargetBlockName  The unlocalizedName of the block
      * @param pMetaData         The blocks metadata
      * @param pCanAlwaysReplace set to true if this block can always be replaced, regardless of it's metavalue. Like:
@@ -148,18 +148,14 @@ public class ModDBMDef {
     /**
      * Internal function Never run this function. It is used to update the blocks name when GalacticGreg is initializing
      * its internal structures
-     * 
+     *
      * @param pParentModName The modname to be attached to the block-name
      */
     public void updateBlockName(String pParentModName) {
         // Do we already have a FQBN? then do nothing
         if (_targetBlockName.contains(":")) {
-            // GalacticGreg.Logger.trace("Not updating blockname, as it already contains a mods name: %s",
-            // _targetBlockName);
             return;
         }
-        // GalacticGreg.Logger.trace("Updating blockname: Old: %s new: %s:%s", _targetBlockName, pParentModName,
-        // _targetBlockName);
         _targetBlockName = String.format("%s:%s", pParentModName, _targetBlockName);
     }
 }
diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java
index 4b634173f1..92b291f089 100644
--- a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java
+++ b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java
@@ -46,7 +46,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return A list of possible asteroid-mixes that shall be generated
      */
     public List<AsteroidBlockComb> getValidAsteroidMaterials() {
@@ -75,7 +75,7 @@ public class ModDimensionDef {
     /**
      * Register new generator for objects in space. You can register as many as you want. If you don't register
      * anything, no structures will generate and the default Asteroid-Generator will be used
-     * 
+     *
      * @param pSpaceObjectGenerator An instance of your own object generator
      */
     public void registerSpaceObjectGenerator(ISpaceObjectGenerator pSpaceObjectGenerator) {
@@ -128,11 +128,11 @@ public class ModDimensionDef {
      * dimension, and you probably don't want to have asteroids stuck in the ground, both generators are separated from
      * each other. Basically, you can go with the default values. If you want to change them, make sure that pOregenMaxY
      * is lower than pAsteroidMinY
-     * 
+     *
      * @param pOregenMaxY   The maximum Y-height where ores will be allowed to spawn. Default: 64
      * @param pAsteroidMinY The minimum Y-height that has to be reached before asteroids will spawn. Default: 128
      * @throws IllegalArgumentException if the limits are invalid
-     * 
+     *
      */
     public void setAsteroidAndPlanetLimits(int pOregenMaxY, int pAsteroidMinY) {
         if (pOregenMaxY >= pAsteroidMinY)
@@ -145,7 +145,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return A list of all special blocks that shall be used to generate the asteroids.
      */
     public List<SpecialBlockComb> getSpecialBlocksForAsteroids() {
@@ -158,7 +158,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return The type for this dimension
      */
     public DimensionType getDimensionType() {
@@ -168,7 +168,7 @@ public class ModDimensionDef {
     /**
      * Set whether this DimensionDefinition defines an void-dimension that shall spawn asteroids instead of ores in
      * stone
-     * 
+     *
      * @param pType The dimensiontype to be used
      */
     public void setDimensionType(DimensionType pType) {
@@ -177,7 +177,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return The configuration for AirBlocks
      */
     public AirReplaceRule getAirSetting() {
@@ -189,10 +189,10 @@ public class ModDimensionDef {
      * NeverReplaceAir: No matter what, if there is an Air-Block found, it will not replace it. AllowReplaceAir: This
      * will generate Ores in Stones (defined by addBlockDefinition()) and air if found OnlyReplaceAir : This will not
      * generate Ores in solid blocks, but only in air
-     * 
+     *
      * Note that "OnlyReplaceAir" is a special setting if you have a dimension that is not defined as "Asteroids" but
      * you still need/want to generate ores in midair.
-     * 
+     *
      * @param pSetting
      */
     public void setAirSetting(AirReplaceRule pSetting) {
@@ -201,7 +201,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return The dimension identifier that is used internally to identify the dimension
      */
     public String getDimIdentifier() {
@@ -211,10 +211,10 @@ public class ModDimensionDef {
     /**
      * Set a manual override for ores that shall be generated. This setting is ignored if getIsAsteroidDimension()
      * returns true
-     * 
+     *
      * For example, on GalactiCraft Mars, this value is set to GTOreTypes.RedGranite, because it matches the color
      * better. If you don't set anything here, it will generate regular stone-ores.
-     * 
+     *
      * @param pStoneType
      */
     public void setStoneType(GTOreTypes pStoneType) {
@@ -223,7 +223,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return The stone override for gregtech ores
      */
     public GTOreTypes getStoneType() {
@@ -232,7 +232,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return The attached chunk-provider for this dimension
      */
     public String getChunkProviderName() {
@@ -242,14 +242,12 @@ public class ModDimensionDef {
     /**
      * Adds a new blockdefinition to this dimension. This block will then later be replaced by ores. You can add as many
      * blocks as you want. Just don't add Blocks.Air, as there is another setting for allowing Air-Replacement
-     * 
+     *
      * @param pBlockDef
      * @return
      */
     public boolean addBlockDefinition(ModDBMDef pBlockDef) {
         if (_mReplaceableBlocks.contains(pBlockDef)) {
-            // GalacticGreg.Logger.error("Cannot add Block %s:%d, as it is already existing!", pBlockDef.getBlockName(),
-            // pBlockDef.getMeta());
             return false;
         } else {
             _mReplaceableBlocks.add(pBlockDef);
@@ -259,7 +257,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return The DimensionName in a Human-readable format
      */
     public String getDimensionName() {
@@ -268,7 +266,7 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * @return A list of all defined Blocks that can be replaced while generating ores
      */
     public ArrayList<ModDBMDef> getReplaceableBlocks() {
@@ -277,7 +275,7 @@ public class ModDimensionDef {
 
     /**
      * Define a new dimension
-     * 
+     *
      * @param pDimensionName The human-readable. Spaces will be removed
      * @param pChunkProvider The chunkprovider class that shall be observed for the oregen
      */
@@ -293,7 +291,7 @@ public class ModDimensionDef {
 
     /**
      * Define a new dimension
-     * 
+     *
      * @param pDimensionName    The human-readable. Spaces will be removed
      * @param pChunkProvider    The chunkprovider class that shall be observed for the oregen
      * @param pBlockDefinitions The list of predefined blocks to be replaced by ores
@@ -310,7 +308,7 @@ public class ModDimensionDef {
 
     /**
      * Define a new dimension
-     * 
+     *
      * @param pDimensionName     The human-readable DimensionName. Spaces will be removed
      * @param pChunkProviderName The human-readable, full-qualified classname for the chunkprovider
      */
@@ -320,7 +318,7 @@ public class ModDimensionDef {
 
     /**
      * Define a new dimension
-     * 
+     *
      * @param pDimensionName     The human-readable DimensionName. Spaces will be removed
      * @param pChunkProviderName The human-readable, full-qualified classname for the chunkprovider
      * @param pBlockDefinitions  The list of predefined blocks to be replaced by ores
@@ -343,15 +341,13 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * Do not call this function by yourself. Ever. It will cause explosions, water to blood, death of firstborn,...
      * Seriously, don't do it.
      */
     protected void setParentModName(String pModName) {
         if (_mInternalDimIdentifier.equals(STR_NOTDEFINED)) {
             _mInternalDimIdentifier = String.format("%s_%s", pModName, _mDimensionName);
-            // GalacticGreg.Logger.debug("Set Internal Identifier for Dimension %s to %s", _mDimensionName,
-            // _mInternalDimIdentifier);
         }
 
         // Else Don't update, we're already set
@@ -360,9 +356,9 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * Check if pBlock can be replaced by an ore
-     * 
+     *
      * @param pBlock
      * @param pMeta
      * @return
@@ -389,9 +385,9 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * Randomly select one material out of all defined materials
-     * 
+     *
      * @return
      */
     public AsteroidBlockComb getRandomAsteroidMaterial() {
@@ -405,9 +401,9 @@ public class ModDimensionDef {
 
     /**
      * Internal function
-     * 
+     *
      * Randomly select one special block to be placed in the asteroids
-     * 
+     *
      * @return
      */
     public SpecialBlockComb getRandomSpecialAsteroidBlock() {
@@ -421,7 +417,7 @@ public class ModDimensionDef {
 
     /**
      * Define the material the asteroid shall be made of. Limited to GT-Based Ores and their stones
-     * 
+     *
      * @param pMaterial
      */
     public void addAsteroidMaterial(GTOreTypes pMaterial) {
@@ -430,7 +426,7 @@ public class ModDimensionDef {
 
     /**
      * Define the material the asteroid shall be made of, more advanced option to specify your own blocks
-     * 
+     *
      * @param pBlockComb
      */
     public void addAsteroidMaterial(AsteroidBlockComb pBlockComb) {
@@ -443,7 +439,7 @@ public class ModDimensionDef {
      * Adds a new material for asteroid generation. These will spawn randomly in asteroids if enabled. You can basically
      * add every block you can imagine. Be warned though, if you use Liquids (Water / Lava / ..), it can affect
      * performance if the liquid is flowing down to the void. So make sure you define "AsteroidCore" as position
-     * 
+     *
      * @param pBlock Block-Meta Combination that shall be used
      */
     public void addSpecialAsteroidBlock(SpecialBlockComb pBlock) {