Update 1.21 filesystem (#4644)

Author: gustovafing

dependencies.gradle

@@ -17,7 +17,6 @@ dependencies {
     compileOnly(forge.emi)
 
     // WAILA-likes
-    compileOnly(forge.theoneprobe)
     compileOnly(forge.jade)
 
     // Curios

docs/content/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md

@@ -8,9 +8,9 @@ title: Modifying Existing Materials
 All periodic table elements are present in GT, but some of them don't have any properties attached. You can also add a BlastProperty for EBF autogenerated recipes. You can also do this for other materials such as Obsidian. Here is how you can add them:
 
 ```js title="periodic_table_elements.js"
-    const $IngotProperty = Java.loadClass('com.gregtechceu.gtceu.api.material.material.properties.IngotProperty');
-    const $DustProperty = Java.loadClass('com.gregtechceu.gtceu.api.material.material.properties.DustProperty');
-    const $BlastProperty = Java.loadClass('com.gregtechceu.gtceu.api.material.material.properties.BlastProperty');
+    const $IngotProperty = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.IngotProperty');
+    const $DustProperty = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty');
+    const $BlastProperty = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty');
 
     GTCEuStartupEvents.registry('gtceu:material', event => {
 
@@ -31,9 +31,9 @@ Adding fluids to existing materials requires a bit of work with the new FluidSto
 
 ```js title="fluid_property.js"
 
-const $FluidProperty = Java.loadClass('com.gregtechceu.gtceu.api.material.material.properties.FluidProperty');
-const $FluidBuilder = Java.loadClass('com.gregtechceu.gtceu.api.fluid.FluidBuilder');
-const $FluidStorageKeys = Java.loadClass('com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys');
+const $FluidProperty = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty');
+const $FluidBuilder = Java.loadClass('com.gregtechceu.gtceu.api.fluids.FluidBuilder');
+const $FluidStorageKeys = Java.loadClass('com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys');
 
 GTCEuStartupEvents.registry('gtceu:material', event => {
     addFluid(GTMaterials.Iodine, $FluidStorageKeys.LIQUID); // Can be LIQUID, GAS, PLASMA or MOLTEN
@@ -53,7 +53,7 @@ You can even add an ore to existing materials:
 ```js title="ore_property.js"
     GTCEuStartupEvents.registry('gtceu:material', event => {
 
-    const $OreProperty = Java.loadClass('com.gregtechceu.gtceu.api.material.material.properties.OreProperty');
+    const $OreProperty = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty');
 
         // Zinc Ore
         GTMaterials.Zinc.setProperty(PropertyKey.ORE, new $OreProperty());

gradle/forge.versions.toml

@@ -14,7 +14,6 @@ clothconfig = "15.0.140"
 create = "6.0.8-168"
 ponder = "1.0.64"
 flywheel = "1.0.5"
-theoneprobe = "1.21_neo-12.0.4-6"
 curios = "9.4.2+1.21.1"
 kotlinforforge = "5.7.0"
 journeyMapApi = "2.0.0-1.21.1-SNAPSHOT"
@@ -72,7 +71,6 @@ create              = { module = "com.simibubi.create:create-1.21.1", version.re
 ponder              = { module = "net.createmod.ponder:Ponder-NeoForge-1.21.1", version.ref = "ponder"}
 flywheel-forge-api  = { module = "dev.engine-room.flywheel:flywheel-neoforge-api-1.21.1", version.ref = "flywheel"}
 flywheel-forge      = { module = "dev.engine-room.flywheel:flywheel-neoforge-1.21.1", version.ref = "flywheel"}
-theoneprobe         = { module = "mcjty.theoneprobe:theoneprobe", version.ref = "theoneprobe" }
 curios              = { module = "top.theillusivec4.curios:curios-neoforge", version.ref = "curios" }
 kotlinforforge      = { module = "thedarkcolour:kotlinforforge-neoforge", version.ref = "kotlinforforge" }
 journeymap-api      = { module = "info.journeymap:journeymap-api-neoforge", version.ref = "journeyMapApi" }

gradle/scripts/repositories.gradle

@@ -50,10 +50,6 @@ repositories {
         forRepository { maven { url = "https://maven.ftb.dev/releases/" } }
         filter { includeGroup("dev.ftb.mods") }
     }
-    exclusiveContent { // TOP
-        forRepository { maven { url = "https://maven.k-4u.nl/" } }
-        filter { includeGroup('mcjty.theoneprobe') }
-    }
     exclusiveContent { // JourneyMap API
         forRepository { maven { url = "https://jm.gserv.me/repository/maven-public/" } }
         filter { includeGroup("info.journeymap") }

gradle/scripts/resources.gradle

@@ -47,7 +47,6 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
             ldlib_version       : forge.versions.ldlib.get(),
             jei_version         : forge.versions.jei.get(),
             emi_version         : forge.versions.emi.get(),
-            top_version         : forge.versions.theoneprobe.get(),
             jade_version        : forge.versions.jade.get(),
             modernfix_version   : forge.versions.modernfix.get(),
             mod_license         : mod_license,

src/main/java/com/gregtechceu/gtceu/GTCEu.java

@@ -2,12 +2,11 @@
 
 import com.gregtechceu.gtceu.api.GTCEuAPI;
 import com.gregtechceu.gtceu.api.GTValues;
-import com.gregtechceu.gtceu.api.material.material.IMaterialRegistry;
+import com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistry;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
-import com.gregtechceu.gtceu.common.CommonInit;
+import com.gregtechceu.gtceu.common.CommonProxy;
 import com.gregtechceu.gtceu.common.network.GTNetwork;
 import com.gregtechceu.gtceu.config.ConfigHolder;
-import com.gregtechceu.gtceu.forge.AlloyBlastPropertyAddition;
 import com.gregtechceu.gtceu.utils.FormattingUtil;
 
 import net.minecraft.client.Minecraft;
@@ -61,9 +60,8 @@ public GTCEu(IEventBus modBus, FMLModContainer container) {
             ConfigHolder.INSTANCE.recipes.generateLowQualityGems = true;
             ConfigHolder.INSTANCE.compat.energy.enableFEConverters = true;
         }
-        CommonInit.init(modBus);
+        CommonProxy.init(modBus);
 
-        modBus.addListener(AlloyBlastPropertyAddition::addAlloyBlastProperties);
         modBus.addListener(GTNetwork::registerPayloads);
     }
 

src/main/java/com/gregtechceu/gtceu/api/GTCEuAPI.java

@@ -5,8 +5,8 @@
 import com.gregtechceu.gtceu.api.addon.IGTAddon;
 import com.gregtechceu.gtceu.api.block.ICoilType;
 import com.gregtechceu.gtceu.api.block.IFilterType;
+import com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistry;
 import com.gregtechceu.gtceu.api.machine.multiblock.IBatteryData;
-import com.gregtechceu.gtceu.api.material.material.IMaterialRegistry;
 import com.gregtechceu.gtceu.common.block.BatteryBlock;
 import com.gregtechceu.gtceu.common.block.CoilBlock;
 import com.gregtechceu.gtceu.config.ConfigHolder;

src/main/java/com/gregtechceu/gtceu/api/GTValues.java

@@ -114,8 +114,7 @@ public static int[] tiersBetween(int minInclusive, int maxInclusive) {
                 .toArray();
     }
 
-    public static final String MODID_TOP = "theoneprobe",
-            MODID_JEI = "jei",
+    public static final String MODID_JEI = "jei",
             MODID_REI = "roughlyenoughitems",
             MODID_EMI = "emi",
             MODID_APPENG = "ae2",

src/main/java/com/gregtechceu/gtceu/api/addon/events/MaterialCasingCollectionEvent.java

@@ -1,6 +1,6 @@
 package com.gregtechceu.gtceu.api.addon.events;
 
-import com.gregtechceu.gtceu.api.material.material.Material;
+import com.gregtechceu.gtceu.api.data.chemical.material.Material;
 
 import net.minecraft.world.level.block.Block;
 

src/main/java/com/gregtechceu/gtceu/api/block/ActiveBlock.java

@@ -14,7 +14,7 @@
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import static com.gregtechceu.gtceu.data.block.GTBlockStateProperties.ACTIVE;
+import static com.gregtechceu.gtceu.common.data.GTBlockStateProperties.ACTIVE;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault