diff --git a/dependencies.gradle b/dependencies.gradle index ede43894d9b..04d2dd05aba 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -17,7 +17,6 @@ dependencies { compileOnly(forge.emi) // WAILA-likes - compileOnly(forge.theoneprobe) compileOnly(forge.jade) // Curios diff --git a/docs/content/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md b/docs/content/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md index d32a3097fc6..36283afb9d5 100644 --- a/docs/content/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md +++ b/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()); diff --git a/gradle/forge.versions.toml b/gradle/forge.versions.toml index 1b26db7b0cb..2808d3fad9b 100644 --- a/gradle/forge.versions.toml +++ b/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" } diff --git a/gradle/scripts/repositories.gradle b/gradle/scripts/repositories.gradle index 1d70670ba8f..91f0146f1a6 100644 --- a/gradle/scripts/repositories.gradle +++ b/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") } diff --git a/gradle/scripts/resources.gradle b/gradle/scripts/resources.gradle index 3919d698a48..1813194b7ac 100644 --- a/gradle/scripts/resources.gradle +++ b/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, diff --git a/src/main/java/com/gregtechceu/gtceu/GTCEu.java b/src/main/java/com/gregtechceu/gtceu/GTCEu.java index b23dda678cc..ef95365a93c 100644 --- a/src/main/java/com/gregtechceu/gtceu/GTCEu.java +++ b/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); } diff --git a/src/main/java/com/gregtechceu/gtceu/api/GTCEuAPI.java b/src/main/java/com/gregtechceu/gtceu/api/GTCEuAPI.java index 6ed69c1ffc5..c01edad055a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/GTCEuAPI.java +++ b/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; diff --git a/src/main/java/com/gregtechceu/gtceu/api/GTValues.java b/src/main/java/com/gregtechceu/gtceu/api/GTValues.java index 266fb92d801..e9a1182ccd0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/GTValues.java +++ b/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", diff --git a/src/main/java/com/gregtechceu/gtceu/api/addon/events/MaterialCasingCollectionEvent.java b/src/main/java/com/gregtechceu/gtceu/api/addon/events/MaterialCasingCollectionEvent.java index 45d3b2b1879..d9c2cacd7f9 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/addon/events/MaterialCasingCollectionEvent.java +++ b/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; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/ActiveBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/ActiveBlock.java index cd8670771f4..ab85e2e12c3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/ActiveBlock.java +++ b/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 diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/ICoilType.java b/src/main/java/com/gregtechceu/gtceu/api/block/ICoilType.java index d95a4a6d0f5..5db9f4708f9 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/ICoilType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/ICoilType.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.block; import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.common.util.Lazy; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/IMachineBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/IMachineBlock.java index 4c9ee3f2bae..35535c351f8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/IMachineBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/IMachineBlock.java @@ -4,10 +4,10 @@ import com.gregtechceu.gtceu.api.capability.*; import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.compat.EnergyStorageList; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine; import com.gregtechceu.gtceu.api.machine.trait.MachineTrait; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java index de48cad1ea6..4cadbe2162e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java @@ -2,14 +2,14 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.PipeBlockItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.renderer.block.MaterialBlockRenderer; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/MaterialPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/MaterialPipeBlock.java index 560f5ad3034..d1827f01c08 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/MaterialPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/MaterialPipeBlock.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.block; import com.gregtechceu.gtceu.api.blockentity.IPaintable; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.pipenet.*; import net.minecraft.client.color.block.BlockColor; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java index 8250457aef7..b232c7d2c2e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java @@ -1,5 +1,6 @@ package com.gregtechceu.gtceu.api.block; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; @@ -8,11 +9,10 @@ import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.feature.*; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.item.GTItems; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/OreBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/OreBlock.java index e010557fa34..562d93b28c9 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/OreBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/OreBlock.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.api.block; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.client.renderer.block.OreBlockRenderer; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java index 1c59e986b37..610296a1fbd 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java @@ -4,6 +4,7 @@ import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.ICoverable; import com.gregtechceu.gtceu.api.cover.CoverBehavior; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.PipeBlockItem; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; @@ -13,12 +14,11 @@ import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet; import com.gregtechceu.gtceu.api.pipenet.PipeNet; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; import com.gregtechceu.gtceu.common.item.behavior.CoverPlaceBehavior; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/RendererMaterialBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/RendererMaterialBlock.java index 0a4e5b08487..3ecb60c245b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/RendererMaterialBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/RendererMaterialBlock.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.block; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.lowdragmc.lowdraglib.client.renderer.IBlockRendererProvider; import com.lowdragmc.lowdraglib.client.renderer.IRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/SimpleCoilType.java b/src/main/java/com/gregtechceu/gtceu/api/block/SimpleCoilType.java index cbc5ba2742d..0dbd120c6a4 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/SimpleCoilType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/SimpleCoilType.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.block; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java index 3e804b8473d..d5f7bfaa3f8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java @@ -5,16 +5,16 @@ import com.gregtechceu.gtceu.api.capability.ICoverable; import com.gregtechceu.gtceu.api.capability.IToolable; import com.gregtechceu.gtceu.api.cover.CoverBehavior; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight; import com.gregtechceu.gtceu.api.machine.TickableSubscription; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.api.pipenet.*; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.utils.GTUtil; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java b/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java index 4e6732f0036..095dcd75253 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.data.misc.GTAttachmentTypes; +import com.gregtechceu.gtceu.common.data.GTAttachmentTypes; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/IDataAccessHatch.java b/src/main/java/com/gregtechceu/gtceu/api/capability/IDataAccessHatch.java index 1ce78d839fc..094a9471c59 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/IDataAccessHatch.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/IDataAccessHatch.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.capability; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/IHazardParticleContainer.java b/src/main/java/com/gregtechceu/gtceu/api/capability/IHazardParticleContainer.java index 9a02ad5d07d..0be8c435a0b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/IHazardParticleContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/IHazardParticleContainer.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.capability; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/IMedicalConditionTracker.java b/src/main/java/com/gregtechceu/gtceu/api/capability/IMedicalConditionTracker.java index 86ee399d8c0..e90f0c53e54 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/IMedicalConditionTracker.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/IMedicalConditionTracker.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.api.capability; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import net.minecraft.core.Holder; import net.minecraft.world.effect.MobEffect; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/IPropertyFluidFilter.java b/src/main/java/com/gregtechceu/gtceu/api/capability/IPropertyFluidFilter.java index f5cb699e69e..3a2332ca91a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/IPropertyFluidFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/IPropertyFluidFilter.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.api.capability; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttribute; -import com.gregtechceu.gtceu.api.fluid.attribute.IAttributedFluid; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttribute; +import com.gregtechceu.gtceu.api.fluids.attribute.IAttributedFluid; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; @@ -18,7 +18,7 @@ import java.util.List; import java.util.function.Predicate; -import static com.gregtechceu.gtceu.api.fluid.FluidConstants.CRYOGENIC_FLUID_THRESHOLD; +import static com.gregtechceu.gtceu.api.fluids.FluidConstants.CRYOGENIC_FLUID_THRESHOLD; public interface IPropertyFluidFilter extends Predicate { diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/IThermalFluidHandlerItemStack.java b/src/main/java/com/gregtechceu/gtceu/api/capability/IThermalFluidHandlerItemStack.java index 027214c35fa..f6b93256304 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/IThermalFluidHandlerItemStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/IThermalFluidHandlerItemStack.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.api.capability; -import com.gregtechceu.gtceu.api.fluid.FluidConstants; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttribute; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; -import com.gregtechceu.gtceu.api.fluid.attribute.IAttributedFluid; +import com.gregtechceu.gtceu.api.fluids.FluidConstants; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttribute; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.fluids.attribute.IAttributedFluid; import net.minecraft.world.level.material.Fluid; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/GTEnergyWrapper.java b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/capability/compat/GTEnergyWrapper.java rename to src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java index b83f9eff5bf..56adb98819f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/GTEnergyWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java @@ -8,7 +8,7 @@ import net.minecraft.core.Direction; import net.neoforged.neoforge.energy.IEnergyStorage; -public class GTEnergyWrapper implements IEnergyContainer { +public class EUToFEProvider implements IEnergyContainer { /** * Internally used FE Buffer so that a very large packet of EU is not partially destroyed @@ -19,7 +19,7 @@ public class GTEnergyWrapper implements IEnergyContainer { private final IEnergyStorage energyStorage; - public GTEnergyWrapper(IEnergyStorage energyStorage) { + public EUToFEProvider(IEnergyStorage energyStorage) { this.energyStorage = energyStorage; } diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/CWURecipeCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/CWURecipeCapability.java index 788db01bcdb..9f731be9e6b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/CWURecipeCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/CWURecipeCapability.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.api.capability.recipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.content.SerializerInteger; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/EURecipeCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/EURecipeCapability.java index 63723280993..c518228571c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/EURecipeCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/EURecipeCapability.java @@ -2,12 +2,12 @@ import com.gregtechceu.gtceu.api.machine.feature.IOverclockMachine; import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.content.SerializerEnergyStack; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/FluidRecipeCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/FluidRecipeCapability.java index a1ae3f09e52..122b4e1481a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/FluidRecipeCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/FluidRecipeCapability.java @@ -4,13 +4,13 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroup; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.content.SerializerFluidIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderFluidIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.fluid.*; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IRecipeHandler.java index fd0446e4c9a..0455c0c3984 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IRecipeHandler.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.capability.recipe; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java index aca784323d6..62787505043 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java @@ -5,6 +5,7 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroup; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.ResearchData; import com.gregtechceu.gtceu.api.recipe.content.Content; @@ -13,15 +14,14 @@ import com.gregtechceu.gtceu.api.recipe.ingredient.IntCircuitIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.item.*; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.recipe.condition.ResearchCondition; import com.gregtechceu.gtceu.common.valueprovider.*; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.integration.xei.entry.item.ItemEntryList; import com.gregtechceu.gtceu.integration.xei.entry.item.ItemStackList; import com.gregtechceu.gtceu.integration.xei.entry.item.ItemTagList; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java index 45a36e8f431..c9c34e2dbe7 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.api.capability.recipe; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.content.IContentSerializer; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI; import com.gregtechceu.gtceu.api.registry.GTRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/api/cosmetics/CapeRegistry.java b/src/main/java/com/gregtechceu/gtceu/api/cosmetics/CapeRegistry.java index 03b95969bb3..389fae12b9e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/cosmetics/CapeRegistry.java +++ b/src/main/java/com/gregtechceu/gtceu/api/cosmetics/CapeRegistry.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.cosmetics.event.RegisterGTCapesEvent; import com.gregtechceu.gtceu.common.network.packets.SPacketNotifyCapeChange; import com.gregtechceu.gtceu.integration.kjs.GTCEuServerEvents; -import com.gregtechceu.gtceu.integration.kjs.events.RegisterCapesKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.RegisterCapesEventJS; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.*; @@ -24,7 +24,7 @@ import java.util.*; -import static com.gregtechceu.gtceu.data.command.GTCommands.ERROR_NO_SUCH_CAPE; +import static com.gregtechceu.gtceu.common.commands.GTCommands.ERROR_NO_SUCH_CAPE; public class CapeRegistry extends SavedData { @@ -319,7 +319,7 @@ private static Set makeSet(UUID ignored) { private static class KJSCallWrapper { public static void fireKJSEvent(RegisterGTCapesEvent event) { - GTCEuServerEvents.REGISTER_CAPES.post(ScriptType.SERVER, new RegisterCapesKubeEvent(event)); + GTCEuServerEvents.REGISTER_CAPES.post(ScriptType.SERVER, new RegisterCapesEventJS(event)); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleFluidFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleFluidFilter.java index c13ff710656..26015a7d6d3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleFluidFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleFluidFilter.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.gui.widget.ScrollablePhantomFluidWidget; import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java index ad92cc4dbe4..5e63b60faf6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.gui.widget.PhantomSlotWidget; import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SmartItemFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SmartItemFilter.java index 20c213f7195..11676b0f869 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SmartItemFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SmartItemFilter.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.ItemStackHashStrategy; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFilter.java index ef0ff372838..b90bddfde2a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFilter.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.cover.filter; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.TagExprFilter; import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFluidFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFluidFilter.java index 89de77e3f97..4b725f1ca64 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFluidFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFluidFilter.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.cover.filter; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.TagExprFilter; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagItemFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagItemFilter.java index f3682110cbd..f45c7575080 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagItemFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagItemFilter.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.cover.filter; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.TagExprFilter; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/DimensionMarker.java b/src/main/java/com/gregtechceu/gtceu/api/data/DimensionMarker.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/DimensionMarker.java rename to src/main/java/com/gregtechceu/gtceu/api/data/DimensionMarker.java index 08c05def737..5093ebd7363 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/DimensionMarker.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/DimensionMarker.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import com.gregtechceu.gtceu.utils.memoization.MemoizedSupplier; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/RotationState.java b/src/main/java/com/gregtechceu/gtceu/api/data/RotationState.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/machine/RotationState.java rename to src/main/java/com/gregtechceu/gtceu/api/data/RotationState.java index 02807141236..b802e50f971 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/RotationState.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/RotationState.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.machine; +package com.gregtechceu.gtceu.api.data; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/ChemicalHelper.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/material/ChemicalHelper.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java index 0dfe21985cb..a706b5d2eec 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/ChemicalHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java @@ -1,19 +1,19 @@ -package com.gregtechceu.gtceu.api.material; +package com.gregtechceu.gtceu.api.data.chemical; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKey; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.FluidProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.tag.TagUtil; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.Holder; import net.minecraft.core.registries.BuiltInRegistries; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; import static com.gregtechceu.gtceu.api.GTValues.M; -import static com.gregtechceu.gtceu.api.material.material.ItemMaterialData.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData.*; public class ChemicalHelper { diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/Element.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/Element.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/material/Element.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/Element.java index a5eaa31ad06..0a8e1c249de 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/Element.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/Element.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material; +package com.gregtechceu.gtceu.api.data.chemical; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/IMaterialRegistry.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/IMaterialRegistry.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/IMaterialRegistry.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/IMaterialRegistry.java index fe24b39286b..04e65b368ea 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/IMaterialRegistry.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/IMaterialRegistry.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material; +package com.gregtechceu.gtceu.api.data.chemical.material; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.core.IMappedRegistryAccess; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/ItemMaterialData.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/ItemMaterialData.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/ItemMaterialData.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/ItemMaterialData.java index cd0f90c0678..ce1c2640cc8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/ItemMaterialData.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/ItemMaterialData.java @@ -1,15 +1,15 @@ -package com.gregtechceu.gtceu.api.material.material; +package com.gregtechceu.gtceu.api.data.chemical.material; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.datagen.TagsHandler; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.data.recipe.misc.RecyclingRecipes; import com.gregtechceu.gtceu.data.recipe.misc.StoneMachineRecipes; import com.gregtechceu.gtceu.data.recipe.misc.WoodMachineRecipes; +import com.gregtechceu.gtceu.data.tags.TagsHandler; import com.gregtechceu.gtceu.utils.ItemStackHashStrategy; import com.gregtechceu.gtceu.utils.memoization.MemoizedBlockSupplier; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/MarkerMaterial.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/MarkerMaterial.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/MarkerMaterial.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/MarkerMaterial.java index 0eb77fdc963..1c3b773d05f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/MarkerMaterial.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/MarkerMaterial.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material; +package com.gregtechceu.gtceu.api.data.chemical.material; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/MarkerMaterials.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/MarkerMaterials.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/MarkerMaterials.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/MarkerMaterials.java index ee3561ad43d..1aa9c63d46a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/MarkerMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/MarkerMaterials.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material; +package com.gregtechceu.gtceu.api.data.chemical.material; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/Material.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/Material.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java index 52934977a44..a03284357eb 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/Material.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java @@ -1,27 +1,27 @@ -package com.gregtechceu.gtceu.api.material.material; +package com.gregtechceu.gtceu.api.data.chemical.material; import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKey; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.Element; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlag; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.*; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.item.tool.MaterialToolTier; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.Element; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlag; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.properties.*; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.tag.TagUtil; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; import com.gregtechceu.gtceu.integration.kjs.helpers.MaterialStackWrapper; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/event/PostMaterialEvent.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/event/PostMaterialEvent.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/event/PostMaterialEvent.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/event/PostMaterialEvent.java index 6428415b0d9..f12a051db42 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/event/PostMaterialEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/event/PostMaterialEvent.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.event; +package com.gregtechceu.gtceu.api.data.chemical.material.event; import net.neoforged.bus.api.Event; import net.neoforged.fml.event.IModBusEvent; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialFlag.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlag.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialFlag.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlag.java index 89b0c47faa1..2e8d8cc9a48 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialFlag.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlag.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.material.material.info; +package com.gregtechceu.gtceu.api.data.chemical.material.info; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialFlags.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlags.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialFlags.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlags.java index e6bda054863..8bdca871326 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialFlags.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlags.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.material.material.info; +package com.gregtechceu.gtceu.api.data.chemical.material.info; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialIconSet.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconSet.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialIconSet.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconSet.java index 08071376c56..caf556f92d5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialIconSet.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconSet.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.info; +package com.gregtechceu.gtceu.api.data.chemical.material.info; import com.google.common.base.Preconditions; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialIconType.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconType.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialIconType.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconType.java index 796047cfaaa..d78306e34d4 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/info/MaterialIconType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconType.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.material.material.info; +package com.gregtechceu.gtceu.api.data.chemical.material.info; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.data.model.GTModels; +import com.gregtechceu.gtceu.common.data.models.GTModels; import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents; -import com.gregtechceu.gtceu.integration.kjs.events.MaterialIconInfoKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.MaterialIconInfoEventJS; import com.lowdragmc.lowdraglib.utils.ResourceHelper; @@ -299,7 +299,7 @@ public String toString() { private static class KJSCallWrapper { private static void postEvent() { - GTCEuStartupEvents.MATERIAL_ICON_INFO.post(new MaterialIconInfoKubeEvent()); + GTCEuStartupEvents.MATERIAL_ICON_INFO.post(new MaterialIconInfoEventJS()); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/AlloyBlastProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/AlloyBlastProperty.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/AlloyBlastProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/AlloyBlastProperty.java index a36800a089e..0e9771607c9 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/AlloyBlastProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/AlloyBlastProperty.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.data.recipe.misc.alloyblast.AlloyBlastRecipeProducer; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ArmorProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ArmorProperty.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ArmorProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ArmorProperty.java index 2417904266e..4412ffe1fa0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ArmorProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ArmorProperty.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.Util; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/BlastProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/BlastProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java index a9d93144c34..b2575714ab5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/BlastProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/DustProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/DustProperty.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/DustProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/DustProperty.java index 349e65c69ed..8a98ca3bad1 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/DustProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/DustProperty.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import lombok.Getter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/FluidPipeProperties.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/FluidPipeProperties.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/FluidPipeProperties.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/FluidPipeProperties.java index 374e7270ff5..5f0f3979a75 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/FluidPipeProperties.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/FluidPipeProperties.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.api.capability.IPropertyFluidFilter; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttribute; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttribute; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import com.gregtechceu.gtceu.utils.GTMath; import it.unimi.dsi.fastutil.objects.Object2BooleanMap; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/FluidProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/FluidProperty.java similarity index 86% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/FluidProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/FluidProperty.java index 0cddadad2af..563c4cab473 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/FluidProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/FluidProperty.java @@ -1,11 +1,11 @@ -package com.gregtechceu.gtceu.api.material.material.properties; - -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorage; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageImpl; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKey; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; -import com.gregtechceu.gtceu.api.material.material.Material; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; + +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorage; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageImpl; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import net.minecraft.world.level.material.Fluid; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/GemProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/GemProperty.java similarity index 86% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/GemProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/GemProperty.java index 4421af3b0cd..dbd05e80381 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/GemProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/GemProperty.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; public class GemProperty implements IMaterialProperty { diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/HazardProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/HazardProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java index 77e906b9c2d..190016c3df7 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/HazardProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java @@ -1,17 +1,17 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.item.GTBucketItem; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.TagPrefixItem; import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.item.GTBucketItem; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/IMaterialProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/IMaterialProperty.java similarity index 63% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/IMaterialProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/IMaterialProperty.java index 79000b17487..e6952c83e48 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/IMaterialProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/IMaterialProperty.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; @FunctionalInterface public interface IMaterialProperty { diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/IngotProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/IngotProperty.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/IngotProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/IngotProperty.java index 49ba0fea4fb..ef6747c9524 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/IngotProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/IngotProperty.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.GTMaterials; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ItemPipeProperties.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ItemPipeProperties.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ItemPipeProperties.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ItemPipeProperties.java index c31fdfdf502..022ee3acd24 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ItemPipeProperties.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ItemPipeProperties.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/MaterialProperties.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/MaterialProperties.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/MaterialProperties.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/MaterialProperties.java index 5fe52dc7a2a..c367e07491a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/MaterialProperties.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/MaterialProperties.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/OreProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/OreProperty.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/OreProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/OreProperty.java index f86061f00fe..c4bbf596f55 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/OreProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/OreProperty.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.util.Mth; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/PolymerProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/PolymerProperty.java similarity index 73% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/PolymerProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/PolymerProperty.java index 2f02deedcaf..910be765b7c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/PolymerProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/PolymerProperty.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; public class PolymerProperty implements IMaterialProperty { diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/PropertyKey.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/PropertyKey.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/PropertyKey.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/PropertyKey.java index 3e06af93e80..7ed5ab0e053 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/PropertyKey.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/PropertyKey.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import lombok.Getter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/RotorProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/RotorProperty.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/RotorProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/RotorProperty.java index fc3f1a0d01c..451b2bc2f69 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/RotorProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/RotorProperty.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import lombok.Getter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ToolProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ToolProperty.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ToolProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ToolProperty.java index fc91d17742f..83201f7e028 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/ToolProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/ToolProperty.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.MaterialToolTier; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.config.ConfigHolder; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/WireProperties.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/WireProperties.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/WireProperties.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/WireProperties.java index 7dfd3c24121..053a5f9c05f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/WireProperties.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/WireProperties.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.utils.GTMath; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.GENERATE_FOIL; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_FOIL; public class WireProperties implements IMaterialProperty { diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/WoodProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/WoodProperty.java similarity index 74% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/properties/WoodProperty.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/WoodProperty.java index 2bb13754c62..12fb39471f7 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/properties/WoodProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/WoodProperty.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.material.material.properties; +package com.gregtechceu.gtceu.api.data.chemical.material.properties; public class WoodProperty implements IMaterialProperty { diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/registry/MaterialRegistry.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/registry/MaterialRegistry.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/registry/MaterialRegistry.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/registry/MaterialRegistry.java index 99791613f25..55c3eed85cb 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/registry/MaterialRegistry.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/registry/MaterialRegistry.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.material.material.registry; +package com.gregtechceu.gtceu.api.data.chemical.material.registry; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.material.IMaterialRegistry; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistry; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.core.Holder; import net.minecraft.core.MappedRegistry; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/stack/ItemMaterialInfo.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/ItemMaterialInfo.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/stack/ItemMaterialInfo.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/ItemMaterialInfo.java index 0bf77647116..61b84db03ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/stack/ItemMaterialInfo.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/ItemMaterialInfo.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.material.material.stack; +package com.gregtechceu.gtceu.api.data.chemical.material.stack; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import it.unimi.dsi.fastutil.objects.Reference2LongMap; import it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/stack/MaterialEntry.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/MaterialEntry.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/stack/MaterialEntry.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/MaterialEntry.java index f817459978d..4669eef5a22 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/stack/MaterialEntry.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/MaterialEntry.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.material.material.stack; +package com.gregtechceu.gtceu.api.data.chemical.material.stack; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.google.common.base.Preconditions; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/material/material/stack/MaterialStack.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/MaterialStack.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/api/material/material/stack/MaterialStack.java rename to src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/MaterialStack.java index a874ada2712..bd53ead282f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/material/material/stack/MaterialStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/MaterialStack.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.material.material.stack; +package com.gregtechceu.gtceu.api.data.chemical.material.stack; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.utils.FormattingUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/medicalcondition/MedicalCondition.java b/src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/MedicalCondition.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/medicalcondition/MedicalCondition.java rename to src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/MedicalCondition.java index 4d6cf8f23a6..74377f38555 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/medicalcondition/MedicalCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/MedicalCondition.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.medicalcondition; +package com.gregtechceu.gtceu.api.data.medicalcondition; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.capability.MedicalConditionTracker; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.data.recipe.misc.AirScrubberRecipes; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/gregtechceu/gtceu/api/medicalcondition/Symptom.java b/src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/Symptom.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/medicalcondition/Symptom.java rename to src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/Symptom.java index 89dcda8c220..89972121b90 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/medicalcondition/Symptom.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/Symptom.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.medicalcondition; +package com.gregtechceu.gtceu.api.data.medicalcondition; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.common.capability.MedicalConditionTracker; -import com.gregtechceu.gtceu.data.effect.GTMobEffects; +import com.gregtechceu.gtceu.common.data.GTMobEffects; import net.minecraft.core.Holder; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/api/tag/TagPrefix.java b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/tag/TagPrefix.java rename to src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java index 8cf1b8746c5..5560d96f11b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/tag/TagPrefix.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java @@ -1,26 +1,26 @@ -package com.gregtechceu.gtceu.api.tag; +package com.gregtechceu.gtceu.api.data.tag; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.MaterialBlock; import com.gregtechceu.gtceu.api.block.OreBlock; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.item.MaterialBlockItem; import com.gregtechceu.gtceu.api.item.TagPrefixItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.material.material.properties.OreProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.registry.GTRegistries; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreByProduct; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; @@ -63,7 +63,7 @@ import java.util.function.*; import java.util.stream.Collectors; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.Conditions.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.Conditions.*; @SuppressWarnings("unused") @Accessors(chain = true, fluent = true) diff --git a/src/main/java/com/gregtechceu/gtceu/api/tag/TagType.java b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/tag/TagType.java rename to src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java index bf33e30bb67..8e066038a58 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/tag/TagType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java @@ -1,6 +1,7 @@ -package com.gregtechceu.gtceu.api.tag; +package com.gregtechceu.gtceu.api.data.tag; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.Util; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/BiomeWeightModifier.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/BiomeWeightModifier.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/BiomeWeightModifier.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/BiomeWeightModifier.java index e0e446ecd49..9024f4305ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/BiomeWeightModifier.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/BiomeWeightModifier.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data.worldgen; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/GTLayerPattern.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/GTLayerPattern.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/GTLayerPattern.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/GTLayerPattern.java index c9b70550a10..35322b64f57 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/GTLayerPattern.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/GTLayerPattern.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data.worldgen; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; import net.minecraft.util.RandomSource; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/OreVeinDefinition.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/GTOreDefinition.java similarity index 73% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/OreVeinDefinition.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/GTOreDefinition.java index 1cdc9091ea6..c4adca8e02d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/OreVeinDefinition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/GTOreDefinition.java @@ -1,11 +1,11 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data.worldgen; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.indicators.SurfaceIndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.*; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.generator.IndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.indicators.SurfaceIndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.*; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; @@ -43,25 +43,25 @@ @SuppressWarnings("UnusedReturnValue") @Accessors(chain = true, fluent = true) -public class OreVeinDefinition { +public class GTOreDefinition { // spotless:off - public static final Codec DIRECT_CODEC = RecordCodecBuilder.create(instance -> instance.group( - IntProvider.NON_NEGATIVE_CODEC.fieldOf("cluster_size").forGetter(OreVeinDefinition::clusterSize), - Codec.floatRange(0.0F, 1.0F).fieldOf("density").forGetter(OreVeinDefinition::density), - Codec.INT.fieldOf("weight").forGetter(OreVeinDefinition::weight), - IWorldGenLayer.CODEC.fieldOf("layer").forGetter(OreVeinDefinition::layer), + public static final Codec DIRECT_CODEC = RecordCodecBuilder.create(instance -> instance.group( + IntProvider.NON_NEGATIVE_CODEC.fieldOf("cluster_size").forGetter(GTOreDefinition::clusterSize), + Codec.floatRange(0.0F, 1.0F).fieldOf("density").forGetter(GTOreDefinition::density), + Codec.INT.fieldOf("weight").forGetter(GTOreDefinition::weight), + IWorldGenLayer.CODEC.fieldOf("layer").forGetter(GTOreDefinition::layer), ResourceKey.codec(Registries.DIMENSION).listOf().fieldOf("dimension_filter").forGetter(ft -> new ArrayList<>(ft.dimensionFilter)), - HeightRangePlacement.CODEC.fieldOf("height_range").forGetter(OreVeinDefinition::heightRange), - Codec.floatRange(0.0F, 1.0F).fieldOf("discard_chance_on_air_exposure").forGetter(OreVeinDefinition::discardChanceOnAirExposure), - RegistryCodecs.homogeneousList(Registries.BIOME).lenientOptionalFieldOf("biomes", HolderSet.empty()).forGetter(OreVeinDefinition::biomes), + HeightRangePlacement.CODEC.fieldOf("height_range").forGetter(GTOreDefinition::heightRange), + Codec.floatRange(0.0F, 1.0F).fieldOf("discard_chance_on_air_exposure").forGetter(GTOreDefinition::discardChanceOnAirExposure), + RegistryCodecs.homogeneousList(Registries.BIOME).lenientOptionalFieldOf("biomes", HolderSet.empty()).forGetter(GTOreDefinition::biomes), BiomeWeightModifier.CODEC.optionalFieldOf("weight_modifier", BiomeWeightModifier.EMPTY).forGetter(ext -> ext.biomeWeightModifier), VeinGenerator.DIRECT_CODEC.fieldOf("generator").forGetter(ft -> ft.veinGenerator), Codec.list(IndicatorGenerator.DIRECT_CODEC).fieldOf("indicators").forGetter(ft -> ft.indicatorGenerators) - ).apply(instance, OreVeinDefinition::new)); + ).apply(instance, GTOreDefinition::new)); - public static final Codec> CODEC = RegistryFixedCodec.create(GTRegistries.ORE_VEIN_REGISTRY); - public static final StreamCodec> STREAM_CODEC = ByteBufCodecs.holderRegistry(GTRegistries.ORE_VEIN_REGISTRY); + public static final Codec> CODEC = RegistryFixedCodec.create(GTRegistries.ORE_VEIN_REGISTRY); + public static final StreamCodec> STREAM_CODEC = ByteBufCodecs.holderRegistry(GTRegistries.ORE_VEIN_REGISTRY); // spotless:on private final InferredProperties inferredProperties = new InferredProperties(); @@ -102,30 +102,30 @@ public class OreVeinDefinition { @Setter private HolderGetter biomeLookup; - public OreVeinDefinition(OreVeinDefinition other) { + public GTOreDefinition(GTOreDefinition other) { this(other.clusterSize, other.density, other.weight, other.layer, Set.copyOf(other.dimensionFilter), other.heightRange, other.discardChanceOnAirExposure, other.biomes, other.biomeWeightModifier, other.veinGenerator, List.copyOf(other.indicatorGenerators), other.biomeLookup); } - public OreVeinDefinition(IntProvider clusterSize, float density, int weight, IWorldGenLayer layer, - List> dimensionFilter, HeightRangePlacement heightRange, - float discardChanceOnAirExposure, HolderSet biomes, - BiomeWeightModifier biomeWeightModifier, @Nullable VeinGenerator veinGenerator, - @Nullable List indicatorGenerators) { + public GTOreDefinition(IntProvider clusterSize, float density, int weight, IWorldGenLayer layer, + List> dimensionFilter, HeightRangePlacement heightRange, + float discardChanceOnAirExposure, HolderSet biomes, + BiomeWeightModifier biomeWeightModifier, @Nullable VeinGenerator veinGenerator, + @Nullable List indicatorGenerators) { this(clusterSize, density, weight, layer, new HashSet<>(dimensionFilter), heightRange, discardChanceOnAirExposure, biomes, biomeWeightModifier, veinGenerator, indicatorGenerators, null); } - public OreVeinDefinition(IntProvider clusterSize, float density, int weight, IWorldGenLayer layer, - Set> dimensionFilter, HeightRangePlacement heightRange, - float discardChanceOnAirExposure, HolderSet biomes, - BiomeWeightModifier biomeWeightModifier, @Nullable VeinGenerator veinGenerator, - @Nullable List indicatorGenerators, - @Nullable HolderGetter biomeLookup) { + public GTOreDefinition(IntProvider clusterSize, float density, int weight, IWorldGenLayer layer, + Set> dimensionFilter, HeightRangePlacement heightRange, + float discardChanceOnAirExposure, HolderSet biomes, + BiomeWeightModifier biomeWeightModifier, @Nullable VeinGenerator veinGenerator, + @Nullable List indicatorGenerators, + @Nullable HolderGetter biomeLookup) { this.clusterSize = clusterSize; this.density = density; this.weight = weight; @@ -149,27 +149,27 @@ public int weightForBiome(Holder biome) { return weight + biomeWeightModifier.applyAsInt(biome); } - public OreVeinDefinition clusterSize(IntProvider clusterSize) { + public GTOreDefinition clusterSize(IntProvider clusterSize) { this.clusterSize = clusterSize; return this; } - public OreVeinDefinition clusterSize(int clusterSize) { + public GTOreDefinition clusterSize(int clusterSize) { this.clusterSize = ConstantInt.of(clusterSize); return this; } - public OreVeinDefinition density(float density) { + public GTOreDefinition density(float density) { this.density = density; return this; } - public OreVeinDefinition weight(int weight) { + public GTOreDefinition weight(int weight) { this.weight = weight; return this; } - public OreVeinDefinition layer(IWorldGenLayer layer) { + public GTOreDefinition layer(IWorldGenLayer layer) { this.layer = layer; if (this.dimensionFilter == null || this.dimensionFilter.isEmpty()) { dimensions(layer.getLevels()); @@ -177,13 +177,13 @@ public OreVeinDefinition layer(IWorldGenLayer layer) { return this; } - public OreVeinDefinition dimensions(Set> dimensions) { + public GTOreDefinition dimensions(Set> dimensions) { this.dimensionFilter = dimensions; return this; } @HideFromJS - public OreVeinDefinition biomes(TagKey biomes) { + public GTOreDefinition biomes(TagKey biomes) { if (biomeLookup == null) { GTRegistries.builtinRegistry().registry(GTRegistries.ORE_VEIN_REGISTRY) .map(reg -> reg.getKey(this)) @@ -199,24 +199,24 @@ public OreVeinDefinition biomes(TagKey biomes) { return this; } - public OreVeinDefinition biomes(HolderSet biomes) { + public GTOreDefinition biomes(HolderSet biomes) { this.biomes = Objects.requireNonNullElseGet(biomes, HolderSet::empty); return this; } - public OreVeinDefinition heightRangeUniform(int min, int max) { + public GTOreDefinition heightRangeUniform(int min, int max) { heightRange(HeightRangePlacement.uniform(VerticalAnchor.absolute(min), VerticalAnchor.absolute(max))); inferredProperties.heightRange = IntIntPair.of(min, max); return this; } - public OreVeinDefinition heightRangeTriangle(int min, int max) { + public GTOreDefinition heightRangeTriangle(int min, int max) { heightRange(HeightRangePlacement.triangle(VerticalAnchor.absolute(min), VerticalAnchor.absolute(max))); inferredProperties.heightRange = IntIntPair.of(min, max); return this; } - public OreVeinDefinition standardVeinGenerator(Consumer config) { + public GTOreDefinition standardVeinGenerator(Consumer config) { var veinGenerator = new StandardVeinGenerator(); config.accept(veinGenerator); @@ -225,7 +225,7 @@ public OreVeinDefinition standardVeinGenerator(Consumer c return this; } - public OreVeinDefinition layeredVeinGenerator(Consumer config) { + public GTOreDefinition layeredVeinGenerator(Consumer config) { var veinGenerator = new LayeredVeinGenerator(); config.accept(veinGenerator); @@ -234,7 +234,7 @@ public OreVeinDefinition layeredVeinGenerator(Consumer con return this; } - public OreVeinDefinition geodeVeinGenerator(Consumer config) { + public GTOreDefinition geodeVeinGenerator(Consumer config) { var veinGenerator = new GeodeVeinGenerator(); config.accept(veinGenerator); @@ -243,7 +243,7 @@ public OreVeinDefinition geodeVeinGenerator(Consumer config) return this; } - public OreVeinDefinition dikeVeinGenerator(Consumer config) { + public GTOreDefinition dikeVeinGenerator(Consumer config) { var veinGenerator = new DikeVeinGenerator(); if (inferredProperties.heightRange != null) { veinGenerator.minYLevel(inferredProperties.heightRange.firstInt()); @@ -256,7 +256,7 @@ public OreVeinDefinition dikeVeinGenerator(Consumer config) { return this; } - public OreVeinDefinition veinedVeinGenerator(Consumer config) { + public GTOreDefinition veinedVeinGenerator(Consumer config) { var veinGenerator = new VeinedVeinGenerator(); if (inferredProperties.heightRange != null) { veinGenerator.minYLevel(inferredProperties.heightRange.firstInt()); @@ -269,7 +269,7 @@ public OreVeinDefinition veinedVeinGenerator(Consumer confi return this; } - public OreVeinDefinition classicVeinGenerator(Consumer config) { + public GTOreDefinition classicVeinGenerator(Consumer config) { var veinGenerator = new ClassicVeinGenerator(); config.accept(veinGenerator); @@ -278,7 +278,7 @@ public OreVeinDefinition classicVeinGenerator(Consumer con return this; } - public OreVeinDefinition cuboidVeinGenerator(Consumer config) { + public GTOreDefinition cuboidVeinGenerator(Consumer config) { var veinGenerator = new CuboidVeinGenerator(); if (inferredProperties.heightRange != null) { veinGenerator.minY(inferredProperties.heightRange.firstInt()); @@ -302,7 +302,7 @@ public VeinGenerator veinGenerator(ResourceLocation id) { return veinGenerator; } - public OreVeinDefinition surfaceIndicatorGenerator(Consumer config) { + public GTOreDefinition surfaceIndicatorGenerator(Consumer config) { config.accept(getOrCreateIndicatorGenerator(SurfaceIndicatorGenerator.class, SurfaceIndicatorGenerator::new)); return this; } diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/IWorldGenLayer.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/IWorldGenLayer.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/IWorldGenLayer.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/IWorldGenLayer.java index f357b415e9c..e8329702c09 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/IWorldGenLayer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/IWorldGenLayer.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data.worldgen; import net.minecraft.resources.ResourceKey; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/SimpleWorldGenLayer.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/SimpleWorldGenLayer.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/SimpleWorldGenLayer.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/SimpleWorldGenLayer.java index ced7e27463a..a820e53f7db 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/SimpleWorldGenLayer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/SimpleWorldGenLayer.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data.worldgen; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/WorldGenLayers.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGenLayers.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/WorldGenLayers.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGenLayers.java index 92277c7b460..a4c6a3ac982 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/WorldGenLayers.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGenLayers.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data.worldgen; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.addon.AddonFinder; import com.gregtechceu.gtceu.api.addon.IGTAddon; import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents; -import com.gregtechceu.gtceu.integration.kjs.events.WorldGenLayerKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.WorldGenLayerEventJS; import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BlockTags; @@ -70,7 +70,7 @@ public boolean isApplicableForLevel(ResourceKey level) { private static final class KJSCallWrapper { private static void postEvent() { - GTCEuStartupEvents.WORLD_GEN_LAYERS.post(new WorldGenLayerKubeEvent()); + GTCEuStartupEvents.WORLD_GEN_LAYERS.post(new WorldGenLayerEventJS()); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/WorldGeneratorUtils.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGeneratorUtils.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/WorldGeneratorUtils.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGeneratorUtils.java index e73fb425749..e4caf7a9fa6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/WorldGeneratorUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGeneratorUtils.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.api.worldgen; +package com.gregtechceu.gtceu.api.data.worldgen; +import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.NoopVeinGenerator; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.generator.IndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.NoopVeinGenerator; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.utils.WeightedEntry; import net.minecraft.core.BlockPos; @@ -51,11 +51,11 @@ public class WorldGeneratorUtils { public static final HashBiMap> INDICATOR_GENERATOR_FUNCTIONS = HashBiMap .create(); - public record WeightedVein(Holder vein, int weight) implements WeightedEntry {} + public record WeightedVein(Holder vein, int weight) implements WeightedEntry {} private static class WorldOreVeinCache { - private final List> worldVeins; + private final List> worldVeins; private final Map, List> biomeVeins = new Object2ObjectOpenHashMap<>(); public WorldOreVeinCache(ServerLevel level) { diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/BedrockFluidDefinition.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/BedrockFluidDefinition.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/BedrockFluidDefinition.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/BedrockFluidDefinition.java index d25f6ef7921..ca1eeb50ec3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/BedrockFluidDefinition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/BedrockFluidDefinition.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.worldgen.bedrockfluid; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/BedrockFluidVeinSavedData.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/BedrockFluidVeinSavedData.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/BedrockFluidVeinSavedData.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/BedrockFluidVeinSavedData.java index 53a6cfe050c..782f9f45fb0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/BedrockFluidVeinSavedData.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/BedrockFluidVeinSavedData.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.worldgen.bedrockfluid; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; import com.gregtechceu.gtceu.utils.GTMath; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/FluidVeinWorldEntry.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/FluidVeinWorldEntry.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/FluidVeinWorldEntry.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/FluidVeinWorldEntry.java index b552d1f57da..2af3ed774c4 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/FluidVeinWorldEntry.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/FluidVeinWorldEntry.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.bedrockfluid; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/package-info.java similarity index 79% rename from src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/package-info.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/package-info.java index ad6b657314a..6a0808a8078 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/package-info.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockfluid/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.api.registry.registrate.forge; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/BedrockOreDefinition.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/BedrockOreDefinition.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/BedrockOreDefinition.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/BedrockOreDefinition.java index 2a556a435a6..44c45c7d305 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/BedrockOreDefinition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/BedrockOreDefinition.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.worldgen.bedrockore; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockore; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/BedrockOreVeinSavedData.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/BedrockOreVeinSavedData.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/BedrockOreVeinSavedData.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/BedrockOreVeinSavedData.java index 5847a47994c..3b9cf107921 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/BedrockOreVeinSavedData.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/BedrockOreVeinSavedData.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.worldgen.bedrockore; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockore; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/OreVeinWorldEntry.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/OreVeinWorldEntry.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/OreVeinWorldEntry.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/OreVeinWorldEntry.java index db36b756f3c..4c4b56683c3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/OreVeinWorldEntry.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/OreVeinWorldEntry.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.bedrockore; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockore; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/WeightedMaterial.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/WeightedMaterial.java similarity index 84% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/WeightedMaterial.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/WeightedMaterial.java index c5174612669..ee82158b318 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/WeightedMaterial.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/WeightedMaterial.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.worldgen.bedrockore; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockore; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.utils.WeightedEntry; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/package-info.java similarity index 80% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/package-info.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/package-info.java index 05df02eddeb..044240119f7 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockfluid/package-info.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/bedrockore/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.api.worldgen.bedrockfluid; +package com.gregtechceu.gtceu.api.data.worldgen.bedrockore; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/IndicatorGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/IndicatorGenerator.java similarity index 87% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/IndicatorGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/IndicatorGenerator.java index 1b0f1195e0c..9a27dc63695 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/IndicatorGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/IndicatorGenerator.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.worldgen.generator; +package com.gregtechceu.gtceu.api.data.worldgen.generator; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; -import com.gregtechceu.gtceu.api.worldgen.ores.OreIndicatorPlacer; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreIndicatorPlacer; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/IndicatorGenerators.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/IndicatorGenerators.java similarity index 78% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/IndicatorGenerators.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/IndicatorGenerators.java index db4522491b5..827d5d371b8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/IndicatorGenerators.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/IndicatorGenerators.java @@ -1,11 +1,11 @@ -package com.gregtechceu.gtceu.api.worldgen.generator; +package com.gregtechceu.gtceu.api.data.worldgen.generator; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.addon.AddonFinder; import com.gregtechceu.gtceu.api.addon.IGTAddon; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; -import com.gregtechceu.gtceu.api.worldgen.generator.indicators.NoopIndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.indicators.SurfaceIndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; +import com.gregtechceu.gtceu.api.data.worldgen.generator.indicators.NoopIndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.indicators.SurfaceIndicatorGenerator; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/VeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java similarity index 89% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/VeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java index c6340d90921..ba0f071ee01 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/VeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java @@ -1,11 +1,11 @@ -package com.gregtechceu.gtceu.api.worldgen.generator; +package com.gregtechceu.gtceu.api.data.worldgen.generator; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; @@ -80,7 +80,7 @@ public List> getValidMaterialsChances() { */ @HideFromJS public abstract Map generate(WorldGenLevel level, RandomSource random, - OreVeinDefinition entry, BlockPos origin); + GTOreDefinition entry, BlockPos origin); @HideFromJS public abstract VeinGenerator build(); diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/VeinGenerators.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerators.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/VeinGenerators.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerators.java index cb37c3b68a0..423ae3efce2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/VeinGenerators.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerators.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.api.worldgen.generator; +package com.gregtechceu.gtceu.api.data.worldgen.generator; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.addon.AddonFinder; import com.gregtechceu.gtceu.api.addon.IGTAddon; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.*; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.*; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/indicators/NoopIndicatorGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/indicators/NoopIndicatorGenerator.java similarity index 77% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/indicators/NoopIndicatorGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/indicators/NoopIndicatorGenerator.java index f5243ba8121..65ed4b1a48f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/indicators/NoopIndicatorGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/indicators/NoopIndicatorGenerator.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.indicators; +package com.gregtechceu.gtceu.api.data.worldgen.generator.indicators; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.generator.IndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; -import com.gregtechceu.gtceu.api.worldgen.ores.OreIndicatorPlacer; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreIndicatorPlacer; import net.minecraft.util.RandomSource; import net.minecraft.world.level.ChunkPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/indicators/SurfaceIndicatorGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/indicators/SurfaceIndicatorGenerator.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/indicators/SurfaceIndicatorGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/indicators/SurfaceIndicatorGenerator.java index 12b99d947a9..12ba59c1936 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/indicators/SurfaceIndicatorGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/indicators/SurfaceIndicatorGenerator.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.indicators; +package com.gregtechceu.gtceu.api.data.worldgen.generator.indicators; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; +import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreIndicatorPlacer; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; -import com.gregtechceu.gtceu.api.worldgen.generator.IndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; -import com.gregtechceu.gtceu.api.worldgen.ores.OreIndicatorPlacer; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/ClassicVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/ClassicVeinGenerator.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/ClassicVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/ClassicVeinGenerator.java index 42d548020d6..a8944c774a5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/ClassicVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/ClassicVeinGenerator.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; - -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; + +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreVeinUtil; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; -import com.gregtechceu.gtceu.api.worldgen.ores.OreVeinUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; @@ -87,7 +87,7 @@ public List getAllEntries() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { Map generatedBlocks = new Object2ObjectOpenHashMap<>(); @@ -129,7 +129,7 @@ public Map generate(WorldGenLevel level, RandomSource } private void placeBlock(BulkSectionAccess access, LevelChunkSection section, long randomSeed, - OreVeinDefinition entry, + GTOreDefinition entry, BlockPos blockPos, BlockPos lowestPos) { RandomSource random = new XoroshiroRandomSource(randomSeed); int x = SectionPos.sectionRelative(blockPos.getX()); @@ -238,7 +238,7 @@ public static class Layer { public int layers; public void place(BlockState blockState, BulkSectionAccess access, LevelChunkSection section, long randomSeed, - OreVeinDefinition entry, BlockPos pos) { + GTOreDefinition entry, BlockPos pos) { RandomSource random = new XoroshiroRandomSource(randomSeed); int x = SectionPos.sectionRelative(pos.getX()); int y = SectionPos.sectionRelative(pos.getY()); diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/CuboidVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/CuboidVeinGenerator.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/CuboidVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/CuboidVeinGenerator.java index df50be89c39..d4e57b7256e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/CuboidVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/CuboidVeinGenerator.java @@ -1,11 +1,11 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; -import com.gregtechceu.gtceu.api.worldgen.ores.OreVeinUtil; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreVeinUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; @@ -86,7 +86,7 @@ public List getAllEntries() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { Map generatedBlocks = new Object2ObjectOpenHashMap<>(); @@ -173,7 +173,7 @@ protected static boolean shouldPlaceOre(@NotNull RandomSource random, int weight * * @return if the ore was placed */ - private boolean placeTop(Map generatedBlocks, OreVeinDefinition entry, + private boolean placeTop(Map generatedBlocks, GTOreDefinition entry, long randomSeed, BlockPos pos, RandomSource random, int weightX, int weightZ) { var top = this.top.target; @@ -189,7 +189,7 @@ private boolean placeTop(Map generatedBlocks, OreVeinD * * @return if the ore was placed */ - private boolean placeMiddle(Map generatedBlocks, OreVeinDefinition entry, + private boolean placeMiddle(Map generatedBlocks, GTOreDefinition entry, long randomSeed, BlockPos pos, RandomSource random, int weightX, int weightZ) { var middle = this.middle.target; @@ -205,7 +205,7 @@ private boolean placeMiddle(Map generatedBlocks, OreVe * * @return if the ore was placed */ - private boolean placeBottom(Map generatedBlocks, OreVeinDefinition entry, + private boolean placeBottom(Map generatedBlocks, GTOreDefinition entry, long randomSeed, BlockPos pos, RandomSource random, int weightX, int weightZ) { var bottom = this.bottom.target; @@ -221,7 +221,7 @@ private boolean placeBottom(Map generatedBlocks, OreVe * * @return if the ore was placed */ - private boolean placeSpread(Map generatedBlocks, OreVeinDefinition entry, + private boolean placeSpread(Map generatedBlocks, GTOreDefinition entry, long randomSeed, BlockPos pos, RandomSource random, int weightX, int weightZ) { var spread = this.spread.target; @@ -233,7 +233,7 @@ private boolean placeSpread(Map generatedBlocks, OreVe } public void placeOre(BulkSectionAccess access, LevelChunkSection section, BlockPos pos, long randomSeed, - Either, Material> ore, OreVeinDefinition entry) { + Either, Material> ore, GTOreDefinition entry) { RandomSource random = new XoroshiroRandomSource(randomSeed); int x = SectionPos.sectionRelative(pos.getX()); int y = SectionPos.sectionRelative(pos.getY()); diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/DikeVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/DikeVeinGenerator.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/DikeVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/DikeVeinGenerator.java index aa2c4952ffc..01deedd4e95 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/DikeVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/DikeVeinGenerator.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; - -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; + +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreVeinUtil; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; -import com.gregtechceu.gtceu.api.worldgen.ores.OreVeinUtil; import com.gregtechceu.gtceu.utils.GTUtil; import com.gregtechceu.gtceu.utils.WeightedEntry; @@ -68,7 +68,7 @@ public List getAllEntries() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { Map generatedBlocks = new Object2ObjectOpenHashMap<>(); @@ -112,7 +112,7 @@ public Map generate(WorldGenLevel level, RandomSource private void placeBlock( BulkSectionAccess level, LevelChunkSection section, long randomSeed, BlockPos pos, - OreVeinDefinition entry) { + GTOreDefinition entry) { var rand = new XoroshiroRandomSource(randomSeed); DikeBlockDefinition blockDefinition = GTUtil.getRandomItem(rand, blocks); BlockState current = level.getBlockState(pos); diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/GeodeVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/GeodeVeinGenerator.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/GeodeVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/GeodeVeinGenerator.java index c0299b993f4..544eb45a96e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/GeodeVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/GeodeVeinGenerator.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.Util; @@ -123,7 +123,7 @@ public List getAllEntries() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { // TODO refactor geode sizes for the new ore generation system. // For now, geode veins are still generated in place. diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/LayeredVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/LayeredVeinGenerator.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/LayeredVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/LayeredVeinGenerator.java index 5c8f1ff33b5..44bb61f7899 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/LayeredVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/LayeredVeinGenerator.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.GTLayerPattern; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; -import com.gregtechceu.gtceu.api.worldgen.ores.OreVeinUtil; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.GTLayerPattern; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreVeinUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; @@ -63,7 +63,7 @@ public List getAllEntries() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { Map generatedBlocks = new Object2ObjectOpenHashMap<>(); var patternPool = this.getLayerPatterns(); @@ -169,7 +169,7 @@ public Map generate(WorldGenLevel level, RandomSource } private static void placeBlock(BulkSectionAccess access, LevelChunkSection section, long randomSeed, - OreVeinDefinition entry, float density, + GTOreDefinition entry, float density, Either, Material> state, BlockPos pos) { RandomSource random = new XoroshiroRandomSource(randomSeed); int x = SectionPos.sectionRelative(pos.getX()); diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/NoopVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/NoopVeinGenerator.java similarity index 77% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/NoopVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/NoopVeinGenerator.java index d46fcb80faa..cbf115b0e7b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/NoopVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/NoopVeinGenerator.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; @@ -27,7 +27,7 @@ public List getAllEntries() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { return Collections.emptyMap(); } diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/StandardVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/StandardVeinGenerator.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/StandardVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/StandardVeinGenerator.java index c343c6e54da..c6c86b82ad3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/StandardVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/StandardVeinGenerator.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; - -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; + +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreVeinUtil; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; -import com.gregtechceu.gtceu.api.worldgen.ores.OreVeinUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; @@ -143,7 +143,7 @@ public MapCodec codec() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { Map generatedBlocks = new Object2ObjectOpenHashMap<>(); @@ -178,7 +178,7 @@ public Map generate(WorldGenLevel level, RandomSource } protected void doPlaceNormal(Map generatedBlocks, RandomSource random, - OreVeinDefinition entry, BlockPos origin, + GTOreDefinition entry, BlockPos origin, Either, Material> targets, double pMinX, double pMaxX, double pMinZ, double pMaxZ, double pMinY, double pMaxY, int pX, int pY, int pZ, int pWidth, int pHeight) { @@ -242,7 +242,7 @@ protected void doPlaceNormal(Map generatedBlocks, Rand } private static void generateShape(Map generatedBlocks, RandomSource random, - OreVeinDefinition entry, BlockPos origin, + GTOreDefinition entry, BlockPos origin, Either, Material> targets, int pX, int pY, int pZ, int pWidth, int pHeight, double[] shape, int shapeIdxOffset, @@ -296,7 +296,7 @@ private static void generateShape(Map generatedBlocks, } } - private static void placeBlock(BulkSectionAccess access, long randomSeed, OreVeinDefinition entry, + private static void placeBlock(BulkSectionAccess access, long randomSeed, GTOreDefinition entry, Either, Material> targets, BlockPos pos, float density, MutableInt placedAmount) { diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/VeinedVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/VeinedVeinGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java index fb819f836d0..3b87401442c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/generator/veins/VeinedVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java @@ -1,14 +1,14 @@ -package com.gregtechceu.gtceu.api.worldgen.generator.veins; +package com.gregtechceu.gtceu.api.data.worldgen.generator.veins; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreVeinUtil; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OreBlockPlacer; -import com.gregtechceu.gtceu.api.worldgen.ores.OreVeinUtil; -import com.gregtechceu.gtceu.data.worldgen.GTDensityFunctions; +import com.gregtechceu.gtceu.common.data.GTWorldgen; import com.gregtechceu.gtceu.utils.GTUtil; import com.gregtechceu.gtceu.utils.WeightedEntry; @@ -109,7 +109,7 @@ public List getAllEntries() { } @Override - public Map generate(WorldGenLevel level, RandomSource random, OreVeinDefinition entry, + public Map generate(WorldGenLevel level, RandomSource random, GTOreDefinition entry, BlockPos origin) { Map generatedBlocks = new Object2ObjectOpenHashMap<>(); @@ -125,9 +125,9 @@ public Map generate(WorldGenLevel level, RandomSource } final Blender finalizedBlender = blender; - DensityFunction veinToggle = mapToNoise(densityFunctions.get(GTDensityFunctions.NEW_ORE_VEIN_TOGGLE), + DensityFunction veinToggle = mapToNoise(densityFunctions.get(GTWorldgen.NEW_ORE_VEIN_TOGGLE), randomState); - DensityFunction veinRidged = mapToNoise(densityFunctions.get(GTDensityFunctions.NEW_ORE_VEIN_RIDGED), + DensityFunction veinRidged = mapToNoise(densityFunctions.get(GTWorldgen.NEW_ORE_VEIN_RIDGED), randomState); int size = entry.clusterSize().sample(random); @@ -204,7 +204,7 @@ public Blender getBlender() { } private void placeBlock(BulkSectionAccess access, LevelChunkSection section, long randomSeed, - OreVeinDefinition entry, + GTOreDefinition entry, double chance, List rareEntries, BlockPos.MutableBlockPos pos, List commonEntries) { @@ -237,7 +237,7 @@ private void placeBlock(BulkSectionAccess access, LevelChunkSection section, lon protected static void placeOre(Either, Material> block, BlockState current, BulkSectionAccess level, LevelChunkSection section, RandomSource random, - BlockPos.MutableBlockPos pos, OreVeinDefinition entry) { + BlockPos.MutableBlockPos pos, GTOreDefinition entry) { int x = SectionPos.sectionRelative(pos.getX()); int y = SectionPos.sectionRelative(pos.getY()); int z = SectionPos.sectionRelative(pos.getZ()); diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/BiomePlacement.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/BiomePlacement.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/BiomePlacement.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/BiomePlacement.java index c62cac3030b..b7c7382b2b0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/BiomePlacement.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/BiomePlacement.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.worldgen.modifier; +package com.gregtechceu.gtceu.api.data.worldgen.modifier; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/DimensionFilter.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/DimensionFilter.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/DimensionFilter.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/DimensionFilter.java index cfefbc99079..d524eb10cc1 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/DimensionFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/DimensionFilter.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.modifier; +package com.gregtechceu.gtceu.api.data.worldgen.modifier; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/FrequencyModifier.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/FrequencyModifier.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/FrequencyModifier.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/FrequencyModifier.java index 0fdebaaa0a1..b67ee0bec32 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/FrequencyModifier.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/FrequencyModifier.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.modifier; +package com.gregtechceu.gtceu.api.data.worldgen.modifier; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/package-info.java similarity index 80% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/package-info.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/package-info.java index be2b9d0d72b..67cd414bc98 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/bedrockore/package-info.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.api.worldgen.bedrockore; +package com.gregtechceu.gtceu.api.data.worldgen.modifier; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedIndicators.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedIndicators.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedIndicators.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedIndicators.java index c2a1db57d0f..e11f388dcae 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedIndicators.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedIndicators.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; import net.minecraft.world.level.ChunkPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedVein.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedVein.java similarity index 89% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedVein.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedVein.java index 1a22f34acbe..9c156e31dfa 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedVein.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedVein.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; -import com.gregtechceu.gtceu.api.worldgen.IWorldGenLayer; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; +import com.gregtechceu.gtceu.api.data.worldgen.IWorldGenLayer; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; import net.minecraft.core.BlockPos; import net.minecraft.world.level.ChunkPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedVeinMetadata.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedVeinMetadata.java similarity index 82% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedVeinMetadata.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedVeinMetadata.java index a4c8bc912e0..9a6f83fc21d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/GeneratedVeinMetadata.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/GeneratedVeinMetadata.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; @@ -22,7 +22,7 @@ public final class GeneratedVeinMetadata { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( CHUNK_POS_CODEC.fieldOf("origin_chunk").forGetter(GeneratedVeinMetadata::originChunk), BlockPos.CODEC.fieldOf("center").forGetter(GeneratedVeinMetadata::center), - OreVeinDefinition.CODEC.fieldOf("definition").forGetter(GeneratedVeinMetadata::definition), + GTOreDefinition.CODEC.fieldOf("definition").forGetter(GeneratedVeinMetadata::definition), Codec.BOOL.optionalFieldOf("depleted", false).forGetter(GeneratedVeinMetadata::depleted) ).apply(instance, GeneratedVeinMetadata::new)); // spotless:on @@ -35,18 +35,18 @@ public final class GeneratedVeinMetadata { @Getter @Setter @NotNull - private Holder definition; + private Holder definition; @Getter @Setter private boolean depleted; public GeneratedVeinMetadata(@NotNull ChunkPos originChunk, @NotNull BlockPos center, - @NotNull Holder definition) { + @NotNull Holder definition) { this(originChunk, center, definition, false); } public GeneratedVeinMetadata(@NotNull ChunkPos originChunk, @NotNull BlockPos center, - @NotNull Holder definition, + @NotNull Holder definition, boolean depleted) { this.originChunk = originChunk; this.center = center; @@ -57,14 +57,14 @@ public GeneratedVeinMetadata(@NotNull ChunkPos originChunk, @NotNull BlockPos ce public static GeneratedVeinMetadata readFromPacket(RegistryFriendlyByteBuf buf) { ChunkPos origin = new ChunkPos(buf.readVarLong()); BlockPos center = BlockPos.of(buf.readVarLong()); - Holder def = OreVeinDefinition.STREAM_CODEC.decode(buf); + Holder def = GTOreDefinition.STREAM_CODEC.decode(buf); return new GeneratedVeinMetadata(origin, center, def, false); } public void writeToPacket(RegistryFriendlyByteBuf buf) { buf.writeVarLong(this.originChunk.toLong()); buf.writeVarLong(this.center.asLong()); - OreVeinDefinition.STREAM_CODEC.encode(buf, this.definition); + GTOreDefinition.STREAM_CODEC.encode(buf, this.definition); } @Override diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreBlockPlacer.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreBlockPlacer.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreBlockPlacer.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreBlockPlacer.java index 73c2e0a1630..0c90746f981 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreBlockPlacer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreBlockPlacer.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; import net.minecraft.world.level.chunk.BulkSectionAccess; import net.minecraft.world.level.chunk.LevelChunkSection; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreGenCache.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreGenCache.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreGenCache.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreGenCache.java index 05ee8ef0aa7..e793cf8bd95 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreGenCache.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreGenCache.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreGenerator.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreGenerator.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreGenerator.java index 6c4f3d2ee5b..7446f7e51fb 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreGenerator.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.worldgen.IWorldGenLayer; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.IWorldGenLayer; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; import com.gregtechceu.gtceu.utils.GTUtil; @@ -65,7 +65,7 @@ public List generateIndicators(WorldGenLevel level, List> generatedIndicators = definition.indicatorGenerators().stream() .flatMap(gen -> gen.generate(level, config.newRandom(), config.data).entrySet().stream()) @@ -98,7 +98,7 @@ public List generateOres(WorldGenLevel level, List generateOres(VeinConfiguration config, WorldGenLevel level, ChunkPos chunkPos) { - OreVeinDefinition definition = config.data.definition().value(); + GTOreDefinition definition = config.data.definition().value(); Map generatedVeins = definition.veinGenerator() .generate(level, config.newRandom(), definition, config.data.center()); @@ -125,8 +125,8 @@ private List createConfigs(WorldGenLevel level, ChunkGenerato })).toList(); } - private Stream> getEntries(WorldGenLevel level, BlockPos veinCenter, - XoroshiroRandomSource random) { + private Stream> getEntries(WorldGenLevel level, BlockPos veinCenter, + XoroshiroRandomSource random) { return WorldGeneratorUtils.WORLD_GEN_LAYERS.values().stream() .filter(layer -> layer.isApplicableForLevel(level.getLevel().dimension())) .map(layer -> { @@ -139,8 +139,8 @@ private Stream> getEntries(WorldGenLevel level, BlockP } @Nullable - private Holder getEntry(WorldGenLevel level, Holder biome, RandomSource random, - IWorldGenLayer layer) { + private Holder getEntry(WorldGenLevel level, Holder biome, RandomSource random, + IWorldGenLayer layer) { var veins = WorldGeneratorUtils.getCachedBiomeVeins(level.getLevel(), biome).stream() .filter(vein -> vein.vein().value().layer().equals(layer)) .toList(); @@ -151,7 +151,7 @@ private Holder getEntry(WorldGenLevel level, Holder bi @NotNull private static Optional computeVeinOrigin(WorldGenLevel level, ChunkGenerator generator, ChunkPos pos, RandomSource random, BlockPos veinCenter, - OreVeinDefinition entry) { + GTOreDefinition entry) { int layerSeed = WorldGeneratorUtils.getWorldGenLayerKey(entry.layer()) .map(String::hashCode) .orElse(0); diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreIndicatorPlacer.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreIndicatorPlacer.java similarity index 76% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreIndicatorPlacer.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreIndicatorPlacer.java index b0d3ffd4332..b37a626b411 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreIndicatorPlacer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreIndicatorPlacer.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; import net.minecraft.world.level.chunk.BulkSectionAccess; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OrePlacer.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OrePlacer.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OrePlacer.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OrePlacer.java index 75ef6b8796b..cdfc95e0f43 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OrePlacer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OrePlacer.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreVeinUtil.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreVeinUtil.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreVeinUtil.java rename to src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreVeinUtil.java index 907dbd6d489..fc81cc37c5a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/ores/OreVeinUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/ores/OreVeinUtil.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.worldgen.ores; +package com.gregtechceu.gtceu.api.data.worldgen.ores; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.common.data.GTOreVeins; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.worldgen.GTOreVeins; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; @@ -19,7 +19,7 @@ public class OreVeinUtil { private OreVeinUtil() {} public static boolean canPlaceOre(BlockState pState, Function pAdjacentStateAccessor, - RandomSource pRandom, OreVeinDefinition entry, + RandomSource pRandom, GTOreDefinition entry, OreConfiguration.TargetBlockState pTargetState, BlockPos pMatablePos) { if (!pTargetState.target.test(pState, pRandom)) @@ -31,7 +31,7 @@ public static boolean canPlaceOre(BlockState pState, Function pAdjacentStateAccessor, - RandomSource pRandom, OreVeinDefinition entry, + RandomSource pRandom, GTOreDefinition entry, BlockPos pMatablePos) { if (!entry.layer().getTarget().test(pState, pRandom)) return false; diff --git a/src/main/java/com/gregtechceu/gtceu/api/datafixer/DataFixesInternals.java b/src/main/java/com/gregtechceu/gtceu/api/datafixer/DataFixesInternals.java deleted file mode 100644 index a1fc36791f8..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/datafixer/DataFixesInternals.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2022 QuiltMC - * Modified by the Steam 'n' Rails (Railways) team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gregtechceu.gtceu.api.datafixer; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.config.ConfigHolder; - -import net.minecraft.SharedConstants; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.datafix.DataFixers; - -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.DataFixUtils; -import com.mojang.datafixers.DataFixer; -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import org.jetbrains.annotations.*; - -import java.util.function.BiFunction; - -import static com.google.common.base.Preconditions.checkArgument; - -@ApiStatus.Internal -public abstract class DataFixesInternals { - - public static final BiFunction BASE_SCHEMA = (version, parent) -> { - checkArgument(version == 0, "version must be 0"); - checkArgument(parent == null, "parent must be null"); - return get().createBaseSchema(); - }; - - public record DataFixerEntry(DataFixer dataFixer, int currentVersion) {} - - @Contract(pure = true) - @Range(from = 0, to = Integer.MAX_VALUE) - public static int getModDataVersion(@NotNull Dynamic compound) { - return compound.get("GTCEu_DataVersion").asInt(0); - } - - private static DataFixesInternals instance; - - public static @NotNull DataFixesInternals get() { - if (instance == null) { - // Init config in case it's not loaded yet - ConfigHolder.init(); - if (!ConfigHolder.INSTANCE.compat.doDatafixers) { - instance = new NoOpDataFixesInternals(); - return instance; - } - - Schema latestVanillaSchema; - try { - latestVanillaSchema = DataFixers.getDataFixer() - .getSchema(DataFixUtils - .makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion())); - } catch (Exception e) { - latestVanillaSchema = null; - } - - if (latestVanillaSchema == null) { - GTCEu.LOGGER.warn("[GTCEuM DFU] Failed to initialize! Either someone stopped DFU from initializing,"); - GTCEu.LOGGER.warn("[GTCEuM DFU] or this Minecraft build is hosed."); - GTCEu.LOGGER.warn("[GTCEuM DFU] Using no-op implementation."); - instance = new NoOpDataFixesInternals(); - } else { - instance = new DataFixesInternalsImpl(latestVanillaSchema); - } - } - - return instance; - } - - public abstract void registerFixer(@Range(from = 0, to = Integer.MAX_VALUE) int currentVersion, - @NotNull DataFixer dataFixer); - - public abstract @Nullable DataFixerEntry getFixerEntry(); - - @Contract(value = "-> new", pure = true) - public abstract @NotNull Schema createBaseSchema(); - - public abstract @NotNull Dynamic updateWithAllFixers(DSL.TypeReference dataFixTypes, - @NotNull Dynamic dynamic); - - public abstract @NotNull CompoundTag addModDataVersions(@NotNull CompoundTag compound); -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/datafixer/DataFixesInternalsImpl.java b/src/main/java/com/gregtechceu/gtceu/api/datafixer/DataFixesInternalsImpl.java deleted file mode 100644 index ed7963a6090..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/datafixer/DataFixesInternalsImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2022 QuiltMC - * Modified by the Steam 'n' Rails (Railways) team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gregtechceu.gtceu.api.datafixer; - -import com.gregtechceu.gtceu.common.datafixer.schemas.V0; - -import net.minecraft.nbt.CompoundTag; - -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.DataFixer; -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; - -@ApiStatus.Internal -public final class DataFixesInternalsImpl extends DataFixesInternals { - - private final @NotNull Schema latestVanillaSchema; - - private DataFixerEntry dataFixer; - - public DataFixesInternalsImpl(@NotNull Schema latestVanillaSchema) { - this.latestVanillaSchema = latestVanillaSchema; - - this.dataFixer = null; - } - - @Override - public void registerFixer(@Range(from = 0, to = Integer.MAX_VALUE) int currentVersion, - @NotNull DataFixer dataFixer) { - if (this.dataFixer != null) { - throw new IllegalArgumentException("GTCEu already has a registered data fixer"); - } - - this.dataFixer = new DataFixerEntry(dataFixer, currentVersion); - } - - @Override - public @Nullable DataFixerEntry getFixerEntry() { - return dataFixer; - } - - @Override - public @NotNull Schema createBaseSchema() { - return new V0(0, this.latestVanillaSchema); - } - - @Override - public @NotNull Dynamic updateWithAllFixers(DSL.TypeReference type, @NotNull Dynamic dynamic) { - if (dataFixer != null) { - int modDataVersion = DataFixesInternals.getModDataVersion(dynamic); - dynamic = dataFixer.dataFixer().update(type, dynamic, modDataVersion, dataFixer.currentVersion()); - } - - return dynamic; - } - - @Override - public @NotNull CompoundTag addModDataVersions(@NotNull CompoundTag compound) { - if (dataFixer != null) - compound.putInt("GTCEu_DataVersion", dataFixer.currentVersion()); - - return compound; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/datafixer/EmptySchema.java b/src/main/java/com/gregtechceu/gtceu/api/datafixer/EmptySchema.java deleted file mode 100644 index d52a41cd072..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/datafixer/EmptySchema.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2022 QuiltMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gregtechceu.gtceu.api.datafixer; - -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.schemas.Schema; -import com.mojang.datafixers.types.Type; -import com.mojang.datafixers.types.templates.TypeTemplate; -import it.unimi.dsi.fastutil.objects.Object2ObjectMaps; -import org.jetbrains.annotations.Range; - -import java.util.Map; -import java.util.function.Supplier; - -/** - * Represents an empty {@link Schema}, having no parent and containing no type definitions. - */ -public final class EmptySchema extends FirstSchema { - - /** - * Constructs an empty schema. - * - * @param versionKey the data version key - */ - public EmptySchema(@Range(from = 0, to = Integer.MAX_VALUE) int versionKey) { - super(versionKey); - } - - // Ensure the schema stays empty. - @Override - public void registerType(boolean recursive, DSL.TypeReference type, Supplier template) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map> buildTypes() { - return Object2ObjectMaps.emptyMap(); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/datafixer/FirstSchema.java b/src/main/java/com/gregtechceu/gtceu/api/datafixer/FirstSchema.java deleted file mode 100644 index a04730bf6d5..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/datafixer/FirstSchema.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2022 QuiltMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gregtechceu.gtceu.api.datafixer; - -import com.mojang.datafixers.schemas.Schema; -import com.mojang.datafixers.types.templates.TypeTemplate; -import org.jetbrains.annotations.Range; - -import java.util.Map; -import java.util.function.Supplier; - -public class FirstSchema extends Schema { - - /** - * Creates a schema. - * - * @param versionKey the data version key - */ - public FirstSchema(@Range(from = 0, to = Integer.MAX_VALUE) int versionKey) { - super(versionKey, null); - } - - // all of these methods refer to this.parent without checking if its null - @Override - public void registerTypes(Schema schema, Map> entityTypes, - Map> blockEntityTypes) {} - - @Override - public Map> registerEntities(Schema schema) { - return Map.of(); - } - - @Override - public Map> registerBlockEntities(Schema schema) { - return Map.of(); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/datafixer/LICENSE b/src/main/java/com/gregtechceu/gtceu/api/datafixer/LICENSE deleted file mode 100644 index ad5b29c1e36..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/datafixer/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ -Certain portions of the datafixer are taken from the -Quilt Standard Library (https://github.com/QuiltMC/quilt-standard-libraries), -and as such are licensed under the following license: - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/src/main/java/com/gregtechceu/gtceu/api/datafixer/NoOpDataFixesInternals.java b/src/main/java/com/gregtechceu/gtceu/api/datafixer/NoOpDataFixesInternals.java deleted file mode 100644 index 2b3b0481ed7..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/datafixer/NoOpDataFixesInternals.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2022 QuiltMC - * Modified by the Steam 'n' Rails (Railways) team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gregtechceu.gtceu.api.datafixer; - -import net.minecraft.nbt.CompoundTag; - -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.DataFixer; -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; - -public class NoOpDataFixesInternals extends DataFixesInternals { - - private final Schema schema; - - public NoOpDataFixesInternals() { - schema = new EmptySchema(0); - } - - @Override - public void registerFixer(@Range(from = 0, to = Integer.MAX_VALUE) int currentVersion, - @NotNull DataFixer dataFixer) {} - - @Override - public @Nullable DataFixerEntry getFixerEntry() { - return null; - } - - @Override - public @NotNull Schema createBaseSchema() { - return schema; - } - - @Override - public @NotNull Dynamic updateWithAllFixers(DSL.TypeReference dataFixTypes, @NotNull Dynamic dynamic) { - return dynamic; - } - - @Override - public @NotNull CompoundTag addModDataVersions(@NotNull CompoundTag compound) { - return compound; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/datafixer/fixes/ToolBehaviorRemainderFix.java b/src/main/java/com/gregtechceu/gtceu/api/datafixer/fixes/ToolBehaviorRemainderFix.java deleted file mode 100644 index 8eb3cccdf3a..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/datafixer/fixes/ToolBehaviorRemainderFix.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gregtechceu.gtceu.api.datafixer.fixes; - -import net.minecraft.util.datafix.fixes.ItemStackComponentRemainderFix; - -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import org.jetbrains.annotations.NotNull; - -public abstract class ToolBehaviorRemainderFix extends ItemStackComponentRemainderFix { - - private final String behaviorId; - private final String newBehaviorId; - - public ToolBehaviorRemainderFix(Schema outputSchema, String name, String behaviorId) { - this(outputSchema, name, behaviorId, behaviorId); - } - - public ToolBehaviorRemainderFix(Schema outputSchema, String name, String behaviorId, String newBehaviorId) { - super(outputSchema, name, "gtceu:tool_behaviors"); - this.behaviorId = behaviorId; - this.newBehaviorId = newBehaviorId; - } - - @Override - protected final @NotNull Dynamic fixComponent(@NotNull Dynamic tag) { - return tag.renameAndFixField(behaviorId, newBehaviorId, this::fixBehavior); - } - - protected abstract @NotNull Dynamic fixBehavior(@NotNull Dynamic tag); -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/FluidBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidBuilder.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/FluidBuilder.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/FluidBuilder.java index 88fa6742f1b..347670df3c4 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/FluidBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidBuilder.java @@ -1,17 +1,16 @@ -package com.gregtechceu.gtceu.api.fluid; - -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttribute; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorage; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorage.FluidEntry; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKey; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; -import com.gregtechceu.gtceu.api.item.GTBucketItem; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +package com.gregtechceu.gtceu.api.fluids; + +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttribute; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorage; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.registry.registrate.GTClientFluidTypeExtensions; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; -import com.gregtechceu.gtceu.api.registry.registrate.forge.GTClientFluidTypeExtensions; +import com.gregtechceu.gtceu.common.item.GTBucketItem; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.core.BlockPos; @@ -45,7 +44,7 @@ import java.util.Collections; import java.util.function.Supplier; -import static com.gregtechceu.gtceu.api.fluid.FluidConstants.*; +import static com.gregtechceu.gtceu.api.fluids.FluidConstants.*; @Accessors(fluent = true, chain = true) public class FluidBuilder { @@ -458,12 +457,12 @@ public Component getDescription(FluidStack stack) { public boolean isVaporizedOnPlacement(Level level, BlockPos pos, FluidStack stack) { FluidStorage fluidStorage = material.getProperty(PropertyKey.FLUID); // always vaporize plasmas and gases - FluidEntry plasmaEntry = fluidStorage.getEntry(FluidStorageKeys.PLASMA); + FluidStorage.FluidEntry plasmaEntry = fluidStorage.getEntry(FluidStorageKeys.PLASMA); if (plasmaEntry != null) { FluidBuilder plasmaBuilder = plasmaEntry.getBuilder(); return plasmaBuilder != null && plasmaBuilder.hasFluidBlock(); } - FluidEntry gasEntry = fluidStorage.getEntry(FluidStorageKeys.GAS); + FluidStorage.FluidEntry gasEntry = fluidStorage.getEntry(FluidStorageKeys.GAS); if (gasEntry != null) { var gasBuilder = gasEntry.getBuilder(); return gasBuilder != null && gasBuilder.hasFluidBlock(); diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/FluidConstants.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidConstants.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/FluidConstants.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/FluidConstants.java index 1a745a2913b..ece429185d2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/FluidConstants.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidConstants.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.fluid; +package com.gregtechceu.gtceu.api.fluids; public final class FluidConstants { diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/FluidState.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidState.java similarity index 87% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/FluidState.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/FluidState.java index 6e436dc2ad0..6af9435f311 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/FluidState.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidState.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.fluid; +package com.gregtechceu.gtceu.api.fluids; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/GTFluid.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/GTFluid.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/GTFluid.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/GTFluid.java index 91a5aaeba9a..91bf3eb9bf8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/GTFluid.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/GTFluid.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.fluid; +package com.gregtechceu.gtceu.api.fluids; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttribute; -import com.gregtechceu.gtceu.api.fluid.attribute.IAttributedFluid; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttribute; +import com.gregtechceu.gtceu.api.fluids.attribute.IAttributedFluid; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/PropertyFluidFilter.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/PropertyFluidFilter.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/PropertyFluidFilter.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/PropertyFluidFilter.java index 9927e3a222c..5373cba8c1b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/PropertyFluidFilter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/PropertyFluidFilter.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.fluid; +package com.gregtechceu.gtceu.api.fluids; import com.gregtechceu.gtceu.api.capability.IPropertyFluidFilter; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttribute; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttribute; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import it.unimi.dsi.fastutil.objects.Object2BooleanMap; import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/FluidAttribute.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/FluidAttribute.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/FluidAttribute.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/FluidAttribute.java index e186669afea..80eae877ec0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/FluidAttribute.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/FluidAttribute.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.fluid.attribute; +package com.gregtechceu.gtceu.api.fluids.attribute; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/FluidAttributes.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/FluidAttributes.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/FluidAttributes.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/FluidAttributes.java index 15e6845baa4..2b191232973 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/FluidAttributes.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/FluidAttributes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.fluid.attribute; +package com.gregtechceu.gtceu.api.fluids.attribute; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/IAttributedFluid.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/IAttributedFluid.java similarity index 81% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/IAttributedFluid.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/IAttributedFluid.java index c2558ffdebb..1b40ebdc6f2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/attribute/IAttributedFluid.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/attribute/IAttributedFluid.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.fluid.attribute; +package com.gregtechceu.gtceu.api.fluids.attribute; -import com.gregtechceu.gtceu.api.fluid.FluidState; +import com.gregtechceu.gtceu.api.fluids.FluidState; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pack/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/package-info.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/common/pack/package-info.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/package-info.java index c5466b00257..222e999498a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pack/package-info.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.common.pack; +package com.gregtechceu.gtceu.api.fluids; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorage.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorage.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorage.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorage.java index 58a4452e0fa..df2f61a33d3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorage.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorage.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.fluid.store; +package com.gregtechceu.gtceu.api.fluids.store; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; import net.minecraft.world.level.material.Fluid; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageImpl.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageImpl.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageImpl.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageImpl.java index dc771fa6fa5..c6beb2d31e1 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageImpl.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageImpl.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.fluid.store; +package com.gregtechceu.gtceu.api.fluids.store; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import net.minecraft.world.level.material.Fluid; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageKey.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKey.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageKey.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKey.java index 244375a81bf..20dd4987721 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageKey.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKey.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.fluid.store; +package com.gregtechceu.gtceu.api.fluids.store; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.tag.TagUtil; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageKeys.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKeys.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageKeys.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKeys.java index b563ceadb46..712e56e0672 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/FluidStorageKeys.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKeys.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.fluid.store; +package com.gregtechceu.gtceu.api.fluids.store; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.material.material.properties.FluidProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/package-info.java similarity index 83% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/store/package-info.java rename to src/main/java/com/gregtechceu/gtceu/api/fluids/store/package-info.java index 28576effef4..db7bedc0207 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/store/package-info.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.api.fluid.store; +package com.gregtechceu.gtceu.api.fluids.store; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java b/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java index f3b1dea0454..75a4dfd578c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java @@ -1,19 +1,19 @@ package com.gregtechceu.gtceu.api.gui.misc; import com.gregtechceu.gtceu.api.GTCEuAPI; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidVeinSavedData; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.FluidVeinWorldEntry; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreVeinSavedData; import com.gregtechceu.gtceu.api.gui.texture.ProspectingTexture; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.tag.TagUtil; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidVeinSavedData; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.FluidVeinWorldEntry; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreVeinSavedData; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverConfigurator.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverConfigurator.java index c65553f7692..a7253922ede 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverConfigurator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverConfigurator.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.cover.IUICover; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.fancy.IFancyConfigurator; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/EnumSelectorWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/EnumSelectorWidget.java index f4771dbdf74..0f08e4ea84f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/EnumSelectorWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/EnumSelectorWidget.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/FloatInputWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/FloatInputWidget.java deleted file mode 100644 index 3a5d6dd178e..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/FloatInputWidget.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.gregtechceu.gtceu.api.gui.widget; - -import com.lowdragmc.lowdraglib.gui.widget.TextFieldWidget; -import com.lowdragmc.lowdraglib.utils.Position; -import com.lowdragmc.lowdraglib.utils.Size; - -import net.minecraft.util.Mth; - -import java.util.function.Consumer; -import java.util.function.Supplier; - -/** - * A widget containing a floating point input field, as well as adjacent buttons for increasing or decreasing the value. - * - *

- * The buttons' change amount can be altered with Ctrl, Shift, or both.
- * The input is limited by a minimum and maximum value. - *

- */ -public class FloatInputWidget extends NumberInputWidget { - - public FloatInputWidget(Supplier valueSupplier, Consumer onChanged) { - super(valueSupplier, onChanged); - } - - public FloatInputWidget(Position position, Supplier valueSupplier, Consumer onChanged) { - super(position, valueSupplier, onChanged); - } - - public FloatInputWidget(Position position, Size size, Supplier valueSupplier, Consumer onChanged) { - super(position, size, valueSupplier, onChanged); - } - - public FloatInputWidget(int x, int y, int width, int height, Supplier valueSupplier, - Consumer onChanged) { - super(x, y, width, height, valueSupplier, onChanged); - } - - @Override - protected Float defaultMin() { - return 0.0f; - } - - @Override - protected Float defaultMax() { - return Float.MAX_VALUE; - } - - @Override - protected String toText(Float value) { - return String.valueOf(value); - } - - @Override - protected Float fromText(String value) { - return Float.parseFloat(value); - } - - @Override - protected ChangeValues getChangeValues() { - return new ChangeValues<>(1.0f, 0.1f, 0.01f, 0.001f); - } - - @Override - protected Float add(Float a, Float b) { - return a + b; - } - - @Override - protected Float multiply(Float a, Float b) { - return a * b; - } - - @Override - protected Float clamp(Float value, Float min, Float max) { - return Mth.clamp(value, min, max); - } - - @Override - protected void setTextFieldRange(TextFieldWidget textField, Float min, Float max) { - textField.setNumbersOnly(min, max); - } - - @Override - protected Float getOne(boolean positive) { - return positive ? 1.0f : -1.0f; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java index 9853155695b..94834a0612c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java @@ -6,10 +6,10 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; -import com.gregtechceu.gtceu.api.multiblock.BlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; -import com.gregtechceu.gtceu.api.multiblock.predicates.SimplePredicate; +import com.gregtechceu.gtceu.api.pattern.BlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; +import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.xei.handlers.item.CycleItemEntryHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ToggleButtonWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ToggleButtonWidget.java index ceb6dab2c21..36f8002646e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ToggleButtonWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ToggleButtonWidget.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.gui.widget; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputFluidConfigHandler.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputFluidConfigHandler.java index 65ff3f14a59..df1058e9021 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputFluidConfigHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputFluidConfigHandler.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.gui.widget.directional.IDirectionalConfigHandler; import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputFluid; import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputItem; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputItemConfigHandler.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputItemConfigHandler.java index 3eeee94da0d..369bea23fc6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputItemConfigHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputItemConfigHandler.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.gui.widget.directional.IDirectionalConfigHandler; import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputFluid; import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputItem; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java index da8815c4918..e821e006a66 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.item; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.item.component.IItemComponent; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java b/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java index 354777ec9dd..fb740540c79 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java @@ -1,9 +1,16 @@ package com.gregtechceu.gtceu.api.item; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.capability.ElectricItem; import com.gregtechceu.gtceu.api.item.component.ElectricStats; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.item.datacomponents.AoESymmetrical; import com.gregtechceu.gtceu.api.item.datacomponents.GTTool; import com.gregtechceu.gtceu.api.item.tool.GTToolType; @@ -11,19 +18,12 @@ import com.gregtechceu.gtceu.api.item.tool.TreeFellingHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolUIBehavior; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.DustProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.sound.SoundEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java index 5933a7056a2..df5113ca95e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java @@ -2,10 +2,10 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.MaterialBlock; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.DustProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.lowdragmc.lowdraglib.client.renderer.IBlockRendererProvider; import com.lowdragmc.lowdraglib.client.renderer.IItemRendererProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/SurfaceRockBlockItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/SurfaceRockBlockItem.java index 8c4603a20e9..dfc68916188 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/SurfaceRockBlockItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/SurfaceRockBlockItem.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.item; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.common.block.SurfaceRockBlock; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java index 94f6834f9bb..344142dd326 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java @@ -2,13 +2,13 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.DustProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.renderer.item.TagPrefixItemRenderer; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; +import com.gregtechceu.gtceu.common.data.GTDamageTypes; import net.minecraft.client.color.item.ItemColor; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorComponentItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorComponentItem.java index 232f4698370..942de934041 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorComponentItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorComponentItem.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.component.*; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import net.minecraft.core.Holder; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorUtils.java b/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorUtils.java index 5747e10c775..8696119e5b5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorUtils.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; +import com.gregtechceu.gtceu.common.data.GTSoundEntries; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.ServerGamePacketListenerImplAccessor; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/capability/ElectricItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/capability/ElectricItem.java index e4430603568..de4cd9cf8ae 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/capability/ElectricItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/capability/ElectricItem.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.item.datacomponents.SimpleEnergyContent; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.core.component.DataComponentType; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java index f5748b6bc8f..754d5d2f77f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java @@ -7,7 +7,6 @@ import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.capability.compat.FeCompat; import com.gregtechceu.gtceu.api.item.capability.ElectricItem; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import com.gregtechceu.gtceu.client.renderer.item.ToolChargeBarRenderer; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java index 1b910f0308a..e9db17773fb 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java @@ -1,6 +1,5 @@ package com.gregtechceu.gtceu.api.item.component; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import com.gregtechceu.gtceu.api.misc.forge.FilteredFluidHandlerItemStack; import com.gregtechceu.gtceu.utils.FormattingUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/forge/IComponentCapability.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/IComponentCapability.java similarity index 80% rename from src/main/java/com/gregtechceu/gtceu/api/item/component/forge/IComponentCapability.java rename to src/main/java/com/gregtechceu/gtceu/api/item/component/IComponentCapability.java index 57f765aac08..4f25690d43a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/forge/IComponentCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/IComponentCapability.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.item.component.forge; +package com.gregtechceu.gtceu.api.item.component; import net.minecraft.world.item.Item; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/IMaterialPartItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/IMaterialPartItem.java index 29ee4e8af4b..df99fd39b64 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/IMaterialPartItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/IMaterialPartItem.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.api.item.component; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.item.IComponentItem; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.client.color.item.ItemColor; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java index 072d15d0674..ed11bfca38c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java @@ -1,7 +1,6 @@ package com.gregtechceu.gtceu.api.item.component; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; import com.gregtechceu.gtceu.api.misc.forge.SimpleThermalFluidHandlerItemStack; import com.gregtechceu.gtceu.api.misc.forge.ThermalFluidHandlerItemStack; import com.gregtechceu.gtceu.client.TooltipsHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolItem.java index a8abbbf8706..0baf2894c75 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolItem.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.api.item.tool; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; import com.gregtechceu.gtceu.api.item.IGTTool; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; import com.gregtechceu.gtceu.api.sound.SoundEntry; import com.gregtechceu.gtceu.client.renderer.item.ToolItemRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java index cb2c094fade..4bcfc5cfc9d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java @@ -2,14 +2,14 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.item.IGTTool; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.api.sound.ExistingSoundEntry; import com.gregtechceu.gtceu.api.sound.SoundEntry; +import com.gregtechceu.gtceu.common.data.GTSoundEntries; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.item.tool.behavior.*; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java index d8be8150d23..e65543d369e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.api.item.tool; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Tier; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java index eaf892a3ac8..8eacf3788e2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java @@ -4,30 +4,31 @@ import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.capability.recipe.*; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.datacomponents.AoESymmetrical; import com.gregtechceu.gtceu.api.item.datacomponents.ToolBehaviors; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.GTEnchantmentProviders; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.enchantment.GTEnchantmentProviders; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.utils.DummyMachineBlockEntity; import com.gregtechceu.gtceu.utils.InfiniteEnergyContainer; @@ -105,7 +106,7 @@ public static CharSet getToolSymbols() { /** * Registers the tool against a crafting symbol, this is used in - * {@link com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper} + * {@link VanillaRecipeHelper} */ public static void registerToolSymbol(char symbol, GTToolType tool) { symbols.put(symbol, tool); diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/TreeFellingHelper.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/TreeFellingHelper.java index 3149cdc6272..ae53be60be6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/TreeFellingHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/TreeFellingHelper.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.api.item.tool; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/behavior/IToolBehavior.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/behavior/IToolBehavior.java index a8ea03071bc..92a81efe0f0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/behavior/IToolBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/behavior/IToolBehavior.java @@ -1,6 +1,7 @@ package com.gregtechceu.gtceu.api.item.tool.behavior; import com.gregtechceu.gtceu.api.item.IGTTool; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -94,7 +95,7 @@ default InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) /** * Queries if an item can perform the given action. * See {@link ItemAbilities} for a description of each stock action - * and {@link com.gregtechceu.gtceu.data.item.GTItemAbilities} for GTCEu's ones + * and {@link GTItemAbilities} for GTCEu's ones * * @param stack The stack being used * @param action The ability being queried diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java b/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java index 1a9d980b7ef..b2e8b30c337 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java @@ -2,11 +2,12 @@ import com.gregtechceu.gtceu.api.block.IMachineBlock; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.gui.editor.EditableMachineUI; import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java index 2d8ad7774b8..052b87f87e4 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java @@ -12,6 +12,7 @@ import com.gregtechceu.gtceu.api.capability.IToolable; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.cover.CoverBehavior; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.fancy.IFancyTooltip; import com.gregtechceu.gtceu.api.item.tool.GTToolType; @@ -22,17 +23,17 @@ import com.gregtechceu.gtceu.api.machine.trait.MachineTrait; import com.gregtechceu.gtceu.api.misc.IOFilteredInvWrapper; import com.gregtechceu.gtceu.api.misc.IOFluidHandlerList; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; import com.gregtechceu.gtceu.client.util.ModelUtils; import com.gregtechceu.gtceu.common.cover.FluidFilterCover; import com.gregtechceu.gtceu.common.cover.ItemFilterCover; import com.gregtechceu.gtceu.common.cover.data.ManualIOMode; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; import com.gregtechceu.gtceu.common.machine.owner.PlayerOwner; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/MultiblockMachineDefinition.java b/src/main/java/com/gregtechceu/gtceu/api/machine/MultiblockMachineDefinition.java index ca0cb92a800..05f033fdf3a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/MultiblockMachineDefinition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/MultiblockMachineDefinition.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; -import com.gregtechceu.gtceu.api.multiblock.BlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.BlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java index ab10cfe6480..1da3db33e10 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java @@ -6,9 +6,9 @@ import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardEmitter; import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java index e357ac199db..78ca55a9a79 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java @@ -22,7 +22,7 @@ import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/AutoStockingFancyConfigurator.java b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/AutoStockingFancyConfigurator.java index e76cb424815..94620e8736c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/AutoStockingFancyConfigurator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/AutoStockingFancyConfigurator.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.api.gui.fancy.IFancyConfigurator; import com.gregtechceu.gtceu.api.gui.widget.IntInputWidget; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTItems; import com.gregtechceu.gtceu.integration.ae2.machine.MEStockingBusPartMachine; import com.gregtechceu.gtceu.integration.ae2.machine.feature.multiblock.IMEStockingPart; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java index 7772e697006..28b0994c887 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/MachineModeFancyConfigurator.java b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/MachineModeFancyConfigurator.java index 04cdb2cd1fb..fd77e63deae 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/MachineModeFancyConfigurator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/MachineModeFancyConfigurator.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.gui.fancy.FancyMachineUIWidget; import com.gregtechceu.gtceu.api.gui.fancy.IFancyUIProvider; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.lowdragmc.lowdraglib.gui.editor.ColorPattern; import com.lowdragmc.lowdraglib.gui.texture.*; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardCleaner.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardCleaner.java index 181b0c1b1ed..cdb7b0e7709 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardCleaner.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardCleaner.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.machine.feature; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; public interface IEnvironmentalHazardCleaner extends IMachineFeature { diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardEmitter.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardEmitter.java index f43969de805..86bb8b68348 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardEmitter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IEnvironmentalHazardEmitter.java @@ -2,11 +2,11 @@ import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IHazardParticleContainer; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IExhaustVentMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IExhaustVentMachine.java index 8eece95b522..a4f81715a27 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IExhaustVentMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IExhaustVentMachine.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; +import com.gregtechceu.gtceu.common.data.GTDamageTypes; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/ILocalizedHazardEmitter.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/ILocalizedHazardEmitter.java index 796a40978c1..41144c5946c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/ILocalizedHazardEmitter.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/ILocalizedHazardEmitter.java @@ -2,11 +2,11 @@ import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IHazardParticleContainer; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.common.capability.LocalizedHazardSavedData; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java index 25d858369ad..ef5d3cc0b4d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.capability.IWorkable; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.jade.provider.RecipeLogicProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMaintenanceMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMaintenanceMachine.java index fd5486bfa12..c97053ba47c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMaintenanceMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMaintenanceMachine.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.gui.fancy.IFancyTooltip; import com.gregtechceu.gtceu.api.gui.fancy.TooltipsPanel; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.config.ConfigHolder; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMufflerMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMufflerMachine.java index e89f2bdf2ec..90a20071f83 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMufflerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMufflerMachine.java @@ -8,8 +8,8 @@ import com.gregtechceu.gtceu.api.gui.fancy.TooltipsPanel; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardEmitter; import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.particle.GTParticleTypes; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTParticleTypes; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiController.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiController.java index a4ef7d18e7d..b297d045220 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiController.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiController.java @@ -5,8 +5,8 @@ import com.gregtechceu.gtceu.api.machine.feature.IMachineFeature; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; -import com.gregtechceu.gtceu.api.multiblock.BlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockState; +import com.gregtechceu.gtceu.api.pattern.BlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockState; import com.gregtechceu.gtceu.client.renderer.MultiblockInWorldPreviewRenderer; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java index be9c38aaf2c..eda18f188c6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IRotorHolderMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IRotorHolderMachine.java index 437523bfbde..1293e92dff5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IRotorHolderMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IRotorHolderMachine.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.api.machine.feature.multiblock; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.fancy.IFancyTooltip; import com.gregtechceu.gtceu.api.gui.fancy.TooltipsPanel; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java index 1b5e000f91d..fbba527a5dc 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java @@ -9,10 +9,10 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; -import com.gregtechceu.gtceu.api.multiblock.MultiblockState; -import com.gregtechceu.gtceu.api.multiblock.MultiblockWorldSavedData; +import com.gregtechceu.gtceu.api.pattern.MultiblockState; +import com.gregtechceu.gtceu.api.pattern.MultiblockWorldSavedData; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockDisplayText.java b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockDisplayText.java index b0d0dad1ed4..80ed9d9017b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockDisplayText.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockDisplayText.java @@ -5,11 +5,11 @@ import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderFluidIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderIngredient; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java index a43881c1bad..a98dea2c319 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java @@ -17,7 +17,7 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifierList; -import com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers; +import com.gregtechceu.gtceu.common.data.GTRecipeModifiers; import com.gregtechceu.gtceu.utils.GTUtil; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java index f30a7b65844..d8956be62ff 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java @@ -14,10 +14,10 @@ import com.gregtechceu.gtceu.api.machine.trait.MachineTrait; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import com.lowdragmc.lowdraglib.syncdata.ISubscription; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/property/GTMachineModelProperties.java b/src/main/java/com/gregtechceu/gtceu/api/machine/property/GTMachineModelProperties.java index 883e9b7b82b..b88a0b1e93a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/property/GTMachineModelProperties.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/property/GTMachineModelProperties.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.machine.property; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.common.machine.electric.ChargerMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.DiodePartMachine; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java index c28d46a94de..ef772efc11b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java @@ -15,9 +15,9 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java index b42ad55dd79..d08bd2af47d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java @@ -13,12 +13,12 @@ import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine; import com.gregtechceu.gtceu.api.machine.feature.IUIMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTTransferUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamEnergyRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamEnergyRecipeHandler.java index 9b697c56646..00da2c0adf0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamEnergyRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamEnergyRecipeHandler.java @@ -5,9 +5,9 @@ import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.utils.GTMath; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamMachine.java index 0d774fe4fad..352d38c645d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamMachine.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java index 6b5b49adf3e..8b717f6edc5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java @@ -15,7 +15,7 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; import com.lowdragmc.lowdraglib.syncdata.ISubscription; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java index d0c3d743949..a97c0ba415f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.common.blockentity.OpticalPipeBlockEntity; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java index bf5d8e79789..75c1e36acd4 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableEnergyContainer.java @@ -12,8 +12,8 @@ import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.feature.IExplosionMachine; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java index c92b8ad93b4..89f6b92b66c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.machine.MetaMachine; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderFluidIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable; import com.gregtechceu.gtceu.utils.GTTransferUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java index afe92931db0..bd8b48b4f56 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java @@ -6,9 +6,9 @@ import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.recipe.DummyCraftingInput; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; import com.gregtechceu.gtceu.utils.GTTransferUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeHandlerList.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeHandlerList.java index 4ec3cf8e3bd..1462cab76cd 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeHandlerList.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeHandlerList.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.lowdragmc.lowdraglib.syncdata.ISubscription; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java index 2338eb2f998..c13de91e329 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java @@ -13,8 +13,8 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.recipe.ActionResult; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.sound.AutoReleasedSound; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/customlogic/SteamBoilerLogic.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/customlogic/SteamBoilerLogic.java index 6b8a5601867..48eb9fd22f0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/customlogic/SteamBoilerLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/customlogic/SteamBoilerLogic.java @@ -2,10 +2,10 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.recipe.*; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.transfer.fluid.FluidHandlerList; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.Util; diff --git a/src/main/java/com/gregtechceu/gtceu/api/misc/IgnoreEnergyRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/api/misc/IgnoreEnergyRecipeHandler.java index e5f8aac8b1f..37ec078d7ba 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/misc/IgnoreEnergyRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/misc/IgnoreEnergyRecipeHandler.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/misc/ItemRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/api/misc/ItemRecipeHandler.java index 889d8834767..57fef55c49e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/misc/ItemRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/misc/ItemRecipeHandler.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/FilteredFluidHandlerItemStack.java b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/FilteredFluidHandlerItemStack.java index 507bb41e4df..91f74ca721a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/FilteredFluidHandlerItemStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/FilteredFluidHandlerItemStack.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.misc.forge; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/QuantumFluidHandlerItemStack.java b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/QuantumFluidHandlerItemStack.java index b06f9ac27be..826a2e30434 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/QuantumFluidHandlerItemStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/QuantumFluidHandlerItemStack.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.misc.forge; import com.gregtechceu.gtceu.api.item.datacomponents.LargeFluidContent; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GTMath; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/SimpleThermalFluidHandlerItemStack.java b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/SimpleThermalFluidHandlerItemStack.java index 95ecc1ef8ce..53083ad6bae 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/SimpleThermalFluidHandlerItemStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/SimpleThermalFluidHandlerItemStack.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.misc.forge; import com.gregtechceu.gtceu.api.capability.IThermalFluidHandlerItemStack; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.capability.templates.FluidHandlerItemStackSimple; diff --git a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/ThermalFluidHandlerItemStack.java b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/ThermalFluidHandlerItemStack.java index 61aae6a7c93..cd97bf4d39f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/ThermalFluidHandlerItemStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/ThermalFluidHandlerItemStack.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.misc.forge; import com.gregtechceu.gtceu.api.capability.IThermalFluidHandlerItemStack; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/VoidFluidHandlerItemStack.java b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/VoidFluidHandlerItemStack.java index eac165c0d6f..548b32cdfa6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/misc/forge/VoidFluidHandlerItemStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/misc/forge/VoidFluidHandlerItemStack.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.misc.forge; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/BlockPattern.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/BlockPattern.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/BlockPattern.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/BlockPattern.java index 78455f0731f..9df0fe7e56b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/BlockPattern.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/BlockPattern.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock; +package com.gregtechceu.gtceu.api.pattern; import com.gregtechceu.gtceu.api.block.ActiveBlock; import com.gregtechceu.gtceu.api.block.MetaMachineBlock; @@ -6,12 +6,12 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; -import com.gregtechceu.gtceu.api.multiblock.error.PatternError; -import com.gregtechceu.gtceu.api.multiblock.error.PatternStringError; -import com.gregtechceu.gtceu.api.multiblock.error.SinglePredicateError; -import com.gregtechceu.gtceu.api.multiblock.predicates.SimplePredicate; -import com.gregtechceu.gtceu.api.multiblock.util.PatternMatchContext; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.error.PatternError; +import com.gregtechceu.gtceu.api.pattern.error.PatternStringError; +import com.gregtechceu.gtceu.api.pattern.error.SinglePredicateError; +import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate; +import com.gregtechceu.gtceu.api.pattern.util.PatternMatchContext; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/FactoryBlockPattern.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/FactoryBlockPattern.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/FactoryBlockPattern.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/FactoryBlockPattern.java index e5a89201b89..305d342caed 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/FactoryBlockPattern.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/FactoryBlockPattern.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.multiblock; +package com.gregtechceu.gtceu.api.pattern; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.google.common.base.Joiner; import it.unimi.dsi.fastutil.chars.Char2ObjectArrayMap; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockShapeInfo.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockShapeInfo.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockShapeInfo.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockShapeInfo.java index 5f87f1b2044..326e1e01b97 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockShapeInfo.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockShapeInfo.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.multiblock; +package com.gregtechceu.gtceu.api.pattern; import com.gregtechceu.gtceu.api.block.IMachineBlock; -import com.gregtechceu.gtceu.api.machine.RotationState; +import com.gregtechceu.gtceu.api.data.RotationState; import com.lowdragmc.lowdraglib.utils.BlockInfo; import com.lowdragmc.lowdraglib.utils.Builder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockState.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockState.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockState.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockState.java index 309087c8025..abb6114370f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockState.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockState.java @@ -1,14 +1,14 @@ -package com.gregtechceu.gtceu.api.multiblock; +package com.gregtechceu.gtceu.api.pattern; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.ActiveBlock; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; -import com.gregtechceu.gtceu.api.multiblock.error.PatternError; -import com.gregtechceu.gtceu.api.multiblock.error.PatternStringError; -import com.gregtechceu.gtceu.api.multiblock.predicates.SimplePredicate; -import com.gregtechceu.gtceu.api.multiblock.util.PatternMatchContext; +import com.gregtechceu.gtceu.api.pattern.error.PatternError; +import com.gregtechceu.gtceu.api.pattern.error.PatternStringError; +import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate; +import com.gregtechceu.gtceu.api.pattern.util.PatternMatchContext; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockWorldSavedData.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockWorldSavedData.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockWorldSavedData.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockWorldSavedData.java index 79a2a17038c..3a66e02b68d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiblockWorldSavedData.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/MultiblockWorldSavedData.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock; +package com.gregtechceu.gtceu.api.pattern; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/Predicates.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/Predicates.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/Predicates.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/Predicates.java index ee07cde80a3..a97f476d814 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/Predicates.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/Predicates.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock; +package com.gregtechceu.gtceu.api.pattern; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.block.ICoilType; @@ -6,21 +6,21 @@ import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.multiblock.IBatteryData; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.multiblock.error.PatternStringError; -import com.gregtechceu.gtceu.api.multiblock.predicates.*; +import com.gregtechceu.gtceu.api.pattern.error.PatternStringError; +import com.gregtechceu.gtceu.api.pattern.predicates.*; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.common.block.BatteryBlock; import com.gregtechceu.gtceu.common.block.CoilBlock; import com.gregtechceu.gtceu.common.block.LampBlock; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; import com.gregtechceu.gtceu.common.machine.multiblock.electric.PowerSubstationMachine; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; import com.lowdragmc.lowdraglib.utils.BlockInfo; @@ -41,10 +41,10 @@ import java.util.function.Predicate; import java.util.function.Supplier; +import static com.gregtechceu.gtceu.common.data.GTBlockStateProperties.ACTIVE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.BORDERLESS_LAMPS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.LAMPS; import static com.gregtechceu.gtceu.common.machine.multiblock.electric.PowerSubstationMachine.PMC_BATTERY_HEADER; -import static com.gregtechceu.gtceu.data.block.GTBlockStateProperties.ACTIVE; -import static com.gregtechceu.gtceu.data.block.GTBlocks.BORDERLESS_LAMPS; -import static com.gregtechceu.gtceu.data.block.GTBlocks.LAMPS; public class Predicates { diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/TraceabilityPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/TraceabilityPredicate.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/TraceabilityPredicate.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/TraceabilityPredicate.java index ffd7b171a1b..e0d7d1f3913 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/TraceabilityPredicate.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/TraceabilityPredicate.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.multiblock; +package com.gregtechceu.gtceu.api.pattern; import com.gregtechceu.gtceu.api.capability.recipe.IO; -import com.gregtechceu.gtceu.api.multiblock.predicates.SimplePredicate; +import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/error/PatternError.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/error/PatternError.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/error/PatternError.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/error/PatternError.java index 895b31171be..9f777d1177b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/error/PatternError.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/error/PatternError.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.multiblock.error; +package com.gregtechceu.gtceu.api.pattern.error; -import com.gregtechceu.gtceu.api.multiblock.MultiblockState; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; -import com.gregtechceu.gtceu.api.multiblock.predicates.SimplePredicate; +import com.gregtechceu.gtceu.api.pattern.MultiblockState; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; +import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/error/PatternStringError.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/error/PatternStringError.java similarity index 87% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/error/PatternStringError.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/error/PatternStringError.java index 0dac9aa9cfb..1f11a61905f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/error/PatternStringError.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/error/PatternStringError.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.error; +package com.gregtechceu.gtceu.api.pattern.error; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/error/SinglePredicateError.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/error/SinglePredicateError.java similarity index 89% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/error/SinglePredicateError.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/error/SinglePredicateError.java index 13ea919efc7..fea8334f348 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/error/SinglePredicateError.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/error/SinglePredicateError.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.api.multiblock.error; +package com.gregtechceu.gtceu.api.pattern.error; -import com.gregtechceu.gtceu.api.multiblock.predicates.SimplePredicate; +import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateBlockTag.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateBlockTag.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateBlockTag.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateBlockTag.java index f56f35b14fb..7c2e954ba2c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateBlockTag.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateBlockTag.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.predicates; +package com.gregtechceu.gtceu.api.pattern.predicates; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateBlocks.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateBlocks.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateBlocks.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateBlocks.java index 0b47910bfd5..09fd7778292 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateBlocks.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.predicates; +package com.gregtechceu.gtceu.api.pattern.predicates; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateFluidTag.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateFluidTag.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateFluidTag.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateFluidTag.java index 6d6ab1eded0..b25e333d8ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateFluidTag.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateFluidTag.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.predicates; +package com.gregtechceu.gtceu.api.pattern.predicates; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateFluids.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateFluids.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateFluids.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateFluids.java index c33506376c3..8d5265478d9 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateFluids.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateFluids.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.predicates; +package com.gregtechceu.gtceu.api.pattern.predicates; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateStates.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateStates.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateStates.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateStates.java index b40864364c4..349b90721a5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/PredicateStates.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/PredicateStates.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.predicates; +package com.gregtechceu.gtceu.api.pattern.predicates; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/SimplePredicate.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/SimplePredicate.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/SimplePredicate.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/SimplePredicate.java index 0b185a3f0ff..031e377aabf 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/predicates/SimplePredicate.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/predicates/SimplePredicate.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.multiblock.predicates; +package com.gregtechceu.gtceu.api.pattern.predicates; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.recipe.IO; -import com.gregtechceu.gtceu.api.multiblock.MultiblockState; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; -import com.gregtechceu.gtceu.api.multiblock.error.PatternStringError; -import com.gregtechceu.gtceu.api.multiblock.error.SinglePredicateError; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.api.pattern.MultiblockState; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; +import com.gregtechceu.gtceu.api.pattern.error.PatternStringError; +import com.gregtechceu.gtceu.api.pattern.error.SinglePredicateError; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/util/PatternMatchContext.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/util/PatternMatchContext.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/util/PatternMatchContext.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/util/PatternMatchContext.java index 4b94c4b5234..b0a01a87f24 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/util/PatternMatchContext.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/util/PatternMatchContext.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.util; +package com.gregtechceu.gtceu.api.pattern.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/gregtechceu/gtceu/api/multiblock/util/RelativeDirection.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/util/RelativeDirection.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/api/multiblock/util/RelativeDirection.java rename to src/main/java/com/gregtechceu/gtceu/api/pattern/util/RelativeDirection.java index db7e0a5bf96..9e23eee4f08 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/multiblock/util/RelativeDirection.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pattern/util/RelativeDirection.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.multiblock.util; +package com.gregtechceu.gtceu.api.pattern.util; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/pipenet/IMaterialPipeType.java b/src/main/java/com/gregtechceu/gtceu/api/pipenet/IMaterialPipeType.java index dbd09a90862..ee96ff3331e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/pipenet/IMaterialPipeType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pipenet/IMaterialPipeType.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.pipenet; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; public interface IMaterialPipeType extends IPipeType { diff --git a/src/main/java/com/gregtechceu/gtceu/api/pipenet/IPipeNode.java b/src/main/java/com/gregtechceu/gtceu/api/pipenet/IPipeNode.java index 96b8bc90b67..2749d0bc9b2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/pipenet/IPipeNode.java +++ b/src/main/java/com/gregtechceu/gtceu/api/pipenet/IPipeNode.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.blockentity.ITickSubscription; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.ICoverable; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.client.model.GTModelProperties; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java b/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java index ee405d881c0..d1316b39630 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.placeholder.exceptions.UnexpectedBracketException; import com.gregtechceu.gtceu.api.placeholder.exceptions.UnknownPlaceholderException; import com.gregtechceu.gtceu.client.renderer.monitor.IMonitorRenderer; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.GTStringUtils; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/FacadeCoverRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/FacadeCoverRecipe.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/kind/FacadeCoverRecipe.java rename to src/main/java/com/gregtechceu/gtceu/api/recipe/FacadeCoverRecipe.java index 5a77ef105ab..be562f259bc 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/FacadeCoverRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/FacadeCoverRecipe.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.api.recipe.kind; +package com.gregtechceu.gtceu.api.recipe; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeSerializers; import com.gregtechceu.gtceu.common.item.behavior.FacadeItemBehaviour; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeSerializers; import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/GTRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/kind/GTRecipe.java rename to src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java index 182fda5b1e7..ffe1706e15f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/GTRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java @@ -1,10 +1,8 @@ -package com.gregtechceu.gtceu.api.recipe.kind; +package com.gregtechceu.gtceu.api.recipe; import com.gregtechceu.gtceu.api.capability.recipe.*; -import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializer.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializer.java index 2171343b885..e84f5c06ab1 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializer.java @@ -4,9 +4,7 @@ import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.common.recipe.condition.ResearchCondition; @@ -32,7 +30,7 @@ import java.util.*; import java.util.function.Function; -import static com.gregtechceu.gtceu.api.codec.GTCodecUtils.quietExceptionCodec; +import static com.gregtechceu.gtceu.utils.codec.GTCodecUtils.quietExceptionCodec; @SuppressWarnings("DataFlowIssue") public class GTRecipeSerializer implements RecipeSerializer { diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java index a6c1ca1847f..3b6582ce0ec 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java @@ -5,12 +5,11 @@ import com.gregtechceu.gtceu.api.gui.SteamTexture; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.recipe.chance.boost.ChanceBoostFunction; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.RecipeAdditionHandler; import com.gregtechceu.gtceu.api.recipe.lookup.RecipeDB; import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI; import com.gregtechceu.gtceu.api.sound.SoundEntry; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/OverclockingLogic.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/OverclockingLogic.java index 292f4464e56..d0e549934ae 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/OverclockingLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/OverclockingLogic.java @@ -3,7 +3,6 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/condition/RecipeCondition.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeCondition.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/condition/RecipeCondition.java rename to src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeCondition.java index 9ff58e4cbe1..071880e0543 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/condition/RecipeCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeCondition.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.recipe.condition; +package com.gregtechceu.gtceu.api.recipe; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java index a33dabc69e7..4f71e5a662c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java @@ -7,16 +7,14 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; import com.gregtechceu.gtceu.api.recipe.ingredient.ExDataComponentFluidIngredient; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.tag.TagUtil; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.config.ConfigHolder; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeRunner.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeRunner.java index e647badd449..d23fc3b5501 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeRunner.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeRunner.java @@ -10,7 +10,6 @@ import com.gregtechceu.gtceu.api.recipe.chance.boost.ChanceBoostFunction; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ResearchRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ResearchRecipeBuilder.java index 68b6099e34c..1a6f629d71b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ResearchRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ResearchRecipeBuilder.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTStringUtils; import com.gregtechceu.gtceu.utils.ResearchManager; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ShapedEnergyTransferRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ShapedEnergyTransferRecipe.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ShapedEnergyTransferRecipe.java rename to src/main/java/com/gregtechceu/gtceu/api/recipe/ShapedEnergyTransferRecipe.java index 37f28f0d4b3..f9ffa4c5633 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ShapedEnergyTransferRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ShapedEnergyTransferRecipe.java @@ -1,11 +1,11 @@ -package com.gregtechceu.gtceu.api.recipe.kind; +package com.gregtechceu.gtceu.api.recipe; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.item.datacomponents.SimpleEnergyContent; +import com.gregtechceu.gtceu.common.data.GTRecipeSerializers; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.core.mixins.ShapedRecipeAccessor; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.recipe.GTRecipeSerializers; import com.gregtechceu.gtceu.utils.codec.StreamCodecUtils; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ShapedFluidContainerRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ShapedFluidContainerRecipe.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ShapedFluidContainerRecipe.java rename to src/main/java/com/gregtechceu/gtceu/api/recipe/ShapedFluidContainerRecipe.java index a064f482b29..f28cb7e73fb 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ShapedFluidContainerRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ShapedFluidContainerRecipe.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.api.recipe.kind; +package com.gregtechceu.gtceu.api.recipe; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidContainerIngredient; +import com.gregtechceu.gtceu.common.data.GTRecipeSerializers; import com.gregtechceu.gtceu.core.mixins.ShapedRecipeAccessor; -import com.gregtechceu.gtceu.data.recipe.GTRecipeSerializers; import net.minecraft.core.NonNullList; import net.minecraft.network.RegistryFriendlyByteBuf; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/StrictShapedRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/StrictShapedRecipe.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/kind/StrictShapedRecipe.java rename to src/main/java/com/gregtechceu/gtceu/api/recipe/StrictShapedRecipe.java index c2a1899ee45..b69f554c8fd 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/StrictShapedRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/StrictShapedRecipe.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.recipe.kind; +package com.gregtechceu.gtceu.api.recipe; +import com.gregtechceu.gtceu.common.data.GTRecipeSerializers; import com.gregtechceu.gtceu.core.mixins.ShapedRecipeAccessor; -import com.gregtechceu.gtceu.data.recipe.GTRecipeSerializers; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ToolHeadReplaceRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ToolHeadReplaceRecipe.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ToolHeadReplaceRecipe.java rename to src/main/java/com/gregtechceu/gtceu/api/recipe/ToolHeadReplaceRecipe.java index a71463037ba..31d88f516e6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/kind/ToolHeadReplaceRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ToolHeadReplaceRecipe.java @@ -1,15 +1,15 @@ -package com.gregtechceu.gtceu.api.recipe.kind; +package com.gregtechceu.gtceu.api.recipe; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.recipe.GTRecipeSerializers; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTRecipeSerializers; import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/category/GTRecipeCategory.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/category/GTRecipeCategory.java index 1ad088a379a..ef0e36d22d1 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/category/GTRecipeCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/category/GTRecipeCategory.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.api.recipe.category; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/condition/RecipeConditionType.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/condition/RecipeConditionType.java index f4be2263325..9fe1658778a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/condition/RecipeConditionType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/condition/RecipeConditionType.java @@ -1,5 +1,7 @@ package com.gregtechceu.gtceu.api.recipe.condition; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; + import com.mojang.serialization.MapCodec; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java index 1c58ff062e1..2616bb60044 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.recipe.ingredient; import com.gregtechceu.gtceu.api.capability.recipe.IO; -import com.gregtechceu.gtceu.api.codec.GTCodecUtils; +import com.gregtechceu.gtceu.utils.codec.GTCodecUtils; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentFluidIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentFluidIngredient.java index fdd0bb16285..e2beaf8b0a1 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentFluidIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentFluidIngredient.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.recipe.ingredient; -import com.gregtechceu.gtceu.data.tag.GTIngredientTypes; +import com.gregtechceu.gtceu.data.recipe.GTIngredientTypes; import net.minecraft.core.HolderSet; import net.minecraft.core.component.DataComponentMap; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentIngredient.java index 235437dccc5..0dc6544601a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/ExDataComponentIngredient.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.recipe.ingredient; -import com.gregtechceu.gtceu.data.tag.GTIngredientTypes; +import com.gregtechceu.gtceu.data.recipe.GTIngredientTypes; import net.minecraft.core.HolderSet; import net.minecraft.core.component.DataComponentMap; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java index 50836b7616c..57e06b6bee5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.recipe.ingredient; -import com.gregtechceu.gtceu.data.tag.GTIngredientTypes; +import com.gregtechceu.gtceu.data.recipe.GTIngredientTypes; import net.minecraft.tags.TagKey; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java index c9110e9e5f0..ca703c21f28 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.api.recipe.ingredient; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.tag.GTIngredientTypes; +import com.gregtechceu.gtceu.data.recipe.GTIngredientTypes; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ExtraCodecs; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredient.java index 1052111368b..c18b2bf2395 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredient.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.tag.GTIngredientTypes; +import com.gregtechceu.gtceu.data.recipe.GTIngredientTypes; import net.minecraft.util.RandomSource; import net.minecraft.util.valueproviders.IntProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredient.java index e451c9c1a08..6de67058db8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredient.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.data.tag.GTIngredientTypes; +import com.gregtechceu.gtceu.data.recipe.GTIngredientTypes; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/NBTPredicateIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/NBTPredicateIngredient.java deleted file mode 100644 index aecf958a9ac..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/NBTPredicateIngredient.java +++ /dev/null @@ -1,103 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient; - -// import com.gregtechceu.gtceu.GTCEu; -// import com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate.NBTPredicate; -// import com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate.NBTPredicates; -// import com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate.TrueNBTPredicate; - -// import net.minecraft.network.FriendlyByteBuf; -// import net.minecraft.resources.ResourceLocation; -// import net.minecraft.util.GsonHelper; -// import net.minecraft.world.item.ItemStack; -// import net.minecraft.world.item.crafting.Ingredient; -// import net.neoforged.neoforge.common.crafting.CraftingHelper; -// import net.neoforged.neoforge.common.crafting.ICustomIngredient; -// import net.neoforged.neoforge.registries.ForgeRegistries; -// import net.neoforged.neoforge.fluids.FluidStack; - -// import com.google.gson.JsonElement; -// import com.google.gson.JsonObject; -// import org.jetbrains.annotations.NotNull; -// import org.jetbrains.annotations.Nullable; - -// import java.util.function.Predicate; -// import java.util.stream.Stream; - -// public class NBTPredicateIngredient implements ICustomIngredient { - -// public static final ResourceLocation TYPE = GTCEu.id("nbt_predicate"); -// public static final NBTPredicate ALWAYS_TRUE = new TrueNBTPredicate(); -// private final NBTPredicate predicate; -// private final ItemStack stack; - -// public NBTPredicateIngredient(ItemStack stack, NBTPredicate predicate) { -// super(Stream.of(new Ingredient.ItemValue(stack))); -// this.stack = stack; -// this.predicate = predicate; -// } - -// protected NBTPredicateIngredient(ItemStack stack) { -// this(stack, ALWAYS_TRUE); -// } - -// public static NBTPredicateIngredient of(ItemStack stack, NBTPredicate predicate) { -// return new NBTPredicateIngredient(stack, predicate); -// } - -// public static NBTPredicateIngredient of(ItemStack stack) { -// return NBTPredicateIngredient.of(stack, ALWAYS_TRUE); -// } - -// public boolean test(@Nullable ItemStack input) { -// if (input == null) { -// return false; -// } else { -// return this.stack.getItem() == input.getItem() && -// predicate.test(input.getOrCreateTag()); -// } -// } - -// public boolean isSimple() { -// return false; -// } - -// public @NotNull IIngredientSerializer getSerializer() { -// return NBTPredicateIngredient.Serializer.INSTANCE; -// } - -// public JsonElement toJson() { -// JsonObject json = new JsonObject(); -// json.addProperty("type", TYPE.toString()); -// json.addProperty("item", ForgeRegistries.ITEMS.getKey(this.stack.getItem()).toString()); -// json.addProperty("count", this.stack.getCount()); -// if (this.stack.hasTag()) { -// json.addProperty("nbt", this.stack.getTag().toString()); -// } -// json.add("predicate", predicate.toJson()); -// return json; -// } - -// public static class Serializer implements IIngredientSerializer { - -// public static final NBTPredicateIngredient.Serializer INSTANCE = new NBTPredicateIngredient.Serializer(); - -// public @NotNull NBTPredicateIngredient parse(FriendlyByteBuf buffer) { -// var stack = buffer.readItem(); -// var json = buffer.readUtf(); -// var predicate = NBTPredicates.fromJson(GsonHelper.parse(json)); -// return new NBTPredicateIngredient(stack, predicate); -// } - -// public @NotNull NBTPredicateIngredient parse(@NotNull JsonObject json) { -// var stack = CraftingHelper.getItemStack(json, true); -// var predicate = NBTPredicates.fromJson(GsonHelper.getAsJsonObject(json, "predicate")); - -// return new NBTPredicateIngredient(stack, predicate); -// } - -// public void write(FriendlyByteBuf buffer, NBTPredicateIngredient ingredient) { -// buffer.writeItem(ingredient.stack); -// buffer.writeUtf(ingredient.toJson().toString()); -// } -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/AllNBTPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/AllNBTPredicate.java deleted file mode 100644 index b65cefea04d..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/AllNBTPredicate.java +++ /dev/null @@ -1,73 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; - -// import com.google.gson.JsonArray; -// import com.google.gson.JsonElement; -// import com.google.gson.JsonObject; - -// import java.util.ArrayList; -// import java.util.List; -// import java.util.stream.Collectors; - -// public class AllNBTPredicate extends NBTPredicate { - -// public static final String TYPE = "all"; - -// @Override -// public String getType() { -// return TYPE; -// } - -// private final List children; - -// public AllNBTPredicate(List children) { -// this.children = children; -// } - -// @Override -// public boolean test(CompoundTag tag) { -// for (NBTPredicate child : children) { -// if (!child.test(tag)) { -// return false; -// } -// } -// return true; -// } - -// @Override -// public JsonObject toJson() { -// JsonObject object = super.toJson(); -// JsonArray childArray = new JsonArray(); -// for (NBTPredicate child : children) { -// childArray.add(child.toJson()); -// } -// object.add("children", childArray); -// return object; -// } - -// public static NBTPredicate fromJson(JsonObject json) { -// if (!json.has("children") || !json.has("type")) { -// throw new IllegalStateException("Could not deserialize AllNBTPredicate: " + json); -// } -// if (!json.get("type").getAsString().equals(TYPE)) { -// throw new IllegalStateException( -// "Trying to deserialize AllNBTPredicate but was something else: " + json); -// } -// List children = new ArrayList<>(); -// for (JsonElement element : json.getAsJsonArray("children")) { -// children.add(NBTPredicates.fromJson(element.getAsJsonObject())); -// } - -// return new AllNBTPredicate(children); -// } - -// @Override -// public String toString() { -// return "AllNBTPredicate{" + -// "children=[" + children.stream() -// .map(Object::toString) -// .collect(Collectors.joining(", ")) + -// "]}"; -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/AnyNBTPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/AnyNBTPredicate.java deleted file mode 100644 index a4ae88ba900..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/AnyNBTPredicate.java +++ /dev/null @@ -1,74 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; - -// import com.google.gson.JsonArray; -// import com.google.gson.JsonElement; -// import com.google.gson.JsonObject; - -// import java.util.ArrayList; -// import java.util.List; -// import java.util.stream.Collectors; - -// public class AnyNBTPredicate extends NBTPredicate { - -// public static final String TYPE = "any"; - -// @Override -// public String getType() { -// return TYPE; -// } - -// private final List children; - -// public AnyNBTPredicate(List children) { -// this.children = children; -// } - -// @Override -// public boolean test(CompoundTag tag) { -// for (NBTPredicate child : children) { -// if (child.test(tag)) { -// return true; -// } -// } -// return false; -// } - -// @Override -// public JsonObject toJson() { -// JsonObject object = super.toJson(); -// JsonArray childArray = new JsonArray(); -// for (NBTPredicate child : children) { -// childArray.add(child.toJson()); -// } -// object.add("children", childArray); -// return object; -// } - -// public static NBTPredicate fromJson(JsonObject json) { -// if (!json.has("children") || !json.has("type")) { -// throw new IllegalStateException("Could not deserialize AnyNBTPredicate: " + json); -// } -// if (!json.get("type").getAsString().equals(TYPE)) { -// throw new IllegalStateException( -// "Trying to deserialize AnyNBTPredicate but was something else: " + json); -// } - -// List children = new ArrayList<>(); -// for (JsonElement element : json.getAsJsonArray("children")) { -// children.add(NBTPredicates.fromJson(element.getAsJsonObject())); -// } - -// return new AnyNBTPredicate(children); -// } - -// @Override -// public String toString() { -// return "AnyNBTPredicate{" + -// "children=[" + children.stream() -// .map(Object::toString) -// .collect(Collectors.joining(", ")) + -// "]}"; -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/ComparisonNBTPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/ComparisonNBTPredicate.java deleted file mode 100644 index 4ddeb5c1ff8..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/ComparisonNBTPredicate.java +++ /dev/null @@ -1,95 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; -// import net.minecraft.nbt.NumericTag; -// import net.minecraft.nbt.Tag; - -// import com.google.gson.JsonObject; - -// import static com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate.NBTPredicateUtils.getNestedTag; - -// public class ComparisonNBTPredicate extends NBTPredicate { - -// public static final String TYPE = "compare"; - -// @Override -// public String getType() { -// return TYPE; -// } - -// private final String key; -// private final double value; -// private final boolean lessThan; -// private final boolean equals; - -// public ComparisonNBTPredicate(String key, double value) { -// this(key, value, false, false); -// } - -// public ComparisonNBTPredicate(String key, double value, boolean lessThan, boolean equals) { -// this.key = key; -// this.value = value; -// this.lessThan = lessThan; -// this.equals = equals; -// } - -// @Override -// public boolean test(CompoundTag tag) { -// Tag toCompare = getNestedTag(tag, key); -// if (toCompare != null) { -// if (toCompare instanceof NumericTag toCompareNum) { -// if (equals) { -// if (toCompareNum.getAsDouble() == value) { -// return true; -// } -// } -// if (lessThan) { -// return toCompareNum.getAsDouble() < value; -// } else { -// return toCompareNum.getAsDouble() > value; -// } -// } -// } -// return false; -// } - -// @Override -// public JsonObject toJson() { -// JsonObject object = super.toJson(); -// object.addProperty("key", key); -// object.addProperty("value", value); -// object.addProperty("lessThan", lessThan); -// object.addProperty("equals", equals); - -// return object; -// } - -// public static NBTPredicate fromJson(JsonObject json) { -// if (!json.has("key") || -// !json.has("value") || -// !json.has("lessThan") || -// !json.has("equals") || -// !json.has("type")) { -// throw new IllegalStateException("Could not deserialize ComparisonNBTPredicate: " + json); -// } -// if (!json.get("type").getAsString().equals(TYPE)) { -// throw new IllegalStateException( -// "Trying to deserialize ComparisonNBTPredicate but was something else: " + json); -// } -// String key = json.get("key").getAsString(); -// double value = json.get("value").getAsDouble(); -// boolean lessThan = json.get("lessThan").getAsBoolean(); -// boolean equals = json.get("equals").getAsBoolean(); -// return new ComparisonNBTPredicate(key, value, lessThan, equals); -// } - -// @Override -// public String toString() { -// return "ComparisonNBTPredicate{" + -// "key='" + key + '\'' + -// ", value=" + value + -// ", lessThan=" + lessThan + -// ", equals=" + equals + -// '}'; -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/EqualsNBTPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/EqualsNBTPredicate.java deleted file mode 100644 index a0997d4fca2..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/EqualsNBTPredicate.java +++ /dev/null @@ -1,82 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; -// import net.minecraft.nbt.NumericTag; -// import net.minecraft.nbt.Tag; - -// import com.google.gson.JsonObject; - -// import static com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate.NBTPredicateUtils.getNestedTag; - -// public class EqualsNBTPredicate extends NBTPredicate { - -// public static final String TYPE = "equals"; - -// @Override -// public String getType() { -// return TYPE; -// } - -// private final String key; -// private final Tag value; -// private final boolean inverted; - -// public EqualsNBTPredicate(String key, Tag value) { -// this(key, value, false); -// } - -// public EqualsNBTPredicate(String key, Tag value, boolean inverted) { -// this.key = key; -// this.value = value; -// this.inverted = inverted; -// } - -// @Override -// public boolean test(CompoundTag tag) { -// Tag toCompare = getNestedTag(tag, key); -// if (toCompare == null) { -// return false; -// } else { -// // Mixed numeric types (e.g., int vs. double) -// if (toCompare instanceof NumericTag toCompareNum && -// value instanceof NumericTag valueNum) { -// return inverted ^ (toCompareNum.getAsDouble() == valueNum.getAsDouble()); -// } -// return inverted ^ toCompare.equals(value); -// } -// } - -// @Override -// public JsonObject toJson() { -// JsonObject object = super.toJson(); -// object.addProperty("key", key); -// object.add("value", NBTPredicateUtils.toJson(value)); -// object.addProperty("inverted", inverted); -// return object; -// } - -// public static NBTPredicate fromJson(JsonObject json) { -// if (!json.has("key") || !json.has("value") || !json.has("type")) { -// throw new IllegalStateException("Could not deserialize EqualsNBTPredicate: " + json); -// } -// if (!json.get("type").getAsString().equals(TYPE)) { -// throw new IllegalStateException("Trying to deserialize EqualsNBTPredicate but was something else: " + json); -// } -// String key = json.get("key").getAsString(); -// Tag value = NBTPredicateUtils.fromJson(json.get("value")); -// boolean inverted = false; -// if (json.has("inverted")) { -// inverted = json.get("inverted").getAsBoolean(); -// } -// return new EqualsNBTPredicate(key, value, inverted); -// } - -// @Override -// public String toString() { -// return "EqualsNBTPredicate{" + -// "key='" + key + '\'' + -// ", value=" + value + -// ", inverted=" + inverted + -// '}'; -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicate.java deleted file mode 100644 index 74305b87575..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicate.java +++ /dev/null @@ -1,23 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; - -// import com.google.gson.JsonObject; -// import org.jetbrains.annotations.MustBeInvokedByOverriders; - -// import java.util.function.Predicate; - -// public abstract class NBTPredicate implements Predicate { - -// // FromJson is handled by the NBTPredicates -// @MustBeInvokedByOverriders -// public JsonObject toJson() { -// JsonObject object = new JsonObject(); -// object.addProperty("type", getType()); -// return object; -// }; - -// public abstract String getType(); - -// public abstract boolean test(CompoundTag tag); -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicateUtils.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicateUtils.java deleted file mode 100644 index 1fd39496ad0..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicateUtils.java +++ /dev/null @@ -1,78 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; -// import net.minecraft.nbt.ListTag; -// import net.minecraft.nbt.NbtOps; -// import net.minecraft.nbt.Tag; - -// import com.google.gson.JsonElement; -// import com.mojang.serialization.JsonOps; - -// public final class NBTPredicateUtils { - -// private NBTPredicateUtils() {}; - -// public static JsonElement toJson(Tag tag) { -// return NbtOps.INSTANCE.convertTo(JsonOps.INSTANCE, tag); -// } - -// public static Tag fromJson(JsonElement e) { -// return JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, e); -// } - -// public static Tag getNestedTag(CompoundTag inputTag, String path) { -// String[] parts = path.split("\\."); - -// Tag current = inputTag; - -// for (String part : parts) { -// if (current == null) { -// return null; -// } - -// int bracketIndex = part.indexOf('['); - -// if (bracketIndex == -1) { -// // simple compound key -// if (!(current instanceof CompoundTag compound) || !compound.contains(part)) { -// return null; -// } -// current = compound.get(part); -// } else { -// // compound key with array index -// String key = part.substring(0, bracketIndex); -// String indexSection = part.substring(bracketIndex); // e.g. "[4][2]" -// if (!(current instanceof CompoundTag compound) || !compound.contains(key)) { -// return null; -// } -// Tag tag = compound.get(key); -// if (!(tag instanceof ListTag list)) { -// return null; -// } - -// // There can be multiple nested indices like arr[1][3] -// Tag element = tag; -// int from = 0; -// while (true) { -// int open = indexSection.indexOf('[', from); -// int close = indexSection.indexOf(']', from); -// if (open == -1 || close == -1) break; -// String numStr = indexSection.substring(open + 1, close); -// if (!(element instanceof ListTag innerList)) return null; -// int index; -// try { -// index = Integer.parseInt(numStr); -// } catch (NumberFormatException e) { -// return null; -// } -// if (index < 0 || index >= innerList.size()) return null; -// element = innerList.get(index); -// from = close + 1; -// } -// current = element; -// } -// } - -// return current; -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicates.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicates.java deleted file mode 100644 index 28a6d75b5d4..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NBTPredicates.java +++ /dev/null @@ -1,207 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.ByteTag; -// import net.minecraft.nbt.DoubleTag; -// import net.minecraft.nbt.FloatTag; -// import net.minecraft.nbt.IntTag; -// import net.minecraft.nbt.StringTag; -// import net.minecraft.nbt.Tag; - -// import com.google.gson.JsonObject; -// import dev.latvian.mods.rhino.util.HideFromJS; -// import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; - -// import java.util.List; -// import java.util.Map; -// import java.util.function.Function; - -// public final class NBTPredicates { - -// private NBTPredicates() {}; - -// public static NBTPredicate eqInt(String key, int value) { -// return eq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate eq(String key, int value) { -// return new EqualsNBTPredicate(key, IntTag.valueOf(value)); -// } - -// public static NBTPredicate eqFloat(String key, float value) { -// return eq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate eq(String key, float value) { -// return new EqualsNBTPredicate(key, FloatTag.valueOf(value)); -// } - -// public static NBTPredicate eqDouble(String key, double value) { -// return eq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate eq(String key, double value) { -// return new EqualsNBTPredicate(key, DoubleTag.valueOf(value)); -// } - -// // Note: Bools are handled as bytes -// public static NBTPredicate eqBool(String key, boolean value) { -// return eq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate eq(String key, boolean value) { -// return new EqualsNBTPredicate(key, ByteTag.valueOf(value)); -// } - -// public static NBTPredicate eqByte(String key, byte value) { -// return eq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate eq(String key, byte value) { -// return new EqualsNBTPredicate(key, ByteTag.valueOf(value)); -// } - -// public static NBTPredicate eqTag(String key, Tag value) { -// return eq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate eq(String key, Tag value) { -// return new EqualsNBTPredicate(key, value); -// } - -// public static NBTPredicate eqString(String key, String value) { -// return eq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate eq(String key, String value) { -// return new EqualsNBTPredicate(key, StringTag.valueOf(value)); -// } - -// public static NBTPredicate neqInt(String key, int value) { -// return neq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate neq(String key, int value) { -// return new EqualsNBTPredicate(key, IntTag.valueOf(value), true); -// } - -// public static NBTPredicate neqFloat(String key, float value) { -// return neq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate neq(String key, float value) { -// return new EqualsNBTPredicate(key, FloatTag.valueOf(value), true); -// } - -// public static NBTPredicate neqDouble(String key, double value) { -// return neq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate neq(String key, double value) { -// return new EqualsNBTPredicate(key, DoubleTag.valueOf(value), true); -// } - -// // Note: Bools are handled as bytes -// public static NBTPredicate neqBool(String key, boolean value) { -// return neq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate neq(String key, boolean value) { -// return new EqualsNBTPredicate(key, ByteTag.valueOf(value), true); -// } - -// public static NBTPredicate neqByte(String key, byte value) { -// return neq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate neq(String key, byte value) { -// return new EqualsNBTPredicate(key, ByteTag.valueOf(value), true); -// } - -// public static NBTPredicate neqTag(String key, Tag value) { -// return neq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate neq(String key, Tag value) { -// return new EqualsNBTPredicate(key, value, true); -// } - -// public static NBTPredicate neqString(String key, String value) { -// return neq(key, value); -// } - -// @HideFromJS -// public static NBTPredicate neq(String key, String value) { -// return new EqualsNBTPredicate(key, StringTag.valueOf(value), true); -// } - -// public static NBTPredicate lte(String key, double value) { -// return new ComparisonNBTPredicate(key, value, true, true); -// } - -// public static NBTPredicate lt(String key, double value) { -// return new ComparisonNBTPredicate(key, value, true, false); -// } - -// public static NBTPredicate gte(String key, double value) { -// return new ComparisonNBTPredicate(key, value, false, true); -// } - -// public static NBTPredicate gt(String key, double value) { -// return new ComparisonNBTPredicate(key, value, false, false); -// } - -// public static NBTPredicate any(NBTPredicate... predicates) { -// return new AnyNBTPredicate(List.of(predicates)); -// } - -// @HideFromJS -// public static NBTPredicate any(List predicates) { -// return new AnyNBTPredicate(predicates); -// } - -// public static NBTPredicate all(NBTPredicate... predicates) { -// return new AllNBTPredicate(List.of(predicates)); -// } - -// @HideFromJS -// public static NBTPredicate all(List predicates) { -// return new AllNBTPredicate(predicates); -// } - -// public static NBTPredicate not(NBTPredicate predicate) { -// return new NotNBTPredicate(predicate); -// } - -// public static final Map> predicateCodecs = new -// Object2ObjectOpenHashMap<>(); - -// static { -// predicateCodecs.put(TrueNBTPredicate.TYPE, TrueNBTPredicate::fromJson); -// predicateCodecs.put(EqualsNBTPredicate.TYPE, EqualsNBTPredicate::fromJson); -// predicateCodecs.put(ComparisonNBTPredicate.TYPE, ComparisonNBTPredicate::fromJson); -// predicateCodecs.put(AllNBTPredicate.TYPE, AllNBTPredicate::fromJson); -// predicateCodecs.put(AnyNBTPredicate.TYPE, AnyNBTPredicate::fromJson); -// predicateCodecs.put(NotNBTPredicate.TYPE, NotNBTPredicate::fromJson); -// }; - -// public static NBTPredicate fromJson(JsonObject json) { -// if (!json.has("type")) { -// throw new IllegalStateException("Can't deserialize JSON without operation key: " + json); -// } -// String op = json.get("type").getAsString(); -// return predicateCodecs.get(op).apply(json); -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NotNBTPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NotNBTPredicate.java deleted file mode 100644 index 3caf5d8d451..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/NotNBTPredicate.java +++ /dev/null @@ -1,53 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; - -// import com.google.gson.JsonObject; - -// public class NotNBTPredicate extends NBTPredicate { - -// public static final String TYPE = "not"; - -// @Override -// public String getType() { -// return TYPE; -// } - -// private final NBTPredicate child; - -// public NotNBTPredicate(NBTPredicate child) { -// this.child = child; -// } - -// @Override -// public boolean test(CompoundTag tag) { -// return !child.test(tag); -// } - -// @Override -// public JsonObject toJson() { -// JsonObject object = super.toJson(); -// object.add("child", child.toJson()); -// return object; -// } - -// public static NBTPredicate fromJson(JsonObject json) { -// if (!json.has("child") || !json.has("type")) { -// throw new IllegalStateException("Could not deserialize NotNBTPredicate: " + json); -// } -// if (!json.get("type").getAsString().equals(TYPE)) { -// throw new IllegalStateException( -// "Trying to deserialize NotNBTPredicate but was something else: " + json); -// } - -// NBTPredicate child = NBTPredicates.fromJson(json.get("child").getAsJsonObject()); -// return new NotNBTPredicate(child); -// } - -// @Override -// public String toString() { -// return "NotNBTPredicate{" + -// "child=" + child + -// '}'; -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/TrueNBTPredicate.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/TrueNBTPredicate.java deleted file mode 100644 index 55c9e89ab77..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/nbtpredicate/TrueNBTPredicate.java +++ /dev/null @@ -1,32 +0,0 @@ -// package com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate; - -// import net.minecraft.nbt.CompoundTag; - -// import com.google.gson.JsonObject; -// import lombok.NoArgsConstructor; - -// @NoArgsConstructor -// public class TrueNBTPredicate extends NBTPredicate { - -// public static final String TYPE = "true"; - -// @Override -// public String getType() { -// return TYPE; -// } - -// @Override -// public boolean test(CompoundTag tag) { -// return true; -// } - -// public static NBTPredicate fromJson(JsonObject json) { -// if (!json.has("type")) { -// throw new IllegalStateException("Could not deserialize TrueNBTPredicate: " + json); -// } -// if (!json.get("type").getAsString().equals(TYPE)) { -// throw new IllegalStateException("Trying to deserialize TrueNBTPredicate but was something else: " + json); -// } -// return new TrueNBTPredicate(); -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/logic/OCParams.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/logic/OCParams.java deleted file mode 100644 index 08fdecd7657..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/logic/OCParams.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gregtechceu.gtceu.api.recipe.logic; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public final class OCParams { - - private long eut; - private int duration; - private int ocAmount; - - public void initialize(long eut, int duration, int ocAmount) { - this.eut = eut; - this.duration = duration; - this.ocAmount = ocAmount; - } - - public void reset() { - this.eut = 0L; - this.duration = 0; - this.ocAmount = 0; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/logic/OCResult.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/logic/OCResult.java deleted file mode 100644 index 59e43488bb3..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/logic/OCResult.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gregtechceu.gtceu.api.recipe.logic; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public final class OCResult { - - private long eut; - private long parallelEUt; - private int duration; - private int parallel; - private int ocLevel; - - public void init(long eut, int duration, int ocLevel) { - init(eut, duration, 0, ocLevel); - } - - public void init(long eut, int duration, int parallel, int ocLevel) { - init(eut, duration, parallel, parallel == 0 ? eut : eut * parallel, ocLevel); - } - - public void init(long eut, int duration, int parallel, long parallelEUt, int ocLevel) { - this.eut = eut; - this.duration = duration; - this.parallel = parallel; - this.parallelEUt = parallelEUt; - this.ocLevel = ocLevel; - } - - public void reset() { - this.eut = 0L; - this.duration = 0; - this.parallel = 0; - this.parallelEUt = 0L; - this.ocLevel = 0; - } - - @Override - public String toString() { - return "OCResult[" + - "EUt=" + eut + ", " + - "duration=" + duration + ", " + - "ocLevel=" + ocLevel + ", " + - "parallel=" + parallel + ", " + - "parallelEUt=" + parallelEUt + ']'; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/Branch.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/Branch.java index cbac0bb4262..1fd87f9607b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/Branch.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/Branch.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.recipe.lookup; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.mojang.datafixers.util.Either; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeAdditionHandler.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeAdditionHandler.java index b77f1b04f0a..1e608bc6e16 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeAdditionHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeAdditionHandler.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.recipe.lookup; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeDB.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeDB.java index 5e092df7a52..356de13658a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeDB.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/RecipeDB.java @@ -5,14 +5,14 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.MapIngredientTypeManager; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.item.armor.PowerlessJetpack; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import net.minecraft.core.registries.BuiltInRegistries; import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/StagingRecipeDB.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/StagingRecipeDB.java index fe01f79bb48..131a26e5b55 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/StagingRecipeDB.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/StagingRecipeDB.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.MapIngredientTypeManager; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/IntersectionMapIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/IntersectionMapIngredient.java index 320a39263cf..5b9800e002b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/IntersectionMapIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/IntersectionMapIngredient.java @@ -2,11 +2,11 @@ import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.item.ItemStackMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.item.ItemTagMapIngredient; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/MapIngredientFunction.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/MapIngredientFunction.java index 213f041ac1a..b70354a3024 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/MapIngredientFunction.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/MapIngredientFunction.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.recipe.lookup.ingredient; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCapabilities; +import com.gregtechceu.gtceu.common.data.GTRecipeCapabilities; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/EfficiencyModifier.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/EfficiencyModifier.java index 309dba3b261..74390e4ccf4 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/EfficiencyModifier.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/EfficiencyModifier.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.google.common.base.Preconditions; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ModifierFunction.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ModifierFunction.java index 59645b1c7a5..35067a36053 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ModifierFunction.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ModifierFunction.java @@ -2,12 +2,12 @@ import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ParallelLogic.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ParallelLogic.java index 39687d8c4a2..741fa36d575 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ParallelLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/ParallelLogic.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifier.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifier.java index 385017c4cc8..ea3e7230946 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifier.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifier.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifierList.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifierList.java index 027f6785911..533b131e481 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifierList.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifierList.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import lombok.Getter; import org.jetbrains.annotations.Contract; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ui/GTRecipeTypeUI.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ui/GTRecipeTypeUI.java index b426584552e..cce91289958 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ui/GTRecipeTypeUI.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ui/GTRecipeTypeUI.java @@ -12,10 +12,10 @@ import com.gregtechceu.gtceu.api.gui.widget.DualProgressWidget; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.gui.widget.TankWidget; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.integration.emi.recipe.GTRecipeEMICategory; import com.gregtechceu.gtceu.integration.jei.recipe.GTRecipeJEICategory; diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java b/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java index ecf08737157..9d5a408330a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java @@ -3,21 +3,21 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.cover.CoverDefinition; +import com.gregtechceu.gtceu.api.data.DimensionMarker; +import com.gregtechceu.gtceu.api.data.chemical.Element; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.registry.MaterialRegistry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.material.Element; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.registry.MaterialRegistry; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; import com.gregtechceu.gtceu.api.sound.SoundEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.DimensionMarker; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; import net.minecraft.client.Minecraft; import net.minecraft.core.MappedRegistry; @@ -46,7 +46,7 @@ public final class GTRegistries { private static final LinkedHashMap> LOAD_ORDER = new LinkedHashMap<>(); // server (datapack) registries' keys - public static final ResourceKey> ORE_VEIN_REGISTRY = makeRegistryKey(GTCEu.id("ore_vein")); + public static final ResourceKey> ORE_VEIN_REGISTRY = makeRegistryKey(GTCEu.id("ore_vein")); public static final ResourceKey> BEDROCK_FLUID_REGISTRY = makeRegistryKey(GTCEu.id("bedrock_fluid")); public static final ResourceKey> BEDROCK_ORE_REGISTRY = makeRegistryKey(GTCEu.id("bedrock_ore")); diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTClientFluidTypeExtensions.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java rename to src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTClientFluidTypeExtensions.java index daaa0b40ee5..0e121db8ed3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTClientFluidTypeExtensions.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.registry.registrate.forge; +package com.gregtechceu.gtceu.api.registry.registrate; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/IGTFluidBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/IGTFluidBuilder.java deleted file mode 100644 index 667baf48b92..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/IGTFluidBuilder.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gregtechceu.gtceu.api.registry.registrate; - -import com.gregtechceu.gtceu.api.fluid.FluidState; - -import net.minecraft.world.level.material.Fluid; - -import com.tterrag.registrate.util.entry.RegistryEntry; - -import java.util.function.Consumer; -import java.util.function.Supplier; - -public interface IGTFluidBuilder { - - IGTFluidBuilder temperature(int temperature); - - IGTFluidBuilder state(FluidState state); - - IGTFluidBuilder density(int density); - - IGTFluidBuilder luminance(int luminance); - - IGTFluidBuilder viscosity(int viscosity); - - IGTFluidBuilder burnTime(int burnTime); - - IGTFluidBuilder hasBlock(boolean hasBlock); - - IGTFluidBuilder hasBucket(boolean hasBucket); - - IGTFluidBuilder color(int color); - - IGTFluidBuilder onFluidRegister(Consumer fluidConsumer); - - Supplier registerFluid(); - - RegistryEntry register(); -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java index b87aa76f1ef..fef5b7fd8f2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java @@ -4,18 +4,18 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.IMachineBlock; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.gui.editor.EditableMachineUI; import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifierList; import com.gregtechceu.gtceu.api.registry.GTRegistries; @@ -23,10 +23,10 @@ import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; import com.gregtechceu.gtceu.client.renderer.BlockEntityWithBERModelRenderer; import com.gregtechceu.gtceu.client.renderer.ItemWithBERModelRenderer; +import com.gregtechceu.gtceu.common.data.GTRecipeModifiers; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.model.builder.MachineModelBuilder; -import com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.model.builder.MachineModelBuilder; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.RenderType; @@ -74,7 +74,7 @@ import java.util.*; import java.util.function.*; -import static com.gregtechceu.gtceu.data.model.GTMachineModels.*; +import static com.gregtechceu.gtceu.common.data.models.GTMachineModels.*; @SuppressWarnings("unused") @RemapPrefixForJS("kjs$") diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java index 55609b6c17c..0e54a91e47a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java @@ -9,8 +9,8 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; -import com.gregtechceu.gtceu.api.multiblock.BlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.BlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/provider/GTBlockstateProvider.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/provider/GTBlockstateProvider.java index da7c427e0f8..36d5d479af3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/provider/GTBlockstateProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/provider/GTBlockstateProvider.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.api.registry.registrate.provider; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.client.util.ExtendedBlockModelRotation; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import net.minecraft.core.Direction; import net.minecraft.data.CachedOutput; diff --git a/src/main/java/com/gregtechceu/gtceu/api/tools/.keep b/src/main/java/com/gregtechceu/gtceu/api/tools/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/EmptyFluidHandler.java b/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/EmptyFluidHandler.java deleted file mode 100644 index 0da2118199a..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/EmptyFluidHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gregtechceu.gtceu.api.transfer.fluid; - -import com.lowdragmc.lowdraglib.side.fluid.IFluidHandlerModifiable; - -import net.neoforged.neoforge.fluids.FluidStack; - -import org.jetbrains.annotations.NotNull; - -public class EmptyFluidHandler implements IFluidHandlerModifiable { - - public static final EmptyFluidHandler INSTANCE = new EmptyFluidHandler(); - - private EmptyFluidHandler() { - /**/ - } - - @Override - public void setFluidInTank(int i, FluidStack fluidStack) {} - - @Override - public int getTanks() { - return 0; - } - - @Override - public @NotNull FluidStack getFluidInTank(int tank) { - return FluidStack.EMPTY; - } - - @Override - public int getTankCapacity(int tank) { - return 0; - } - - @Override - public boolean isFluidValid(int tank, @NotNull FluidStack stack) { - return false; - } - - @Override - public int fill(FluidStack resource, FluidAction action) { - return 0; - } - - @Override - public @NotNull FluidStack drain(FluidStack resource, FluidAction action) { - return FluidStack.EMPTY; - } - - @Override - public @NotNull FluidStack drain(int maxDrain, FluidAction action) { - return FluidStack.EMPTY; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/FluidBlockTransfer.java b/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/FluidBlockTransfer.java deleted file mode 100644 index 6716d4f9fe3..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/FluidBlockTransfer.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gregtechceu.gtceu.api.transfer.fluid; - -import com.lowdragmc.lowdraglib.side.fluid.FluidHelper; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; - -import org.jetbrains.annotations.NotNull; - -public class FluidBlockTransfer implements IFluidHandler { - - protected final LiquidBlock fluidBlock; - protected final BlockState blockState; - protected final Level world; - protected final BlockPos blockPos; - - public FluidBlockTransfer(LiquidBlock fluidBlock, Level world, BlockPos blockPos) { - this.fluidBlock = fluidBlock; - this.world = world; - this.blockPos = blockPos; - this.blockState = world.getBlockState(blockPos); - } - - public Fluid getFluid() { - return fluidBlock.fluid; - } - - public int getTanks() { - return 1; - } - - public @NotNull FluidStack getFluidInTank(int tank) { - return tank == 0 ? new FluidStack(getFluid(), FluidHelper.getBucket()) : FluidStack.EMPTY; - } - - public int getTankCapacity(int tank) { - return FluidHelper.getBucket(); - } - - public boolean isFluidValid(int tank, @NotNull FluidStack stack) { - return stack.getFluid() == getFluid(); - } - - @Override - public int fill(FluidStack resource, FluidAction action) { - return 0; - } - - @Override - public @NotNull FluidStack drain(int maxDrain, FluidAction action) { - return drain(new FluidStack(this.getFluid(), maxDrain), action); - } - - public @NotNull FluidStack drain(FluidStack resource, FluidAction action) { - if (!resource.isEmpty() && resource.getFluid() == getFluid() && resource.getAmount() >= getTankCapacity(0)) { - FluidStack drained = getFluidInTank(0).copy(); - if (action == FluidAction.EXECUTE) { - world.setBlockAndUpdate(blockPos, Blocks.AIR.defaultBlockState()); - } - return drained; - } - - return FluidStack.EMPTY; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/package-info.java deleted file mode 100644 index 84d3d03b195..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/worldgen/modifier/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.api.worldgen.modifier; - -import net.minecraft.FieldsAreNonnullByDefault; -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/client/forge/ForgeClientEventListener.java b/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/client/forge/ForgeClientEventListener.java rename to src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java index 7802a7d31c6..e0173ee32ca 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/forge/ForgeClientEventListener.java +++ b/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java @@ -1,24 +1,23 @@ -package com.gregtechceu.gtceu.client.forge; +package com.gregtechceu.gtceu.client; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.cosmetics.CapeRegistry; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.client.EnvironmentalHazardClientHandler; import com.gregtechceu.gtceu.client.renderer.BlockHighlightRenderer; import com.gregtechceu.gtceu.client.renderer.MultiblockInWorldPreviewRenderer; import com.gregtechceu.gtceu.client.renderer.cover.FacadeCoverRenderer; import com.gregtechceu.gtceu.client.util.TooltipHelper; +import com.gregtechceu.gtceu.common.commands.GTClientCommands; +import com.gregtechceu.gtceu.common.data.GTAttributeModifierIds; +import com.gregtechceu.gtceu.common.data.GTMobEffects; import com.gregtechceu.gtceu.core.mixins.client.AbstractClientPlayerAccessor; import com.gregtechceu.gtceu.core.mixins.client.PlayerSkinAccessor; -import com.gregtechceu.gtceu.data.command.GTClientCommands; -import com.gregtechceu.gtceu.data.effect.GTMobEffects; -import com.gregtechceu.gtceu.data.entity.GTAttributeModifierIds; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; import net.minecraft.ChatFormatting; @@ -58,7 +57,7 @@ @EventBusSubscriber(modid = GTCEu.MOD_ID, value = Dist.CLIENT) @OnlyIn(Dist.CLIENT) -public class ForgeClientEventListener { +public class ClientEventListener { @SubscribeEvent public static void onRenderLevelStageEvent(RenderLevelStageEvent event) { diff --git a/src/main/java/com/gregtechceu/gtceu/client/ClientInit.java b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/client/ClientInit.java rename to src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java index 29b72d01bf9..2385f0cf29e 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/ClientInit.java +++ b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java @@ -5,7 +5,6 @@ import com.gregtechceu.gtceu.api.cosmetics.event.RegisterGTCapesEvent; import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.IGTTool; -import com.gregtechceu.gtceu.api.item.LampBlockItem; import com.gregtechceu.gtceu.client.model.item.FacadeUnbakedModel; import com.gregtechceu.gtceu.client.model.machine.MachineModelLoader; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; @@ -26,17 +25,18 @@ import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderManager; import com.gregtechceu.gtceu.client.renderer.machine.impl.*; import com.gregtechceu.gtceu.client.renderer.machine.impl.BoilerMultiPartRender; +import com.gregtechceu.gtceu.common.CommonEventListener; +import com.gregtechceu.gtceu.common.data.GTEntityTypes; +import com.gregtechceu.gtceu.common.data.GTFluids; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTParticleTypes; +import com.gregtechceu.gtceu.common.data.models.GTModels; import com.gregtechceu.gtceu.common.item.DrumMachineItem; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import com.gregtechceu.gtceu.common.item.QuantumTankMachineItem; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.datagen.model.builder.PipeModelBuilder; -import com.gregtechceu.gtceu.data.entity.GTEntityTypes; -import com.gregtechceu.gtceu.data.fluid.GTFluids; -import com.gregtechceu.gtceu.data.model.GTModels; +import com.gregtechceu.gtceu.data.model.builder.PipeModelBuilder; import com.gregtechceu.gtceu.data.pack.event.RegisterDynamicResourcesEvent; -import com.gregtechceu.gtceu.data.particle.GTParticleTypes; -import com.gregtechceu.gtceu.forge.CommonEventListener; import com.gregtechceu.gtceu.integration.kjs.GTKubeJSPlugin; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; import com.gregtechceu.gtceu.integration.map.cache.client.GTClientCache; @@ -64,10 +64,10 @@ import org.jetbrains.annotations.NotNull; -public class ClientInit { +public class ClientProxy { public static void init(IEventBus modBus) { - modBus.register(ClientInit.class); + modBus.register(ClientProxy.class); if (!GTCEu.isDataGen()) { ClientCacheManager.registerClientCache(GTClientCache.instance, "gtceu"); Layers.registerLayer(OreRenderLayer::new, "ore_veins"); diff --git a/src/main/java/com/gregtechceu/gtceu/client/GTCEuClient.java b/src/main/java/com/gregtechceu/gtceu/client/GTCEuClient.java index 42fe0aadcbc..1940941a1fa 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/GTCEuClient.java +++ b/src/main/java/com/gregtechceu/gtceu/client/GTCEuClient.java @@ -11,6 +11,6 @@ public class GTCEuClient { public GTCEuClient(IEventBus modBus, FMLModContainer container) { - ClientInit.init(modBus); + ClientProxy.init(modBus); } } diff --git a/src/main/java/com/gregtechceu/gtceu/client/TooltipsHandler.java b/src/main/java/com/gregtechceu/gtceu/client/TooltipsHandler.java index b2a55a87384..cba264e0d94 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/TooltipsHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/client/TooltipsHandler.java @@ -2,17 +2,17 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.fluid.FluidConstants; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.GTFluid; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.fluids.FluidConstants; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.GTFluid; +import com.gregtechceu.gtceu.common.data.GTFluids; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluidHelper; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.fluid.GTFluids; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/machine/MachineModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/machine/MachineModel.java index 80fa504ca26..51d75049a80 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/machine/MachineModel.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/machine/MachineModel.java @@ -16,7 +16,7 @@ import com.gregtechceu.gtceu.client.renderer.cover.ICoverableRenderer; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRender; import com.gregtechceu.gtceu.client.util.StaticFaceBakery; -import com.gregtechceu.gtceu.data.model.GTModels; +import com.gregtechceu.gtceu.common.data.models.GTModels; import com.lowdragmc.lowdraglib.client.bakedpipeline.FaceQuad; import com.lowdragmc.lowdraglib.client.model.custommodel.CustomBakedModel; diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/HPCAOverlay.java b/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/HPCAOverlay.java index 64923d6d572..f7f0f0a88c6 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/HPCAOverlay.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/HPCAOverlay.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic.Status; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.data.model.GTModels; +import com.gregtechceu.gtceu.common.data.models.GTModels; import com.gregtechceu.gtceu.utils.data.RuntimeExistingFileHelper; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/WorkableOverlays.java b/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/WorkableOverlays.java index 928b33399e4..c46b5099cc9 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/WorkableOverlays.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/machine/overlays/WorkableOverlays.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic.Status; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.data.model.GTMachineModels; -import com.gregtechceu.gtceu.data.model.GTModels; +import com.gregtechceu.gtceu.common.data.models.GTMachineModels; +import com.gregtechceu.gtceu.common.data.models.GTModels; import com.gregtechceu.gtceu.utils.data.RuntimeExistingFileHelper; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java index fb0fd785ca5..38d8d35c7fd 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.api.block.PipeBlock; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.datagen.model.builder.PipeModelBuilder; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.data.model.builder.PipeModelBuilder; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/BakedPipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/BakedPipeModel.java index 043b2d1cb73..115573640c8 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/BakedPipeModel.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/BakedPipeModel.java @@ -1,15 +1,15 @@ package com.gregtechceu.gtceu.client.model.pipe; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.pipenet.Node; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.model.BaseBakedModel; import com.gregtechceu.gtceu.client.model.GTModelProperties; import com.gregtechceu.gtceu.client.model.IBlockEntityRendererBakedModel; import com.gregtechceu.gtceu.client.renderer.cover.ICoverableRenderer; import com.gregtechceu.gtceu.client.util.GTQuadTransformers; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java index 2253ec4dc55..aa80c3583e5 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java @@ -3,8 +3,7 @@ import com.gregtechceu.gtceu.api.block.PipeBlock; import com.gregtechceu.gtceu.api.registry.registrate.GTBlockBuilder; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.datagen.model.builder.PipeModelBuilder; +import com.gregtechceu.gtceu.data.model.builder.PipeModelBuilder; import com.gregtechceu.gtceu.data.pack.event.RegisterDynamicResourcesEvent; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java index c426d56f20b..7e14ff80769 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java @@ -8,12 +8,12 @@ import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.pipenet.IPipeType; import com.gregtechceu.gtceu.client.util.RenderUtil; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.item.behavior.CoverPlaceBehavior; import com.gregtechceu.gtceu.common.item.tool.rotation.CustomBlockRotations; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/MultiblockInWorldPreviewRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/MultiblockInWorldPreviewRenderer.java index cd26f6028bc..189a99ac9c6 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/MultiblockInWorldPreviewRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/MultiblockInWorldPreviewRenderer.java @@ -3,12 +3,12 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.IMachineBlock; import com.gregtechceu.gtceu.api.block.MetaMachineBlock; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; import com.lowdragmc.lowdraglib.client.scene.WorldSceneRenderer; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java index 38632da8aaa..2d21c55204e 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.client.renderer.block; -import com.gregtechceu.gtceu.api.item.LampBlockItem; import com.gregtechceu.gtceu.common.block.LampBlock; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampRenderer.java deleted file mode 100644 index 8b137891791..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampRenderer.java +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java index e3e4ccdc65e..f6559abfce2 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.client.renderer.block; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.models.BlockModelGenerators; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java index bc795356127..8c58d76b1ef 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java @@ -2,11 +2,11 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.MaterialBlock; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import com.gregtechceu.gtceu.utils.memoization.function.MemoizedBiFunction; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/SurfaceRockRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/SurfaceRockRenderer.java index 67a04e49b71..f8741eebc8c 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/SurfaceRockRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/SurfaceRockRenderer.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.client.renderer.block; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.minecraft.core.Direction; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ArmorItemRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ArmorItemRenderer.java index 084d65578f5..aff929e7ac2 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ArmorItemRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ArmorItemRenderer.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.client.renderer.item; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.minecraft.client.Minecraft; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/LampItemOverlayRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/LampItemOverlayRenderer.java deleted file mode 100644 index 5c078d1ef87..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/LampItemOverlayRenderer.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gregtechceu.gtceu.client.renderer.item; - -import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.data.item.GTDataComponents; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.world.item.ItemStack; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.api.distmarker.OnlyIn; - -import com.mojang.blaze3d.systems.RenderSystem; - -@OnlyIn(Dist.CLIENT) -public class LampItemOverlayRenderer { - - private LampItemOverlayRenderer() {} - - public static OverlayType getOverlayType(boolean light, boolean bloom) { - if (light) { - return bloom ? OverlayType.NONE : OverlayType.NO_BLOOM; - } else { - return bloom ? OverlayType.NO_LIGHT : OverlayType.NO_BLOOM_NO_LIGHT; - } - } - - public static void renderOverlay(GuiGraphics graphics, ItemStack stack, int xPosition, - int yPosition) { - if (stack.has(GTDataComponents.LAMP_DATA)) { - var lampData = stack.get(GTDataComponents.LAMP_DATA); - var overlayType = getOverlayType(lampData.lit(), lampData.bloom()); - if (overlayType == OverlayType.NONE) { - return; - } - - RenderSystem.disableDepthTest(); - if (overlayType.noBloom()) { - GuiTextures.LAMP_NO_BLOOM.draw(graphics, 0, 0, xPosition, yPosition, 16, 16); - } - - if (overlayType.noLight()) { - GuiTextures.LAMP_NO_LIGHT.draw(graphics, 0, 0, xPosition, yPosition, 16, 16); - } - RenderSystem.enableDepthTest(); - } - } - - public enum OverlayType { - - NONE, - NO_BLOOM, - NO_LIGHT, - NO_BLOOM_NO_LIGHT; - - public boolean noLight() { - return this == NO_LIGHT || this == NO_BLOOM_NO_LIGHT; - } - - public boolean noBloom() { - return this == NO_BLOOM || this == NO_BLOOM_NO_LIGHT; - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java index b53ed0677bb..0537d125a26 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.client.renderer.item; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.models.model.DelegatedModel; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java index 34903884c90..9858c4daad9 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.client.renderer.item; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.models.model.DelegatedModel; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java index e63e28c9ba6..a7aa7f7622a 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.client.renderer.item.decorator; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.api.item.LampBlockItem; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/DynamicRenderHelper.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/DynamicRenderHelper.java index e2b48097e62..dd7093de5f6 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/DynamicRenderHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/DynamicRenderHelper.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.client.renderer.machine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.client.renderer.block.FluidBlockRenderer; import com.gregtechceu.gtceu.client.renderer.machine.impl.*; import com.gregtechceu.gtceu.common.block.BoilerFireboxType; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/BoilerMultiPartRender.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/BoilerMultiPartRender.java index 982a3fbab60..b25efac6f01 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/BoilerMultiPartRender.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/BoilerMultiPartRender.java @@ -4,14 +4,14 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.client.model.machine.IControllerModelRenderer; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRender; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderType; import com.gregtechceu.gtceu.client.util.ModelUtils; import com.gregtechceu.gtceu.common.block.BoilerFireboxType; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTBlocks; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FluidAreaRender.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FluidAreaRender.java index ab5f4f042ce..4220bdf186e 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FluidAreaRender.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FluidAreaRender.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.client.renderer.machine.impl; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IFluidRenderMulti; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.client.renderer.block.FluidBlockRenderer; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRender; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderType; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FusionRingRender.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FusionRingRender.java index 52c9ae9977e..1e3e14cbd77 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FusionRingRender.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/FusionRingRender.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.client.renderer.machine.impl; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.client.renderer.GTRenderTypes; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRender; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderType; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java index 3fc6f3ddb7d..2d18d740510 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRender; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderType; import com.gregtechceu.gtceu.client.util.RenderUtil; @@ -13,7 +13,7 @@ import com.gregtechceu.gtceu.core.mixins.GrowingPlantBlockAccessor; import com.gregtechceu.gtceu.core.mixins.IntegerPropertyAccessor; import com.gregtechceu.gtceu.core.mixins.StemBlockAccessor; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumChestItemRender.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumChestItemRender.java index 53e8905bf32..b9e810d8f54 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumChestItemRender.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumChestItemRender.java @@ -6,10 +6,10 @@ import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderType; import com.gregtechceu.gtceu.client.util.PoseStackExtensions; import com.gregtechceu.gtceu.client.util.RenderUtil; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.machine.storage.CreativeChestMachine; import com.gregtechceu.gtceu.common.machine.storage.QuantumChestMachine; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumTankFluidRender.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumTankFluidRender.java index f6130bfbfe1..ae9623bfc86 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumTankFluidRender.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/QuantumTankFluidRender.java @@ -6,10 +6,10 @@ import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderType; import com.gregtechceu.gtceu.client.util.RenderBufferHelper; import com.gregtechceu.gtceu.client.util.RenderUtil; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.machine.storage.CreativeTankMachine; import com.gregtechceu.gtceu.common.machine.storage.QuantumTankMachine; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.machine.GTMachines; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/gregtechceu/gtceu/client/util/ModelUtils.java b/src/main/java/com/gregtechceu/gtceu/client/util/ModelUtils.java index 69d8fd34f3c..beb258d1217 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/util/ModelUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/client/util/ModelUtils.java @@ -17,7 +17,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.ResourceManagerReloadListener; import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; @@ -32,8 +31,6 @@ import net.neoforged.neoforge.client.event.TextureAtlasStitchedEvent; import net.neoforged.neoforge.client.model.data.ModelData; -import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -94,13 +91,8 @@ public static void registerAddModelsEventListener(boolean removeOnReload, @SubscribeEvent(priority = EventPriority.HIGH) public static void registerReloadListener(RegisterClientReloadListenersEvent event) { - event.registerReloadListener(new ResourceManagerReloadListener() { - - @Override - public void onResourceManagerReload(@NotNull ResourceManager resourceManager) { - EVENT_LISTENERS.removeIf(EventListenerHolder::removeOnReload); - } - }); + event.registerReloadListener((ResourceManagerReloadListener) resourceManager -> EVENT_LISTENERS + .removeIf(EventListenerHolder::removeOnReload)); } @SuppressWarnings({ "unchecked", "deprecation" }) diff --git a/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java b/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java index aaafa7a42ae..54917abeb4d 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GTMatrixUtils; import com.gregtechceu.gtceu.utils.ResearchManager; diff --git a/src/main/java/com/gregtechceu/gtceu/forge/CommonEventListener.java b/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java similarity index 86% rename from src/main/java/com/gregtechceu/gtceu/forge/CommonEventListener.java rename to src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java index 84887c8efb3..da6e41a4afb 100644 --- a/src/main/java/com/gregtechceu/gtceu/forge/CommonEventListener.java +++ b/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java @@ -1,30 +1,45 @@ -package com.gregtechceu.gtceu.forge; +package com.gregtechceu.gtceu.common; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.block.MetaMachineBlock; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; import com.gregtechceu.gtceu.api.cosmetics.CapeRegistry; import com.gregtechceu.gtceu.api.cosmetics.event.RegisterGTCapesEvent; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.event.PostMaterialEvent; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.AlloyBlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.misc.virtualregistry.VirtualEnderRegistry; -import com.gregtechceu.gtceu.api.multiblock.MultiblockWorldSavedData; +import com.gregtechceu.gtceu.api.pattern.MultiblockWorldSavedData; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.client.TooltipsHandler; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; import com.gregtechceu.gtceu.common.capability.LocalizedHazardSavedData; import com.gregtechceu.gtceu.common.capability.WorldIDSaveData; +import com.gregtechceu.gtceu.common.commands.GTCommands; +import com.gregtechceu.gtceu.common.commands.HazardCommands; +import com.gregtechceu.gtceu.common.commands.MedicalConditionCommands; import com.gregtechceu.gtceu.common.cosmetics.GTCapes; -import com.gregtechceu.gtceu.common.data.loader.PostRegistryListener; +import com.gregtechceu.gtceu.common.data.GTAttributeModifierIds; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.armor.IJetpack; import com.gregtechceu.gtceu.common.item.armor.IStepAssist; import com.gregtechceu.gtceu.common.item.armor.QuarkTechSuite; @@ -36,13 +51,9 @@ import com.gregtechceu.gtceu.common.network.packets.hazard.SPacketRemoveHazardZone; import com.gregtechceu.gtceu.common.network.packets.hazard.SPacketSyncLevelHazards; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.command.GTCommands; -import com.gregtechceu.gtceu.data.command.HazardCommands; -import com.gregtechceu.gtceu.data.command.MedicalConditionCommands; -import com.gregtechceu.gtceu.data.entity.GTAttributeModifierIds; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.loader.PostRegistryListener; +import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.recipe.misc.alloyblast.CustomAlloyBlastRecipeProducer; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; import com.gregtechceu.gtceu.integration.map.WaypointManager; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; @@ -92,6 +103,10 @@ import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.network.PacketDistributor; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + @EventBusSubscriber(modid = GTCEu.MOD_ID) public class CommonEventListener { @@ -482,4 +497,42 @@ public static void playerTickEvent(PlayerTickEvent.Pre event) { speedBoost, AttributeModifier.Operation.ADD_MULTIPLIED_BASE)); } } + + public static void addAlloyBlastProperties(PostMaterialEvent event) { + for (Material material : GTCEuAPI.materialManager) { + if (!material.hasFlag(MaterialFlags.DISABLE_ALLOY_PROPERTY)) { + addAlloyBlastProperty(material); + } + } + // Alloy Blast Overriding + GTMaterials.NiobiumNitride.getProperty(PropertyKey.ALLOY_BLAST) + .setRecipeProducer(new CustomAlloyBlastRecipeProducer(1, 11, -1)); + + GTMaterials.IndiumTinBariumTitaniumCuprate.getProperty(PropertyKey.ALLOY_BLAST) + .setRecipeProducer(new CustomAlloyBlastRecipeProducer(-1, -1, 16)); + } + + private static void addAlloyBlastProperty(@NotNull Material material) { + final List components = material.getMaterialComponents(); + // ignore materials which are not alloys + if (components.size() < 2) return; + + BlastProperty blastProperty = material.getProperty(PropertyKey.BLAST); + if (blastProperty == null) return; + + if (!material.hasProperty(PropertyKey.FLUID)) return; + + // if there are more than 2 fluid-only components in the material, do not generate a hot fluid + if (components.stream().filter(CommonEventListener::isMaterialStackFluidOnly).limit(3).count() > 2) { + return; + } + + material.setProperty(PropertyKey.ALLOY_BLAST, new AlloyBlastProperty(material.getBlastTemperature())); + material.getProperty(PropertyKey.FLUID).getStorage().enqueueRegistration(FluidStorageKeys.MOLTEN, + new FluidBuilder().state(FluidState.LIQUID)); + } + + private static boolean isMaterialStackFluidOnly(@NotNull MaterialStack ms) { + return !ms.material().hasProperty(PropertyKey.DUST) && ms.material().hasProperty(PropertyKey.FLUID); + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/CommonInit.java b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java similarity index 86% rename from src/main/java/com/gregtechceu/gtceu/common/CommonInit.java rename to src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java index 78adf646ce9..b85f3595920 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/CommonInit.java +++ b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java @@ -7,22 +7,28 @@ import com.gregtechceu.gtceu.api.addon.IGTAddon; import com.gregtechceu.gtceu.api.block.IMachineBlock; import com.gregtechceu.gtceu.api.capability.GTCapability; -import com.gregtechceu.gtceu.api.capability.compat.GTEnergyWrapper; +import com.gregtechceu.gtceu.api.capability.compat.EUToFEProvider; import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.event.PostMaterialEvent; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.chemical.material.registry.MaterialRegistry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGenLayers; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerators; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerators; import com.gregtechceu.gtceu.api.gui.factory.CoverUIFactory; import com.gregtechceu.gtceu.api.gui.factory.GTUIEditorFactory; import com.gregtechceu.gtceu.api.gui.factory.MachineUIFactory; -import com.gregtechceu.gtceu.api.item.GTBucketItem; import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.event.PostMaterialEvent; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.material.material.registry.MaterialRegistry; import com.gregtechceu.gtceu.api.misc.forge.QuantumFluidHandlerItemStack; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; import com.gregtechceu.gtceu.api.recipe.ingredient.IntCircuitIngredient; @@ -38,62 +44,36 @@ import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.item.*; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.WorldGenLayers; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.IndicatorGenerators; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerators; import com.gregtechceu.gtceu.common.block.*; +import com.gregtechceu.gtceu.common.data.*; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.item.*; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.materials.GTFoods; import com.gregtechceu.gtceu.common.fluid.potion.BottleItemFluidHandler; import com.gregtechceu.gtceu.common.fluid.potion.PotionItemFluidHandler; import com.gregtechceu.gtceu.common.item.DrumMachineItem; +import com.gregtechceu.gtceu.common.item.GTBucketItem; +import com.gregtechceu.gtceu.common.item.armor.GTArmorMaterials; import com.gregtechceu.gtceu.common.item.tool.rotation.CustomBlockRotations; import com.gregtechceu.gtceu.common.machine.multiblock.electric.FusionReactorMachine; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; import com.gregtechceu.gtceu.common.machine.storage.QuantumTankMachine; -import com.gregtechceu.gtceu.common.pack.GTDynamicDataPack; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; -import com.gregtechceu.gtceu.common.pack.GTPackSource; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.registrate.AbstractRegistrateAccessor; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.blockentity.GTBlockEntities; -import com.gregtechceu.gtceu.data.command.GTCommandArguments; -import com.gregtechceu.gtceu.data.cover.GTCovers; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; -import com.gregtechceu.gtceu.data.datafixer.GTDataFixers; -import com.gregtechceu.gtceu.data.datagen.GTRegistrateDatagen; -import com.gregtechceu.gtceu.data.datagen.lang.MaterialLangGenerator; -import com.gregtechceu.gtceu.data.effect.GTMobEffects; -import com.gregtechceu.gtceu.data.entity.GTEntityTypes; -import com.gregtechceu.gtceu.data.fluid.GTFluids; -import com.gregtechceu.gtceu.data.item.*; +import com.gregtechceu.gtceu.data.GregTechDatagen; +import com.gregtechceu.gtceu.data.lang.MaterialLangGenerator; import com.gregtechceu.gtceu.data.loot.ChestGenHooks; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.material.GTElements; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.misc.GTAttachmentTypes; -import com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs; -import com.gregtechceu.gtceu.data.misc.GTDimensionMarkers; -import com.gregtechceu.gtceu.data.particle.GTParticleTypes; +import com.gregtechceu.gtceu.data.pack.GTDynamicDataPack; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.data.pack.GTPackSource; import com.gregtechceu.gtceu.data.placeholder.GTPlaceholders; import com.gregtechceu.gtceu.data.recipe.*; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; -import com.gregtechceu.gtceu.data.tag.GTIngredientTypes; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; -import com.gregtechceu.gtceu.data.tools.GTToolTiers; -import com.gregtechceu.gtceu.data.valueprovider.GTValueProviderTypes; -import com.gregtechceu.gtceu.data.worldgen.GTFeatures; import com.gregtechceu.gtceu.integration.cctweaked.CCTweakedPlugin; import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents; import com.gregtechceu.gtceu.integration.kjs.GTKubeJSPlugin; -import com.gregtechceu.gtceu.integration.kjs.events.MaterialModificationKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.MaterialModificationEventJS; import com.gregtechceu.gtceu.integration.map.WaypointManager; -import com.gregtechceu.gtceu.integration.top.TheOneProbePlugin; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import com.lowdragmc.lowdraglib.gui.factory.UIFactory; @@ -113,13 +93,11 @@ import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.InterModComms; import net.neoforged.fml.ModContainer; import net.neoforged.fml.ModList; import net.neoforged.fml.ModLoader; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.neoforged.fml.event.lifecycle.InterModProcessEvent; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.Capabilities.FluidHandler; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; @@ -144,36 +122,34 @@ import com.tterrag.registrate.providers.RegistrateProvider; import com.tterrag.registrate.util.nullness.NonNullConsumer; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import mcjty.theoneprobe.api.ITheOneProbe; import org.jetbrains.annotations.ApiStatus; import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.function.Function; import java.util.stream.Stream; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -public class CommonInit { +public class CommonProxy { private static IEventBus modBus; public static void init(final IEventBus modBus) { - CommonInit.modBus = modBus; + CommonProxy.modBus = modBus; if (GTCEu.Mods.isKubeJSLoaded()) { // initialize this before the class's static listeners // so KubeJS materials are registered before the material registry is closed. modBus.addListener(EventPriority.LOW, GTKubeJSPlugin::registerWrappers); } - modBus.register(CommonInit.class); + modBus.register(CommonProxy.class); UIFactory.register(MachineUIFactory.INSTANCE); UIFactory.register(CoverUIFactory.INSTANCE); UIFactory.register(GTUIEditorFactory.INSTANCE); // Initialize the model generator before any content is loaded so machine models can use the generated data - GTRegistrateDatagen.initPre(); + GregTechDatagen.initPre(); GTRegistries.init(modBus); REGISTRATE.registerEventListeners(modBus); @@ -237,7 +213,7 @@ public static void onRegister(RegisterEvent event) { GTMobEffects.MOB_EFFECTS.register(modBus); GTParticleTypes.PARTICLE_TYPES.register(modBus); - GTRegistrateDatagen.initPost(); + GregTechDatagen.initPost(); GTValueProviderTypes.init(modBus); GTFeatures.register(modBus); WorldGenLayers.registerAll(); @@ -249,7 +225,6 @@ public static void onRegister(RegisterEvent event) { SyncedKeyMappings.init(); MachineOwner.init(); ChestGenHooks.init(); - GTDataFixers.init(); } @ApiStatus.Internal @@ -327,7 +302,7 @@ public static void registerRegistries(NewRegistryEvent event) { @SubscribeEvent public static void registerDataPackRegistries(DataPackRegistryEvent.NewRegistry event) { event.dataPackRegistry(GTRegistries.ORE_VEIN_REGISTRY, - OreVeinDefinition.DIRECT_CODEC, OreVeinDefinition.DIRECT_CODEC); + GTOreDefinition.DIRECT_CODEC, GTOreDefinition.DIRECT_CODEC); event.dataPackRegistry(GTRegistries.BEDROCK_FLUID_REGISTRY, BedrockFluidDefinition.DIRECT_CODEC, BedrockFluidDefinition.DIRECT_CODEC); event.dataPackRegistry(GTRegistries.BEDROCK_ORE_REGISTRY, @@ -336,7 +311,7 @@ public static void registerDataPackRegistries(DataPackRegistryEvent.NewRegistry @SubscribeEvent public static void modifyRegistries(ModifyRegistriesEvent event) { - GTRegistries.MATERIALS.addCallback((BakeCallback) CommonInit::postInitMaterials); + GTRegistries.MATERIALS.addCallback((BakeCallback) CommonProxy::postInitMaterials); GTRegistries.MACHINES.addCallback((BakeCallback) GTMachines::bakeRenderStates); } @@ -413,12 +388,6 @@ public static void commonSetup(FMLCommonSetupEvent event) { @SubscribeEvent public static void loadComplete(FMLLoadCompleteEvent event) {} - @SubscribeEvent - public static void interModProcess(InterModProcessEvent event) { - InterModComms.sendTo("theoneprobe", "getTheOneProbe", - () -> (Function) TheOneProbePlugin::init); - } - @SubscribeEvent(priority = EventPriority.LOWEST) public static void registerCapabilities(RegisterCapabilitiesEvent event) { event.registerItem(FluidHandler.ITEM, BottleItemFluidHandler::new, Items.GLASS_BOTTLE); @@ -445,7 +414,7 @@ public static void registerCapabilities(RegisterCapabilitiesEvent event) { IEnergyStorage forgeEnergy = level.getCapability(Capabilities.EnergyStorage.BLOCK, pos, state, blockEntity, side); if (forgeEnergy != null) { - return new GTEnergyWrapper(forgeEnergy); + return new EUToFEProvider(forgeEnergy); } return null; }, block); @@ -524,7 +493,7 @@ public static void addValidBlocksToBETypes(BlockEntityTypeAddBlocksEvent event) public static final class KJSEventWrapper { public static void materialModification() { - GTCEuStartupEvents.MATERIAL_MODIFICATION.post(new MaterialModificationKubeEvent()); + GTCEuStartupEvents.MATERIAL_MODIFICATION.post(new MaterialModificationEventJS()); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/addon/.keep b/src/main/java/com/gregtechceu/gtceu/common/addon/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java index abf82016ddc..18dfedbd53f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java @@ -6,20 +6,20 @@ import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IToolable; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.WireProperties; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import com.gregtechceu.gtceu.common.blockentity.CableBlockEntity; +import com.gregtechceu.gtceu.common.data.GTBlockEntities; +import com.gregtechceu.gtceu.common.data.GTDamageTypes; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; import com.gregtechceu.gtceu.common.pipelike.cable.Insulation; import com.gregtechceu.gtceu.common.pipelike.cable.LevelEnergyNet; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.blockentity.GTBlockEntities; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/CoilBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/CoilBlock.java index 2e066eb4c01..ecf581a8862 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/CoilBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/CoilBlock.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.ActiveBlock; import com.gregtechceu.gtceu.api.block.ICoilType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java index 8e8036c85b0..dab95c84a9a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java @@ -12,10 +12,10 @@ import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import com.gregtechceu.gtceu.common.blockentity.DuctPipeBlockEntity; +import com.gregtechceu.gtceu.common.data.GTBlockEntities; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeProperties; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeType; import com.gregtechceu.gtceu.common.pipelike.duct.LevelDuctPipeNet; -import com.gregtechceu.gtceu.data.blockentity.GTBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/FluidPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/FluidPipeBlock.java index 3c119c2eacf..7706fbda9f7 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/FluidPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/FluidPipeBlock.java @@ -6,18 +6,18 @@ import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IToolable; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import com.gregtechceu.gtceu.common.blockentity.FluidPipeBlockEntity; +import com.gregtechceu.gtceu.common.data.GTBlockEntities; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeType; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.LevelFluidPipeNet; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.blockentity.GTBlockEntities; import com.gregtechceu.gtceu.utils.EntityDamageUtil; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/FoamBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/FoamBlock.java index 83cfc7ec6b2..f258950e461 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/FoamBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/FoamBlock.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.block; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/ItemPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/ItemPipeBlock.java index a3224549097..38f3a974b11 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/ItemPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/ItemPipeBlock.java @@ -4,16 +4,16 @@ import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IToolable; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.ItemPipeProperties; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import com.gregtechceu.gtceu.common.blockentity.ItemPipeBlockEntity; +import com.gregtechceu.gtceu.common.data.GTBlockEntities; import com.gregtechceu.gtceu.common.pipelike.item.ItemPipeType; import com.gregtechceu.gtceu.common.pipelike.item.LevelItemPipeNet; -import com.gregtechceu.gtceu.data.blockentity.GTBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java index 8128d7d0c7a..2e340993ba6 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.block; -import com.gregtechceu.gtceu.api.item.LampBlockItem; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java index b7f8de9f257..689d4637a21 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java @@ -12,11 +12,11 @@ import com.gregtechceu.gtceu.client.model.pipe.ActivablePipeModel; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import com.gregtechceu.gtceu.common.blockentity.LaserPipeBlockEntity; +import com.gregtechceu.gtceu.common.data.GTBlockEntities; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import com.gregtechceu.gtceu.common.pipelike.laser.LaserPipeProperties; import com.gregtechceu.gtceu.common.pipelike.laser.LaserPipeType; import com.gregtechceu.gtceu.common.pipelike.laser.LevelLaserPipeNet; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.blockentity.GTBlockEntities; import net.minecraft.client.color.block.BlockColor; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java index f9475911d96..a39b01ba98b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java @@ -11,11 +11,11 @@ import com.gregtechceu.gtceu.client.model.pipe.ActivablePipeModel; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import com.gregtechceu.gtceu.common.blockentity.OpticalPipeBlockEntity; +import com.gregtechceu.gtceu.common.data.GTBlockEntities; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import com.gregtechceu.gtceu.common.pipelike.optical.LevelOpticalPipeNet; import com.gregtechceu.gtceu.common.pipelike.optical.OpticalPipeProperties; import com.gregtechceu.gtceu.common.pipelike.optical.OpticalPipeType; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.blockentity.GTBlockEntities; import net.minecraft.client.color.block.BlockColor; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/RubberLogBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/RubberLogBlock.java index 8ca015f6bdc..8b0baea9ea1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/RubberLogBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/RubberLogBlock.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.block; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTBlocks; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/RubberWoodBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/RubberWoodBlock.java index 49a33a7d09e..0ef3090f003 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/RubberWoodBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/RubberWoodBlock.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.block; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.RotatedPillarBlock; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/StoneTypes.java b/src/main/java/com/gregtechceu/gtceu/common/block/StoneTypes.java index f6a14e5549f..41735b0a931 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/StoneTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/StoneTypes.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.common.block; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.util.StringRepresentable; import net.minecraft.world.level.block.Blocks; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java index d4a54889391..1b523fcfd4d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.block; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.item.SurfaceRockBlockItem; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.client.renderer.block.SurfaceRockRenderer; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java index 2bf9cef4e6e..d570d2cee76 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java @@ -4,16 +4,16 @@ import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.feature.IDataInfoProvider; -import com.gregtechceu.gtceu.api.material.material.properties.WireProperties; import com.gregtechceu.gtceu.common.block.CableBlock; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.pipelike.cable.*; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java index a6f2f93deca..ecc6c6f05c1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java @@ -3,10 +3,10 @@ import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IHazardParticleContainer; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardCleaner; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardEmitter; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.common.pipelike.duct.*; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java index 9b5fb81625f..3d36b5d2743 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java @@ -6,13 +6,13 @@ import com.gregtechceu.gtceu.api.capability.ICoverable; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.cover.CoverBehavior; -import com.gregtechceu.gtceu.api.fluid.FluidConstants; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.GTFluid; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttribute; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.fluids.FluidConstants; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.GTFluid; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttribute; import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.feature.IDataInfoProvider; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java index ffdfad6864c..633a40be955 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.cover.CoverBehavior; -import com.gregtechceu.gtceu.api.material.material.properties.ItemPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; import com.gregtechceu.gtceu.common.block.ItemPipeBlock; import com.gregtechceu.gtceu.common.pipelike.item.ItemNetHandler; import com.gregtechceu.gtceu.common.pipelike.item.ItemPipeNet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java index 9e3089328d2..8519cb966ac 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java @@ -5,9 +5,9 @@ import com.gregtechceu.gtceu.api.capability.ILaserContainer; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.pipelike.laser.*; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; import com.gregtechceu.gtceu.utils.GTUtil; import com.gregtechceu.gtceu.utils.TaskHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java index b36d6cc3502..b782a405e53 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java @@ -5,10 +5,10 @@ import com.gregtechceu.gtceu.api.capability.IOpticalComputationProvider; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.pipelike.optical.*; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java b/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java index e0e38ae28da..fd23ce78fda 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java +++ b/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.common.network.packets.hazard.SPacketAddHazardZone; import com.gregtechceu.gtceu.common.network.packets.hazard.SPacketRemoveHazardZone; import com.gregtechceu.gtceu.common.network.packets.hazard.SPacketSyncHazardZoneStrength; @@ -294,7 +294,7 @@ public static HazardZone deserializeNBT(CompoundTag zoneTag) { boolean canSpread = zoneTag.getBoolean("can_spread"); HazardProperty.HazardTrigger trigger = HazardProperty.HazardTrigger.ALL_TRIGGERS .get(zoneTag.getString("trigger")); - MedicalCondition condition = com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition.CONDITIONS + MedicalCondition condition = MedicalCondition.CONDITIONS .get(zoneTag.getString("condition")); return new HazardZone(source, strength, canSpread, trigger, condition); diff --git a/src/main/java/com/gregtechceu/gtceu/common/capability/LocalizedHazardSavedData.java b/src/main/java/com/gregtechceu/gtceu/common/capability/LocalizedHazardSavedData.java index a05e1604ee5..c11007e270a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/capability/LocalizedHazardSavedData.java +++ b/src/main/java/com/gregtechceu/gtceu/common/capability/LocalizedHazardSavedData.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.common.particle.HazardParticleOptions; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.BreadthFirstBlockSearch; diff --git a/src/main/java/com/gregtechceu/gtceu/common/capability/MedicalConditionTracker.java b/src/main/java/com/gregtechceu/gtceu/common/capability/MedicalConditionTracker.java index 607f1e4d0c6..4163b0a3bf4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/capability/MedicalConditionTracker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/capability/MedicalConditionTracker.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.capability; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.medicalcondition.Symptom; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.Symptom; import net.minecraft.core.Holder; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/gregtechceu/gtceu/data/command/GTClientCommands.java b/src/main/java/com/gregtechceu/gtceu/common/commands/GTClientCommands.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/command/GTClientCommands.java rename to src/main/java/com/gregtechceu/gtceu/common/commands/GTClientCommands.java index 5de5fc6e0d3..2fe1133c6c3 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/command/GTClientCommands.java +++ b/src/main/java/com/gregtechceu/gtceu/common/commands/GTClientCommands.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.command; +package com.gregtechceu.gtceu.common.commands; import com.gregtechceu.gtceu.common.network.packets.SCPacketShareProspection; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; diff --git a/src/main/java/com/gregtechceu/gtceu/data/command/GTCommands.java b/src/main/java/com/gregtechceu/gtceu/common/commands/GTCommands.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/command/GTCommands.java rename to src/main/java/com/gregtechceu/gtceu/common/commands/GTCommands.java index 9d8d757f4dd..2a4c1328082 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/command/GTCommands.java +++ b/src/main/java/com/gregtechceu/gtceu/common/commands/GTCommands.java @@ -1,12 +1,12 @@ -package com.gregtechceu.gtceu.data.command; +package com.gregtechceu.gtceu.common.commands; import com.gregtechceu.gtceu.api.cosmetics.CapeRegistry; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OreGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OrePlacer; import com.gregtechceu.gtceu.api.gui.factory.GTUIEditorFactory; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; -import com.gregtechceu.gtceu.api.worldgen.ores.OreGenerator; -import com.gregtechceu.gtceu.api.worldgen.ores.OrePlacer; import com.gregtechceu.gtceu.core.mixins.ResourceKeyArgumentAccessor; import net.minecraft.commands.CommandBuildContext; @@ -270,7 +270,7 @@ private static int setActiveCape(CommandSourceStack source, ServerPlayer player, private static int placeVein(CommandContext context, BlockPos sourcePos) throws CommandSyntaxException { - Holder.Reference vein = ResourceKeyArgumentAccessor.callResolveKey(context, "vein", + Holder.Reference vein = ResourceKeyArgumentAccessor.callResolveKey(context, "vein", GTRegistries.ORE_VEIN_REGISTRY, ERROR_INVALID_VEIN); ResourceLocation id = vein.key().location(); diff --git a/src/main/java/com/gregtechceu/gtceu/data/command/HazardCommands.java b/src/main/java/com/gregtechceu/gtceu/common/commands/HazardCommands.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/command/HazardCommands.java rename to src/main/java/com/gregtechceu/gtceu/common/commands/HazardCommands.java index 1f5e352d31a..91d3d67dc6f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/command/HazardCommands.java +++ b/src/main/java/com/gregtechceu/gtceu/common/commands/HazardCommands.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.data.command; +package com.gregtechceu.gtceu.common.commands; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; import com.gregtechceu.gtceu.common.capability.LocalizedHazardSavedData; -import com.gregtechceu.gtceu.common.command.argument.MedicalConditionArgument; +import com.gregtechceu.gtceu.common.commands.arguments.MedicalConditionArgument; import net.minecraft.commands.CommandBuildContext; import net.minecraft.commands.CommandSourceStack; diff --git a/src/main/java/com/gregtechceu/gtceu/data/command/MedicalConditionCommands.java b/src/main/java/com/gregtechceu/gtceu/common/commands/MedicalConditionCommands.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/command/MedicalConditionCommands.java rename to src/main/java/com/gregtechceu/gtceu/common/commands/MedicalConditionCommands.java index 629f159bfd7..38d3d00ce15 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/command/MedicalConditionCommands.java +++ b/src/main/java/com/gregtechceu/gtceu/common/commands/MedicalConditionCommands.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.data.command; +package com.gregtechceu.gtceu.common.commands; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.common.command.argument.MedicalConditionArgument; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.common.commands.arguments.MedicalConditionArgument; import net.minecraft.commands.CommandBuildContext; import net.minecraft.commands.CommandSourceStack; diff --git a/src/main/java/com/gregtechceu/gtceu/common/command/argument/MedicalConditionArgument.java b/src/main/java/com/gregtechceu/gtceu/common/commands/arguments/MedicalConditionArgument.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/common/command/argument/MedicalConditionArgument.java rename to src/main/java/com/gregtechceu/gtceu/common/commands/arguments/MedicalConditionArgument.java index cb83e11c087..c3fdae68a4c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/command/argument/MedicalConditionArgument.java +++ b/src/main/java/com/gregtechceu/gtceu/common/commands/arguments/MedicalConditionArgument.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.common.command.argument; +package com.gregtechceu.gtceu.common.commands.arguments; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; diff --git a/src/main/java/com/gregtechceu/gtceu/common/command/argument/MedicalConditionParser.java b/src/main/java/com/gregtechceu/gtceu/common/commands/arguments/MedicalConditionParser.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/common/command/argument/MedicalConditionParser.java rename to src/main/java/com/gregtechceu/gtceu/common/commands/arguments/MedicalConditionParser.java index bd388e78b8f..36001e8da01 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/command/argument/MedicalConditionParser.java +++ b/src/main/java/com/gregtechceu/gtceu/common/commands/arguments/MedicalConditionParser.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.common.command.argument; +package com.gregtechceu.gtceu.common.commands.arguments; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/ComputerMonitorCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/ComputerMonitorCover.java index 4a57eae90d1..75b2a3eec9a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/ComputerMonitorCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/ComputerMonitorCover.java @@ -15,9 +15,9 @@ import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; import com.gregtechceu.gtceu.client.renderer.cover.CoverTextRenderer; import com.gregtechceu.gtceu.client.renderer.cover.IDynamicCoverRenderer; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.datacomponents.ComputerMonitorConfig; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.integration.create.GTCreateIntegration; import com.gregtechceu.gtceu.utils.GTStringUtils; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/ShutterCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/ShutterCover.java index f6b43e167ee..f43b9450614 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/ShutterCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/ShutterCover.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.cover.CoverBehavior; import com.gregtechceu.gtceu.api.cover.CoverDefinition; import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/WirelessTransmitterCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/WirelessTransmitterCover.java index 841585b1680..d2249ce04df 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/WirelessTransmitterCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/WirelessTransmitterCover.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.cover.CoverDefinition; import com.gregtechceu.gtceu.api.machine.feature.IDataStickInteractable; import com.gregtechceu.gtceu.api.placeholder.IPlaceholderInfoProviderCover; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GlobalPosWithRot; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/detector/DetectorCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/detector/DetectorCover.java index b94eea37fb4..1d8b2d51c67 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/detector/DetectorCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/detector/DetectorCover.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.cover.CoverBehavior; import com.gregtechceu.gtceu.api.cover.CoverDefinition; import com.gregtechceu.gtceu.api.machine.TickableSubscription; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java index 03011e4fa76..5f3c9cfa5d1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.capability.ICoverable; import com.gregtechceu.gtceu.api.cover.CoverDefinition; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.RedstoneUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java index b87167d5469..814d5d790ba 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable; import com.gregtechceu.gtceu.common.cover.PumpCover; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.utils.GTMath; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/ItemVoidingCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/ItemVoidingCover.java index 07d2dbb921c..6fc558728ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/ItemVoidingCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/ItemVoidingCover.java @@ -9,7 +9,7 @@ import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.common.cover.ConveyorCover; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/damagesource/.keep b/src/main/java/com/gregtechceu/gtceu/common/damagesource/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/data/block/GCYMBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GCYMBlocks.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/block/GCYMBlocks.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GCYMBlocks.java index f4d972ab4bd..9c882fbcafe 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/block/GCYMBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GCYMBlocks.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.block; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.ActiveBlock; @@ -7,8 +7,8 @@ import com.tterrag.registrate.util.entry.BlockEntry; -import static com.gregtechceu.gtceu.data.block.GTBlocks.createActiveCasing; -import static com.gregtechceu.gtceu.data.block.GTBlocks.createCasingBlock; +import static com.gregtechceu.gtceu.common.data.GTBlocks.createActiveCasing; +import static com.gregtechceu.gtceu.common.data.GTBlocks.createCasingBlock; public class GCYMBlocks { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GCYMRecipeTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GCYMRecipeTypes.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GCYMRecipeTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GCYMRecipeTypes.java index bd11758b9dd..820bf8f88fd 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GCYMRecipeTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GCYMRecipeTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.block.ICoilType; @@ -6,7 +6,6 @@ import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; import com.gregtechceu.gtceu.integration.xei.handlers.item.CycleItemEntryHandler; import com.gregtechceu.gtceu.utils.FormattingUtil; @@ -18,8 +17,8 @@ import java.util.ArrayList; import java.util.List; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.MULTIBLOCK; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.register; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MULTIBLOCK; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.register; import static com.lowdragmc.lowdraglib.gui.texture.ProgressTexture.FillDirection.LEFT_TO_RIGHT; public class GCYMRecipeTypes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/misc/GTAttachmentTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTAttachmentTypes.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/misc/GTAttachmentTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTAttachmentTypes.java index c226199ce28..5f48d47966e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/misc/GTAttachmentTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTAttachmentTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.misc; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.capability.MedicalConditionTracker; diff --git a/src/main/java/com/gregtechceu/gtceu/data/entity/GTAttributeModifierIds.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTAttributeModifierIds.java similarity index 83% rename from src/main/java/com/gregtechceu/gtceu/data/entity/GTAttributeModifierIds.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTAttributeModifierIds.java index 5f4b6b3622a..38ed1703c8a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/entity/GTAttributeModifierIds.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTAttributeModifierIds.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.entity; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTBedrockFluids.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBedrockFluids.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/data/worldgen/GTBedrockFluids.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTBedrockFluids.java index 45cc8691dc2..0ea0cbcf0c7 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTBedrockFluids.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBedrockFluids.java @@ -1,9 +1,8 @@ -package com.gregtechceu.gtceu.data.worldgen; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.data.material.GTMaterials; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTBiomeModifiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBiomeModifiers.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/data/worldgen/GTBiomeModifiers.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTBiomeModifiers.java index 974d399b248..d7850838f9f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTBiomeModifiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBiomeModifiers.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.worldgen; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.core.*; import net.minecraft.core.registries.Registries; @@ -35,22 +35,22 @@ public static void bootstrap(BootstrapContext ctx) { ctx.register(RUBBER_TREE, new BiomeModifiers.AddFeaturesBiomeModifier( biomeLookup.getOrThrow(CustomTags.HAS_RUBBER_TREE), - HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RUBBER_TREE)), + HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacements.RUBBER_TREE)), GenerationStep.Decoration.VEGETAL_DECORATION)); ctx.register(RUBBER_TREE_SWAMP, new BiomeModifiers.AddFeaturesBiomeModifier( biomeLookup.getOrThrow(Tags.Biomes.IS_SWAMP), - HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RUBBER_TREE_SWAMP)), + HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacements.RUBBER_TREE_SWAMP)), GenerationStep.Decoration.VEGETAL_DECORATION)); HolderSet overworld = biomeLookup.getOrThrow(BiomeTags.IS_OVERWORLD); - Holder redGraniteBlob = placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RED_GRANITE_BLOB); - Holder marbleBlob = placedFeatureRegistry.getOrThrow(GTPlacedFeatures.MARBLE_BLOB); + Holder redGraniteBlob = placedFeatureRegistry.getOrThrow(GTPlacements.RED_GRANITE_BLOB); + Holder marbleBlob = placedFeatureRegistry.getOrThrow(GTPlacements.MARBLE_BLOB); ctx.register(STONE_BLOB, new BiomeModifiers.AddFeaturesBiomeModifier( overworld, HolderSet.direct(redGraniteBlob, marbleBlob), GenerationStep.Decoration.UNDERGROUND_ORES)); - Holder rawOilSprout = placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RAW_OIL_SPROUT); + Holder rawOilSprout = placedFeatureRegistry.getOrThrow(GTPlacements.RAW_OIL_SPROUT); ctx.register(RAW_OIL_SPROUT, new BiomeModifiers.AddFeaturesBiomeModifier( overworld, HolderSet.direct(rawOilSprout), diff --git a/src/main/java/com/gregtechceu/gtceu/data/blockentity/GTBlockEntities.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlockEntities.java similarity index 76% rename from src/main/java/com/gregtechceu/gtceu/data/blockentity/GTBlockEntities.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTBlockEntities.java index 26d14c208a8..c95c497aaa0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/blockentity/GTBlockEntities.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlockEntities.java @@ -1,10 +1,6 @@ -package com.gregtechceu.gtceu.data.blockentity; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.common.blockentity.*; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; - -import net.minecraft.world.level.block.entity.SignBlockEntity; import com.tterrag.registrate.util.entry.BlockEntityEntry; import com.tterrag.registrate.util.entry.BlockEntry; @@ -46,13 +42,5 @@ public class GTBlockEntities { .validBlocks(GTBlocks.DUCT_PIPES) .register(); - public static final BlockEntityEntry GT_SIGN = REGISTRATE - .blockEntity("sign", SignBlockEntity::new) - .validBlocks(GTBlocks.RUBBER_SIGN, - GTBlocks.RUBBER_WALL_SIGN, - GTBlocks.TREATED_WOOD_SIGN, - GTBlocks.TREATED_WOOD_WALL_SIGN) - .register(); - public static void init() {} } diff --git a/src/main/java/com/gregtechceu/gtceu/data/block/GTBlockStateProperties.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlockStateProperties.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/block/GTBlockStateProperties.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTBlockStateProperties.java index 3f243ddf6f0..ae1f4ca1261 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/block/GTBlockStateProperties.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlockStateProperties.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.block; +package com.gregtechceu.gtceu.common.data; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BooleanProperty; diff --git a/src/main/java/com/gregtechceu/gtceu/data/block/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/block/GTBlocks.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index 9770fc07e5f..989678d3078 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/block/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.block; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; @@ -6,18 +6,19 @@ import com.gregtechceu.gtceu.api.addon.AddonFinder; import com.gregtechceu.gtceu.api.addon.events.MaterialCasingCollectionEvent; import com.gregtechceu.gtceu.api.block.*; -import com.gregtechceu.gtceu.api.item.*; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.item.PipeBlockItem; import com.gregtechceu.gtceu.api.machine.multiblock.IBatteryData; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.pipenet.longdistance.LongDistancePipeBlock; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.tag.TagUtil; import com.gregtechceu.gtceu.common.block.*; import com.gregtechceu.gtceu.common.block.explosive.IndustrialTNTBlock; import com.gregtechceu.gtceu.common.block.explosive.PowderbarrelBlock; +import com.gregtechceu.gtceu.common.data.models.GTModels; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import com.gregtechceu.gtceu.common.item.LaserPipeBlockItem; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeType; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.longdistance.LDFluidPipeType; @@ -25,13 +26,8 @@ import com.gregtechceu.gtceu.common.pipelike.laser.LaserPipeType; import com.gregtechceu.gtceu.common.pipelike.optical.OpticalPipeType; import com.gregtechceu.gtceu.core.mixins.BlockPropertiesAccessor; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs; -import com.gregtechceu.gtceu.data.model.GTModels; -import com.gregtechceu.gtceu.data.tag.CustomTags; -import com.gregtechceu.gtceu.data.worldgen.GTConfiguredFeatures; +import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.utils.TagUtil; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.advancements.critereon.StatePropertiesPredicate; @@ -85,8 +81,8 @@ import java.util.function.Supplier; import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.gregtechceu.gtceu.common.data.GCYMBlocks.*; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.block.GCYMBlocks.*; @SuppressWarnings({ "removal", "unchecked" }) public class GTBlocks { diff --git a/src/main/java/com/gregtechceu/gtceu/data/command/GTCommandArguments.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTCommandArguments.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/data/command/GTCommandArguments.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTCommandArguments.java index 582a895008e..d9b19367c9a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/command/GTCommandArguments.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTCommandArguments.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.command; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.common.command.argument.MedicalConditionArgument; +import com.gregtechceu.gtceu.common.commands.arguments.MedicalConditionArgument; import net.minecraft.commands.synchronization.ArgumentTypeInfo; import net.minecraft.commands.synchronization.ArgumentTypeInfos; diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTConfiguredFeatures.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTConfiguredFeatures.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/worldgen/GTConfiguredFeatures.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTConfiguredFeatures.java index a79ca19cf2a..ff006f089bd 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTConfiguredFeatures.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTConfiguredFeatures.java @@ -1,10 +1,8 @@ -package com.gregtechceu.gtceu.data.worldgen; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.worldgen.feature.configurations.FluidSproutConfiguration; import com.gregtechceu.gtceu.common.worldgen.feature.configurations.StoneBlobConfiguration; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.material.GTMaterials; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; diff --git a/src/main/java/com/gregtechceu/gtceu/data/cover/GTCovers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTCovers.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/cover/GTCovers.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTCovers.java index 65680a6d742..5ba309c829b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/cover/GTCovers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTCovers.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.cover; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; diff --git a/src/main/java/com/gregtechceu/gtceu/data/misc/GTCreativeModeTabs.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTCreativeModeTabs.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/misc/GTCreativeModeTabs.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTCreativeModeTabs.java index 5b9320fc93e..37718f4d281 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/misc/GTCreativeModeTabs.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTCreativeModeTabs.java @@ -1,20 +1,16 @@ -package com.gregtechceu.gtceu.data.misc; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.IGTTool; -import com.gregtechceu.gtceu.api.item.LampBlockItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import com.gregtechceu.gtceu.common.pipelike.cable.Insulation; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; import net.minecraft.core.NonNullList; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/gregtechceu/gtceu/data/damagesource/GTDamageTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTDamageTypes.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/data/damagesource/GTDamageTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTDamageTypes.java index 1f08a6b2762..6312d3ed1bc 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/damagesource/GTDamageTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTDamageTypes.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.damagesource; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; diff --git a/src/main/java/com/gregtechceu/gtceu/data/misc/GTDimensionMarkers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTDimensionMarkers.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/data/misc/GTDimensionMarkers.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTDimensionMarkers.java index 7e9be8f2b72..8bb6da55f37 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/misc/GTDimensionMarkers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTDimensionMarkers.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.misc; +package com.gregtechceu.gtceu.common.data; +import com.gregtechceu.gtceu.api.data.DimensionMarker; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.DimensionMarker; import com.gregtechceu.gtceu.common.recipe.condition.DimensionCondition; import com.gregtechceu.gtceu.utils.FormattingUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/GTElements.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/material/GTElements.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java index 289d5d393cc..93c27d5d1df 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/GTElements.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.Element; +import com.gregtechceu.gtceu.api.data.chemical.Element; import com.gregtechceu.gtceu.api.registry.GTRegistries; public class GTElements { diff --git a/src/main/java/com/gregtechceu/gtceu/data/enchantment/GTEnchantmentProviders.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTEnchantmentProviders.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/enchantment/GTEnchantmentProviders.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTEnchantmentProviders.java index 059d8ba1950..0c4757d28dd 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/enchantment/GTEnchantmentProviders.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTEnchantmentProviders.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.enchantment; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/data/entity/GTEntityTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTEntityTypes.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/entity/GTEntityTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTEntityTypes.java index 7c7e426118c..2b337f73ea0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/entity/GTEntityTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTEntityTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.entity; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.common.entity.*; diff --git a/src/main/java/com/gregtechceu/gtceu/data/inject/GTEnumProxies.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTEnumProxies.java similarity index 89% rename from src/main/java/com/gregtechceu/gtceu/data/inject/GTEnumProxies.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTEnumProxies.java index 01c731adf85..7b79f3a845f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/inject/GTEnumProxies.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTEnumProxies.java @@ -1,7 +1,4 @@ -package com.gregtechceu.gtceu.data.inject; - -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; +package com.gregtechceu.gtceu.common.data; import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTFeatures.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java similarity index 84% rename from src/main/java/com/gregtechceu/gtceu/data/worldgen/GTFeatures.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java index aefb01fcbf4..122fa19927d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTFeatures.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.data.worldgen; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.worldgen.modifier.BiomePlacement; -import com.gregtechceu.gtceu.api.worldgen.modifier.DimensionFilter; -import com.gregtechceu.gtceu.api.worldgen.modifier.FrequencyModifier; +import com.gregtechceu.gtceu.api.data.worldgen.modifier.BiomePlacement; +import com.gregtechceu.gtceu.api.data.worldgen.modifier.DimensionFilter; +import com.gregtechceu.gtceu.api.data.worldgen.modifier.FrequencyModifier; import com.gregtechceu.gtceu.common.worldgen.feature.FluidSproutFeature; import com.gregtechceu.gtceu.common.worldgen.feature.StoneBlobFeature; import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement; diff --git a/src/main/java/com/gregtechceu/gtceu/data/fluid/GTFluids.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/data/fluid/GTFluids.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java index deed8df57fa..a15cb3c1e4f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/fluid/GTFluids.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java @@ -1,15 +1,13 @@ -package com.gregtechceu.gtceu.data.fluid; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluid; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; diff --git a/src/main/java/com/gregtechceu/gtceu/data/item/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/item/GTItems.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index 7238c65004d..bdd06bd5c41 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/item/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -1,42 +1,41 @@ -package com.gregtechceu.gtceu.data.item; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.cover.filter.*; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterial; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; import com.gregtechceu.gtceu.api.item.ComponentItem; import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.TagPrefixItem; import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; import com.gregtechceu.gtceu.api.item.component.*; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterial; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.tag.TagUtil; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.materials.GTFoods; +import com.gregtechceu.gtceu.common.item.ItemFluidContainer; import com.gregtechceu.gtceu.common.item.armor.*; +import com.gregtechceu.gtceu.common.item.armor.GTArmorMaterials; import com.gregtechceu.gtceu.common.item.behavior.*; import com.gregtechceu.gtceu.common.item.behavior.MachineConfigCopyBehaviour; import com.gregtechceu.gtceu.common.item.datacomponents.DataItem; import com.gregtechceu.gtceu.common.item.modules.ImageModuleBehaviour; import com.gregtechceu.gtceu.common.item.modules.TextModuleBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.cover.GTCovers; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.inject.GTEnumProxies; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; -import com.gregtechceu.gtceu.data.sound.GTJukeboxSongs; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.lang.LangHandler; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.client.color.item.ItemColor; @@ -81,11 +80,11 @@ import java.util.*; import java.util.function.Supplier; +import static com.gregtechceu.gtceu.common.data.GTCreativeModeTabs.ITEM; +import static com.gregtechceu.gtceu.common.data.GTCreativeModeTabs.TOOL; +import static com.gregtechceu.gtceu.common.data.models.GTModels.createTextureModel; +import static com.gregtechceu.gtceu.common.data.models.GTModels.overrideModel; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs.ITEM; -import static com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs.TOOL; -import static com.gregtechceu.gtceu.data.model.GTModels.createTextureModel; -import static com.gregtechceu.gtceu.data.model.GTModels.overrideModel; import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName; public class GTItems { diff --git a/src/main/java/com/gregtechceu/gtceu/data/sound/GTJukeboxSongs.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTJukeboxSongs.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/sound/GTJukeboxSongs.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTJukeboxSongs.java index e0c9615e525..c31d83bf58d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/sound/GTJukeboxSongs.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTJukeboxSongs.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.sound; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/data/machine/GTMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/machine/GTMachines.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java index 99a47856c28..3b36a0de3a8 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/machine/GTMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.machine; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; @@ -6,19 +6,22 @@ import com.gregtechceu.gtceu.api.capability.IMiner; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine; import com.gregtechceu.gtceu.api.machine.steam.SteamBoilerMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderHelper; import com.gregtechceu.gtceu.client.util.TooltipHelper; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.machines.*; +import com.gregtechceu.gtceu.common.data.models.GTModels; import com.gregtechceu.gtceu.common.machine.electric.*; import com.gregtechceu.gtceu.common.machine.multiblock.part.*; import com.gregtechceu.gtceu.common.machine.multiblock.part.monitor.AdvancedMonitorPartMachine; @@ -31,12 +34,7 @@ import com.gregtechceu.gtceu.common.pipelike.fluidpipe.longdistance.LDFluidEndpointMachine; import com.gregtechceu.gtceu.common.pipelike.item.longdistance.LDItemEndpointMachine; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.model.GTModels; -import com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.ChatFormatting; @@ -56,13 +54,13 @@ import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.capability.recipe.IO.*; import static com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties.*; +import static com.gregtechceu.gtceu.common.data.GTCreativeModeTabs.MACHINE; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DUMMY_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.STEAM_BOILER_RECIPES; +import static com.gregtechceu.gtceu.common.data.machines.GTMachineUtils.*; +import static com.gregtechceu.gtceu.common.data.machines.GTMachineUtils.ALL_TIERS; +import static com.gregtechceu.gtceu.common.data.models.GTMachineModels.*; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.machine.GTMachineUtils.*; -import static com.gregtechceu.gtceu.data.machine.GTMachineUtils.ALL_TIERS; -import static com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs.MACHINE; -import static com.gregtechceu.gtceu.data.model.GTMachineModels.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.DUMMY_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.STEAM_BOILER_RECIPES; public class GTMachines { diff --git a/src/main/java/com/gregtechceu/gtceu/data/block/GTMaterialBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterialBlocks.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/block/GTMaterialBlocks.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTMaterialBlocks.java index adf16db826d..19ead7376e0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/block/GTMaterialBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterialBlocks.java @@ -1,22 +1,21 @@ -package com.gregtechceu.gtceu.data.block; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.block.MaterialBlock; import com.gregtechceu.gtceu.api.block.MaterialPipeBlock; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.MaterialBlockItem; import com.gregtechceu.gtceu.api.item.MaterialPipeBlockItem; import com.gregtechceu.gtceu.api.item.SurfaceRockBlockItem; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.common.block.*; import com.gregtechceu.gtceu.common.pipelike.cable.Insulation; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeType; import com.gregtechceu.gtceu.common.pipelike.item.ItemPipeType; -import com.gregtechceu.gtceu.data.sound.GTSoundTypes; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/gregtechceu/gtceu/data/item/GTMaterialItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterialItems.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/item/GTMaterialItems.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTMaterialItems.java index bc26e9db571..20c3a64289b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/item/GTMaterialItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterialItems.java @@ -1,21 +1,22 @@ -package com.gregtechceu.gtceu.data.item; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.api.GTCEuAPI; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ArmorProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.TagPrefixItem; import com.gregtechceu.gtceu.api.item.datacomponents.ToolBehaviors; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.IGTToolDefinition; import com.gregtechceu.gtceu.api.item.tool.MaterialToolTier; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.properties.ArmorProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.armor.GTArmorItem; import net.minecraft.core.component.DataComponents; @@ -45,9 +46,9 @@ import java.util.*; import java.util.function.Supplier; +import static com.gregtechceu.gtceu.common.data.GTCreativeModeTabs.MATERIAL_ITEM; +import static com.gregtechceu.gtceu.common.data.GTCreativeModeTabs.TOOL; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs.MATERIAL_ITEM; -import static com.gregtechceu.gtceu.data.misc.GTCreativeModeTabs.TOOL; public class GTMaterialItems { diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/GTMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/material/GTMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java index c43dcd0b457..c7e6d63a36d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/GTMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java @@ -1,14 +1,14 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterial; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlag; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterial; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlag; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.materials.*; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.resources.ResourceLocation; @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; /** * Material Registration. diff --git a/src/main/java/com/gregtechceu/gtceu/data/medicalcondition/GTMedicalConditions.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMedicalConditions.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/medicalcondition/GTMedicalConditions.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTMedicalConditions.java index 72f43d2a863..5781aec5d5c 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/medicalcondition/GTMedicalConditions.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMedicalConditions.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.data.medicalcondition; +package com.gregtechceu.gtceu.common.data; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.medicalcondition.Symptom; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.Symptom; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class GTMedicalConditions { diff --git a/src/main/java/com/gregtechceu/gtceu/data/effect/GTMobEffects.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMobEffects.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/effect/GTMobEffects.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTMobEffects.java index 8f6277e0346..8ac0dca2a3a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/effect/GTMobEffects.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMobEffects.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.effect; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.effect.GTPoisonEffect; diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTOreVeins.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTOreVeins.java similarity index 88% rename from src/main/java/com/gregtechceu/gtceu/data/worldgen/GTOreVeins.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTOreVeins.java index d9861549bfb..6ef734a47e9 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTOreVeins.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTOreVeins.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.data.worldgen; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.worldgen.*; +import com.gregtechceu.gtceu.api.data.worldgen.generator.indicators.SurfaceIndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.NoopVeinGenerator; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.*; -import com.gregtechceu.gtceu.api.worldgen.generator.indicators.SurfaceIndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.NoopVeinGenerator; import net.minecraft.core.HolderGetter; import net.minecraft.core.HolderSet; @@ -30,9 +30,9 @@ import java.util.*; import java.util.function.Consumer; -import static com.gregtechceu.gtceu.api.worldgen.generator.veins.DikeVeinGenerator.DikeBlockDefinition; -import static com.gregtechceu.gtceu.api.worldgen.generator.veins.VeinedVeinGenerator.VeinBlockDefinition; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.worldgen.generator.veins.DikeVeinGenerator.DikeBlockDefinition; +import static com.gregtechceu.gtceu.api.data.worldgen.generator.veins.VeinedVeinGenerator.VeinBlockDefinition; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; @SuppressWarnings("unused") public class GTOreVeins { @@ -47,72 +47,72 @@ public class GTOreVeins { @Getter private static int largestIndicatorOffset = 0; - public static final Set> ALL_KEYS = new ReferenceOpenHashSet<>(); + public static final Set> ALL_KEYS = new ReferenceOpenHashSet<>(); ////////////////////////////////////// // ******** End Vein *********// /// /////////////////////////////////// - public static final ResourceKey END_BAUXITE_VEIN = create(GTCEu.id("end_bauxite")); - public static final ResourceKey END_MAGNETITE_VEIN = create(GTCEu.id("end_magnetite")); - public static final ResourceKey NAQUADAH_VEIN = create(GTCEu.id("naquadah")); - public static final ResourceKey PITCHBLENDE_VEIN = create(GTCEu.id("pitchblende")); - public static final ResourceKey SCHEELITE_VEIN = create(GTCEu.id("scheelite")); - public static final ResourceKey SHELDONITE_VEIN = create(GTCEu.id("sheldonite")); + public static final ResourceKey END_BAUXITE_VEIN = create(GTCEu.id("end_bauxite")); + public static final ResourceKey END_MAGNETITE_VEIN = create(GTCEu.id("end_magnetite")); + public static final ResourceKey NAQUADAH_VEIN = create(GTCEu.id("naquadah")); + public static final ResourceKey PITCHBLENDE_VEIN = create(GTCEu.id("pitchblende")); + public static final ResourceKey SCHEELITE_VEIN = create(GTCEu.id("scheelite")); + public static final ResourceKey SHELDONITE_VEIN = create(GTCEu.id("sheldonite")); ////////////////////////////////////// // ****** Nether Vein *******// /// /////////////////////////////////// - public static final ResourceKey BANDED_IRON_VEIN = create(GTCEu.id("banded_iron")); - public static final ResourceKey BERYLLIUM_VEIN = create(GTCEu.id("beryllium")); - public static final ResourceKey CERTUS_QUARTZ_VEIN = create(GTCEu.id("certus_quartz")); - public static final ResourceKey NETHER_MANGANESE_VEIN = create(GTCEu.id("nether_manganese")); - public static final ResourceKey MOLYBDENUM_VEIN = create(GTCEu.id("molybdenum")); - public static final ResourceKey MONAZITE_VEIN = create(GTCEu.id("monazite")); - public static final ResourceKey NETHER_QUARTZ_VEIN = create(GTCEu.id("nether_quartz")); - public static final ResourceKey METHER_REDSTONE_VEIN = create(GTCEu.id("nether_redstone")); - public static final ResourceKey SALTPETER_VEIN = create(GTCEu.id("saltpeter")); - public static final ResourceKey SULFUR_VEIN = create(GTCEu.id("sulfur")); - public static final ResourceKey TETRAHEDRITE_VEIN = create(GTCEu.id("tetrahedrite")); - public static final ResourceKey TOPAZ_VEIN = create(GTCEu.id("topaz")); + public static final ResourceKey BANDED_IRON_VEIN = create(GTCEu.id("banded_iron")); + public static final ResourceKey BERYLLIUM_VEIN = create(GTCEu.id("beryllium")); + public static final ResourceKey CERTUS_QUARTZ_VEIN = create(GTCEu.id("certus_quartz")); + public static final ResourceKey NETHER_MANGANESE_VEIN = create(GTCEu.id("nether_manganese")); + public static final ResourceKey MOLYBDENUM_VEIN = create(GTCEu.id("molybdenum")); + public static final ResourceKey MONAZITE_VEIN = create(GTCEu.id("monazite")); + public static final ResourceKey NETHER_QUARTZ_VEIN = create(GTCEu.id("nether_quartz")); + public static final ResourceKey METHER_REDSTONE_VEIN = create(GTCEu.id("nether_redstone")); + public static final ResourceKey SALTPETER_VEIN = create(GTCEu.id("saltpeter")); + public static final ResourceKey SULFUR_VEIN = create(GTCEu.id("sulfur")); + public static final ResourceKey TETRAHEDRITE_VEIN = create(GTCEu.id("tetrahedrite")); + public static final ResourceKey TOPAZ_VEIN = create(GTCEu.id("topaz")); ////////////////////////////////////// // ***** Stone *****// /// /////////////////////////////////// - public static final ResourceKey APATITE_VEIN = create(GTCEu.id("apatite")); - public static final ResourceKey CASSITERITE_VEIN = create(GTCEu.id("cassiterite")); - public static final ResourceKey COAL_VEIN = create(GTCEu.id("coal")); - public static final ResourceKey COPPER_TIN_VEIN = create(GTCEu.id("copper_tin")); - public static final ResourceKey GALENA_VEIN = create(GTCEu.id("galena")); - public static final ResourceKey GARNET_TIN_VEIN = create(GTCEu.id("garnet_tin")); - public static final ResourceKey GARNET_VEIN = create(GTCEu.id("garnet")); - public static final ResourceKey IRON_VEIN = create(GTCEu.id("iron")); - public static final ResourceKey LUBRICANT_VEIN = create(GTCEu.id("lubricant")); - public static final ResourceKey MAGNETITE_VEIN = create(GTCEu.id("magnetite")); - public static final ResourceKey MINERAL_SAND_VEIN = create(GTCEu.id("mineral_sand")); - public static final ResourceKey NICKEL_VEIN = create(GTCEu.id("nickel")); - public static final ResourceKey SALTS_VEIN = create(GTCEu.id("salts")); - public static final ResourceKey OILSANDS_VEIN = create(GTCEu.id("oilsands")); + public static final ResourceKey APATITE_VEIN = create(GTCEu.id("apatite")); + public static final ResourceKey CASSITERITE_VEIN = create(GTCEu.id("cassiterite")); + public static final ResourceKey COAL_VEIN = create(GTCEu.id("coal")); + public static final ResourceKey COPPER_TIN_VEIN = create(GTCEu.id("copper_tin")); + public static final ResourceKey GALENA_VEIN = create(GTCEu.id("galena")); + public static final ResourceKey GARNET_TIN_VEIN = create(GTCEu.id("garnet_tin")); + public static final ResourceKey GARNET_VEIN = create(GTCEu.id("garnet")); + public static final ResourceKey IRON_VEIN = create(GTCEu.id("iron")); + public static final ResourceKey LUBRICANT_VEIN = create(GTCEu.id("lubricant")); + public static final ResourceKey MAGNETITE_VEIN = create(GTCEu.id("magnetite")); + public static final ResourceKey MINERAL_SAND_VEIN = create(GTCEu.id("mineral_sand")); + public static final ResourceKey NICKEL_VEIN = create(GTCEu.id("nickel")); + public static final ResourceKey SALTS_VEIN = create(GTCEu.id("salts")); + public static final ResourceKey OILSANDS_VEIN = create(GTCEu.id("oilsands")); ////////////////////////////////////// // ***** Deepslate *****// /// /////////////////////////////////// - public static final ResourceKey COPPER_VEIN = create(GTCEu.id("copper")); - public static final ResourceKey DIAMOND_VEIN = create(GTCEu.id("diamond")); - public static final ResourceKey LAPIS_VEIN = create(GTCEu.id("lapis")); - public static final ResourceKey MANGANESE_VEIN = create(GTCEu.id("manganese")); - public static final ResourceKey MICA_VEIN = create(GTCEu.id("mica")); - public static final ResourceKey OLIVINE_VEIN = create(GTCEu.id("olivine")); - public static final ResourceKey REDSTONE_VEIN = create(GTCEu.id("redstone")); - public static final ResourceKey SAPPHIRE_VEIN = create(GTCEu.id("sapphire")); + public static final ResourceKey COPPER_VEIN = create(GTCEu.id("copper")); + public static final ResourceKey DIAMOND_VEIN = create(GTCEu.id("diamond")); + public static final ResourceKey LAPIS_VEIN = create(GTCEu.id("lapis")); + public static final ResourceKey MANGANESE_VEIN = create(GTCEu.id("manganese")); + public static final ResourceKey MICA_VEIN = create(GTCEu.id("mica")); + public static final ResourceKey OLIVINE_VEIN = create(GTCEu.id("olivine")); + public static final ResourceKey REDSTONE_VEIN = create(GTCEu.id("redstone")); + public static final ResourceKey SAPPHIRE_VEIN = create(GTCEu.id("sapphire")); - public static void updateLargestVeinSize(Registry registry) { + public static void updateLargestVeinSize(Registry registry) { // map to average of min & max values. GTOreVeins.largestVeinSize = registry.stream() - .map(OreVeinDefinition::clusterSize) + .map(GTOreDefinition::clusterSize) .mapToInt(intProvider -> (intProvider.getMinValue() + intProvider.getMaxValue()) / 2) .max() .orElse(0); @@ -125,29 +125,29 @@ public static void updateLargestVeinSize(Registry registry) { .orElse(0); } - public static ResourceKey create(ResourceLocation id) { + public static ResourceKey create(ResourceLocation id) { var key = ResourceKey.create(GTRegistries.ORE_VEIN_REGISTRY, id); ALL_KEYS.add(key); return key; } - public static OreVeinDefinition blankOreDefinition(HolderGetter biomeLookup) { - return new OreVeinDefinition( + public static GTOreDefinition blankOreDefinition(HolderGetter biomeLookup) { + return new GTOreDefinition( ConstantInt.ZERO, 0, 0, IWorldGenLayer.NOWHERE, Set.of(), HeightRangePlacement.uniform(VerticalAnchor.absolute(0), VerticalAnchor.absolute(0)), 0, HolderSet.empty(), BiomeWeightModifier.EMPTY, NoopVeinGenerator.INSTANCE, new ArrayList<>(), biomeLookup); } - private static void register(BootstrapContext context, - ResourceKey key, - Consumer consumer) { - OreVeinDefinition builder = blankOreDefinition(context.lookup(Registries.BIOME)); + private static void register(BootstrapContext context, + ResourceKey key, + Consumer consumer) { + GTOreDefinition builder = blankOreDefinition(context.lookup(Registries.BIOME)); consumer.accept(builder); context.register(key, builder); } - public static void bootstrap(BootstrapContext context) { + public static void bootstrap(BootstrapContext context) { // END RuleTest[] endRules = new RuleTest[] { WorldGeneratorUtils.END_ORE_REPLACEABLES }; diff --git a/src/main/java/com/gregtechceu/gtceu/data/particle/GTParticleTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTParticleTypes.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/particle/GTParticleTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTParticleTypes.java index ec318dea9e9..199ef6a6e99 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/particle/GTParticleTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTParticleTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.particle; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.particle.HazardParticleOptions; diff --git a/src/main/java/com/gregtechceu/gtceu/data/placeholder/GTPlaceholders.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTPlaceholders.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/placeholder/GTPlaceholders.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTPlaceholders.java index e8ed186ecf7..826ea873f7a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/placeholder/GTPlaceholders.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTPlaceholders.java @@ -21,13 +21,13 @@ import com.gregtechceu.gtceu.client.renderer.placeholder.QuadPlaceholderRenderer; import com.gregtechceu.gtceu.client.renderer.placeholder.RectPlaceholderRenderer; import com.gregtechceu.gtceu.common.blockentity.CableBlockEntity; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.datacomponents.BindingData; import com.gregtechceu.gtceu.common.item.datacomponents.DataItem; import com.gregtechceu.gtceu.common.item.datacomponents.FormatStringList; import com.gregtechceu.gtceu.common.item.modules.ImageModuleBehaviour; import com.gregtechceu.gtceu.common.machine.multiblock.part.monitor.AdvancedMonitorPartMachine; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.integration.ae2.GTAEPlaceholders; import com.gregtechceu.gtceu.integration.create.GTCreateIntegration; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTPlacedFeatures.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTPlacements.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/data/worldgen/GTPlacedFeatures.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTPlacements.java index 3a09ba4a529..f280220dddd 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTPlacedFeatures.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTPlacements.java @@ -1,8 +1,7 @@ -package com.gregtechceu.gtceu.data.worldgen; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement; -import com.gregtechceu.gtceu.data.block.GTBlocks; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; @@ -15,7 +14,7 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.placement.*; -public class GTPlacedFeatures { +public class GTPlacements { public static final ResourceKey RUBBER_TREE = ResourceKey.create(Registries.PLACED_FEATURE, GTCEu.id("rubber_tree")); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeCapabilities.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeCapabilities.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeCapabilities.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeCapabilities.java index 7478768bd20..be5d115f1ee 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeCapabilities.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeCapabilities.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.recipe.*; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeCategories.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeCategories.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeCategories.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeCategories.java index 3fd93e8f82b..418c8a23ae0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeCategories.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeCategories.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.gui.GuiTextures; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeConditions.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeConditions.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeConditions.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeConditions.java index f358c68f575..7e85576b713 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeConditions.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeConditions.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.common.recipe.condition.*; @@ -27,7 +27,6 @@ private GTRecipeConditions() {} public static final RecipeConditionType RESEARCH = register("research", ResearchCondition::new, ResearchCondition.CODEC); public static final RecipeConditionType ENVIRONMENTAL_HAZARD = register("environmental_hazard", EnvironmentalHazardCondition::new, EnvironmentalHazardCondition.CODEC); public static final RecipeConditionType DAYTIME = register("daytime", DaytimeCondition::new, DaytimeCondition.CODEC); - public static final RecipeConditionType ROCK_BREAKER = register("rock_breaker", RockBreakerCondition::new, RockBreakerCondition.CODEC); public static RecipeConditionType FTB_QUEST; // public static RecipeConditionType GAMESTAGE; public static RecipeConditionType HERACLES_QUEST; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeModifiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeModifiers.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java index 588f8cef168..957ae9cb3b5 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeModifiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java @@ -1,23 +1,22 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IOverclockMachine; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.OverclockingLogic; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; import net.minecraft.Util; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeSerializers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeSerializers.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeSerializers.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeSerializers.java index 640bc9ac019..11148edf857 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeSerializers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeSerializers.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.recipe.kind.*; +import com.gregtechceu.gtceu.api.recipe.*; import net.minecraft.core.registries.Registries; import net.minecraft.world.item.crafting.RecipeSerializer; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java index d820b45c026..d5e28f9db12 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipeTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; @@ -11,18 +11,15 @@ import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.gui.widget.TankWidget; import com.gregtechceu.gtceu.api.recipe.*; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.sound.ExistingSoundEntry; import com.gregtechceu.gtceu.common.machine.multiblock.electric.FusionReactorMachine; import com.gregtechceu.gtceu.common.machine.trait.customlogic.*; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.common.recipe.condition.AdjacentFluidCondition; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.integration.xei.entry.fluid.FluidEntryList; import com.gregtechceu.gtceu.integration.xei.entry.fluid.FluidHolderSetList; import com.gregtechceu.gtceu.integration.xei.handlers.fluid.CycleFluidEntryHandler; @@ -75,8 +72,7 @@ public class GTRecipeTypes { GTRecipeTypes.LARGE_BOILER_RECIPES.copyFrom(builder).duration(duration).save(provider); } }) - .setSound(GTSoundEntries.FURNACE) - .addCustomRecipeLogic(SmallBoilerLogic.INSTANCE); + .setSound(GTSoundEntries.FURNACE); ////////////////////////////////////// // ********* Common *********// @@ -494,8 +490,7 @@ public class GTRecipeTypes { .setMaxIOSize(1, 0, 1, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_BOILER_FUEL.get(true), DOWN_TO_UP) .setMaxTooltips(1) - .setSound(GTSoundEntries.FURNACE) - .addCustomRecipeLogic(LargeBoilerLogic.INSTANCE); + .setSound(GTSoundEntries.FURNACE); public final static GTRecipeType COKE_OVEN_RECIPES = register("coke_oven", MULTIBLOCK).setMaxIOSize(1, 1, 0, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, LEFT_TO_RIGHT) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java index 228cbf75c50..1f4b1ce5517 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java @@ -1,11 +1,12 @@ -package com.gregtechceu.gtceu.data.recipe; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.addon.AddonFinder; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.data.recipe.MaterialInfoLoader; import com.gregtechceu.gtceu.data.recipe.configurable.RecipeAddition; import com.gregtechceu.gtceu.data.recipe.configurable.RecipeRemoval; import com.gregtechceu.gtceu.data.recipe.generated.*; diff --git a/src/main/java/com/gregtechceu/gtceu/data/sound/GTSoundEntries.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTSoundEntries.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/sound/GTSoundEntries.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTSoundEntries.java index be640574e7e..93ceadec07a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/sound/GTSoundEntries.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTSoundEntries.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.sound; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.sound.SoundEntry; diff --git a/src/main/java/com/gregtechceu/gtceu/data/sound/GTSoundTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTSoundTypes.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/data/sound/GTSoundTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTSoundTypes.java index ff4e94c1ba3..29dd6768837 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/sound/GTSoundTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTSoundTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.sound; +package com.gregtechceu.gtceu.common.data; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.level.block.SoundType; diff --git a/src/main/java/com/gregtechceu/gtceu/data/inject/GTSyncedFieldAccessors.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTSyncedFieldAccessors.java similarity index 89% rename from src/main/java/com/gregtechceu/gtceu/data/inject/GTSyncedFieldAccessors.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTSyncedFieldAccessors.java index e63913d3d09..19bf6acb326 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/inject/GTSyncedFieldAccessors.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTSyncedFieldAccessors.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.inject; +package com.gregtechceu.gtceu.common.data; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; import com.gregtechceu.gtceu.common.machine.multiblock.electric.monitor.MonitorGroup; import com.gregtechceu.gtceu.syncdata.*; diff --git a/src/main/java/com/gregtechceu/gtceu/data/tools/GTToolBehaviors.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTToolBehaviors.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/tools/GTToolBehaviors.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTToolBehaviors.java index 514b46d921e..18a41a6e53e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tools/GTToolBehaviors.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTToolBehaviors.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.tools; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; diff --git a/src/main/java/com/gregtechceu/gtceu/data/tools/GTToolTiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTToolTiers.java similarity index 75% rename from src/main/java/com/gregtechceu/gtceu/data/tools/GTToolTiers.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTToolTiers.java index 47ae4d6b0c6..ce7ecc9fc9e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tools/GTToolTiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTToolTiers.java @@ -1,9 +1,8 @@ -package com.gregtechceu.gtceu.data.tools; +package com.gregtechceu.gtceu.common.data; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.world.item.Tier; import net.minecraft.world.item.crafting.Ingredient; diff --git a/src/main/java/com/gregtechceu/gtceu/data/valueprovider/GTValueProviderTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/valueprovider/GTValueProviderTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java index 5185bf20608..9535df0c1d5 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/valueprovider/GTValueProviderTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.valueprovider; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.valueprovider.AddedFloat; diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTDensityFunctions.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTWorldgen.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/data/worldgen/GTDensityFunctions.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GTWorldgen.java index 2c0e3138cd4..f079f73b879 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/GTDensityFunctions.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTWorldgen.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.worldgen; +package com.gregtechceu.gtceu.common.data; import com.gregtechceu.gtceu.GTCEu; @@ -12,7 +12,7 @@ import net.minecraft.world.level.levelgen.Noises; import net.minecraft.world.level.levelgen.synth.NormalNoise; -public class GTDensityFunctions { +public class GTWorldgen { public static final ResourceKey NEW_ORE_VEIN_TOGGLE = create("vein_toggle"); public static final ResourceKey NEW_ORE_VEIN_RIDGED = create("vein_ridged"); diff --git a/src/main/java/com/gregtechceu/gtceu/data/item/GTDataComponents.java b/src/main/java/com/gregtechceu/gtceu/common/data/item/GTDataComponents.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/item/GTDataComponents.java rename to src/main/java/com/gregtechceu/gtceu/common/data/item/GTDataComponents.java index ea83a78ae71..575bbc72a08 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/item/GTDataComponents.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/item/GTDataComponents.java @@ -1,13 +1,13 @@ -package com.gregtechceu.gtceu.data.item; +package com.gregtechceu.gtceu.common.data.item; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.cover.filter.SimpleFluidFilter; import com.gregtechceu.gtceu.api.cover.filter.SimpleItemFilter; import com.gregtechceu.gtceu.api.cover.filter.SmartItemFilter; -import com.gregtechceu.gtceu.api.item.LampBlockItem; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.item.datacomponents.*; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.api.registry.GTRegistries; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import com.gregtechceu.gtceu.common.item.behavior.ItemMagnetBehavior; import com.gregtechceu.gtceu.common.item.datacomponents.*; import com.gregtechceu.gtceu.common.item.tool.behavior.ToolModeSwitchBehavior; diff --git a/src/main/java/com/gregtechceu/gtceu/data/item/GTItemAbilities.java b/src/main/java/com/gregtechceu/gtceu/common/data/item/GTItemAbilities.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/item/GTItemAbilities.java rename to src/main/java/com/gregtechceu/gtceu/common/data/item/GTItemAbilities.java index f49417e26d6..7a289fd63aa 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/item/GTItemAbilities.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/item/GTItemAbilities.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.item; +package com.gregtechceu.gtceu.common.data.item; import com.gregtechceu.gtceu.api.item.tool.GTToolType; diff --git a/src/main/java/com/gregtechceu/gtceu/data/machine/GCYMMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GCYMMachines.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/machine/GCYMMachines.java rename to src/main/java/com/gregtechceu/gtceu/common/data/machines/GCYMMachines.java index 88b81db9fc4..8c8d60dea42 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/machine/GCYMMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GCYMMachines.java @@ -1,30 +1,30 @@ -package com.gregtechceu.gtceu.data.machine; +package com.gregtechceu.gtceu.common.data.machines; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.RotationState; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.multiblock.FactoryBlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; -import com.gregtechceu.gtceu.api.multiblock.Predicates; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.Predicates; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderHelper; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeModifiers; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.electric.DistillationTowerMachine; import com.gregtechceu.gtceu.common.machine.multiblock.electric.gcym.*; import com.gregtechceu.gtceu.common.machine.multiblock.part.ParallelHatchPartMachine; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.ChatFormatting; @@ -40,18 +40,18 @@ import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.*; import static com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties.IS_FORMED; -import static com.gregtechceu.gtceu.api.multiblock.Predicates.*; -import static com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection.*; +import static com.gregtechceu.gtceu.api.pattern.Predicates.*; +import static com.gregtechceu.gtceu.api.pattern.util.RelativeDirection.*; +import static com.gregtechceu.gtceu.common.data.GCYMBlocks.*; +import static com.gregtechceu.gtceu.common.data.GCYMRecipeTypes.ALLOY_BLAST_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NaquadahAlloy; +import static com.gregtechceu.gtceu.common.data.GTRecipeModifiers.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.common.data.machines.GTMachineUtils.registerTieredMachines; +import static com.gregtechceu.gtceu.common.data.models.GTMachineModels.*; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.block.GCYMBlocks.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.machine.GTMachineUtils.registerTieredMachines; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.NaquadahAlloy; -import static com.gregtechceu.gtceu.data.model.GTMachineModels.*; -import static com.gregtechceu.gtceu.data.recipe.GCYMRecipeTypes.ALLOY_BLAST_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; public class GCYMMachines { diff --git a/src/main/java/com/gregtechceu/gtceu/data/machine/GTAEMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTAEMachines.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/machine/GTAEMachines.java rename to src/main/java/com/gregtechceu/gtceu/common/data/machines/GTAEMachines.java index af0776e0208..72abe4159a2 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/machine/GTAEMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTAEMachines.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.data.machine; +package com.gregtechceu.gtceu.common.data.machines; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.integration.ae2.machine.*; diff --git a/src/main/java/com/gregtechceu/gtceu/data/machine/GTMachineUtils.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/machine/GTMachineUtils.java rename to src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java index 937f50a885a..ca7ff792903 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/machine/GTMachineUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.machine; +package com.gregtechceu.gtceu.common.data.machines; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; @@ -10,32 +10,39 @@ import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; -import com.gregtechceu.gtceu.api.fluid.PropertyFluidFilter; +import com.gregtechceu.gtceu.api.data.RotationState; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.PropertyFluidFilter; import com.gregtechceu.gtceu.api.machine.*; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IRotorHolderMachine; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.multiblock.FactoryBlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; -import com.gregtechceu.gtceu.api.multiblock.Predicates; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; -import com.gregtechceu.gtceu.api.multiblock.predicates.SimplePredicate; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.Predicates; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; +import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; import com.gregtechceu.gtceu.api.registry.registrate.MultiblockMachineBuilder; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.renderer.machine.*; import com.gregtechceu.gtceu.common.block.BoilerFireboxType; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeModifiers; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.models.GTMachineModels; import com.gregtechceu.gtceu.common.item.DrumMachineItem; import com.gregtechceu.gtceu.common.machine.electric.BatteryBufferMachine; import com.gregtechceu.gtceu.common.machine.electric.ChargerMachine; @@ -54,13 +61,6 @@ import com.gregtechceu.gtceu.common.machine.storage.QuantumChestMachine; import com.gregtechceu.gtceu.common.machine.storage.QuantumTankMachine; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; -import com.gregtechceu.gtceu.data.model.GTMachineModels; -import com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.lowdragmc.lowdraglib.utils.BlockInfo; @@ -94,15 +94,12 @@ import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.capability.recipe.IO.*; import static com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties.IS_FORMED; -import static com.gregtechceu.gtceu.api.multiblock.Predicates.*; -import static com.gregtechceu.gtceu.api.multiblock.Predicates.autoAbilities; -import static com.gregtechceu.gtceu.common.machine.storage.QuantumTankMachine.TANK_CAPACITY; +import static com.gregtechceu.gtceu.api.pattern.Predicates.*; +import static com.gregtechceu.gtceu.api.pattern.Predicates.autoAbilities; +import static com.gregtechceu.gtceu.common.data.GTBlocks.ALL_FIREBOXES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DUMMY_RECIPES; +import static com.gregtechceu.gtceu.common.data.models.GTMachineModels.*; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.ALL_FIREBOXES; -import static com.gregtechceu.gtceu.data.model.GTMachineModels.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.DUMMY_RECIPES; import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName; public class GTMachineUtils { diff --git a/src/main/java/com/gregtechceu/gtceu/data/machine/GTMultiMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/machine/GTMultiMachines.java rename to src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java index e6e9d479e37..bd546ce08c6 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/machine/GTMultiMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java @@ -1,26 +1,32 @@ -package com.gregtechceu.gtceu.data.machine; +package com.gregtechceu.gtceu.common.data.machines; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; -import com.gregtechceu.gtceu.api.fluid.PropertyFluidFilter; +import com.gregtechceu.gtceu.api.data.RotationState; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.PropertyFluidFilter; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.multiblock.FactoryBlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; -import com.gregtechceu.gtceu.api.multiblock.Predicates; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.Predicates; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; import com.gregtechceu.gtceu.client.renderer.machine.*; import com.gregtechceu.gtceu.client.util.TooltipHelper; import com.gregtechceu.gtceu.common.block.BoilerFireboxType; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeModifiers; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.electric.*; import com.gregtechceu.gtceu.common.machine.multiblock.electric.BedrockOreMinerMachine; import com.gregtechceu.gtceu.common.machine.multiblock.primitive.CharcoalPileIgniterMachine; @@ -29,11 +35,6 @@ import com.gregtechceu.gtceu.common.machine.multiblock.primitive.PrimitivePumpMachine; import com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; @@ -58,16 +59,16 @@ import java.util.Locale; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.multiblock.Predicates.*; -import static com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection.*; +import static com.gregtechceu.gtceu.api.pattern.Predicates.*; +import static com.gregtechceu.gtceu.api.pattern.util.RelativeDirection.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.DrillingFluid; +import static com.gregtechceu.gtceu.common.data.GTRecipeModifiers.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DUMMY_RECIPES; +import static com.gregtechceu.gtceu.common.data.machines.GTMachineUtils.*; +import static com.gregtechceu.gtceu.common.data.models.GTMachineModels.*; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.machine.GTMachineUtils.*; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.DrillingFluid; -import static com.gregtechceu.gtceu.data.model.GTMachineModels.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.DUMMY_RECIPES; import static com.gregtechceu.gtceu.utils.FormattingUtil.toRomanNumeral; public class GTMultiMachines { diff --git a/src/main/java/com/gregtechceu/gtceu/data/machine/GTResearchMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTResearchMachines.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/machine/GTResearchMachines.java rename to src/main/java/com/gregtechceu/gtceu/common/data/machines/GTResearchMachines.java index 81850345316..6c213387d72 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/machine/GTResearchMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTResearchMachines.java @@ -1,19 +1,22 @@ -package com.gregtechceu.gtceu.data.machine; +package com.gregtechceu.gtceu.common.data.machines; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.multiblock.FactoryBlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; import com.gregtechceu.gtceu.client.util.TooltipHelper; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.electric.research.DataBankMachine; import com.gregtechceu.gtceu.common.machine.multiblock.electric.research.HPCAMachine; import com.gregtechceu.gtceu.common.machine.multiblock.electric.research.NetworkSwitchMachine; @@ -24,9 +27,7 @@ import com.gregtechceu.gtceu.common.machine.multiblock.part.OpticalDataHatchMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.hpca.*; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.MethodsReturnNonnullByDefault; @@ -46,11 +47,11 @@ import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties.IS_FORMED; -import static com.gregtechceu.gtceu.api.multiblock.Predicates.*; +import static com.gregtechceu.gtceu.api.pattern.Predicates.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.CREATIVE_TOOLTIPS; +import static com.gregtechceu.gtceu.common.data.models.GTMachineModels.*; import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.machine.GTMachines.CREATIVE_TOOLTIPS; -import static com.gregtechceu.gtceu.data.model.GTMachineModels.*; @SuppressWarnings("unused") @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/ElementMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/material/ElementMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java index f4e60caf038..02534d8de4d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/ElementMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java @@ -1,23 +1,24 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ArmorProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.ArmorProperty; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty.GasTier; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTElements; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class ElementMaterials { diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/FirstDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/material/FirstDegreeMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java index af9e5d04dc6..5f6a189feeb 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/FirstDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java @@ -1,24 +1,24 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ArmorProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.ArmorProperty; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty.GasTier; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; import net.minecraft.world.item.enchantment.Enchantments; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class FirstDegreeMaterials { diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/GCYMMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/data/material/GCYMMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java index 3305321ea97..95079799674 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/GCYMMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java @@ -1,14 +1,14 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty.GasTier; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class GCYMMaterials { diff --git a/src/main/java/com/gregtechceu/gtceu/data/item/GTFoods.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/GTFoods.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/data/item/GTFoods.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/GTFoods.java index 54082f68e74..b29b026023a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/item/GTFoods.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/GTFoods.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.item; +package com.gregtechceu.gtceu.common.data.materials; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/HigherDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/material/HigherDegreeMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java index ba5dfd1ce1b..f2b0a3099ca 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/HigherDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java @@ -1,16 +1,16 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty.GasTier; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class HigherDegreeMaterials { diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/MaterialFlagAddition.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/MaterialFlagAddition.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/material/MaterialFlagAddition.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/MaterialFlagAddition.java index 3547d2e1119..9af9bdcaf91 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/MaterialFlagAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/MaterialFlagAddition.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; -import com.gregtechceu.gtceu.api.material.material.properties.OreProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class MaterialFlagAddition { diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/OrganicChemistryMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/material/OrganicChemistryMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java index 4a3f0ffc68f..b581ac7cf73 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/OrganicChemistryMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java @@ -1,18 +1,18 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; - -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.FINE; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.ROUGH; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; + +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.FINE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.ROUGH; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class OrganicChemistryMaterials { diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/SecondDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/data/material/SecondDegreeMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java index da42d6053de..a3c1aae455d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/SecondDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java @@ -1,22 +1,22 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty.GasTier; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; import net.minecraft.world.item.enchantment.Enchantments; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class SecondDegreeMaterials { diff --git a/src/main/java/com/gregtechceu/gtceu/data/material/UnknownCompositionMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/data/material/UnknownCompositionMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java index 50e356e451e..022a0555f38 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/material/UnknownCompositionMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java @@ -1,18 +1,19 @@ -package com.gregtechceu.gtceu.data.material; +package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; - -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; + +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dustSmall; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dustTiny; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class UnknownCompositionMaterials { diff --git a/src/main/java/com/gregtechceu/gtceu/data/model/GTMachineModels.java b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTMachineModels.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/model/GTMachineModels.java rename to src/main/java/com/gregtechceu/gtceu/common/data/models/GTMachineModels.java index a8498fe5952..e1d33aa9859 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/model/GTMachineModels.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTMachineModels.java @@ -1,22 +1,22 @@ -package com.gregtechceu.gtceu.data.model; +package com.gregtechceu.gtceu.common.data.models; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.IMachineBlock; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; import com.gregtechceu.gtceu.client.model.machine.overlays.EnergyIOOverlay; import com.gregtechceu.gtceu.client.model.machine.overlays.HPCAOverlay; import com.gregtechceu.gtceu.client.model.machine.overlays.WorkableOverlays; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.machine.electric.ChargerMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.DiodePartMachine; -import com.gregtechceu.gtceu.data.datagen.model.builder.MachineModelBuilder; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.data.model.builder.MachineModelBuilder; import net.minecraft.Util; import net.minecraft.core.Direction; @@ -36,7 +36,7 @@ import static com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties.*; import static com.gregtechceu.gtceu.client.model.machine.overlays.EnergyIOOverlay.*; -import static com.gregtechceu.gtceu.data.model.GTModels.*; +import static com.gregtechceu.gtceu.common.data.models.GTModels.*; public class GTMachineModels { diff --git a/src/main/java/com/gregtechceu/gtceu/data/model/GTModels.java b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/data/model/GTModels.java rename to src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java index 7b9b09838f8..05494a065d7 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/model/GTModels.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java @@ -1,18 +1,18 @@ -package com.gregtechceu.gtceu.data.model; +package com.gregtechceu.gtceu.common.data.models; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.block.*; -import com.gregtechceu.gtceu.api.fluid.GTFluid; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorage; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.fluids.GTFluid; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorage; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; import com.gregtechceu.gtceu.api.machine.multiblock.IBatteryData; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; import com.gregtechceu.gtceu.common.block.*; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import com.gregtechceu.gtceu.core.MixinHelpers; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.minecraft.client.Minecraft; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/DataItemComponentFix.java b/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/DataItemComponentFix.java index 2458080bdee..8b137891791 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/DataItemComponentFix.java +++ b/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/DataItemComponentFix.java @@ -1,29 +1 @@ -package com.gregtechceu.gtceu.common.datafixer.fixes; -import net.minecraft.util.datafix.fixes.ItemStackComponentRemainderFix; - -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import org.jetbrains.annotations.Nullable; - -public class DataItemComponentFix extends ItemStackComponentRemainderFix { - - public DataItemComponentFix(Schema outputSchema) { - super(outputSchema, "GTDataItemComponentFix", "gtceu:data_item"); - } - - @SuppressWarnings("NullableProblems") // this method is passed to Optional#map, where null is a valid return value. - @Override - protected @Nullable Dynamic fixComponent(Dynamic tag) { - Dynamic oldValue = tag; - - tag = tag.emptyMap(); - if (oldValue.asBoolean().isSuccess()) { - tag = tag.set("requires_data_bank", oldValue); - } - // assign a default capacity of 8 because it has to be set to something - tag = tag.set("capacity", tag.createInt(8)); - - return tag; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/EntityDamageBehaviorFix.java b/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/EntityDamageBehaviorFix.java deleted file mode 100644 index 0290d288936..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/EntityDamageBehaviorFix.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.gregtechceu.gtceu.common.datafixer.fixes; - -import com.gregtechceu.gtceu.api.datafixer.fixes.ToolBehaviorRemainderFix; - -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; - -public class EntityDamageBehaviorFix extends ToolBehaviorRemainderFix { - - public EntityDamageBehaviorFix(Schema outputSchema) { - super(outputSchema, "EntityDamageBehaviorFix", "gtceu:tool_behaviors"); - } - - @Override - protected @NotNull Dynamic fixBehavior(@NotNull Dynamic tag) { - Optional> bonusList = tag.get("bonus_list").result(); - tag = tag.remove("bonus_list"); - - if (bonusList.isPresent()) { - final Dynamic dynamic = tag; - var map = bonusList.get().asMap(key -> key.asString(""), - value -> value.asFloat(0.0f)); - if (map.isEmpty()) return tag; - - tag = tag.set("bonus_list", tag.createList( - map.entrySet().stream() - .map(entry -> { - Dynamic bonus = dynamic.emptyMap() - .set("bonus", dynamic.createFloat(entry.getValue())); - if (entry.getKey().isEmpty()) { - bonus = bonus.set("entities", bonus.emptyList()); - } else { - bonus = bonus.set("entities", bonus.createString("#" + entry.getKey())); - } - return bonus; - }))); - } - return tag; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/GTItemStackComponentizationFix.java b/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/GTItemStackComponentizationFix.java deleted file mode 100644 index cad802e212e..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/GTItemStackComponentizationFix.java +++ /dev/null @@ -1,268 +0,0 @@ -package com.gregtechceu.gtceu.common.datafixer.fixes; - -import com.gregtechceu.gtceu.utils.FormattingUtil; - -import net.minecraft.util.datafix.fixes.References; -import net.minecraft.util.datafix.schemas.NamespacedSchema; - -import com.mojang.datafixers.DataFix; -import com.mojang.datafixers.DataFixUtils; -import com.mojang.datafixers.TypeRewriteRule; -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import com.mojang.serialization.DynamicOps; -import com.mojang.serialization.OptionalDynamic; - -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; -import java.util.function.UnaryOperator; - -public class GTItemStackComponentizationFix extends DataFix { - - private static final Set ARMOR_IDS = Set.of( - "gtceu:nightvision_goggles", - "gtceu:nanomuscle_chestplate", - "gtceu:nanomuscle_leggings", - "gtceu:nanomuscle_boots", - "gtceu:nanomuscle_helmet", - "gtceu:face_mask", - "gtceu:rubber_gloves", - "gtceu:hazmat_chestpiece", - "gtceu:hazmat_leggings", - "gtceu:hazmat_boots", - "gtceu:hazmat_headpiece", - "gtceu:quarktech_chestplate", - "gtceu:quarktech_leggings", - "gtceu:quarktech_boots", - "gtceu:quarktech_helmet", - "gtceu:liquid_fuel_jetpack", - "gtceu:electric_jetpack", - "gtceu:advanced_electric_jetpack", - "gtceu:avanced_nanomuscle_chestplate", - "gtceu:advanced_quarktech_chestplate"); - - public GTItemStackComponentizationFix(Schema outputSchema) { - super(outputSchema, true); - } - - @Override - protected TypeRewriteRule makeRule() { - return this.writeFixAndRead( - "ItemStack componentization: GTCEuM edition", - this.getInputSchema().getType(References.ITEM_STACK), - this.getOutputSchema().getType(References.ITEM_STACK), - dynamic -> { - Optional> optional = ItemStackData.read(dynamic).map(data -> { - fixItemStack(data, data.tag); - return data.write(); - }); - return DataFixUtils.orElse(optional, dynamic); - }); - } - - private static void fixItemStack(ItemStackData data, Dynamic tag) { - // Fix tool info tag - OptionalDynamic gtTool = data.removeTag("GT.Tool"); - if (gtTool.result().isPresent()) { - Dynamic dynamic = tag.emptyMap() - .set("tool_speed", tag.createFloat(gtTool.get("ToolSpeed").asFloat(0.0f))) - .set("attack_damage", tag.createFloat(gtTool.get("AttackDamage").asFloat(0.0f))) - .set("enchantability", tag.createInt(gtTool.get("Enchantability").asInt(0))) - .set("harvest_level", tag.createInt(gtTool.get("HarvestLevel").asInt(0))) - .set("last_crafting_use", tag.createInt(gtTool.get("LastCraftingUse").asInt(0))); - data.setComponent("gtceu:gt_tool", dynamic); - - data.setComponent("minecraft:max_damage", gtTool.get("MaxDamage")); - data.setComponent("minecraft:damage", gtTool.get("Damage")); - OptionalDynamic dynamic1 = gtTool.get("TintColor"); - if (dynamic1.result().isPresent()) { - Dynamic colorDynamic = tag.emptyMap() - .set("rgb", tag.createInt(dynamic1.asInt(0))) - .set("showInTooltip", tag.createBoolean(false)); - data.setComponent("minecraft:dyed_color", colorDynamic); - } - data.setComponent("gtceu:disallow_container_item", gtTool.get("DisallowContainerItem")); - } - - // fix tool behaviors tag - fixGtToolBehaviors(data, tag); - - // Fix power info tags - if (tag.get("Charge").result().isPresent()) { - OptionalDynamic charge = data.removeTag("Charge"); - OptionalDynamic maxCharge = data.removeTag("MaxCharge"); - OptionalDynamic infinite = data.removeTag("Infinite"); - OptionalDynamic dischargeMode = data.removeTag("DischargeMode"); - Dynamic dynamic = tag.emptyMap() - .set("max_charge", tag.createLong(maxCharge.asLong(-1))) - .set("charge", tag.createLong(charge.asLong(0))) - .set("infinite", tag.createBoolean(infinite.asBoolean(false))) - .set("discharge_mode", tag.createBoolean(dischargeMode.asBoolean(false))); - data.setComponent("gtceu:energy_content", dynamic); - } - - // Fix magnet tag - if (tag.get("IsActive").result().isPresent()) { - OptionalDynamic isActive = data.removeTag("IsActive"); - data.setComponent("item_magnet", isActive); - } - - // Fix armors - if (data.is(ARMOR_IDS)) { - OptionalDynamic toggleTimer = data.removeTag("toggleTimer"); - OptionalDynamic hover = data.removeTag("hover"); - OptionalDynamic burnTimer = data.removeTag("burnTimer"); - OptionalDynamic canShare = data.removeTag("canShare"); - OptionalDynamic nightVision = data.removeTag("Nightvision"); - OptionalDynamic consumerTicks = data.removeTag("consumerTicks"); - Dynamic dynamic = tag.emptyMap() - .set("toggle_timer", tag.createByte(toggleTimer.asByte((byte) 0))) - .set("hover", tag.createBoolean(hover.asBoolean(false))) - .set("burn_timer", tag.createShort(burnTimer.asShort((short) 0))) - .set("can_share", tag.createBoolean(canShare.asBoolean(false))) - .set("nightvision", tag.createBoolean(nightVision.asBoolean(false))) - .set("consumer_ticks", tag.createByte(consumerTicks.asByte((byte) 0))); - data.setComponent("gtceu:armor", dynamic); - } - } - - private static void fixGtToolBehaviors(ItemStackData data, Dynamic tag) { - OptionalDynamic gtBehaviorsOpt = data.removeTag("GT.Behaviours"); - - Optional> gtBehaviors = gtBehaviorsOpt.result(); - if (gtBehaviors.isPresent()) { - Dynamic dynamic = tag.emptyMap() - .set("max_column", tag.createInt(gtBehaviors.get().remove("MaxAoEColumn").asInt(0))) - .set("max_row", tag.createInt(gtBehaviors.get().remove("MaxAoERow").asInt(0))) - .set("max_layer", tag.createInt(gtBehaviors.get().remove("MaxAoELayer").asInt(0))) - .set("column", tag.createInt(gtBehaviors.get().remove("AoEColumn").asInt(0))) - .set("row", tag.createInt(gtBehaviors.get().remove("AoERow").asInt(0))) - .set("layer", tag.createInt(gtBehaviors.get().remove("AoELayer").asInt(0))); - data.setComponent("gtceu:aoe", dynamic); - - Map> map = gtBehaviors.get().asMap(val -> val.asString(""), - Function.identity()); - if (!map.isEmpty()) { - dynamic = tag.emptyMap(); - - for (var entry : map.entrySet()) { - if (entry.getKey().equals("RelocateMinedBlocks")) { - data.setComponent("gtceu:relocate_mined_blocks", createEmpty(tag)); - continue; - } else if (entry.getKey().contains("AoE")) { - continue; - } - dynamic = dynamic.set("gtceu:" + FormattingUtil.toLowerCaseUnderscore(entry.getKey()), - createEmpty(tag)); - } - - data.setComponent("gtceu:tool_behaviors", dynamic); - } - } - } - - // I love generics <3 - private static Dynamic createEmpty(Dynamic dynamic) { - return new Dynamic<>(dynamic.getOps(), dynamic.getOps().empty()); - } - - static class ItemStackData { - - private final String item; - private Dynamic components; - private final Dynamic remainder; - Dynamic tag; - - private ItemStackData(String pItem, Dynamic pNbt) { - this.item = NamespacedSchema.ensureNamespaced(pItem); - this.components = pNbt.emptyMap(); - this.tag = pNbt.get("components").get("minecraft:custom_data") - .result().orElseGet(() -> (Dynamic) pNbt.get("tag").orElseEmptyMap()); - this.remainder = pNbt.remove("tag").set("components", pNbt.get("components") - .orElseEmptyMap().remove("minecraft:custom_data")); - } - - public static Optional read(final Dynamic pTag) { - return pTag.get("id") - .asString() - .map(itemId -> new ItemStackData(itemId, pTag)) - .result(); - } - - public OptionalDynamic removeTag(String pKey) { - OptionalDynamic optionaldynamic = this.tag.get(pKey); - this.tag = this.tag.remove(pKey); - return optionaldynamic; - } - - public void setComponent(String pComponent, Dynamic pValue) { - this.components = this.components.set(pComponent, pValue); - } - - public void setComponent(String pComponent, OptionalDynamic pValue) { - pValue.result().ifPresent(p_332105_ -> this.components = this.components.set(pComponent, p_332105_)); - } - - public Dynamic moveTagInto(String pOldKey, Dynamic pTag, String pNewKey) { - Optional> optional = this.removeTag(pOldKey).result(); - return optional.isPresent() ? pTag.set(pNewKey, optional.get()) : pTag; - } - - public void moveTagToComponent(String pKey, String pComponent, Dynamic pTag) { - Optional> optional = this.removeTag(pKey).result(); - if (optional.isPresent() && !optional.get().equals(pTag)) { - this.setComponent(pComponent, optional.get()); - } - } - - public void moveTagToComponent(String pKey, String pComponent) { - this.removeTag(pKey).result().ifPresent(p_330514_ -> this.setComponent(pComponent, p_330514_)); - } - - public void fixSubTag(String pKey, boolean pSkipIfEmpty, UnaryOperator> pFixer) { - OptionalDynamic optionaldynamic = this.tag.get(pKey); - if (!pSkipIfEmpty || !optionaldynamic.result().isEmpty()) { - Dynamic dynamic = optionaldynamic.orElseEmptyMap(); - dynamic = pFixer.apply(dynamic); - if (dynamic.equals(dynamic.emptyMap())) { - this.tag = this.tag.remove(pKey); - } else { - this.tag = this.tag.set(pKey, dynamic); - } - } - } - - public Dynamic write() { - Dynamic dynamic = this.tag; - - if (!this.components.equals(this.tag.emptyMap())) { - dynamic = dynamic.set("components", this.components); - } - - return mergeRemainder(dynamic, this.remainder); - } - - private static Dynamic mergeRemainder(Dynamic tag, Dynamic remainder) { - DynamicOps ops = tag.getOps(); - return ops.getMap(tag.getValue()) - .flatMap(mapLike -> ops.mergeToMap(remainder.convert(ops).getValue(), mapLike)) - .map(object -> new Dynamic<>(ops, object)) - .result() - .orElse(tag); - } - - public boolean is(String pItem) { - return this.item.equals(pItem); - } - - public boolean is(Set pItems) { - return pItems.contains(this.item); - } - - public boolean hasComponent(String pComponent) { - return this.components.get(pComponent).result().isPresent(); - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/GTToolComponentFix.java b/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/GTToolComponentFix.java deleted file mode 100644 index 1d3bc76e34a..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/GTToolComponentFix.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gregtechceu.gtceu.common.datafixer.fixes; - -import net.minecraft.util.datafix.fixes.ItemStackComponentRemainderFix; - -import com.mojang.datafixers.schemas.Schema; -import com.mojang.serialization.Dynamic; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; - -public class GTToolComponentFix extends ItemStackComponentRemainderFix { - - public GTToolComponentFix(Schema outputSchema) { - super(outputSchema, "GTToolComponentFix", "gtceu:gt_tool"); - } - - @Override - protected @NotNull Dynamic fixComponent(Dynamic tag) { - tag.remove("tool_speed").remove("attack_damage").remove("harvest_level"); - - Optional> lastCraftingUse = tag.get("last_crafting_use").result(); - if (lastCraftingUse.isEmpty()) { - tag = tag.set("last_crafting_use", tag.createInt(0)); - } - - return tag; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/OilVariantsRenameFix.java b/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/OilVariantsRenameFix.java deleted file mode 100644 index b4efc7f6654..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/datafixer/fixes/OilVariantsRenameFix.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.gregtechceu.gtceu.common.datafixer.fixes; - -import com.google.common.collect.ImmutableMap; - -import java.util.Map; - -public class OilVariantsRenameFix { - - public static final Map RENAMED_ITEM_IDS = ImmutableMap.builder() - .put("gtceu:oil_heavy_bucket", "gtceu:heavy_oil_bucket") - .put("gtceu:oil_light_bucket", "gtceu:light_oil_bucket") - .put("gtceu:oil_medium_bucket", "gtceu:raw_oil_bucket") - .build(); - - public static final Map RENAMED_BLOCK_IDS = ImmutableMap.builder() - .put("gtceu:oil_heavy", "gtceu:heavy_oil") - .put("gtceu:oil_light", "gtceu:light_oil") - .put("gtceu:oil_medium", "gtceu:raw_oil") - .build(); -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/datafixer/schemas/V0.java b/src/main/java/com/gregtechceu/gtceu/common/datafixer/schemas/V0.java deleted file mode 100644 index 583a38df2f3..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/datafixer/schemas/V0.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gregtechceu.gtceu.common.datafixer.schemas; - -import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.datafixer.GTReferences; - -import net.minecraft.util.datafix.fixes.References; -import net.minecraft.util.datafix.schemas.NamespacedSchema; - -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.schemas.Schema; -import com.mojang.datafixers.types.templates.TypeTemplate; - -import java.util.*; -import java.util.function.Supplier; - -public class V0 extends NamespacedSchema { - - public V0(int versionKey, Schema parent) { - super(versionKey, parent); - } - - @Override - public void registerTypes(Schema schema, Map> entityTypes, - Map> blockEntityTypes) { - super.registerTypes(schema, entityTypes, blockEntityTypes); - schema.registerType(false, GTReferences.MATERIAL_NAME, () -> DSL.constType(namespacedString())); - } - - @Override - public Map> registerBlockEntities(Schema schema) { - Map> map = super.registerBlockEntities(schema); - for (MachineDefinition definition : GTRegistries.MACHINES) { - registerInventory(schema, map, definition.getId().toString()); - } - return map; - } - - protected static void registerInventory(Schema schema, Map> map, String name) { - schema.register(map, name, () -> DSL.or( - DSL.fields( - "importItems", - DSL.field("storage", - DSL.field("Items", - DSL.list(References.ITEM_STACK.in(schema)))), - "exportItems", - DSL.field("storage", - DSL.field("Items", - DSL.list(References.ITEM_STACK.in(schema))))), - DSL.or( - DSL.fields( - "inventory", - DSL.field("storage", - DSL.field("Items", - DSL.list(References.ITEM_STACK.in(schema))))), - DSL.or( - DSL.fields( - "cache", - DSL.field("storage", - DSL.field("Items", - DSL.list(References.ITEM_STACK.in(schema))))), - DSL.remainder())))); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java b/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java index 72d26190c1d..5b4d480d119 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.entity; -import com.gregtechceu.gtceu.data.entity.GTEntityTypes; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTEntityTypes; +import com.gregtechceu.gtceu.common.data.GTItems; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/entity/IndustrialTNTEntity.java b/src/main/java/com/gregtechceu/gtceu/common/entity/IndustrialTNTEntity.java index 2c8566440aa..a8a0a1903a4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/entity/IndustrialTNTEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/entity/IndustrialTNTEntity.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.entity; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.entity.GTEntityTypes; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTEntityTypes; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/entity/PowderbarrelEntity.java b/src/main/java/com/gregtechceu/gtceu/common/entity/PowderbarrelEntity.java index 55c5deed933..94873878c96 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/entity/PowderbarrelEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/entity/PowderbarrelEntity.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.entity; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.entity.GTEntityTypes; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTEntityTypes; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/fluid/.keep b/src/main/java/com/gregtechceu/gtceu/common/fluid/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java index 7d9f37c734b..ee4625059bc 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.fluid.potion; import com.gregtechceu.gtceu.api.misc.forge.FilteredFluidHandlerItemStackSimple; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.core.component.DataComponents; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluid.java b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluid.java index a45b65712d3..07ea0560c1b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluid.java +++ b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluid.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.fluid.potion; -import com.gregtechceu.gtceu.data.fluid.GTFluids; +import com.gregtechceu.gtceu.common.data.GTFluids; import net.minecraft.core.Holder; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluidHelper.java b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluidHelper.java index 665df990af5..55098d0abfa 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluidHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionFluidHelper.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.fluid.potion; -import com.gregtechceu.gtceu.data.fluid.GTFluids; +import com.gregtechceu.gtceu.common.data.GTFluids; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionItemFluidHandler.java b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionItemFluidHandler.java index 15e1202c876..8ddde8f41fd 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionItemFluidHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/PotionItemFluidHandler.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.fluid.potion; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; diff --git a/src/main/java/com/gregtechceu/gtceu/common/gui/.keep b/src/main/java/com/gregtechceu/gtceu/common/gui/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java index 949c2e5ad67..3ef3225132f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java @@ -1,13 +1,13 @@ package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.api.block.IMachineBlock; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.item.MetaMachineItem; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.misc.forge.ThermalFluidHandlerItemStack; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/GTBucketItem.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java rename to src/main/java/com/gregtechceu/gtceu/common/item/GTBucketItem.java index 78ea96c3056..f217cbb5126 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/GTBucketItem.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.api.item; +package com.gregtechceu.gtceu.common.item; -import com.gregtechceu.gtceu.api.fluid.GTFluid; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.fluids.GTFluid; import net.minecraft.network.chat.Component; import net.minecraft.world.item.BucketItem; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemFluidContainer.java b/src/main/java/com/gregtechceu/gtceu/common/item/ItemFluidContainer.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemFluidContainer.java rename to src/main/java/com/gregtechceu/gtceu/common/item/ItemFluidContainer.java index 37844c2b4f6..e8f6f512ebf 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemFluidContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/ItemFluidContainer.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item.behavior; +package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.api.item.component.IRecipeRemainder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java rename to src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java index 94684172ebd..c9949782ad7 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.api.item; +package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.client.renderer.block.LampItemRenderer; import com.gregtechceu.gtceu.client.util.ModelUtils; import com.gregtechceu.gtceu.common.block.LampBlock; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.resources.model.BakedModel; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java index 6ae110de366..562184ae0ca 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedQuarkTechSuite.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedQuarkTechSuite.java index 67bf88a32fb..20b584768e5 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedQuarkTechSuite.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedQuarkTechSuite.java @@ -6,8 +6,8 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.core.IFireImmuneEntity; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorItem.java index 19505597969..71b6908ab3a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorItem.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.item.armor; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.ArmorProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ArmorProperty; import com.gregtechceu.gtceu.client.renderer.item.ArmorItemRenderer; import net.minecraft.client.color.item.ItemColor; diff --git a/src/main/java/com/gregtechceu/gtceu/data/item/GTArmorMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorMaterials.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/item/GTArmorMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorMaterials.java index 2a53ae26bea..bc7be737437 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/item/GTArmorMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/GTArmorMaterials.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.item; +package com.gregtechceu.gtceu.common.item.armor; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/IJetpack.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/IJetpack.java index 61d45ab3ae1..4b57d3f51ce 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/IJetpack.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/IJetpack.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import net.minecraft.core.particles.ParticleOptions; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/Jetpack.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/Jetpack.java index 160cf08a4f3..f2496001f2f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/Jetpack.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/Jetpack.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorLogicSuite; import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/NanoMuscleSuite.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/NanoMuscleSuite.java index f481ab1832b..a257c425605 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/NanoMuscleSuite.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/NanoMuscleSuite.java @@ -6,8 +6,8 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorLogicSuite; import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/NightvisionGoggles.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/NightvisionGoggles.java index decf8e9e655..1d32878f1af 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/NightvisionGoggles.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/NightvisionGoggles.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorLogicSuite; import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java index e13fe11f3a8..bd3d8b7c94f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java @@ -5,11 +5,11 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.armor.IArmorLogic; import com.gregtechceu.gtceu.api.item.component.*; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; import com.gregtechceu.gtceu.api.recipe.content.SerializerFluidIngredient; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GradientUtil; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java index 8b8176fe595..9a3851551d4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java @@ -6,9 +6,9 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorLogicSuite; import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.datacomponents.GTArmor; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.core.IFireImmuneEntity; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/AntidoteBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/AntidoteBehavior.java index 974e3cb9d72..a27b3007163 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/AntidoteBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/AntidoteBehavior.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.item.component.IAddInformation; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java index 44e40491a4d..6efe9df9e8a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java @@ -6,8 +6,8 @@ import com.gregtechceu.gtceu.api.item.component.IDurabilityBar; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; +import com.gregtechceu.gtceu.common.data.GTSoundEntries; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; import com.gregtechceu.gtceu.utils.BreadthFirstBlockSearch; import com.gregtechceu.gtceu.utils.GradientUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/CoverPlaceBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/CoverPlaceBehavior.java index dd6861a2cde..6096c9338f2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/CoverPlaceBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/CoverPlaceBehavior.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.item.component.IItemComponent; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DataItemBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DataItemBehavior.java index faed102c7a6..eda26a9aebc 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DataItemBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DataItemBehavior.java @@ -5,9 +5,9 @@ import com.gregtechceu.gtceu.api.capability.ICoverable; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.machine.feature.IDataStickInteractable; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.datacomponents.BindingData; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FacadeItemBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FacadeItemBehaviour.java index 5da4916a16b..d0687ddd720 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FacadeItemBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FacadeItemBehaviour.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.api.item.component.ICustomDescriptionId; import com.gregtechceu.gtceu.api.item.component.ISubItemHandler; import com.gregtechceu.gtceu.api.item.datacomponents.FacadeWrapper; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java index 4ac5e4db215..f172d462d78 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java @@ -8,9 +8,9 @@ import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; import com.lowdragmc.lowdraglib.gui.factory.HeldItemUIFactory; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java index 0bbd5de6281..3a525b786ba 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java @@ -16,8 +16,8 @@ import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.item.component.IItemLifeCycle; import com.gregtechceu.gtceu.api.item.component.IItemUIFactory; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.factory.HeldItemUIFactory; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/LighterBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/LighterBehavior.java index 9f66a01c0fd..fa675cc4dee 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/LighterBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/LighterBehavior.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.common.block.explosive.GTExplosiveBlock; import com.gregtechceu.gtceu.common.block.explosive.IndustrialTNTBlock; import com.gregtechceu.gtceu.common.block.explosive.PowderbarrelBlock; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GradientUtil; import net.minecraft.advancements.CriteriaTriggers; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/MachineConfigCopyBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/MachineConfigCopyBehaviour.java index 0e1b6766f59..82d5d626eed 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/MachineConfigCopyBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/MachineConfigCopyBehaviour.java @@ -6,8 +6,8 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.*; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/PortableScannerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/PortableScannerBehavior.java index 75f627507d2..459ae70e1ee 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/PortableScannerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/PortableScannerBehavior.java @@ -7,6 +7,7 @@ import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; import com.gregtechceu.gtceu.api.capability.IWorkable; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidVeinSavedData; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; import com.gregtechceu.gtceu.api.item.component.IAddInformation; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; @@ -15,16 +16,15 @@ import com.gregtechceu.gtceu.api.machine.feature.IDataInfoProvider; import com.gregtechceu.gtceu.api.machine.feature.IMufflableMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidVeinSavedData; import com.gregtechceu.gtceu.common.blockentity.FluidPipeBlockEntity; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; import com.gregtechceu.gtceu.common.capability.LocalizedHazardSavedData; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTSoundEntries; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.network.packets.prospecting.SPacketProspectBedrockFluid; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ProspectorScannerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ProspectorScannerBehavior.java index 82368f5db2c..e23a3f0184a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ProspectorScannerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ProspectorScannerBehavior.java @@ -8,8 +8,8 @@ import com.gregtechceu.gtceu.api.item.component.IAddInformation; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.item.component.IItemUIFactory; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.factory.HeldItemUIFactory; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ToggleEnergyConsumerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ToggleEnergyConsumerBehavior.java index bb5af17df42..301ecd90d49 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ToggleEnergyConsumerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ToggleEnergyConsumerBehavior.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.item.component.IAddInformation; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.item.component.IItemLifeCycle; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TurbineRotorBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TurbineRotorBehaviour.java index a931e35ddf9..1462afce925 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TurbineRotorBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TurbineRotorBehaviour.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.GTCEuAPI; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.component.IMaterialPartItem; import com.gregtechceu.gtceu.api.item.component.ISubItemHandler; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -19,7 +19,7 @@ import java.util.List; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.turbineBlade; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.turbineBlade; public class TurbineRotorBehaviour implements IMaterialPartItem, ISubItemHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/modules/ImageModuleBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/modules/ImageModuleBehaviour.java index 13190a60567..a9947553b4c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/modules/ImageModuleBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/modules/ImageModuleBehaviour.java @@ -4,10 +4,10 @@ import com.gregtechceu.gtceu.api.item.component.IMonitorModuleItem; import com.gregtechceu.gtceu.client.renderer.monitor.IMonitorRenderer; import com.gregtechceu.gtceu.client.renderer.monitor.MonitorImageRenderer; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.machine.multiblock.electric.CentralMonitorMachine; import com.gregtechceu.gtceu.common.machine.multiblock.electric.monitor.MonitorGroup; import com.gregtechceu.gtceu.common.network.packets.SCPacketMonitorGroupNBTChange; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.widget.ButtonWidget; import com.lowdragmc.lowdraglib.gui.widget.TextFieldWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java index 6b7b2367ed7..69e6c0b68e0 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java @@ -8,11 +8,11 @@ import com.gregtechceu.gtceu.api.placeholder.PlaceholderHandler; import com.gregtechceu.gtceu.client.renderer.monitor.IMonitorRenderer; import com.gregtechceu.gtceu.client.renderer.monitor.MonitorTextRenderer; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.datacomponents.TextLineList; import com.gregtechceu.gtceu.common.machine.multiblock.electric.CentralMonitorMachine; import com.gregtechceu.gtceu.common.machine.multiblock.electric.monitor.MonitorGroup; import com.gregtechceu.gtceu.common.network.packets.SCPacketMonitorGroupNBTChange; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.widget.ButtonWidget; import com.lowdragmc.lowdraglib.gui.widget.TextFieldWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/ToolEventHandlers.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/ToolEventHandlers.java index 068f5a0b2cf..202b611bbd2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/ToolEventHandlers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/ToolEventHandlers.java @@ -7,8 +7,8 @@ import com.gregtechceu.gtceu.api.item.capability.ElectricItem; import com.gregtechceu.gtceu.api.item.datacomponents.ToolBehaviors; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.core.BlockPos; import net.minecraft.server.TickTask; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/AOEConfigUIBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/AOEConfigUIBehavior.java index 2bb5b5384f1..60c35f3cc13 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/AOEConfigUIBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/AOEConfigUIBehavior.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.api.item.datacomponents.AoESymmetrical; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolUIBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.factory.HeldItemUIFactory; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/BlockRotatingBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/BlockRotatingBehavior.java index ef45ff600aa..57dbb84022a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/BlockRotatingBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/BlockRotatingBehavior.java @@ -4,10 +4,10 @@ import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.item.tool.rotation.CustomBlockRotations; import com.gregtechceu.gtceu.common.item.tool.rotation.ICustomRotationBehavior; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; import com.lowdragmc.lowdraglib.utils.RayTraceHelper; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/DisableShieldBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/DisableShieldBehavior.java index 9d126f07713..3e2ceef0cdc 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/DisableShieldBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/DisableShieldBehavior.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.network.chat.Component; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/EntityDamageBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/EntityDamageBehavior.java index 38b93dbb791..26bd54b44e0 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/EntityDamageBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/EntityDamageBehavior.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/GrassPathBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/GrassPathBehavior.java index bbbc513f29b..612f85d1739 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/GrassPathBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/GrassPathBehavior.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestCropsBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestCropsBehavior.java index ef9ae17ed5c..6fa8a524cd2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestCropsBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestCropsBehavior.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestIceBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestIceBehavior.java index f9a46defa3c..824ed35ecb1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestIceBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestIceBehavior.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.network.chat.Component; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HoeGroundBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HoeGroundBehavior.java index 39c9e6d8711..c7e08e14d65 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HoeGroundBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HoeGroundBehavior.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/LogStripBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/LogStripBehavior.java index 8868b05954e..34c3f02565a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/LogStripBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/LogStripBehavior.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java index 07f75f0bc3a..72fde04e453 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java @@ -1,13 +1,13 @@ package com.gregtechceu.gtceu.common.item.tool.behavior; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ProspectingBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ProspectingBehavior.java index 5f8089d0a03..53e4c1600f6 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ProspectingBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ProspectingBehavior.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.Util; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/RotateRailBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/RotateRailBehavior.java index 8f0335724d0..43dbaada20d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/RotateRailBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/RotateRailBehavior.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ScrapeBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ScrapeBehavior.java index 48fb2b4a4de..f85a9017951 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ScrapeBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ScrapeBehavior.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java index 9109715aade..e6f6f13edb4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java @@ -6,11 +6,11 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; -import com.gregtechceu.gtceu.data.tag.CustomTags; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTSoundEntries; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java index dfa0fd119ac..d94570f790d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java @@ -3,9 +3,9 @@ import com.gregtechceu.gtceu.api.item.datacomponents.ToolBehaviors; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.api.tag.TagUtil; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TreeFellingBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TreeFellingBehavior.java index 373275bdd96..a8fdbbdad65 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TreeFellingBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TreeFellingBehavior.java @@ -5,8 +5,8 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/WaxOffBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/WaxOffBehavior.java index 085b3abdc3c..92d6d391c46 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/WaxOffBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/WaxOffBehavior.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.item.tool.behavior.ToolBehaviorType; -import com.gregtechceu.gtceu.data.tools.GTToolBehaviors; +import com.gregtechceu.gtceu.common.data.GTToolBehaviors; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/AirScrubberMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/AirScrubberMachine.java index cd07472e18a..e2d01b00134 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/AirScrubberMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/AirScrubberMachine.java @@ -1,18 +1,18 @@ package com.gregtechceu.gtceu.common.machine.electric; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardCleaner; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.common.blockentity.DuctPipeBlockEntity; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.common.network.packets.hazard.SPacketRemoveHazardZone; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java index 17f1625a1cc..dcb8ec80629 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java @@ -18,9 +18,9 @@ import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ConverterMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ConverterMachine.java index c5c02c434db..95eb59edc3c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ConverterMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ConverterMachine.java @@ -8,8 +8,8 @@ import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.common.machine.trait.ConverterTrait; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java index fdd2f708355..be741268523 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java @@ -19,9 +19,9 @@ import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java index 7525e666e5c..263a50c08a9 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java @@ -21,10 +21,10 @@ import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java index 95bee89581d..a172ad09c50 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java @@ -19,11 +19,11 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.trait.miner.MinerLogic; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.widget.ComponentPanelWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/PumpMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/PumpMachine.java index c6e6faadfff..75adf984ae3 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/PumpMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/PumpMachine.java @@ -13,7 +13,7 @@ import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.feature.IUIMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/RockCrusherMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/RockCrusherMachine.java index c841667f387..b40a7fca0ac 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/RockCrusherMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/RockCrusherMachine.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; public class RockCrusherMachine extends SimpleTieredMachine { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/WorldAcceleratorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/WorldAcceleratorMachine.java index ec3d9104fb0..c06921a20e4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/WorldAcceleratorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/WorldAcceleratorMachine.java @@ -12,9 +12,9 @@ import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; import com.gregtechceu.gtceu.utils.GTUtil; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/ActiveTransformerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/ActiveTransformerMachine.java index 2d289fe626d..1453b977fec 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/ActiveTransformerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/ActiveTransformerMachine.java @@ -17,7 +17,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; @@ -26,7 +26,6 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.block.Block; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMaps; @@ -36,7 +35,7 @@ import java.util.Comparator; import java.util.List; -import static com.gregtechceu.gtceu.api.multiblock.Predicates.abilities; +import static com.gregtechceu.gtceu.api.pattern.Predicates.abilities; public class ActiveTransformerMachine extends WorkableElectricMultiblockMachine implements IControllable, IExplosionMachine, IFancyUIMachine, IDisplayUIMachine { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineMachine.java index c0a0378695f..9f2eaaa5a9d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineMachine.java @@ -14,10 +14,10 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.recipe.ActionResult; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.config.ConfigHolder; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/BedrockOreMinerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/BedrockOreMinerMachine.java index 69126ceee28..ad127dc181d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/BedrockOreMinerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/BedrockOreMinerMachine.java @@ -5,18 +5,18 @@ import com.gregtechceu.gtceu.api.capability.IEnergyContainer; import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.WeightedMaterial; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.WeightedMaterial; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.machine.trait.BedrockOreMinerLogic; import com.gregtechceu.gtceu.common.machine.trait.FluidDrillLogic; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java index b64086b4e24..f16040aeb0a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java @@ -20,15 +20,15 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; -import com.gregtechceu.gtceu.api.multiblock.*; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.*; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.multiblock.electric.monitor.MonitorGroup; import com.gregtechceu.gtceu.common.machine.trait.CentralMonitorLogic; import com.gregtechceu.gtceu.common.network.packets.SCPacketMonitorGroupNBTChange; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.machine.GTMachines; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.GTStringUtils; import com.lowdragmc.lowdraglib.gui.texture.*; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java index 25f2429c886..484fb0f42cf 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java @@ -22,10 +22,12 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; -import com.gregtechceu.gtceu.api.multiblock.BlockPattern; -import com.gregtechceu.gtceu.api.multiblock.FactoryBlockPattern; -import com.gregtechceu.gtceu.api.multiblock.Predicates; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; +import com.gregtechceu.gtceu.api.pattern.BlockPattern; +import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; +import com.gregtechceu.gtceu.api.pattern.Predicates; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.electric.HullMachine; import com.gregtechceu.gtceu.common.machine.multiblock.generator.LargeCombustionEngineMachine; @@ -36,9 +38,7 @@ import com.gregtechceu.gtceu.common.machine.multiblock.primitive.PrimitivePumpMachine; import com.gregtechceu.gtceu.common.machine.trait.CleanroomLogic; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.utils.GTUtil; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; @@ -69,8 +69,8 @@ import java.util.*; -import static com.gregtechceu.gtceu.api.multiblock.Predicates.*; -import static com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection.*; +import static com.gregtechceu.gtceu.api.pattern.Predicates.*; +import static com.gregtechceu.gtceu.api.pattern.util.RelativeDirection.*; public class CleanroomMachine extends WorkableElectricMultiblockMachine implements ICleanroomProvider, IDisplayUIMachine, IDataInfoProvider { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/DistillationTowerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/DistillationTowerMachine.java index fce412c3cc1..0b7fd01456c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/DistillationTowerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/DistillationTowerMachine.java @@ -10,12 +10,12 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.recipe.ActionResult; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FluidDrillMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FluidDrillMachine.java index 1e053138110..e41ecda1b83 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FluidDrillMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FluidDrillMachine.java @@ -5,16 +5,16 @@ import com.gregtechceu.gtceu.api.capability.IEnergyContainer; import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.machine.trait.FluidDrillLogic; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java index 73abc506605..a0c97dbbaf7 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java @@ -14,9 +14,9 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.OverclockingLogic; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.gregtechceu.gtceu.common.block.FusionCasingBlock; @@ -47,7 +47,7 @@ import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.recipe.OverclockingLogic.PERFECT_HALF_DURATION_FACTOR; import static com.gregtechceu.gtceu.api.recipe.OverclockingLogic.PERFECT_HALF_VOLTAGE_FACTOR; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; public class FusionReactorMachine extends WorkableElectricMultiblockMachine implements ITieredMachine { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java index ddcbe6e4c38..8fdb8f2557a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java @@ -7,19 +7,19 @@ import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.IDataInfoProvider; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; import com.gregtechceu.gtceu.api.transfer.fluid.FluidHandlerList; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.trait.miner.LargeMinerLogic; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.GTUtil; @@ -49,7 +49,7 @@ import java.util.Collections; import java.util.List; -import static com.gregtechceu.gtceu.data.material.GTMaterials.DrillingFluid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.DrillingFluid; public class LargeMinerMachine extends WorkableElectricMultiblockMachine implements IMiner, IControllable, IDataInfoProvider { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/MultiblockTankMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/MultiblockTankMachine.java index b48252cc54c..957da3fb4b3 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/MultiblockTankMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/MultiblockTankMachine.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.machine.multiblock.electric; import com.gregtechceu.gtceu.api.capability.recipe.IO; -import com.gregtechceu.gtceu.api.fluid.PropertyFluidFilter; +import com.gregtechceu.gtceu.api.fluids.PropertyFluidFilter; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.TankWidget; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeChemicalBathMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeChemicalBathMachine.java index 68f544299d8..b597420a1f2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeChemicalBathMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeChemicalBathMachine.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IFluidRenderMulti; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.RequireRerender; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMacerationTowerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMacerationTowerMachine.java index cd2fb832d65..1b0d418bc92 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMacerationTowerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMacerationTowerMachine.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.item.ItemEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMixerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMixerMachine.java index c8977e688f9..a61da82aead 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMixerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/gcym/LargeMixerMachine.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IFluidRenderMulti; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.RequireRerender; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/monitor/MonitorGroup.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/monitor/MonitorGroup.java index c4b6eb0257b..81ef2b8d653 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/monitor/MonitorGroup.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/monitor/MonitorGroup.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.api.item.component.IItemComponent; import com.gregtechceu.gtceu.api.item.component.IMonitorModuleItem; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GlobalPosWithRot; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java index f19b1bb2498..3b30304129b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java @@ -17,7 +17,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.transfer.fluid.FluidHandlerList; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; @@ -63,7 +63,7 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.data.tag.CustomTags.HPCA_COOLANTS; +import static com.gregtechceu.gtceu.data.recipe.CustomTags.HPCA_COOLANTS; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java index 19ad84463ea..ef674048fc4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java @@ -15,8 +15,8 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.recipe.ActionResult; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java index f5f30b5e31c..c571ea37e02 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.IO; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.fancy.IFancyTooltip; import com.gregtechceu.gtceu.api.gui.fancy.TooltipsPanel; @@ -12,16 +12,16 @@ import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockDisplayText; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeTurbineMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeTurbineMachine.java index d7c1c1ab438..7bd453e99f1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeTurbineMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeTurbineMachine.java @@ -9,9 +9,9 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IRotorHolderMachine; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java index f5229a985ae..5d5f7ccc093 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java @@ -15,11 +15,11 @@ import com.gregtechceu.gtceu.api.machine.multiblock.part.MultiblockPartMachine; import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.multiblock.electric.research.DataBankMachine; import com.gregtechceu.gtceu.common.recipe.condition.ResearchCondition; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.ItemStackHashStrategy; import com.gregtechceu.gtceu.utils.ResearchManager; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DiodePartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DiodePartMachine.java index cd3ea0a4d85..9889a963e1b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DiodePartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DiodePartMachine.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableEnergyContainer; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java index 79d075919e6..013451d3d1f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.data.machine.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.widget.Widget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java index ec538dced44..ac37513e3f4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java @@ -17,9 +17,9 @@ import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; @@ -40,7 +40,6 @@ import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java index 33973b857d8..38a8c0ce0ee 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java @@ -18,9 +18,9 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.widget.Widget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MaintenanceHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MaintenanceHatchPartMachine.java index cffa8b27303..5a8226b202f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MaintenanceHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MaintenanceHatchPartMachine.java @@ -16,7 +16,7 @@ import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ObjectHolderMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ObjectHolderMachine.java index 1b13e9c255e..c4a46f39874 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ObjectHolderMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ObjectHolderMachine.java @@ -10,7 +10,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.part.MultiblockPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; import com.lowdragmc.lowdraglib.gui.widget.Widget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java index 8e473464d24..34b65174b79 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IWorkableMultiController; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.multiblock.part.MultiblockPartMachine; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/PumpHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/PumpHatchPartMachine.java index b03c39b065b..43884f6d4d9 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/PumpHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/PumpHatchPartMachine.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java index 85e203dafd7..437f83e5155 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java @@ -1,6 +1,8 @@ package com.gregtechceu.gtceu.common.machine.multiblock.part; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.BlockableSlotWidget; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; @@ -11,11 +13,9 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.*; import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.common.data.GTDamageTypes; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.lowdragmc.lowdraglib.gui.widget.Widget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamHatchPartMachine.java index bd29d457f91..0d8ab74d03d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamHatchPartMachine.java @@ -6,8 +6,8 @@ import com.gregtechceu.gtceu.api.gui.widget.TankWidget; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamItemBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamItemBusPartMachine.java index b6e595aaf0b..de9de695a05 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamItemBusPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/SteamItemBusPartMachine.java @@ -7,8 +7,8 @@ import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MachineDefinition; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCAComponentPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCAComponentPartMachine.java index 31c5e5fd0c8..784a74168a8 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCAComponentPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCAComponentPartMachine.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.part.MultiblockPartMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/monitor/AdvancedMonitorPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/monitor/AdvancedMonitorPartMachine.java index 7d1a45d847a..fbb785ce4e1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/monitor/AdvancedMonitorPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/monitor/AdvancedMonitorPartMachine.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine; import com.gregtechceu.gtceu.api.machine.multiblock.part.MultiblockPartMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java index 6a6804f2bc3..438baa06775 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java @@ -6,14 +6,14 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.multiblock.BlockPattern; -import com.gregtechceu.gtceu.api.multiblock.FactoryBlockPattern; -import com.gregtechceu.gtceu.api.multiblock.Predicates; -import com.gregtechceu.gtceu.api.multiblock.TraceabilityPredicate; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.BlockPattern; +import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; +import com.gregtechceu.gtceu.api.pattern.Predicates; +import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; +import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.item.behavior.LighterBehavior; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; @@ -49,7 +49,7 @@ import java.util.*; -import static com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection.*; +import static com.gregtechceu.gtceu.api.pattern.util.RelativeDirection.*; public class CharcoalPileIgniterMachine extends WorkableMultiblockMachine implements IWorkable { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitiveBlastFurnaceMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitiveBlastFurnaceMachine.java index a36a79d6b8b..83224575e03 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitiveBlastFurnaceMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitiveBlastFurnaceMachine.java @@ -12,7 +12,7 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IFluidRenderMulti; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitivePumpMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitivePumpMachine.java index 756d757d58f..fb65fde36fb 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitivePumpMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitivePumpMachine.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.utils.GTUtil; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java index e81b5149464..023614bd149 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java @@ -11,11 +11,11 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IDisplayUIMachine; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.util.ClickData; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/SteamParallelMultiblockMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/SteamParallelMultiblockMachine.java index 21b62bf4410..2b1fa911446 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/SteamParallelMultiblockMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/SteamParallelMultiblockMachine.java @@ -13,14 +13,14 @@ import com.gregtechceu.gtceu.api.machine.steam.SteamEnergyRecipeHandler; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamSolidBoilerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamSolidBoilerMachine.java index f0441db953f..d1417d51687 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamSolidBoilerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamSolidBoilerMachine.java @@ -3,16 +3,16 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.steam.SteamBoilerMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java index 6b8c186774d..a2da507347d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java @@ -2,6 +2,7 @@ import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.UITemplate; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; @@ -10,9 +11,8 @@ import com.gregtechceu.gtceu.api.machine.feature.*; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeChestMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeChestMachine.java index 3306c239094..838c4b7ffaa 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeChestMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeChestMachine.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.item.datacomponents.CreativeMachineInfo; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.ResourceBorderTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeTankMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeTankMachine.java index 09ed6f491f7..81a5672e903 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeTankMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeTankMachine.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.ResourceBorderTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java index 25a71c63deb..197322752a5 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java @@ -2,6 +2,8 @@ import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; @@ -11,10 +13,8 @@ import com.gregtechceu.gtceu.api.machine.feature.IDropSaveMachine; import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java index 813fbcb0fcf..1a5a73fcf69 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java @@ -20,9 +20,9 @@ import com.gregtechceu.gtceu.api.machine.trait.MachineTrait; import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTItemAbilities; import com.gregtechceu.gtceu.core.MixinHelpers; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItemAbilities; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.GTTransferUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java index 825b222b85c..099c745b0b2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java @@ -18,8 +18,8 @@ import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.core.MixinHelpers; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.GTTransferUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/BedrockOreMinerLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/BedrockOreMinerLogic.java index 5725f7cd8de..b25720a03c1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/BedrockOreMinerLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/BedrockOreMinerLogic.java @@ -2,18 +2,18 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreVeinSavedData; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.OreVeinWorldEntry; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.WeightedMaterial; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreVeinSavedData; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.OreVeinWorldEntry; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.WeightedMaterial; import com.gregtechceu.gtceu.common.machine.multiblock.electric.BedrockOreMinerMachine; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.config.ConfigHolder; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.core.SectionPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/FluidDrillLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/FluidDrillLogic.java index 488d746c01f..b6e2ecca90b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/FluidDrillLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/FluidDrillLogic.java @@ -2,13 +2,13 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidVeinSavedData; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.FluidVeinWorldEntry; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidVeinSavedData; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.FluidVeinWorldEntry; import com.gregtechceu.gtceu.common.machine.multiblock.electric.FluidDrillMachine; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.core.SectionPos; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java index a85519e45eb..b0c79d93420 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java @@ -4,16 +4,16 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; import net.minecraft.core.component.DataComponents; import net.minecraft.network.chat.Component; @@ -22,11 +22,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.ingot; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.nugget; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.turbineBlade; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeCategories.ARC_FURNACE_RECYCLING; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ARC_FURNACE_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.ingot; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.nugget; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.turbineBlade; +import static com.gregtechceu.gtceu.common.data.GTRecipeCategories.ARC_FURNACE_RECYCLING; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ARC_FURNACE_RECIPES; public enum ArcFurnaceLogic implements GTRecipeType.ICustomRecipeLogic { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java index 74745d11c44..f46ef8cba03 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java @@ -7,12 +7,12 @@ import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.tag.TagUtil; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluidHelper; import com.gregtechceu.gtceu.core.mixins.PotionBrewingAccessor; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.Util; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/CannerLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/CannerLogic.java index 70090fafd2e..ef369871c02 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/CannerLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/CannerLogic.java @@ -6,9 +6,9 @@ import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/FormingPressLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/FormingPressLogic.java index 91b84d4bd82..2da1511c548 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/FormingPressLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/FormingPressLogic.java @@ -5,10 +5,10 @@ import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.utils.GTStringUtils; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/LargeBoilerLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/LargeBoilerLogic.java index 4a840aa0cc7..b2edc5e60b0 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/LargeBoilerLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/LargeBoilerLogic.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.machine.trait.customlogic.SteamBoilerLogic; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.LARGE_BOILER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LARGE_BOILER_RECIPES; public class LargeBoilerLogic extends SteamBoilerLogic { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java index 4fb4ece8216..e4b2da0040f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java @@ -4,16 +4,16 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.IGTTool; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; import net.minecraft.core.component.DataComponents; import net.minecraft.network.chat.Component; @@ -22,12 +22,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dustSmall; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dustTiny; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.turbineBlade; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeCategories.MACERATOR_RECYCLING; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.MACERATOR_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dustSmall; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dustTiny; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.turbineBlade; +import static com.gregtechceu.gtceu.common.data.GTRecipeCategories.MACERATOR_RECYCLING; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MACERATOR_RECIPES; public enum MaceratorLogic implements GTRecipeType.ICustomRecipeLogic { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/SmallBoilerLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/SmallBoilerLogic.java index 9b952ed5422..6836104b15c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/SmallBoilerLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/SmallBoilerLogic.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.machine.trait.customlogic.SteamBoilerLogic; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.STEAM_BOILER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.STEAM_BOILER_RECIPES; public class SmallBoilerLogic extends SteamBoilerLogic { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/LargeMinerLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/LargeMinerLogic.java index 47131bf06c3..2de8f1034ec 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/LargeMinerLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/LargeMinerLogic.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.machine.trait.miner; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java index 2e8a703eb0a..5f73ac6b039 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java @@ -3,22 +3,22 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.IMiner; import com.gregtechceu.gtceu.api.capability.recipe.*; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; import com.gregtechceu.gtceu.api.misc.IgnoreEnergyRecipeHandler; import com.gregtechceu.gtceu.api.misc.ItemRecipeHandler; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.api.transfer.item.NotifiableAccountedInvWrapper; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/multiblock/.keep b/src/main/java/com/gregtechceu/gtceu/common/multiblock/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/common/network/packets/prospecting/SPacketProspectOre.java b/src/main/java/com/gregtechceu/gtceu/common/network/packets/prospecting/SPacketProspectOre.java index d5770188fe9..c09b444805e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/network/packets/prospecting/SPacketProspectOre.java +++ b/src/main/java/com/gregtechceu/gtceu/common/network/packets/prospecting/SPacketProspectOre.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.network.packets.prospecting; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.integration.map.cache.client.GTClientCache; import net.minecraft.network.RegistryFriendlyByteBuf; diff --git a/src/main/java/com/gregtechceu/gtceu/common/particle/HazardParticleOptions.java b/src/main/java/com/gregtechceu/gtceu/common/particle/HazardParticleOptions.java index c59dbe78463..43f3057950b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/particle/HazardParticleOptions.java +++ b/src/main/java/com/gregtechceu/gtceu/common/particle/HazardParticleOptions.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.particle; -import com.gregtechceu.gtceu.data.particle.GTParticleTypes; +import com.gregtechceu.gtceu.common.data.GTParticleTypes; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleType; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNet.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNet.java index fdc9d209bc2..2b9931a5d06 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNet.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNet.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.cable; -import com.gregtechceu.gtceu.api.material.material.properties.WireProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet; import com.gregtechceu.gtceu.api.pipenet.Node; import com.gregtechceu.gtceu.api.pipenet.PipeNet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java index 494b2df01c3..d9345e7a6ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.pipelike.cable; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.material.properties.WireProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; import com.gregtechceu.gtceu.api.pipenet.PipeNetWalker; import com.gregtechceu.gtceu.common.blockentity.CableBlockEntity; import com.gregtechceu.gtceu.utils.GTTransferUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java index 414ad0d6d31..fc543f04ff4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java @@ -2,20 +2,20 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.PipeBlock; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.material.material.properties.WireProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.pipenet.IMaterialPipeType; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; -import com.gregtechceu.gtceu.data.model.GTModels; +import com.gregtechceu.gtceu.common.data.models.GTModels; import net.minecraft.resources.ResourceLocation; import lombok.Getter; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; public enum Insulation implements IMaterialPipeType { diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/LevelEnergyNet.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/LevelEnergyNet.java index 4647a2d51ee..9b8c53cdf8f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/LevelEnergyNet.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/LevelEnergyNet.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.cable; -import com.gregtechceu.gtceu.api.material.material.properties.WireProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetHandler.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetHandler.java index 0091fba4589..611446b5457 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetHandler.java @@ -2,10 +2,10 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.IHazardParticleContainer; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardCleaner; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.common.blockentity.DuctPipeBlockEntity; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java index 27666674bf5..1bb6ddef095 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.fluidpipe; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet; import com.gregtechceu.gtceu.api.pipenet.PipeNet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java index b5e34419f52..f068dd69236 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java @@ -2,19 +2,19 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.PipeBlock; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.pipenet.IMaterialPipeType; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import net.minecraft.resources.ResourceLocation; import lombok.Getter; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; public enum FluidPipeType implements IMaterialPipeType { diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/LevelFluidPipeNet.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/LevelFluidPipeNet.java index 71ced0d132d..e19a35e7afe 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/LevelFluidPipeNet.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/LevelFluidPipeNet.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.fluidpipe; -import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetWalker.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetWalker.java index e7e6c86ce36..b007f3e7994 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetWalker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetWalker.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.cover.CoverBehavior; -import com.gregtechceu.gtceu.api.material.material.properties.ItemPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; import com.gregtechceu.gtceu.api.pipenet.PipeNetWalker; import com.gregtechceu.gtceu.common.blockentity.ItemPipeBlockEntity; import com.gregtechceu.gtceu.common.cover.ItemFilterCover; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeNet.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeNet.java index 7d81b334bac..7d4b95b176b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeNet.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeNet.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.item; -import com.gregtechceu.gtceu.api.material.material.properties.ItemPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet; import com.gregtechceu.gtceu.api.pipenet.Node; import com.gregtechceu.gtceu.api.pipenet.PipeNet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java index 5f27a5df4a3..8c6a4f78083 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java @@ -2,12 +2,12 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.PipeBlock; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.ItemPipeProperties; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.pipenet.IMaterialPipeType; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemRoutePath.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemRoutePath.java index ae12216f732..d1e7cb2e0ab 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemRoutePath.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemRoutePath.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.item; -import com.gregtechceu.gtceu.api.material.material.properties.ItemPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; import com.gregtechceu.gtceu.api.pipenet.IRoutePath; import com.gregtechceu.gtceu.common.blockentity.ItemPipeBlockEntity; import com.gregtechceu.gtceu.utils.FacingPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/LevelItemPipeNet.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/LevelItemPipeNet.java index b996480dba4..5356d9faaa6 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/LevelItemPipeNet.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/LevelItemPipeNet.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.item; -import com.gregtechceu.gtceu.api.material.material.properties.ItemPipeProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetHandler.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetHandler.java index a6755c2190c..9072b18fcfc 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetHandler.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.capability.IDataAccessHatch; import com.gregtechceu.gtceu.api.capability.IOpticalComputationProvider; import com.gregtechceu.gtceu.api.capability.IOpticalDataAccessHatch; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.common.blockentity.OpticalPipeBlockEntity; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java index 36ad8af2acc..73b62906521 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.common.recipe.condition; -import com.gregtechceu.gtceu.api.codec.GTCodecUtils; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.codec.GTCodecUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java index 4571664321f..cecf264000b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.common.recipe.condition; -import com.gregtechceu.gtceu.api.codec.GTCodecUtils; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.codec.GTCodecUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeCondition.java index 9c100aa4ce5..394ec041279 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeCondition.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeTagCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeTagCondition.java index be112fc16b1..a808213cf34 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeTagCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/BiomeTagCondition.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/CleanroomCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/CleanroomCondition.java index b36cbba7521..0a4b55ed9dd 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/CleanroomCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/CleanroomCondition.java @@ -6,11 +6,11 @@ import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DaytimeCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DaytimeCondition.java index 1516e15d579..6b9ca5ce358 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DaytimeCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DaytimeCondition.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.network.chat.Component; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DimensionCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DimensionCondition.java index a7d8ec335cd..5b516789c94 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DimensionCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/DimensionCondition.java @@ -1,15 +1,15 @@ package com.gregtechceu.gtceu.common.recipe.condition; +import com.gregtechceu.gtceu.api.data.DimensionMarker; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.api.worldgen.DimensionMarker; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; import com.lowdragmc.lowdraglib.gui.texture.TextTexture; import com.lowdragmc.lowdraglib.jei.IngredientIO; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EUToStartCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EUToStartCondition.java index 4ef54950e66..a7cffe0044d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EUToStartCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EUToStartCondition.java @@ -2,10 +2,10 @@ import com.gregtechceu.gtceu.api.capability.IEnergyContainer; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EnvironmentalHazardCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EnvironmentalHazardCondition.java index 7258a98e136..6ce20ed4e40 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EnvironmentalHazardCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/EnvironmentalHazardCondition.java @@ -1,14 +1,14 @@ package com.gregtechceu.gtceu.common.recipe.condition; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.common.capability.EnvironmentalHazardSavedData; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/FTBQuestCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/FTBQuestCondition.java index c034c48b788..2cb1fec6dc1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/FTBQuestCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/FTBQuestCondition.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.common.machine.owner.FTBOwner; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/GameStageCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/GameStageCondition.java deleted file mode 100644 index 9767098a7d9..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/GameStageCondition.java +++ /dev/null @@ -1,67 +0,0 @@ -// package com.gregtechceu.gtceu.common.recipe.condition; - -// import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -// import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; -// import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -// import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -// import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; -// import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; - -// import net.darkhax.gamestages.data.GameStageSaveHandler; -// import net.minecraft.network.chat.Component; - -// import com.mojang.serialization.Codec; -// import com.mojang.serialization.codecs.RecordCodecBuilder; -// import lombok.NoArgsConstructor; -// import org.jetbrains.annotations.NotNull; - -// @NoArgsConstructor -// public class GameStageCondition extends RecipeCondition { - -// public static final MapCodec CODEC = RecordCodecBuilder -// .mapCodec(instance -> RecipeCondition.isReverse(instance) -// .and(Codec.STRING.fieldOf("stageName").forGetter(val -> val.stageName)) -// .apply(instance, GameStageCondition::new)); - -// private String stageName; - -// public final static GameStageCondition INSTANCE = new GameStageCondition(); - -// public GameStageCondition(String stageName) { -// this(false, stageName); -// } - -// public GameStageCondition(boolean isReverse, String stageName) { -// super(isReverse); -// this.stageName = stageName; -// } - -// @Override -// public RecipeConditionType getType() { -// return GTRecipeConditions.GAMESTAGE; -// } - -// @Override -// public Component getTooltips() { -// if (isReverse) return Component.translatable("recipe.condition.gamestage.locked_stage", stageName); -// return Component.translatable("recipe.condition.gamestage.unlocked_stage", stageName); -// } - -// @Override -// public boolean testCondition(@NotNull GTRecipe recipe, @NotNull RecipeLogic recipeLogic) { -// MachineOwner owner = recipeLogic.machine.self().getOwner(); -// if (owner == null) return false; -// for (var player : owner.getMembers()) { -// var playerData = GameStageSaveHandler.getPlayerData(player); -// if (playerData != null && playerData.hasStage(stageName)) { -// return true; -// } -// } -// return false; -// } - -// @Override -// public RecipeCondition createTemplate() { -// return new GameStageCondition(); -// } -// } diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/HeraclesQuestCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/HeraclesQuestCondition.java index 48532bce349..f701ffece09 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/HeraclesQuestCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/HeraclesQuestCondition.java @@ -2,11 +2,11 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/PositionYCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/PositionYCondition.java index 5731f473fdc..62250a1a9b6 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/PositionYCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/PositionYCondition.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/RainingCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/RainingCondition.java index 0621c4ccae5..3520cac68ef 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/RainingCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/RainingCondition.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.network.chat.Component; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ResearchCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ResearchCondition.java index a27e19b57a1..264bd9db184 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ResearchCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ResearchCondition.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.ResearchData; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/RockBreakerCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/RockBreakerCondition.java deleted file mode 100644 index b27a0d4817f..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/RockBreakerCondition.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.gregtechceu.gtceu.common.recipe.condition; - -import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; -import com.gregtechceu.gtceu.utils.GTUtil; - -import net.minecraft.core.Direction; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; - -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; - -@NoArgsConstructor -public class RockBreakerCondition extends RecipeCondition { - - public static final MapCodec CODEC = RecordCodecBuilder - .mapCodec(instance -> RecipeCondition.isReverse(instance) - .apply(instance, RockBreakerCondition::new)); - - public final static RockBreakerCondition INSTANCE = new RockBreakerCondition(); - - public RockBreakerCondition(boolean isReverse) { - super(isReverse); - } - - @Override - public RecipeConditionType getType() { - return GTRecipeConditions.ROCK_BREAKER; - } - - @Override - public Component getTooltips() { - return Component.translatable("recipe.condition.rock_breaker.tooltip"); - } - - @Override - public boolean testCondition(@NotNull GTRecipe recipe, @NotNull RecipeLogic recipeLogic) { - var fluidA = BuiltInRegistries.FLUID.get(ResourceLocation.parse(recipe.data.getString("fluidA"))); - var fluidB = BuiltInRegistries.FLUID.get(ResourceLocation.parse(recipe.data.getString("fluidB"))); - boolean hasFluidA = false, hasFluidB = false; - var level = recipeLogic.machine.self().getLevel(); - var pos = recipeLogic.machine.self().getPos(); - for (Direction side : GTUtil.DIRECTIONS) { - if (side.getAxis() != Direction.Axis.Y) { - var fluid = level.getFluidState(pos.relative(side)); - if (fluid.getType() == fluidA) hasFluidA = true; - if (fluid.getType() == fluidB) hasFluidB = true; - if (hasFluidA && hasFluidB) return true; - } - } - return false; - } - - @Override - public RockBreakerCondition createTemplate() { - return new RockBreakerCondition(); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ThunderCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ThunderCondition.java index 3ce7c53a3ed..0b3d036aaeb 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ThunderCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/ThunderCondition.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.common.recipe.condition; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.network.chat.Component; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/VentCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/VentCondition.java index 58bc4fe0421..f2a64fa87e0 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/VentCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/VentCondition.java @@ -2,10 +2,10 @@ import com.gregtechceu.gtceu.api.machine.feature.IExhaustVentMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; -import com.gregtechceu.gtceu.data.recipe.GTRecipeConditions; +import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/common/tools/.keep b/src/main/java/com/gregtechceu/gtceu/common/tools/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/AddedFloat.java b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/AddedFloat.java index 81938eba133..3c7220680f9 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/AddedFloat.java +++ b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/AddedFloat.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.valueprovider; -import com.gregtechceu.gtceu.data.valueprovider.GTValueProviderTypes; +import com.gregtechceu.gtceu.common.data.GTValueProviderTypes; import net.minecraft.util.RandomSource; import net.minecraft.util.valueproviders.ConstantFloat; diff --git a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/CastedFloat.java b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/CastedFloat.java index 27ddc4634de..d48dd716cf0 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/CastedFloat.java +++ b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/CastedFloat.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.valueprovider; -import com.gregtechceu.gtceu.data.valueprovider.GTValueProviderTypes; +import com.gregtechceu.gtceu.common.data.GTValueProviderTypes; import net.minecraft.util.RandomSource; import net.minecraft.util.valueproviders.FloatProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/FlooredInt.java b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/FlooredInt.java index 3247deaf23b..4a3b001100b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/FlooredInt.java +++ b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/FlooredInt.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.valueprovider; -import com.gregtechceu.gtceu.data.valueprovider.GTValueProviderTypes; +import com.gregtechceu.gtceu.common.data.GTValueProviderTypes; import net.minecraft.util.RandomSource; import net.minecraft.util.valueproviders.FloatProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/MultipliedFloat.java b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/MultipliedFloat.java index 60f7cc1ebe3..9e742f875eb 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/valueprovider/MultipliedFloat.java +++ b/src/main/java/com/gregtechceu/gtceu/common/valueprovider/MultipliedFloat.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.valueprovider; -import com.gregtechceu.gtceu.data.valueprovider.GTValueProviderTypes; +import com.gregtechceu.gtceu.common.data.GTValueProviderTypes; import net.minecraft.util.RandomSource; import net.minecraft.util.valueproviders.ConstantFloat; diff --git a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java index c1aec888c3b..5b46cbc0b44 100644 --- a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java +++ b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java @@ -163,12 +163,6 @@ public static class RecipeConfigs { public static class CompatibilityConfigs { - @Configurable - @Configurable.Comment({ "Whether to run datafixers on world load.", - "Do note that mods like ModernFix will interfere with this.", - "Default: true" }) - public boolean doDatafixers = true; - @Configurable @Configurable.Comment("Config options regarding GTEU compatibility with other energy systems") public EnergyCompatConfig energy = new EnergyCompatConfig(); diff --git a/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java b/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java index 542c7ecc261..fcc8e02d375 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java +++ b/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java @@ -3,32 +3,32 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.GTFluid; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorage; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKey; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.FluidProperty; -import com.gregtechceu.gtceu.api.material.material.properties.OreProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.GTFluid; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorage; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.registry.registrate.forge.GTClientFluidTypeExtensions; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.registry.registrate.GTClientFluidTypeExtensions; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.BlockBehaviourAccessor; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.integration.kjs.GTCEuServerEvents; -import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockFluidVeinKubeEvent; -import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockOreVeinKubeEvent; -import com.gregtechceu.gtceu.integration.kjs.events.GTOreVeinKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockFluidVeinEventJS; +import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockOreVeinEventJS; +import com.gregtechceu.gtceu.integration.kjs.events.GTOreVeinEventJS; import net.minecraft.client.Minecraft; import net.minecraft.core.*; @@ -434,16 +434,16 @@ private static void postEventWithRegistry(Consumer> even } } - private static void postOreVeinEvent(WritableRegistry registry) { - GTCEuServerEvents.ORE_VEIN_MODIFICATION.post(new GTOreVeinKubeEvent(registry)); + private static void postOreVeinEvent(WritableRegistry registry) { + GTCEuServerEvents.ORE_VEIN_MODIFICATION.post(new GTOreVeinEventJS(registry)); } private static void postBedrockFluidEvent(WritableRegistry registry) { - GTCEuServerEvents.FLUID_VEIN_MODIFICATION.post(new GTBedrockFluidVeinKubeEvent(registry)); + GTCEuServerEvents.FLUID_VEIN_MODIFICATION.post(new GTBedrockFluidVeinEventJS(registry)); } private static void postBedrockOreEvent(WritableRegistry registry) { - GTCEuServerEvents.BEDROCK_ORE_VEIN_MODIFICATION.post(new GTBedrockOreVeinKubeEvent(registry)); + GTCEuServerEvents.BEDROCK_ORE_VEIN_MODIFICATION.post(new GTBedrockOreVeinEventJS(registry)); } } diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkGeneratorMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkGeneratorMixin.java index 9d44f8bfc15..a1ea8bea910 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkGeneratorMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkGeneratorMixin.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.core.mixins; -import com.gregtechceu.gtceu.api.worldgen.ores.OrePlacer; +import com.gregtechceu.gtceu.api.data.worldgen.ores.OrePlacer; import net.minecraft.world.level.StructureManager; import net.minecraft.world.level.WorldGenLevel; diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkSerializerMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkSerializerMixin.java deleted file mode 100644 index 2de3ac1d20b..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkSerializerMixin.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.gregtechceu.gtceu.core.mixins; - -import com.gregtechceu.gtceu.api.datafixer.DataFixesInternals; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.chunk.storage.ChunkSerializer; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; - -@Mixin(ChunkSerializer.class) -public abstract class ChunkSerializerMixin { - - @ModifyVariable( - method = "write", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/nbt/CompoundTag;putInt(Ljava/lang/String;I)V", - ordinal = 0)) - private static CompoundTag gtceu$addModDataVersions(CompoundTag compound) { - return DataFixesInternals.get().addModDataVersions(compound); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/DataFixTypesMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/DataFixTypesMixin.java deleted file mode 100644 index 7ba633121ca..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/DataFixTypesMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gregtechceu.gtceu.core.mixins; - -import com.gregtechceu.gtceu.api.datafixer.DataFixesInternals; - -import net.minecraft.util.datafix.DataFixTypes; - -import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import com.mojang.datafixers.DSL; -import com.mojang.serialization.Dynamic; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(DataFixTypes.class) -public class DataFixTypesMixin { - - @Shadow - @Final - private DSL.TypeReference type; - - // ModifyReturnValue to inject our fixes *after* vanilla ones - @ModifyReturnValue(method = "update(Lcom/mojang/datafixers/DataFixer;Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;", - at = @At(value = "RETURN")) - private Dynamic gtceu$injectDataFixers(Dynamic value) { - return DataFixesInternals.get().updateWithAllFixers(this.type, value); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/IOWorkerMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/IOWorkerMixin.java deleted file mode 100644 index e581bf5a33d..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/IOWorkerMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gregtechceu.gtceu.core.mixins; - -import com.gregtechceu.gtceu.api.datafixer.DataFixesInternals; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.chunk.storage.IOWorker; - -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.concurrent.CompletableFuture; - -@Mixin(IOWorker.class) -public class IOWorkerMixin { - - @Inject(method = "store", at = @At("HEAD")) - private void gtceu$addModDataVersions(ChunkPos chunkPos, @Nullable CompoundTag chunkData, - CallbackInfoReturnable> cir) { - if (chunkData != null) - DataFixesInternals.get().addModDataVersions(chunkData); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelMixin.java index 079222d19ba..d095baa8fa6 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelMixin.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.core.mixins; -import com.gregtechceu.gtceu.api.multiblock.MultiblockState; -import com.gregtechceu.gtceu.api.multiblock.MultiblockWorldSavedData; +import com.gregtechceu.gtceu.api.pattern.MultiblockState; +import com.gregtechceu.gtceu.api.pattern.MultiblockWorldSavedData; import com.lowdragmc.lowdraglib.async.AsyncThreadData; diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerEarlyMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerEarlyMixin.java index bd41f0fd0db..2cb9557f2a8 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerEarlyMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerEarlyMixin.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.core.mixins; -import com.gregtechceu.gtceu.data.recipe.GTRecipes; +import com.gregtechceu.gtceu.common.data.GTRecipes; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerLateMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerLateMixin.java index ee26c11fc32..563c9523382 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerLateMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/RecipeManagerLateMixin.java @@ -1,10 +1,9 @@ package com.gregtechceu.gtceu.core.mixins; -import com.gregtechceu.gtceu.api.machine.trait.customlogic.SteamBoilerLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.StagingRecipeDB; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; @@ -76,7 +75,6 @@ public void accept(@NotNull ResourceLocation id, @NotNull Recipe recipe, }); gtceu$replaceRecipes(recipesByName); - SteamBoilerLogic.clearBoilerRecipeCaches(); for (RecipeType recipeType : BuiltInRegistries.RECIPE_TYPE) { if (recipeType instanceof GTRecipeType gtRecipeType) { var stagingDB = new StagingRecipeDB(); diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java index 3f98f302e9b..9f9cb89c7e6 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.core.mixins; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.common.pack.GTDynamicDataPack; +import com.gregtechceu.gtceu.common.data.GTRecipes; import com.gregtechceu.gtceu.core.MixinHelpers; import com.gregtechceu.gtceu.data.loot.DungeonLootLoader; +import com.gregtechceu.gtceu.data.pack.GTDynamicDataPack; import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents; -import com.gregtechceu.gtceu.data.recipe.GTRecipes; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ServerChunkProviderMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ServerChunkProviderMixin.java index 6ccd317d618..a07c1dc44c0 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/ServerChunkProviderMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/ServerChunkProviderMixin.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.core.mixins; -import com.gregtechceu.gtceu.api.multiblock.MultiblockWorldSavedData; +import com.gregtechceu.gtceu.api.pattern.MultiblockWorldSavedData; import com.lowdragmc.lowdraglib.async.AsyncThreadData; diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/StructureMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/StructureMixin.java deleted file mode 100644 index cc956bf3ea2..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/StructureMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gregtechceu.gtceu.core.mixins; - -import com.gregtechceu.gtceu.api.datafixer.DataFixesInternals; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(StructureTemplate.class) -public abstract class StructureMixin { - - @Inject(method = "save", at = @At("TAIL"), cancellable = true) - private void addModDataVersions(CompoundTag compound, CallbackInfoReturnable cir) { - CompoundTag out = cir.getReturnValue(); - DataFixesInternals.get().addModDataVersions(out); - cir.setReturnValue(out); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/client/HotbarManagerMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/client/HotbarManagerMixin.java deleted file mode 100644 index 336f64d8869..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/client/HotbarManagerMixin.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2022 QuiltMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gregtechceu.gtceu.core.mixins.client; - -import com.gregtechceu.gtceu.api.datafixer.DataFixesInternals; - -import net.minecraft.client.HotbarManager; -import net.minecraft.nbt.CompoundTag; - -import com.llamalad7.mixinextras.sugar.Local; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(HotbarManager.class) -public abstract class HotbarManagerMixin { - - @Inject( - method = "save", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/nbt/NbtIo;write(Lnet/minecraft/nbt/CompoundTag;Ljava/nio/file/Path;)V", - shift = At.Shift.AFTER)) - private void gtceu$addModDataVersions(CallbackInfo ci, @Local CompoundTag tag) { - DataFixesInternals.get().addModDataVersions(tag); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/client/ItemEntityMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/client/ItemEntityMixin.java index f07089bc5de..e2d9c6e8cd3 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/client/ItemEntityMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/client/ItemEntityMixin.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.core.mixins.client; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTSoundEntries; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/client/LevelRendererMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/client/LevelRendererMixin.java index 73c4a878944..b66140a3c88 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/client/LevelRendererMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/client/LevelRendererMixin.java @@ -3,13 +3,13 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.MaterialBlock; import com.gregtechceu.gtceu.api.block.MaterialPipeBlock; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.item.datacomponents.AoESymmetrical; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine; import com.gregtechceu.gtceu.api.machine.steam.SteamMachine; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.common.blockentity.CableBlockEntity; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/top/ConfigMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/top/ConfigMixin.java deleted file mode 100644 index 71a68f75b79..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/top/ConfigMixin.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gregtechceu.gtceu.core.mixins.top; - -import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.item.tool.MaterialToolTier; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.data.tag.CustomTags; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; - -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import it.unimi.dsi.fastutil.ints.IntSet; -import mcjty.theoneprobe.config.Config; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.Map; - -@Mixin(value = Config.class, remap = false) -public class ConfigMixin { - - @Shadow - private static Map tooltypeTagsSet; - @Shadow - private static Map harvestabilityTagsSet; - - @Inject(method = "getTooltypeTags", - at = @At(value = "INVOKE", target = "Ljava/util/List;iterator()Ljava/util/Iterator;")) - private static void gtceu$injectToolTags(CallbackInfoReturnable> cir) { - for (GTToolType type : GTToolType.getTypes().values()) { - for (TagKey tag : type.itemTags) { - if (!tooltypeTagsSet.containsKey(tag.location())) tooltypeTagsSet.put(tag.location(), - Component.translatable("gtceu.tool.class." + type.name).getString()); - } - } - } - - @Inject(method = "getHarvestabilityTags", - at = @At(value = "INVOKE", target = "Ljava/util/List;iterator()Ljava/util/Iterator;")) - private static void gtceu$injectHarvestTags(CallbackInfoReturnable> cir) { - IntSet passedTiers = new IntOpenHashSet(); - for (Material mat : GTCEuAPI.materialManager) { - if (mat.hasProperty(PropertyKey.TOOL)) { - MaterialToolTier tier = mat.getToolTier(); - int harvestLevel = tier.property.getHarvestLevel(); - if (!passedTiers.contains(harvestLevel)) { - passedTiers.add(harvestLevel); - TagKey tag = CustomTags.TOOL_TIERS[harvestLevel]; - if (!harvestabilityTagsSet.containsKey(tag.location())) - harvestabilityTagsSet.put(tag.location(), mat.getLocalizedName().getString()); - } - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/GTVanillaDatagen.java b/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java similarity index 83% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/GTVanillaDatagen.java rename to src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java index 06a98b786b8..e73bd5561c6 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/GTVanillaDatagen.java +++ b/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java @@ -1,14 +1,11 @@ -package com.gregtechceu.gtceu.data.datagen; +package com.gregtechceu.gtceu.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.registry.registrate.SoundEntryBuilder; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; -import com.gregtechceu.gtceu.data.datagen.tag.BiomeTagsLoader; -import com.gregtechceu.gtceu.data.datagen.tag.DamageTypeTagsLoader; -import com.gregtechceu.gtceu.data.enchantment.GTEnchantmentProviders; -import com.gregtechceu.gtceu.data.sound.GTJukeboxSongs; -import com.gregtechceu.gtceu.data.worldgen.*; +import com.gregtechceu.gtceu.common.data.*; +import com.gregtechceu.gtceu.data.tags.BiomeTagsLoader; +import com.gregtechceu.gtceu.data.tags.DamageTypeTagsLoader; import net.minecraft.core.RegistrySetBuilder; import net.minecraft.core.registries.Registries; @@ -24,7 +21,7 @@ import java.util.Set; @EventBusSubscriber(modid = GTCEu.MOD_ID) -public class GTVanillaDatagen { +public class DataGenerators { @SubscribeEvent public static void gatherData(GatherDataEvent event) { @@ -42,8 +39,8 @@ public static void gatherData(GatherDataEvent event) { packOutput, registries, new RegistrySetBuilder() .add(Registries.DAMAGE_TYPE, GTDamageTypes::bootstrap) .add(Registries.CONFIGURED_FEATURE, GTConfiguredFeatures::bootstrap) - .add(Registries.PLACED_FEATURE, GTPlacedFeatures::bootstrap) - .add(Registries.DENSITY_FUNCTION, GTDensityFunctions::bootstrap) + .add(Registries.PLACED_FEATURE, GTPlacements::bootstrap) + .add(Registries.DENSITY_FUNCTION, GTWorldgen::bootstrap) .add(NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTBiomeModifiers::bootstrap) .add(Registries.JUKEBOX_SONG, GTJukeboxSongs::bootstrap) .add(Registries.ENCHANTMENT_PROVIDER, GTEnchantmentProviders::bootstrap) diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/GTRegistrateDatagen.java b/src/main/java/com/gregtechceu/gtceu/data/GregTechDatagen.java similarity index 77% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/GTRegistrateDatagen.java rename to src/main/java/com/gregtechceu/gtceu/data/GregTechDatagen.java index fd6e63a22ff..e2964bc6aa1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/GTRegistrateDatagen.java +++ b/src/main/java/com/gregtechceu/gtceu/data/GregTechDatagen.java @@ -1,18 +1,21 @@ -package com.gregtechceu.gtceu.data.datagen; +package com.gregtechceu.gtceu.data; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; import com.gregtechceu.gtceu.common.registry.GTRegistration; import com.gregtechceu.gtceu.core.mixins.registrate.RegistrateDataProviderAccessor; -import com.gregtechceu.gtceu.data.datagen.datamap.DataMapsHandler; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.datagen.model.BlockstateModelLoader; -import com.gregtechceu.gtceu.data.datagen.tag.*; +import com.gregtechceu.gtceu.data.datamap.DataMapsHandler; +import com.gregtechceu.gtceu.data.lang.LangHandler; +import com.gregtechceu.gtceu.data.model.BlockstateModelLoader; +import com.gregtechceu.gtceu.data.tags.BlockTagLoader; +import com.gregtechceu.gtceu.data.tags.EntityTypeTagLoader; +import com.gregtechceu.gtceu.data.tags.FluidTagLoader; +import com.gregtechceu.gtceu.data.tags.ItemTagLoader; import net.minecraft.data.DataProvider; import com.tterrag.registrate.providers.ProviderType; -public class GTRegistrateDatagen { +public class GregTechDatagen { // we only register this so the class gets loaded. the key gets overwritten in #initPre. private static final ProviderType BLOCKSTATE_PROVIDER = ProviderType.registerProvider( diff --git a/src/main/java/com/gregtechceu/gtceu/data/datafixer/GTDataFixers.java b/src/main/java/com/gregtechceu/gtceu/data/datafixer/GTDataFixers.java deleted file mode 100644 index b3cf67f5075..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/data/datafixer/GTDataFixers.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.gregtechceu.gtceu.data.datafixer; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.datafixer.DataFixesInternals; -import com.gregtechceu.gtceu.common.datafixer.fixes.*; -import com.gregtechceu.gtceu.config.ConfigHolder; - -import net.minecraft.util.datafix.DataFixTypes; -import net.minecraft.util.datafix.fixes.AddNewChoices; -import net.minecraft.util.datafix.fixes.BlockRenameFix; -import net.minecraft.util.datafix.fixes.ItemRenameFix; -import net.minecraft.util.datafix.fixes.References; -import net.minecraft.util.datafix.schemas.NamespacedSchema; - -import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.mojang.datafixers.DataFixerBuilder; -import com.mojang.datafixers.schemas.Schema; - -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.function.BiFunction; -import java.util.function.UnaryOperator; -import java.util.regex.Pattern; - -import static com.gregtechceu.gtceu.api.datafixer.DataFixesInternals.BASE_SCHEMA; - -@SuppressWarnings("SameParameterValue") -public class GTDataFixers { - - private static final BiFunction SAME_NAMESPACED = NamespacedSchema::new; - - public static void init() { - if (!ConfigHolder.INSTANCE.compat.doDatafixers) { - return; - } - - GTCEu.LOGGER.info("Registering data fixers"); - - DataFixesInternals api = DataFixesInternals.get(); - - DataFixerBuilder builder = new DataFixerBuilder(GTCEuAPI.GT_DATA_VERSION); - addFixers(builder); - - ExecutorService executor = Executors.newSingleThreadExecutor( - new ThreadFactoryBuilder().setNameFormat("GTCEu Datafixer Bootstrap") - .setDaemon(true).setPriority(1).build()); - DataFixerBuilder.Result result = builder.build(); - result.optimize(DataFixTypes.TYPES_FOR_LEVEL_LIST, executor); - api.registerFixer(GTCEuAPI.GT_DATA_VERSION, result.fixer()); - } - - public static void addFixers(DataFixerBuilder builder) { - Schema schemaV0 = builder.addSchema(0, BASE_SCHEMA); - builder.addFixer(new AddNewChoices(schemaV0, "Added GT block entities", References.BLOCK_ENTITY)); - - Schema schemaV1 = builder.addSchema(1, SAME_NAMESPACED); - builder.addFixer(ItemRenameFix.create(schemaV1, "advanced_nanomuscle_chestplate rename fix", - createRenamer("gtceu:avanced_nanomuscle_chestplate", "gtceu:advanced_nanomuscle_chestplate"))); - - builder.addFixer(ItemRenameFix.create(schemaV1, "U238 item rename fix", - createRenamer(Pattern.compile("gtceu:(.*)uranium_"), "gtceu:$1uranium_238_"))); - builder.addFixer(BlockRenameFix.create(schemaV1, "U238 block rename fix", - createRenamer(Pattern.compile("gtceu:(.*)uranium_"), "gtceu:$1uranium_238_"))); - builder.addFixer(ItemRenameFix.create(schemaV1, "Pu239 item rename fix", - createRenamer(Pattern.compile("gtceu:(.*)plutonium_"), "gtceu:$1plutonium_239_"))); - builder.addFixer(BlockRenameFix.create(schemaV1, "Pu239 block rename fix", - createRenamer(Pattern.compile("gtceu:(.*)plutonium_"), "gtceu:$1plutonium_239_"))); - builder.addFixer(ItemRenameFix.create(schemaV1, "Red granite item rename fix", - createRenamer(Pattern.compile("gtceu:(.*)granite_red"), "gtceu:$1red_granite"))); - builder.addFixer(BlockRenameFix.create(schemaV1, "Red granite block rename fix", - createRenamer(Pattern.compile("gtceu:(.*)granite_red"), "gtceu:$1red_granite"))); - - builder.addFixer(ItemRenameFix.create(schemaV1, "Raw oil bucket rename fix", - createRenamer(OilVariantsRenameFix.RENAMED_ITEM_IDS))); - builder.addFixer(BlockRenameFix.create(schemaV1, "Raw oil block rename fix", - createRenamer(OilVariantsRenameFix.RENAMED_BLOCK_IDS))); - - builder.addFixer(new GTItemStackComponentizationFix(schemaV1)); - Schema schemaV2 = builder.addSchema(2, SAME_NAMESPACED); - builder.addFixer(ItemRenameFix.create(schemaV2, "Tungstensteel rename fix", - createRenamer(Pattern.compile("gtceu:(.*)tungstensteel"), "gtceu:$1tungsten_steel"))); - - builder.addFixer(ItemRenameFix.create(schemaV2, "Palladium Substation Casing item rename fix", - createRenamer("gtceu:palladium_substation", "gtceu:palladium_substation_casing"))); - builder.addFixer(BlockRenameFix.create(schemaV2, "Palladium Substation Casing block rename fix", - createRenamer("gtceu:palladium_substation", "gtceu:palladium_substation_casing"))); - - Schema schemaV3 = builder.addSchema(3, SAME_NAMESPACED); - builder.addFixer(new GTToolComponentFix(schemaV3)); - builder.addFixer(new EntityDamageBehaviorFix(schemaV3)); - - Schema schemaV4 = builder.addSchema(4, SAME_NAMESPACED); - builder.addFixer(new DataItemComponentFix(schemaV4)); - builder.addFixer(ItemRenameFix.create(schemaV1, "Limonite rename fix", - createRenamer(Pattern.compile("gtceu:(.*)yellow_limonite"), "gtceu:$1limonite"))); - builder.addFixer(BlockRenameFix.create(schemaV1, "Limonite rename fix", - createRenamer(Pattern.compile("gtceu:(.*)yellow_limonite"), "gtceu:$1limonite"))); - } - - private static UnaryOperator createRenamer(String oldName, String newName) { - return id -> Objects.equals(NamespacedSchema.ensureNamespaced(id), oldName) ? newName : id; - } - - private static UnaryOperator createRenamer(Map renameMap) { - return id -> renameMap.getOrDefault(NamespacedSchema.ensureNamespaced(id), id); - } - - private static UnaryOperator createRenamer(Pattern check, String replaceWith) { - return id -> check.matcher(NamespacedSchema.ensureNamespaced(id)).replaceAll(replaceWith); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/data/datafixer/GTReferences.java b/src/main/java/com/gregtechceu/gtceu/data/datafixer/GTReferences.java deleted file mode 100644 index d9b953bc401..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/data/datafixer/GTReferences.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.gregtechceu.gtceu.data.datafixer; - -import com.mojang.datafixers.DSL; - -public class GTReferences { - - public static final DSL.TypeReference MATERIAL_NAME = reference("material_name"); - - public static DSL.TypeReference reference(final String pName) { - return new DSL.TypeReference() { - - @Override - public String typeName() { - return pName; - } - - @Override - public String toString() { - return "@" + pName; - } - }; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/datamap/DataMapsHandler.java b/src/main/java/com/gregtechceu/gtceu/data/datamap/DataMapsHandler.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/datamap/DataMapsHandler.java rename to src/main/java/com/gregtechceu/gtceu/data/datamap/DataMapsHandler.java index 273053863ab..9b359f57d9d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/datamap/DataMapsHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/datamap/DataMapsHandler.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.datamap; +package com.gregtechceu.gtceu.data.datamap; import com.gregtechceu.gtceu.data.recipe.misc.ComposterRecipes; diff --git a/src/main/java/com/gregtechceu/gtceu/data/gui/.keep b/src/main/java/com/gregtechceu/gtceu/data/gui/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/AdvancementLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/AdvancementLang.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/AdvancementLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/AdvancementLang.java index 3b4f79838a7..e4598678378 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/AdvancementLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/AdvancementLang.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; import com.tterrag.registrate.providers.RegistrateLangProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/BlockLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/BlockLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java index 7eb9d62e0f5..6703bc2f021 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/BlockLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; import com.tterrag.registrate.providers.RegistrateLangProvider; -import static com.gregtechceu.gtceu.data.datagen.lang.LangHandler.replace; +import static com.gregtechceu.gtceu.data.lang.LangHandler.replace; public class BlockLang { diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ConfigurationLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ConfigurationLang.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ConfigurationLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/ConfigurationLang.java index 99823098b41..6c355cf0c83 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ConfigurationLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ConfigurationLang.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/IntegrationLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/IntegrationLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java index d26d9a83c92..438111c3f43 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/IntegrationLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.data.worldgen.GTBedrockFluids; -import com.gregtechceu.gtceu.data.worldgen.GTOreVeins; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.common.data.GTBedrockFluids; +import com.gregtechceu.gtceu.common.data.GTOreVeins; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -31,7 +31,7 @@ private static void initRecipeViewerLang(RegistrateLangProvider provider) { provider.add("gtceu.jei.ore_vein_diagram.spawn_range", "Spawn Range:"); provider.add("gtceu.jei.ore_vein_diagram.weight", "Weight: %s"); provider.add("gtceu.jei.ore_vein_diagram.dimensions", "Dimensions:"); - for (ResourceKey key : GTOreVeins.ALL_KEYS) { + for (ResourceKey key : GTOreVeins.ALL_KEYS) { ResourceLocation id = key.location(); String name = id.getPath(); provider.add(id.toLanguageKey("ore_vein"), RegistrateLangProvider.toEnglishName(name)); @@ -45,7 +45,7 @@ private static void initRecipeViewerLang(RegistrateLangProvider provider) { provider.add("gtceu.rei.group.potion_fluids", "Potion Fluids"); } - /** Jade, TheOneProbe, WTHIT */ + /** Jade */ private static void initWailaLikeLang(RegistrateLangProvider provider) { provider.add("gtceu.top.working_disabled", "Working Disabled"); provider.add("gtceu.top.energy_consumption", "Using"); diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ItemLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index c87897e9e2a..d19f91f7cd8 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -1,16 +1,16 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import net.minecraft.core.registries.BuiltInRegistries; import com.tterrag.registrate.providers.RegistrateLangProvider; -import static com.gregtechceu.gtceu.data.datagen.lang.LangHandler.multilineLang; -import static com.gregtechceu.gtceu.data.datagen.lang.LangHandler.replace; +import static com.gregtechceu.gtceu.data.lang.LangHandler.multilineLang; +import static com.gregtechceu.gtceu.data.lang.LangHandler.replace; import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName; public class ItemLang { diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/LangHandler.java b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/LangHandler.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java index adc4134d828..3ad832031b8 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/LangHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/MachineLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/MachineLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java index f83401da82e..0efc336ac21 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/MachineLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; import com.tterrag.registrate.providers.RegistrateLangProvider; -import static com.gregtechceu.gtceu.data.datagen.lang.LangHandler.*; +import static com.gregtechceu.gtceu.data.lang.LangHandler.*; public class MachineLang { diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/MaterialLangGenerator.java b/src/main/java/com/gregtechceu/gtceu/data/lang/MaterialLangGenerator.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/MaterialLangGenerator.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/MaterialLangGenerator.java index ac72d10ee2d..213c9412668 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/MaterialLangGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/MaterialLangGenerator.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; import com.gregtechceu.gtceu.api.GTCEuAPI; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/RecipeLogicLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/RecipeLogicLang.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/RecipeLogicLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/RecipeLogicLang.java index 8035eff41c2..3146df4ba7b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/RecipeLogicLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/RecipeLogicLang.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; import com.tterrag.registrate.providers.RegistrateLangProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ToolLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ToolLang.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ToolLang.java rename to src/main/java/com/gregtechceu/gtceu/data/lang/ToolLang.java index 1efeb9fc43a..45db5fbcb9d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/lang/ToolLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ToolLang.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.lang; +package com.gregtechceu.gtceu.data.lang; import com.tterrag.registrate.providers.RegistrateLangProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/loader/PostRegistryListener.java b/src/main/java/com/gregtechceu/gtceu/data/loader/PostRegistryListener.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/common/data/loader/PostRegistryListener.java rename to src/main/java/com/gregtechceu/gtceu/data/loader/PostRegistryListener.java index 754cb5f29f2..1656a707791 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/loader/PostRegistryListener.java +++ b/src/main/java/com/gregtechceu/gtceu/data/loader/PostRegistryListener.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.common.data.loader; +package com.gregtechceu.gtceu.data.loader; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.WorldGeneratorUtils; -import com.gregtechceu.gtceu.data.worldgen.GTOreVeins; +import com.gregtechceu.gtceu.common.data.GTOreVeins; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; import net.minecraft.core.Registry; @@ -33,7 +33,7 @@ protected void apply() { WorldGeneratorUtils.invalidateOreVeinCache(); } - public static void buildVeinGenerators(Registry registry) { + public static void buildVeinGenerators(Registry registry) { var iterator = registry.holders().iterator(); while (iterator.hasNext()) { var definition = iterator.next(); diff --git a/src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java b/src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java index d02914c9c3e..099d1929d9f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.data.loot; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/model/BlockstateModelLoader.java b/src/main/java/com/gregtechceu/gtceu/data/model/BlockstateModelLoader.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/model/BlockstateModelLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/model/BlockstateModelLoader.java index bfa52f4a790..de97fe5238c 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/model/BlockstateModelLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/model/BlockstateModelLoader.java @@ -1,14 +1,14 @@ -package com.gregtechceu.gtceu.data.datagen.model; +package com.gregtechceu.gtceu.data.model; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.data.model.GTMachineModels; +import com.gregtechceu.gtceu.common.data.models.GTMachineModels; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.model.generators.BlockModelProvider; -import static com.gregtechceu.gtceu.data.model.GTMachineModels.*; +import static com.gregtechceu.gtceu.common.data.models.GTMachineModels.*; public class BlockstateModelLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/MachineModelBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/model/builder/MachineModelBuilder.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/MachineModelBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/model/builder/MachineModelBuilder.java index ef2e8c0c947..2910040c0ab 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/MachineModelBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/model/builder/MachineModelBuilder.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.model.builder; +package com.gregtechceu.gtceu.data.model.builder; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/PipeModelBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/model/builder/PipeModelBuilder.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/PipeModelBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/model/builder/PipeModelBuilder.java index 6c33cdca18a..fde2a7b3969 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/PipeModelBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/model/builder/PipeModelBuilder.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.datagen.model.builder; +package com.gregtechceu.gtceu.data.model.builder; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/package-info.java b/src/main/java/com/gregtechceu/gtceu/data/model/builder/package-info.java similarity index 100% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/model/builder/package-info.java rename to src/main/java/com/gregtechceu/gtceu/data/model/builder/package-info.java diff --git a/src/main/java/com/gregtechceu/gtceu/data/multiblock/.keep b/src/main/java/com/gregtechceu/gtceu/data/multiblock/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicDataPack.java b/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicDataPack.java rename to src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java index 2cf6eaadf8c..0c76e3a15b4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicDataPack.java +++ b/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.pack; +package com.gregtechceu.gtceu.data.pack; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.addon.AddonFinder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicPackContents.java b/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicPackContents.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicPackContents.java rename to src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicPackContents.java index 48f79b027af..7b622d9eb7f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicPackContents.java +++ b/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicPackContents.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.pack; +package com.gregtechceu.gtceu.data.pack; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.PackResources; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicResourcePack.java b/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicResourcePack.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicResourcePack.java rename to src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicResourcePack.java index df19b2bbd09..59b8be2ef30 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicResourcePack.java +++ b/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicResourcePack.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.pack; +package com.gregtechceu.gtceu.data.pack; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.addon.AddonFinder; @@ -39,7 +39,7 @@ import java.util.Set; import java.util.function.Supplier; -import static com.gregtechceu.gtceu.common.pack.GTDynamicDataPack.writeJson; +import static com.gregtechceu.gtceu.data.pack.GTDynamicDataPack.writeJson; public class GTDynamicResourcePack implements PackResources { diff --git a/src/main/java/com/gregtechceu/gtceu/common/pack/GTPackSource.java b/src/main/java/com/gregtechceu/gtceu/data/pack/GTPackSource.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/common/pack/GTPackSource.java rename to src/main/java/com/gregtechceu/gtceu/data/pack/GTPackSource.java index ec24bdf1417..986aed2a46e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pack/GTPackSource.java +++ b/src/main/java/com/gregtechceu/gtceu/data/pack/GTPackSource.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.pack; +package com.gregtechceu.gtceu.data.pack; import net.minecraft.network.chat.Component; import net.minecraft.server.packs.PackLocationInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluid/package-info.java b/src/main/java/com/gregtechceu/gtceu/data/pack/package-info.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/api/fluid/package-info.java rename to src/main/java/com/gregtechceu/gtceu/data/pack/package-info.java index d12e7fe578e..3ecde85ab22 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluid/package-info.java +++ b/src/main/java/com/gregtechceu/gtceu/data/pack/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.api.fluid; +package com.gregtechceu.gtceu.data.pack; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/data/pipelike/.keep b/src/main/java/com/gregtechceu/gtceu/data/pipelike/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/component/CraftingComponent.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/api/recipe/component/CraftingComponent.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java index 7716460ed7c..481a48e1ca0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/component/CraftingComponent.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.api.recipe.component; +package com.gregtechceu.gtceu.data.recipe; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/gregtechceu/gtceu/data/tag/CustomTags.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/data/tag/CustomTags.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java index 5ad45e6c74d..f14b7c35c39 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tag/CustomTags.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.data.tag; +package com.gregtechceu.gtceu.data.recipe; -import com.gregtechceu.gtceu.api.tag.TagUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java index 6803c7645b7..b5015a7f873 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java @@ -2,21 +2,19 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.recipe.component.CraftingComponent; -import com.gregtechceu.gtceu.common.recipe.event.CraftingComponentModificationEvent; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.data.recipe.event.CraftingComponentModificationEvent; import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents; -import com.gregtechceu.gtceu.integration.kjs.events.CraftingComponentsKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.CraftingComponentsEventJS; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.common.Tags; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class GTCraftingComponents { @@ -759,7 +757,7 @@ public static void init() { private static final class KJSCallWrapper { private static void craftingComponentModification() { - GTCEuStartupEvents.CRAFTING_COMPONENTS.post(new CraftingComponentsKubeEvent()); + GTCEuStartupEvents.CRAFTING_COMPONENTS.post(new CraftingComponentsEventJS()); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/tag/GTIngredientTypes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/GTIngredientTypes.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/tag/GTIngredientTypes.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/GTIngredientTypes.java index a77e79a8448..7594c4b27be 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tag/GTIngredientTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/GTIngredientTypes.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.tag; +package com.gregtechceu.gtceu.data.recipe; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.recipe.ingredient.*; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/MaterialInfoLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/MaterialInfoLoader.java index bc9ce5773b5..6cdf8114f6c 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/MaterialInfoLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/MaterialInfoLoader.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.data.recipe; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/StoneTypeEntry.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/StoneTypeEntry.java index 0c083a0cded..1bebccc7845 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/StoneTypeEntry.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/StoneTypeEntry.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.data.recipe; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java index c4e58e0fb47..70f5e78e645 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java @@ -1,18 +1,18 @@ package com.gregtechceu.gtceu.data.recipe; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterial; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterial; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.common.recipe.builder.*; +import com.gregtechceu.gtceu.data.recipe.builder.*; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java index 9395e6c0f3c..97ca62f9ab4 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.data.recipe; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/GTRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/recipe/builder/GTRecipeBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java index 54db6c31a20..97830c205ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/GTRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java @@ -1,31 +1,31 @@ -package com.gregtechceu.gtceu.common.recipe.builder; +package com.gregtechceu.gtceu.data.recipe.builder; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.*; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.recipe.*; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.*; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.common.recipe.condition.*; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.utils.GTUtil; import com.gregtechceu.gtceu.utils.ResearchManager; import com.gregtechceu.gtceu.utils.codec.CodecUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedEnergyTransferRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedEnergyTransferRecipeBuilder.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedEnergyTransferRecipeBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedEnergyTransferRecipeBuilder.java index f912dd766bc..c8ca8232c70 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedEnergyTransferRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedEnergyTransferRecipeBuilder.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.common.recipe.builder; +package com.gregtechceu.gtceu.data.recipe.builder; -import com.gregtechceu.gtceu.api.recipe.kind.ShapedEnergyTransferRecipe; +import com.gregtechceu.gtceu.api.recipe.ShapedEnergyTransferRecipe; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.RecipeOutput; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedFluidContainerRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedFluidContainerRecipeBuilder.java similarity index 88% rename from src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedFluidContainerRecipeBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedFluidContainerRecipeBuilder.java index 2f3038a2046..6c693173766 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedFluidContainerRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedFluidContainerRecipeBuilder.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.common.recipe.builder; +package com.gregtechceu.gtceu.data.recipe.builder; -import com.gregtechceu.gtceu.api.recipe.kind.ShapedFluidContainerRecipe; +import com.gregtechceu.gtceu.api.recipe.ShapedFluidContainerRecipe; import net.minecraft.data.recipes.RecipeBuilder; import net.minecraft.data.recipes.RecipeOutput; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedRecipeBuilder.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedRecipeBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedRecipeBuilder.java index ffeb4a66956..431a105025f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapedRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapedRecipeBuilder.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.common.recipe.builder; +package com.gregtechceu.gtceu.data.recipe.builder; -import com.gregtechceu.gtceu.api.recipe.kind.StrictShapedRecipe; +import com.gregtechceu.gtceu.api.recipe.StrictShapedRecipe; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.RecipeBuilder; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapelessRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapelessRecipeBuilder.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapelessRecipeBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapelessRecipeBuilder.java index 7cdbbc29a2e..d0948ba55df 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/ShapelessRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/ShapelessRecipeBuilder.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.recipe.builder; +package com.gregtechceu.gtceu.data.recipe.builder; import net.minecraft.core.NonNullList; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/SimpleCookingRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/SimpleCookingRecipeBuilder.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/recipe/builder/SimpleCookingRecipeBuilder.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/builder/SimpleCookingRecipeBuilder.java index 006481436dd..2f3004fb503 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/builder/SimpleCookingRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/SimpleCookingRecipeBuilder.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.recipe.builder; +package com.gregtechceu.gtceu.data.recipe.builder; import com.gregtechceu.gtceu.api.recipe.ingredient.ExDataComponentIngredient; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index dc60daaac63..ab72aae46e1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -1,18 +1,18 @@ package com.gregtechceu.gtceu.data.recipe.configurable; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidContainerIngredient; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.core.registries.BuiltInRegistries; @@ -26,10 +26,10 @@ import net.neoforged.neoforge.common.Tags; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class RecipeAddition { @@ -529,7 +529,7 @@ private static void hardRedstoneRecipes(RecipeOutput provider) { VanillaRecipeHelper.addShapedRecipe(provider, "redstone_torch", new ItemStack(Blocks.REDSTONE_TORCH), "R", "T", - 'R', new MaterialEntry(TagPrefix.dust, GTMaterials.Redstone), + 'R', new MaterialEntry(dust, GTMaterials.Redstone), 'T', new ItemStack(Blocks.TORCH)); ASSEMBLER_RECIPES.recipeBuilder("calibrated_sculk_sensor") @@ -1357,13 +1357,13 @@ private static void hardGlassRecipes(RecipeOutput provider) { private static void nerfPaperCrafting(RecipeOutput provider) { VanillaRecipeHelper.addShapedRecipe(provider, "paper_dust", - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Paper, 2), "SSS", " m ", 'S', + ChemicalHelper.get(dust, GTMaterials.Paper, 2), "SSS", " m ", 'S', new ItemStack(Items.SUGAR_CANE)); - VanillaRecipeHelper.addShapedRecipe(provider, "sugar", ChemicalHelper.get(TagPrefix.dust, GTMaterials.Sugar, 1), + VanillaRecipeHelper.addShapedRecipe(provider, "sugar", ChemicalHelper.get(dust, GTMaterials.Sugar, 1), "Sm ", 'S', new ItemStack(Items.SUGAR_CANE)); VanillaRecipeHelper.addShapedFluidContainerRecipe(provider, "paper", new ItemStack(Items.PAPER, 2), " r ", "SSS", " B ", - 'S', new MaterialEntry(TagPrefix.dust, GTMaterials.Paper), + 'S', new MaterialEntry(dust, GTMaterials.Paper), 'B', new FluidContainerIngredient(Water.getFluidTag(), 1000)); } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 1470d9a5ee2..114eba9af14 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.data.recipe.configurable; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterial; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterial; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.misc.WoodMachineRecipes; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/event/CraftingComponentModificationEvent.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/event/CraftingComponentModificationEvent.java similarity index 81% rename from src/main/java/com/gregtechceu/gtceu/common/recipe/event/CraftingComponentModificationEvent.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/event/CraftingComponentModificationEvent.java index 3fb61e553f5..bd7af5cce79 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/event/CraftingComponentModificationEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/event/CraftingComponentModificationEvent.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.recipe.event; +package com.gregtechceu.gtceu.data.recipe.event; import net.neoforged.bus.api.Event; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/DecompositionRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/DecompositionRecipeHandler.java index 43263502e8f..46f841fee06 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/DecompositionRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/DecompositionRecipeHandler.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.data.recipe.generated; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTMath; import net.minecraft.data.recipes.RecipeOutput; @@ -19,10 +19,11 @@ import java.util.List; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.CENTRIFUGE_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ELECTROLYZER_RECIPES; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CENTRIFUGE_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ELECTROLYZER_RECIPES; public final class DecompositionRecipeHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java index 8174c08501c..abc9f0aef95 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java @@ -1,20 +1,20 @@ package com.gregtechceu.gtceu.data.recipe.generated; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.*; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.*; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.data.recipes.RecipeOutput; @@ -31,10 +31,10 @@ import java.util.Locale; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public final class MaterialRecipeHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/OreRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/OreRecipeHandler.java index 1c54aa17b10..6db3c80e9a6 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/OreRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/OreRecipeHandler.java @@ -1,18 +1,18 @@ package com.gregtechceu.gtceu.data.recipe.generated; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.properties.OreProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.data.recipes.RecipeOutput; @@ -26,10 +26,11 @@ import java.util.List; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.HIGH_SIFTER_OUTPUT; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.HIGH_SIFTER_OUTPUT; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public final class OreRecipeHandler { // Make sure to update OreByProduct jei page with any byproduct changes made here! diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java index 8ebe557cf32..18456eaa8a5 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java @@ -1,17 +1,17 @@ package com.gregtechceu.gtceu.data.recipe.generated; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.*; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.ItemStack; @@ -20,9 +20,9 @@ import org.jetbrains.annotations.NotNull; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public final class PartsRecipeHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PipeRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PipeRecipeHandler.java index 8bc6f3d7e1c..c49c1ef0e74 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PipeRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PipeRecipeHandler.java @@ -1,13 +1,13 @@ package com.gregtechceu.gtceu.data.recipe.generated; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeType; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.utils.FormattingUtil; @@ -17,10 +17,10 @@ import org.jetbrains.annotations.NotNull; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.NO_SMASHING; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_SMASHING; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public final class PipeRecipeHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PolarizingRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PolarizingRecipeHandler.java index 92d4f60251e..c71ea58f373 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PolarizingRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PolarizingRecipeHandler.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.data.recipe.generated; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.IngotProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.IngotProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.data.recipes.RecipeOutput; @@ -14,8 +14,9 @@ import org.jetbrains.annotations.NotNull; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.POLARIZER_RECIPES; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.POLARIZER_RECIPES; public final class PolarizingRecipeHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/RecyclingRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/RecyclingRecipeHandler.java index 63ef5199b67..17bec5c6140 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/RecyclingRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/RecyclingRecipeHandler.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.data.recipe.generated; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.data.recipe.misc.RecyclingRecipes; import net.minecraft.data.recipes.RecipeOutput; @@ -16,7 +16,8 @@ import java.util.Arrays; import java.util.List; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; public final class RecyclingRecipeHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/ToolRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/ToolRecipeHandler.java index 5bb162ed069..bac4ec4fe36 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/ToolRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/ToolRecipeHandler.java @@ -4,19 +4,19 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.core.component.DataComponents; @@ -35,8 +35,8 @@ import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.NotNull; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; public final class ToolRecipeHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireCombiningHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireCombiningHandler.java index a6572f57ca0..ff73486ba07 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireCombiningHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireCombiningHandler.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.data.recipe.generated; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.data.recipes.RecipeOutput; @@ -15,8 +15,9 @@ import java.util.Map; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.PACKER_RECIPES; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.PACKER_RECIPES; public final class WireCombiningHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireRecipeHandler.java index 91505c9652a..9ecdec43808 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/WireRecipeHandler.java @@ -1,15 +1,15 @@ package com.gregtechceu.gtceu.data.recipe.generated; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.WireProperties; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.Util; @@ -20,12 +20,12 @@ import org.jetbrains.annotations.NotNull; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.GENERATE_FINE_WIRE; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.GENERATE_PLATE; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.NO_WORKING; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_FINE_WIRE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_PLATE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_WORKING; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; /** * Guide to the GregTech CE: Unofficial Cable Processing. diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AirScrubberRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AirScrubberRecipes.java index 416188835c7..f35f1f99eaf 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AirScrubberRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AirScrubberRecipes.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.AIR_SCRUBBER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.AIR_SCRUBBER_RECIPES; public class AirScrubberRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblerRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblerRecipeLoader.java index 21c2a870da0..544de085405 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblerRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblerRecipeLoader.java @@ -6,11 +6,11 @@ import net.minecraft.world.item.Items; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; public class AssemblerRecipeLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java index ce60a8a7065..10f4f9096fe 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java @@ -1,17 +1,17 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.machine.GTMultiMachines.FUSION_REACTOR; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; +import static com.gregtechceu.gtceu.common.data.machines.GTMultiMachines.FUSION_REACTOR; public class AssemblyLineLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java index df10349cb75..2a45dbaa301 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java @@ -1,19 +1,19 @@ package com.gregtechceu.gtceu.data.recipe.misc; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials.Color; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials.Color; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class BatteryRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java index 3af548fe760..fb53a5df79b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java @@ -1,22 +1,22 @@ package com.gregtechceu.gtceu.data.recipe.misc; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials.Color; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials.Color; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class CircuitRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java index 25ca5e1451e..ccbcf685f8a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.Items; @@ -13,11 +13,11 @@ import java.util.Map; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLER_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; public class ComponentRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComposterRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComposterRecipes.java index ebb1c07df75..898bd7fc6cd 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComposterRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComposterRecipes.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java index 00d6b9051a0..e0f9e08e49d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java @@ -1,21 +1,21 @@ package com.gregtechceu.gtceu.data.recipe.misc; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.ItemStack; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; -import static com.gregtechceu.gtceu.data.machine.GTResearchMachines.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.common.data.machines.GTResearchMachines.*; public class ComputerRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java index 28e43278e40..95c3df87f0f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java @@ -1,15 +1,15 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.recipe.FacadeCoverRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidContainerIngredient; -import com.gregtechceu.gtceu.api.recipe.kind.FacadeCoverRecipe; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeType; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.data.recipes.SpecialRecipeBuilder; @@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class CraftingRecipeLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java index 8753b2abd19..1ae6bc0aaaf 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java @@ -2,17 +2,17 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.recipe.kind.ToolHeadReplaceRecipe; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.recipe.ToolHeadReplaceRecipe; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import com.gregtechceu.gtceu.utils.ToolItemHelper; import net.minecraft.core.registries.BuiltInRegistries; @@ -34,7 +34,7 @@ import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.GTValues.LuV; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; import static com.gregtechceu.gtceu.data.recipe.generated.ToolRecipeHandler.*; public final class CustomToolRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/DecorationRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/DecorationRecipes.java index 2631eec928c..b633b0618d0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/DecorationRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/DecorationRecipes.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.DyeColor; @@ -8,10 +8,10 @@ import net.minecraft.world.item.Items; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class DecorationRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FuelRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FuelRecipes.java index bfd877c1aa8..189e9e0e80f 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FuelRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FuelRecipes.java @@ -1,14 +1,15 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.level.material.Fluids; import net.neoforged.neoforge.fluids.FluidStack; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class FuelRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java index 713306d99eb..1641aa5f1d0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java @@ -1,12 +1,13 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.FUSION_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.FUSION_RECIPES; public class FusionLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java index df8286e4d9e..707159eca74 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java @@ -1,35 +1,35 @@ package com.gregtechceu.gtceu.data.recipe.misc; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GCYMRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GCYMRecipeTypes; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import org.jetbrains.annotations.NotNull; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.block.GCYMBlocks.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.CASING_TEMPERED_GLASS; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.machine.GCYMMachines.*; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLER_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.MIXER_RECIPES; -import static com.gregtechceu.gtceu.data.tag.CustomTags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GCYMBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TEMPERED_GLASS; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES; +import static com.gregtechceu.gtceu.common.data.machines.GCYMMachines.*; +import static com.gregtechceu.gtceu.data.recipe.CustomTags.*; public class GCYMRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java index b810615fb27..7bd60f81227 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java @@ -2,26 +2,26 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterial; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterial; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; import com.gregtechceu.gtceu.common.block.LampBlock; import com.gregtechceu.gtceu.common.block.StoneBlockType; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.machines.GTAEMachines; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTAEMachines; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.RecipeOutput; @@ -40,11 +40,11 @@ import java.util.Locale; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class MachineRecipeLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java index 8d39e320e5d..0e0cf5e26f3 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java @@ -1,22 +1,22 @@ package com.gregtechceu.gtceu.data.recipe.misc; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.recipe.component.CraftingComponent; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.recipe.CraftingComponent; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.tags.ItemTags; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java index 0e4a6a63f18..3b307662ba7 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java @@ -3,14 +3,14 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; -import com.gregtechceu.gtceu.data.machine.GTAEMachines; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; +import com.gregtechceu.gtceu.common.data.machines.GTAEMachines; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.ItemStack; @@ -22,14 +22,14 @@ import java.util.Locale; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.block.GTBlocks.LD_FLUID_PIPE; -import static com.gregtechceu.gtceu.data.block.GTBlocks.LD_ITEM_PIPE; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLER_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.LD_FLUID_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.LD_ITEM_PIPE; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; public class MetaTileEntityMachineRecipeLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java index 5ed5dc49300..b0e237fd745 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java @@ -1,15 +1,15 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials.Color; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials.Color; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidContainerIngredient; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.tags.FluidTags; @@ -22,10 +22,10 @@ import com.tterrag.registrate.util.entry.ItemEntry; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class MiscRecipeLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/RecyclingRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/RecyclingRecipes.java index ebc7c7070b4..c44a04b3c17 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/RecyclingRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/RecyclingRecipes.java @@ -2,19 +2,19 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.RecipeOutput; @@ -35,7 +35,8 @@ import static com.gregtechceu.gtceu.api.GTValues.L; import static com.gregtechceu.gtceu.api.GTValues.M; -import static com.gregtechceu.gtceu.api.material.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; public class RecyclingRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/StoneMachineRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/StoneMachineRecipes.java index 7134ab95200..eb353198f60 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/StoneMachineRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/StoneMachineRecipes.java @@ -2,15 +2,15 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.data.recipe.StoneTypeEntry; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; @@ -24,7 +24,7 @@ import java.util.List; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; public class StoneMachineRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index 525faeb3431..1741d7e03ff 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.data.recipe.misc; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidContainerIngredient; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.core.registries.BuiltInRegistries; @@ -22,10 +22,10 @@ import net.neoforged.neoforge.common.crafting.IntersectionIngredient; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class VanillaStandardRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java index 1698f463096..4a733e0571e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java @@ -2,19 +2,19 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.ItemMaterialData; -import com.gregtechceu.gtceu.api.material.material.stack.ItemMaterialInfo; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.ItemMaterialInfo; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.data.recipe.WoodTypeEntry; import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents; -import com.gregtechceu.gtceu.integration.kjs.events.RegisterWoodsKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.RegisterWoodsEventJS; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; @@ -33,10 +33,10 @@ import java.util.function.Consumer; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.BIO_CHAFF; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.BIO_CHAFF; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class WoodMachineRecipes { @@ -313,7 +313,7 @@ private static List getDefaultEntries() { if (CUSTOM_ENTRIES == null) { if (GTCEu.Mods.isKubeJSLoaded()) { CUSTOM_ENTRIES = new ArrayList(); - var evt = new RegisterWoodsKubeEvent(); + var evt = new RegisterWoodsEventJS(); GTCEuStartupEvents.REGISTER_WOODS.post(evt); CUSTOM_ENTRIES = new ArrayList(evt.woods); } else { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java index b7a8712ff41..a83d5dad15e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java @@ -1,19 +1,19 @@ package com.gregtechceu.gtceu.data.recipe.misc.alloyblast; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GCYMRecipeTypes; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GCYMRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.data.recipes.RecipeOutput; @@ -24,7 +24,7 @@ import lombok.experimental.ExtensionMethod; import org.jetbrains.annotations.NotNull; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.ingotHot; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.ingotHot; @ExtensionMethod(SizedIngredientExtensions.class) public class AlloyBlastRecipeProducer { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/CustomAlloyBlastRecipeProducer.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/CustomAlloyBlastRecipeProducer.java index e733020c518..b64a4217b22 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/CustomAlloyBlastRecipeProducer.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/CustomAlloyBlastRecipeProducer.java @@ -1,7 +1,8 @@ package com.gregtechceu.gtceu.data.recipe.misc.alloyblast; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.google.common.base.Preconditions; import org.jetbrains.annotations.NotNull; @@ -16,7 +17,7 @@ public class CustomAlloyBlastRecipeProducer extends AlloyBlastRecipeProducer { * @param circuitNum the custom circuit number to use * @param gasCircuitNum the custom gas circuit number to use * @param outputAmount the custom output amount in quantities of - * {@link com.gregtechceu.gtceu.api.tag.TagPrefix#ingot} + * {@link TagPrefix#ingot} * / {@link com.gregtechceu.gtceu.api.GTValues#M}) to use */ public CustomAlloyBlastRecipeProducer(int circuitNum, int gasCircuitNum, int outputAmount) { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AcidRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AcidRecipes.java index 849315534e6..bcc64a0e8b6 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AcidRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AcidRecipes.java @@ -3,10 +3,11 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.CHEMICAL_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; public class AcidRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AntidoteRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AntidoteRecipes.java index 7f5d82200f2..2c9ff7b9472 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AntidoteRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/AntidoteRecipes.java @@ -3,9 +3,10 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class AntidoteRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/BrewingRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/BrewingRecipes.java index 28b9ee50cc4..dc48397f8cc 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/BrewingRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/BrewingRecipes.java @@ -1,16 +1,16 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.data.item.GTItems.BIO_CHAFF; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.BREWING_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTItems.BIO_CHAFF; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.BREWING_RECIPES; public class BrewingRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java index b9a4d6a88bc..cdb92e63e8b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java @@ -1,15 +1,16 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.CHEMICAL_BATH_RECIPES; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CHEMICAL_BATH_RECIPES; public class ChemicalBathRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java index 46a110970ed..0f4ceb3055a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java @@ -1,16 +1,18 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.ingot; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.ingot; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class ChemistryRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/DistillationRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/DistillationRecipes.java index 1ab1e006957..eca73167826 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/DistillationRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/DistillationRecipes.java @@ -3,11 +3,11 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.FERTILIZER; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.DISTILLATION_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.DISTILLERY_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.FERTILIZER; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DISTILLATION_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DISTILLERY_RECIPES; public class DistillationRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/FuelRecipeChains.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/FuelRecipeChains.java index 1ca7fb03df9..f93e8c1a982 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/FuelRecipeChains.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/FuelRecipeChains.java @@ -3,9 +3,9 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.CHEMICAL_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; public class FuelRecipeChains { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GemSlurryRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GemSlurryRecipes.java index f768613901a..24eb0d0484d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GemSlurryRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GemSlurryRecipes.java @@ -3,10 +3,11 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.CENTRIFUGE_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.MIXER_RECIPES; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CENTRIFUGE_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES; public class GemSlurryRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GrowthMediumRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GrowthMediumRecipes.java index 2dfc6c5611c..8a9e0cd82cf 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GrowthMediumRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/GrowthMediumRecipes.java @@ -7,11 +7,11 @@ import net.minecraft.world.level.block.Blocks; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dustTiny; -import static com.gregtechceu.gtceu.data.item.GTItems.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dustTiny; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class GrowthMediumRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/LCRCombined.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/LCRCombined.java index 13160765e90..b9058b94676 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/LCRCombined.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/LCRCombined.java @@ -3,9 +3,9 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; public class LCRCombined { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java index 08e5ac49dd0..628e6785fb8 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java @@ -1,15 +1,15 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.MIXER_RECIPES; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES; public class MixerRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NaquadahRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NaquadahRecipes.java index bff1289649b..1d85e04a677 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NaquadahRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NaquadahRecipes.java @@ -3,9 +3,10 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class NaquadahRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NuclearRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NuclearRecipes.java index 7f7b5bb665d..ef9b310876a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NuclearRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/NuclearRecipes.java @@ -3,9 +3,9 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.dust; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class NuclearRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PetrochemRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PetrochemRecipes.java index 3bc3e8ee006..d8efe74f3ba 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PetrochemRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PetrochemRecipes.java @@ -1,13 +1,14 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class PetrochemRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PlatGroupMetalsRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PlatGroupMetalsRecipes.java index e2f016a5333..e71b037ce33 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PlatGroupMetalsRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PlatGroupMetalsRecipes.java @@ -3,9 +3,10 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class PlatGroupMetalsRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java index 6bb51185b7b..5eeb314de54 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java @@ -3,9 +3,10 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class PolymerRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java index 01931123631..df32d38eb95 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.ItemStack; @@ -11,10 +11,10 @@ import net.minecraft.world.level.block.Blocks; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.GELLED_TOLUENE; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.GELLED_TOLUENE; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class ReactorRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java index 77fedf62362..6c0a3b15593 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.ItemStack; @@ -8,11 +8,11 @@ import net.minecraft.world.level.block.Blocks; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.item.GTItems.PLANT_BALL; -import static com.gregtechceu.gtceu.data.item.GTItems.STICKY_RESIN; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTItems.PLANT_BALL; +import static com.gregtechceu.gtceu.common.data.GTItems.STICKY_RESIN; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class SeparationRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/TitaniumRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/TitaniumRecipes.java index 9e1d080344f..8b99b4ef5d9 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/TitaniumRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/TitaniumRecipes.java @@ -3,9 +3,10 @@ import net.minecraft.data.recipes.RecipeOutput; import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class TitaniumRecipes { diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/BiomeTagsLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/BiomeTagsLoader.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/tag/BiomeTagsLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/BiomeTagsLoader.java index 02319eabdb0..c7e9b4da878 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/BiomeTagsLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/BiomeTagsLoader.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.datagen.tag; +package com.gregtechceu.gtceu.data.tags; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/BlockTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/tag/BlockTagLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java index 660d58c5594..06ea0610846 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/BlockTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.data.datagen.tag; +package com.gregtechceu.gtceu.data.tags; import com.gregtechceu.gtceu.common.block.StoneTypes; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/DamageTypeTagsLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/DamageTypeTagsLoader.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/tag/DamageTypeTagsLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/DamageTypeTagsLoader.java index d2958bf353b..a5c967e624d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/DamageTypeTagsLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/DamageTypeTagsLoader.java @@ -1,8 +1,8 @@ -package com.gregtechceu.gtceu.data.datagen.tag; +package com.gregtechceu.gtceu.data.tags; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.common.data.GTDamageTypes; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/EntityTypeTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/EntityTypeTagLoader.java similarity index 88% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/tag/EntityTypeTagLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/EntityTypeTagLoader.java index bd11a603b8a..2b7e4285714 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/EntityTypeTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/EntityTypeTagLoader.java @@ -1,6 +1,6 @@ -package com.gregtechceu.gtceu.data.datagen.tag; +package com.gregtechceu.gtceu.data.tags; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/FluidTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java similarity index 74% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/tag/FluidTagLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java index e1c6252a243..4924d3bd74e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/FluidTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.data.datagen.tag; +package com.gregtechceu.gtceu.data.tags; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.world.level.material.Fluid; diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/ItemTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/tag/ItemTagLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java index 92b9e43f6b4..044d16951c1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/tag/ItemTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java @@ -1,13 +1,13 @@ -package com.gregtechceu.gtceu.data.datagen.tag; +package com.gregtechceu.gtceu.data.tags; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials.Color; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.tag.TagUtil; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials.Color; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.tags.ItemTags; @@ -19,8 +19,8 @@ import java.util.Objects; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; @SuppressWarnings({ "SameParameterValue", "DataFlowIssue" }) public class ItemTagLoader { diff --git a/src/main/java/com/gregtechceu/gtceu/data/datagen/TagsHandler.java b/src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java similarity index 74% rename from src/main/java/com/gregtechceu/gtceu/data/datagen/TagsHandler.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java index d036c793c87..0444bb07e11 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/datagen/TagsHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java @@ -1,12 +1,13 @@ -package com.gregtechceu.gtceu.data.datagen; +package com.gregtechceu.gtceu.data.tags; -import com.gregtechceu.gtceu.api.material.material.MarkerMaterials.Color; +import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials.Color; import net.minecraft.world.item.Items; -import static com.gregtechceu.gtceu.api.material.material.ItemMaterialData.registerMaterialEntry; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData.registerMaterialEntry; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class TagsHandler { diff --git a/src/main/java/com/gregtechceu/gtceu/data/worldgen/package-info.java b/src/main/java/com/gregtechceu/gtceu/data/worldgen/package-info.java deleted file mode 100644 index 46f1c426c6f..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/data/worldgen/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.common.data; - -import net.minecraft.FieldsAreNonnullByDefault; -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/forge/AlloyBlastPropertyAddition.java b/src/main/java/com/gregtechceu/gtceu/forge/AlloyBlastPropertyAddition.java deleted file mode 100644 index c1ab4b982b8..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/forge/AlloyBlastPropertyAddition.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gregtechceu.gtceu.forge; - -import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.event.PostMaterialEvent; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.properties.AlloyBlastProperty; -import com.gregtechceu.gtceu.api.material.material.properties.BlastProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.misc.alloyblast.CustomAlloyBlastRecipeProducer; - -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -/** - * Listen to PostMaterialEvent instead of doing this directly because it's a lot cleaner this way. - */ -public class AlloyBlastPropertyAddition { - - public static void addAlloyBlastProperties(PostMaterialEvent event) { - for (Material material : GTCEuAPI.materialManager) { - if (!material.hasFlag(MaterialFlags.DISABLE_ALLOY_PROPERTY)) { - addAlloyBlastProperty(material); - } - } - // Alloy Blast Overriding - GTMaterials.NiobiumNitride.getProperty(PropertyKey.ALLOY_BLAST) - .setRecipeProducer(new CustomAlloyBlastRecipeProducer(1, 11, -1)); - - GTMaterials.IndiumTinBariumTitaniumCuprate.getProperty(PropertyKey.ALLOY_BLAST) - .setRecipeProducer(new CustomAlloyBlastRecipeProducer(-1, -1, 16)); - } - - public static void addAlloyBlastProperty(@NotNull Material material) { - final List components = material.getMaterialComponents(); - // ignore materials which are not alloys - if (components.size() < 2) return; - - BlastProperty blastProperty = material.getProperty(PropertyKey.BLAST); - if (blastProperty == null) return; - - if (!material.hasProperty(PropertyKey.FLUID)) return; - - // if there are more than 2 fluid-only components in the material, do not generate a hot fluid - if (components.stream().filter(AlloyBlastPropertyAddition::isMaterialStackFluidOnly).limit(3).count() > 2) { - return; - } - - material.setProperty(PropertyKey.ALLOY_BLAST, new AlloyBlastProperty(material.getBlastTemperature())); - material.getProperty(PropertyKey.FLUID).getStorage().enqueueRegistration(FluidStorageKeys.MOLTEN, - new FluidBuilder().state(FluidState.LIQUID)); - } - - private static boolean isMaterialStackFluidOnly(@NotNull MaterialStack ms) { - return !ms.material().hasProperty(PropertyKey.DUST) && ms.material().hasProperty(PropertyKey.FLUID); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java index e6fc1c46563..80fc4625867 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java @@ -6,8 +6,8 @@ import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot; import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.integration.ae2.gui.widget.AEItemConfigWidget; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEItemList; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEItemSlot; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java index 54b27ff6494..a992cc00f9c 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java @@ -6,8 +6,8 @@ import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot; import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; -import com.gregtechceu.gtceu.data.item.GTDataComponents; import com.gregtechceu.gtceu.integration.ae2.gui.widget.AEFluidConfigWidget; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEFluidList; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEFluidSlot; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEOutputHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEOutputHatchPartMachine.java index 42cf16ffb3b..b5c14e53bc7 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEOutputHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEOutputHatchPartMachine.java @@ -5,8 +5,8 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; import com.gregtechceu.gtceu.integration.ae2.gui.widget.list.AEListGridWidget; import com.gregtechceu.gtceu.integration.ae2.utils.KeyStorage; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java index cbca696b56e..196eb1a16f8 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java @@ -18,9 +18,9 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.machines.GTAEMachines; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.machine.GTAEMachines; import com.gregtechceu.gtceu.integration.ae2.gui.widget.AETextInputButtonWidget; import com.gregtechceu.gtceu.integration.ae2.gui.widget.slot.AEPatternViewSlotWidget; import com.gregtechceu.gtceu.integration.ae2.machine.trait.InternalSlotRecipeHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java index a00bf517db8..1762b6aef32 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.api.machine.feature.IMachineLife; import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.integration.ae2.machine.trait.ProxySlotRecipeHandler; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java index 3ed73922ca4..c58a244c4bb 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableRecipeHandlerTrait; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferPartMachine; import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferPartMachine.InternalSlot; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java index e062460113b..ce44d0a7d48 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableRecipeHandlerTrait; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferPartMachine; import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferProxyPartMachine; import com.gregtechceu.gtceu.integration.ae2.machine.trait.InternalSlotRecipeHandler.SlotRHL; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/slot/ExportOnlyAEItemList.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/slot/ExportOnlyAEItemList.java index 4e065a9f673..39b74b21897 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/slot/ExportOnlyAEItemList.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/slot/ExportOnlyAEItemList.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java index ef78a38526b..796d4ea5733 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java @@ -4,14 +4,14 @@ import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.registry.GTRegistries; +import com.gregtechceu.gtceu.common.data.GTFluids; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluid; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluidHelper; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.fluid.GTFluids; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.integration.emi.circuit.GTProgrammedCircuitCategory; import com.gregtechceu.gtceu.integration.emi.multipage.MultiblockInfoEmiCategory; import com.gregtechceu.gtceu.integration.emi.oreprocessing.GTOreProcessingEmiCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java index fd8b72b86ca..90cb88abf4b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.emi.circuit; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; -import com.gregtechceu.gtceu.data.item.GTItems; import com.gregtechceu.gtceu.integration.xei.widgets.GTProgrammedCircuitWidget; import com.lowdragmc.lowdraglib.emi.ModularEmiRecipe; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/multipage/MultiblockInfoEmiCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/multipage/MultiblockInfoEmiCategory.java index a6108d1b323..8e09667d4b1 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/multipage/MultiblockInfoEmiCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/multipage/MultiblockInfoEmiCategory.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTEmiOreProcessing.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTEmiOreProcessing.java index 464899d1c06..debdbe15819 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTEmiOreProcessing.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTEmiOreProcessing.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.emi.oreprocessing; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreByProductWidget; import com.lowdragmc.lowdraglib.emi.ModularEmiRecipe; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTOreProcessingEmiCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTOreProcessingEmiCategory.java index f3336cd94d7..d90e79ddc97 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTOreProcessingEmiCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/oreprocessing/GTOreProcessingEmiCategory.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.integration.emi.GTEMIPlugin; @@ -18,8 +18,8 @@ import java.util.ArrayList; import java.util.List; -import static com.gregtechceu.gtceu.api.material.material.properties.PropertyKey.ORE; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.ORE; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; public class GTOreProcessingEmiCategory extends EmiRecipeCategory { diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluid.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluid.java index 8a25d423210..50202c4f242 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluid.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluid.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.emi.orevein; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.emi.ModularEmiRecipe; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluidEmiCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluidEmiCategory.java index 7455a2d05a3..ddb819f3a18 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluidEmiCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockFluidEmiCategory.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOre.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOre.java index 6978583b091..e9c9a4c4ff3 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOre.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOre.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.emi.orevein; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.emi.ModularEmiRecipe; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOreEmiCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOreEmiCategory.java index 1c27432fc1a..ea761bd6eee 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOreEmiCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTBedrockOreEmiCategory.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.integration.emi.orevein; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTEmiOreVein.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTEmiOreVein.java index 01c8841bc75..16c0b6f8bcc 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTEmiOreVein.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTEmiOreVein.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.emi.orevein; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.emi.ModularEmiRecipe; @@ -17,9 +17,9 @@ public class GTEmiOreVein extends ModularEmiRecipe { - private final Holder oreDefinition; + private final Holder oreDefinition; - public GTEmiOreVein(Holder oreDefinition) { + public GTEmiOreVein(Holder oreDefinition) { super(() -> new GTOreVeinWidget(oreDefinition)); this.oreDefinition = oreDefinition; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTOreVeinEmiCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTOreVeinEmiCategory.java index fa1cb0a8d81..3f71e942cd5 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTOreVeinEmiCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/orevein/GTOreVeinEmiCategory.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTEmiRecipe.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTEmiRecipe.java index 5a5cdbebb00..a99e0539a7a 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTEmiRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTEmiRecipe.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.emi.recipe; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.integration.xei.widgets.GTRecipeWidget; import com.lowdragmc.lowdraglib.emi.ModularEmiRecipe; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTRecipeEMICategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTRecipeEMICategory.java index acffa1fc680..50dd4c2d56b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTRecipeEMICategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTRecipeEMICategory.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.integration.emi.GTEMIPlugin; import com.lowdragmc.lowdraglib.emi.IGui2Renderable; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jade/GTJadePlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/jade/GTJadePlugin.java index 3943b70661a..84c00df2907 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jade/GTJadePlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jade/GTJadePlugin.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.common.blockentity.FluidPipeBlockEntity; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.integration.jade.provider.*; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/RecipeOutputProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/RecipeOutputProvider.java index 7c3b28355f1..53f132a9ef3 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/RecipeOutputProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/RecipeOutputProvider.java @@ -5,13 +5,13 @@ import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderFluidIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.integration.jade.GTElementHelper; import com.gregtechceu.gtceu.utils.codec.CodecUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java index 51cb560d9d6..b854f5414f2 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java @@ -3,13 +3,13 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.registry.GTRegistries; +import com.gregtechceu.gtceu.common.data.GTFluids; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluid; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.fluid.GTFluids; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.integration.jei.circuit.GTProgrammedCircuitCategory; import com.gregtechceu.gtceu.integration.jei.multipage.MultiblockInfoCategory; import com.gregtechceu.gtceu.integration.jei.oreprocessing.GTOreProcessingInfoCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/circuit/GTProgrammedCircuitCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/circuit/GTProgrammedCircuitCategory.java index dc2bb3e0ada..b211672a353 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/circuit/GTProgrammedCircuitCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/circuit/GTProgrammedCircuitCategory.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.jei.circuit; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.integration.xei.widgets.GTProgrammedCircuitWidget; import com.lowdragmc.lowdraglib.jei.ModularUIRecipeCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/multipage/MultiblockInfoCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/multipage/MultiblockInfoCategory.java index 30f7cf81820..fe4889c6e23 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/multipage/MultiblockInfoCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/multipage/MultiblockInfoCategory.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.lowdragmc.lowdraglib.gui.widget.Widget; import com.lowdragmc.lowdraglib.jei.ModularUIRecipeCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoCategory.java index 0dacd5e9854..130a6aac1e7 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoCategory.java @@ -3,10 +3,10 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.lowdragmc.lowdraglib.jei.ModularUIRecipeCategory; @@ -21,9 +21,9 @@ import mezz.jei.api.registration.IRecipeRegistration; import org.jetbrains.annotations.NotNull; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.rawOre; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; -import static com.gregtechceu.gtceu.data.material.GTMaterials.Iron; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.rawOre; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Iron; public class GTOreProcessingInfoCategory extends ModularUIRecipeCategory { diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoWrapper.java index c80b6328ef3..3f33de6d446 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/oreprocessing/GTOreProcessingInfoWrapper.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.jei.oreprocessing; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreByProductWidget; import com.lowdragmc.lowdraglib.jei.ModularWrapper; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoCategory.java index b6cebbbe8cc..c8c4c60dda1 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoCategory.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.integration.jei.orevein; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.jei.ModularUIRecipeCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoWrapper.java index 4ea7f8e2d4f..cd60ded349b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockFluidInfoWrapper.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.jei.orevein; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.jei.ModularWrapper; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoCategory.java index ecb8aab8798..8ff439ab1d8 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoCategory.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.jei.orevein; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.jei.ModularUIRecipeCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoWrapper.java index 44b4fc95a96..a92f6c78526 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTBedrockOreInfoWrapper.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.jei.orevein; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.jei.ModularWrapper; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoCategory.java index 7b37a0532a9..ab6ad81f7d3 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoCategory.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.integration.jei.orevein; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.jei.ModularUIRecipeCategory; @@ -29,9 +29,9 @@ import java.util.function.Function; -public class GTOreVeinInfoCategory extends ModularUIRecipeCategory> { +public class GTOreVeinInfoCategory extends ModularUIRecipeCategory> { - public final static RecipeType> RECIPE_TYPE = new RecipeType(GTCEu.id("ore_vein_diagram"), + public final static RecipeType> RECIPE_TYPE = new RecipeType(GTCEu.id("ore_vein_diagram"), Holder.class); @Getter private final IDrawable background; @@ -51,12 +51,12 @@ public static void registerRecipes(IRecipeRegistration registry) { .registryOrThrow(GTRegistries.ORE_VEIN_REGISTRY); registry.addRecipes(RECIPE_TYPE, ores.holders() .filter(ore -> ore.value().canGenerate()) - .>map(Function.identity()) + .>map(Function.identity()) .toList()); } @Override - public void setRecipe(IRecipeLayoutBuilder builder, Holder definition, IFocusGroup focuses) { + public void setRecipe(IRecipeLayoutBuilder builder, Holder definition, IFocusGroup focuses) { super.setRecipe(builder, definition, focuses); builder.addInvisibleIngredients(RecipeIngredientRole.OUTPUT) .addItemStacks(GTOreVeinWidget.getContainedOresAndBlocks(definition.value())); @@ -70,7 +70,7 @@ public static void registerRecipeCatalysts(IRecipeCatalystRegistration registrat @NotNull @Override - public RecipeType> getRecipeType() { + public RecipeType> getRecipeType() { return RECIPE_TYPE; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoWrapper.java index cd01cc28f20..c39e9078339 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/orevein/GTOreVeinInfoWrapper.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.jei.orevein; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.jei.ModularWrapper; @@ -9,9 +9,9 @@ public class GTOreVeinInfoWrapper extends ModularWrapper { - public final Holder oreDefinition; + public final Holder oreDefinition; - public GTOreVeinInfoWrapper(Holder oreDefinition) { + public GTOreVeinInfoWrapper(Holder oreDefinition) { super(new GTOreVeinWidget(oreDefinition)); this.oreDefinition = oreDefinition; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeJEICategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeJEICategory.java index 838aa934cdc..93d359fa065 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeJEICategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeJEICategory.java @@ -2,11 +2,11 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.MachineDefinition; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.lowdragmc.lowdraglib.jei.IGui2IDrawable; import com.lowdragmc.lowdraglib.jei.ModularUIRecipeCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeWrapper.java index 983c4661970..602b9586ac8 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeWrapper.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.jei.recipe; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.integration.xei.widgets.GTRecipeWidget; import com.lowdragmc.lowdraglib.gui.widget.Widget; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/CircuitSubtypeInterpreter.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/CircuitSubtypeInterpreter.java index 631110b388c..7ddc85b1359 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/CircuitSubtypeInterpreter.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/CircuitSubtypeInterpreter.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.jei.subtype; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/MaterialSubtypeInterpreter.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/MaterialSubtypeInterpreter.java index 6dd6e35279c..be5a7411820 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/MaterialSubtypeInterpreter.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/subtype/MaterialSubtypeInterpreter.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.jei.subtype; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuServerEvents.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuServerEvents.java index a866384d160..76f8e61519a 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuServerEvents.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuServerEvents.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.kjs; -import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockFluidVeinKubeEvent; -import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockOreVeinKubeEvent; -import com.gregtechceu.gtceu.integration.kjs.events.GTOreVeinKubeEvent; -import com.gregtechceu.gtceu.integration.kjs.events.RegisterCapesKubeEvent; +import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockFluidVeinEventJS; +import com.gregtechceu.gtceu.integration.kjs.events.GTBedrockOreVeinEventJS; +import com.gregtechceu.gtceu.integration.kjs.events.GTOreVeinEventJS; +import com.gregtechceu.gtceu.integration.kjs.events.RegisterCapesEventJS; import dev.latvian.mods.kubejs.event.EventGroup; import dev.latvian.mods.kubejs.event.EventHandler; @@ -12,9 +12,9 @@ public interface GTCEuServerEvents { EventGroup GROUP = EventGroup.of("GTCEuServerEvents"); - EventHandler ORE_VEIN_MODIFICATION = GROUP.server("oreVeins", () -> GTOreVeinKubeEvent.class); - EventHandler FLUID_VEIN_MODIFICATION = GROUP.server("fluidVeins", () -> GTBedrockFluidVeinKubeEvent.class); - EventHandler BEDROCK_ORE_VEIN_MODIFICATION = GROUP.server("bedrockOreVeins", () -> GTBedrockOreVeinKubeEvent.class); + EventHandler ORE_VEIN_MODIFICATION = GROUP.server("oreVeins", () -> GTOreVeinEventJS.class); + EventHandler FLUID_VEIN_MODIFICATION = GROUP.server("fluidVeins", () -> GTBedrockFluidVeinEventJS.class); + EventHandler BEDROCK_ORE_VEIN_MODIFICATION = GROUP.server("bedrockOreVeins", () -> GTBedrockOreVeinEventJS.class); - EventHandler REGISTER_CAPES = GROUP.server("registerCapes", () -> RegisterCapesKubeEvent.class); + EventHandler REGISTER_CAPES = GROUP.server("registerCapes", () -> RegisterCapesEventJS.class); } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuStartupEvents.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuStartupEvents.java index c0a4f7273d5..bd1839c4b5b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuStartupEvents.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTCEuStartupEvents.java @@ -9,12 +9,12 @@ public interface GTCEuStartupEvents { EventGroup GROUP = EventGroup.of("GTCEuStartupEvents"); - EventHandler MATERIAL_ICON_INFO = GROUP.startup("materialIconInfo", () -> MaterialIconInfoKubeEvent.class); - EventHandler WORLD_GEN_LAYERS = GROUP.startup("worldGenLayers", () -> WorldGenLayerKubeEvent.class); + EventHandler MATERIAL_ICON_INFO = GROUP.startup("materialIconInfo", () -> MaterialIconInfoEventJS.class); + EventHandler WORLD_GEN_LAYERS = GROUP.startup("worldGenLayers", () -> WorldGenLayerEventJS.class); EventHandler MATERIAL_MODIFICATION = GROUP.startup("materialModification", - () -> MaterialModificationKubeEvent.class); - EventHandler CRAFTING_COMPONENTS = GROUP.startup("craftingComponents", () -> CraftingComponentsKubeEvent.class); + () -> MaterialModificationEventJS.class); + EventHandler CRAFTING_COMPONENTS = GROUP.startup("craftingComponents", () -> CraftingComponentsEventJS.class); - EventHandler REGISTER_WOODS = GROUP.startup("registerWoods", () -> RegisterWoodsKubeEvent.class); + EventHandler REGISTER_WOODS = GROUP.startup("registerWoods", () -> RegisterWoodsEventJS.class); } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTKubeJSPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTKubeJSPlugin.java index c37385154c6..1771e6983e5 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTKubeJSPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GTKubeJSPlugin.java @@ -5,88 +5,88 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.cosmetics.CapeRegistry; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.attribute.FluidAttributes; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.data.RotationState; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.Element; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ArmorProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.medicalcondition.Symptom; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.*; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.indicators.NoopIndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.indicators.SurfaceIndicatorGenerator.IndicatorPlacement; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.DikeVeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.NoopVeinGenerator; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.machine.RotationState; import com.gregtechceu.gtceu.api.machine.SimpleGeneratorMachine; import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.Element; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.material.material.properties.ArmorProperty; -import com.gregtechceu.gtceu.api.material.material.properties.HazardProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.material.material.properties.ToolProperty; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.medicalcondition.Symptom; -import com.gregtechceu.gtceu.api.multiblock.FactoryBlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; -import com.gregtechceu.gtceu.api.multiblock.Predicates; +import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.Predicates; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.OverclockingLogic; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; -import com.gregtechceu.gtceu.api.recipe.component.CraftingComponent; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.*; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.IndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.indicators.NoopIndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.indicators.SurfaceIndicatorGenerator.IndicatorPlacement; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.DikeVeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.NoopVeinGenerator; import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderHelper; import com.gregtechceu.gtceu.common.cosmetics.GTCapes; +import com.gregtechceu.gtceu.common.data.GCYMBlocks; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTElements; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMedicalConditions; +import com.gregtechceu.gtceu.common.data.GTOreVeins; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; +import com.gregtechceu.gtceu.common.data.GTRecipeModifiers; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTSoundEntries; +import com.gregtechceu.gtceu.common.data.machines.GCYMMachines; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; +import com.gregtechceu.gtceu.common.data.models.GTMachineModels; +import com.gregtechceu.gtceu.common.data.models.GTModels; import com.gregtechceu.gtceu.common.machine.multiblock.primitive.PrimitiveFancyUIWorkableMachine; -import com.gregtechceu.gtceu.common.pack.GTDynamicDataPack; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; -import com.gregtechceu.gtceu.data.block.GCYMBlocks; -import com.gregtechceu.gtceu.data.block.GTBlocks; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.machine.GCYMMachines; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.material.GTElements; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.medicalcondition.GTMedicalConditions; -import com.gregtechceu.gtceu.data.model.GTMachineModels; -import com.gregtechceu.gtceu.data.model.GTModels; +import com.gregtechceu.gtceu.data.pack.GTDynamicDataPack; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.data.recipe.CraftingComponent; import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; -import com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; -import com.gregtechceu.gtceu.data.sound.GTSoundEntries; -import com.gregtechceu.gtceu.data.worldgen.GTOreVeins; +import com.gregtechceu.gtceu.integration.kjs.builders.ElementBuilder; +import com.gregtechceu.gtceu.integration.kjs.builders.GTRecipeCategoryBuilder; +import com.gregtechceu.gtceu.integration.kjs.builders.GTRecipeTypeBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.block.ActiveBlockBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.block.CoilBlockBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.machine.*; -import com.gregtechceu.gtceu.integration.kjs.builders.material.ElementBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.material.MaterialBuilderWrapper; import com.gregtechceu.gtceu.integration.kjs.builders.prefix.OreTagPrefixBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.prefix.TagPrefixBuilder; -import com.gregtechceu.gtceu.integration.kjs.builders.recipetype.GTRecipeCategoryBuilder; -import com.gregtechceu.gtceu.integration.kjs.builders.recipetype.GTRecipeTypeBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockFluidBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockOreBuilder; import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.DimensionMarkerBuilder; @@ -217,7 +217,7 @@ public void registerBuilderTypes(BuilderTypeRegistry registry) { @Override public void registerServerRegistries(ServerRegistryRegistry registry) { - registry.register(GTRegistries.ORE_VEIN_REGISTRY, OreVeinDefinition.DIRECT_CODEC, OreVeinDefinition.class); + registry.register(GTRegistries.ORE_VEIN_REGISTRY, GTOreDefinition.DIRECT_CODEC, GTOreDefinition.class); registry.register(GTRegistries.BEDROCK_FLUID_REGISTRY, BedrockFluidDefinition.DIRECT_CODEC, BedrockFluidDefinition.class); registry.register(GTRegistries.BEDROCK_ORE_REGISTRY, @@ -354,8 +354,8 @@ public void registerBindings(BindingRegistry event) { event.add("MedicalCondition", MedicalCondition.class); event.add("Symptom", Symptom.class); // World Gen Related - event.add("GTOreVein", OreVeinDefinition.class); - event.add("OreVeinDefinition", OreVeinDefinition.class); + event.add("GTOreVein", GTOreDefinition.class); + event.add("OreVeinDefinition", GTOreDefinition.class); event.add("GTLayerPattern", GTLayerPattern.class); event.add("GTDikeBlockDefinition", DikeVeinGenerator.DikeBlockDefinition.class); event.add("GTOres", GTOreVeins.class); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/ElementBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/ElementBuilder.java similarity index 86% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/ElementBuilder.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/ElementBuilder.java index dd5622f6ac9..f5b4f14c1a5 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/ElementBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/ElementBuilder.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.integration.kjs.builders.material; +package com.gregtechceu.gtceu.integration.kjs.builders; -import com.gregtechceu.gtceu.api.material.Element; -import com.gregtechceu.gtceu.data.material.GTElements; +import com.gregtechceu.gtceu.api.data.chemical.Element; +import com.gregtechceu.gtceu.common.data.GTElements; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeCategoryBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/GTRecipeCategoryBuilder.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeCategoryBuilder.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/GTRecipeCategoryBuilder.java index e455ca8f85f..d74fc471f1b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeCategoryBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/GTRecipeCategoryBuilder.java @@ -1,9 +1,9 @@ -package com.gregtechceu.gtceu.integration.kjs.builders.recipetype; +package com.gregtechceu.gtceu.integration.kjs.builders; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeCategories; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import com.gregtechceu.gtceu.utils.FormattingUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeTypeBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/GTRecipeTypeBuilder.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeTypeBuilder.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/GTRecipeTypeBuilder.java index 1c65a80d04e..77e77596897 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeTypeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/GTRecipeTypeBuilder.java @@ -1,11 +1,11 @@ -package com.gregtechceu.gtceu.integration.kjs.builders.recipetype; +package com.gregtechceu.gtceu.integration.kjs.builders; import com.gregtechceu.gtceu.api.capability.recipe.*; import com.gregtechceu.gtceu.api.gui.SteamTexture; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.sound.SoundEntry; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/WorldGenLayerBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/WorldGenLayerBuilder.java similarity index 87% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/WorldGenLayerBuilder.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/WorldGenLayerBuilder.java index b4957bad03b..7bc41ac5284 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/WorldGenLayerBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/WorldGenLayerBuilder.java @@ -1,7 +1,7 @@ -package com.gregtechceu.gtceu.integration.kjs.builders.worldgen; +package com.gregtechceu.gtceu.integration.kjs.builders; -import com.gregtechceu.gtceu.api.worldgen.IWorldGenLayer; -import com.gregtechceu.gtceu.api.worldgen.SimpleWorldGenLayer; +import com.gregtechceu.gtceu.api.data.worldgen.IWorldGenLayer; +import com.gregtechceu.gtceu.api.data.worldgen.SimpleWorldGenLayer; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/ActiveBlockBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/ActiveBlockBuilder.java index d9e7a9633e1..2472e2862e3 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/ActiveBlockBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/ActiveBlockBuilder.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.ActiveBlock; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java index b4a6dd64739..f4c507ebdb7 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java @@ -2,10 +2,10 @@ import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.block.SimpleCoilType; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.common.block.CoilBlock; -import com.gregtechceu.gtceu.data.block.GTBlockStateProperties; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTBlockStateProperties; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/IMachineBuilderKJS.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/IMachineBuilderKJS.java index b1cd1dfafb5..4d5bd4ebfbb 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/IMachineBuilderKJS.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/IMachineBuilderKJS.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; -import com.gregtechceu.gtceu.data.model.GTMachineModels; +import com.gregtechceu.gtceu.common.data.models.GTMachineModels; import com.gregtechceu.gtceu.utils.data.RuntimeBlockstateProvider; import com.tterrag.registrate.providers.DataGenContext; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java index 4b0a870b857..7c1d8f9dc52 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine; -import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; +import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java index 823d7249c7c..c25d6a0cbd8 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java @@ -9,7 +9,7 @@ import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java index b8607034579..41c89f9be42 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; import com.gregtechceu.gtceu.api.registry.registrate.MultiblockMachineBuilder; -import com.gregtechceu.gtceu.data.machine.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MultiblockMachineBuilderWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MultiblockMachineBuilderWrapper.java index 64dbb914341..5a62b535852 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MultiblockMachineBuilderWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MultiblockMachineBuilderWrapper.java @@ -3,6 +3,7 @@ import com.gregtechceu.gtceu.api.block.MetaMachineBlock; import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.gui.editor.EditableMachineUI; import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.machine.*; @@ -12,10 +13,10 @@ import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; -import com.gregtechceu.gtceu.api.multiblock.BlockPattern; -import com.gregtechceu.gtceu.api.multiblock.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.pattern.BlockPattern; +import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/MaterialBuilderWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/MaterialBuilderWrapper.java index 37dbbd27733..474a7e60c0c 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/MaterialBuilderWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/MaterialBuilderWrapper.java @@ -1,15 +1,17 @@ package com.gregtechceu.gtceu.integration.kjs.builders.material; -import com.gregtechceu.gtceu.api.fluid.FluidBuilder; -import com.gregtechceu.gtceu.api.fluid.FluidState; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKey; -import com.gregtechceu.gtceu.api.material.Element; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlag; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.properties.*; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.Element; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlag; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import com.gregtechceu.gtceu.integration.kjs.helpers.MaterialStackWrapper; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/package-info.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/package-info.java index c9aaf70d6ab..833b6846691 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/package-info.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/package-info.java @@ -1,7 +1,4 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault +@NotNullByDefault package com.gregtechceu.gtceu.integration.kjs.builders; -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; +import org.jetbrains.annotations.NotNullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/OreTagPrefixBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/OreTagPrefixBuilder.java index 751ec3d541a..600dd56afce 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/OreTagPrefixBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/OreTagPrefixBuilder.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.integration.kjs.builders.prefix; import com.gregtechceu.gtceu.api.block.OreBlock; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.block.GTBlocks; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.resources.ResourceLocation; @@ -16,7 +16,7 @@ import java.util.function.Supplier; -import static com.gregtechceu.gtceu.api.tag.TagPrefix.Conditions.hasOreProperty; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.Conditions.hasOreProperty; import static com.gregtechceu.gtceu.integration.kjs.Validator.*; @Accessors(fluent = true, chain = true) diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java index 70ad40620ff..c6b21f7a231 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.kjs.builders.prefix; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/package-info.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/package-info.java deleted file mode 100644 index 0c13c13cb45..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.integration.kjs.builders.recipetype; - -import net.minecraft.FieldsAreNonnullByDefault; -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java index 8cbdd72d88e..be0f214cdb2 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.kjs.builders.worldgen; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.core.*; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java index c07bfd8e249..60097bb0d47 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.kjs.builders.worldgen; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.WeightedMaterial; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.WeightedMaterial; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/DimensionMarkerBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/DimensionMarkerBuilder.java index ddcecb40768..8b7810ce073 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/DimensionMarkerBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/DimensionMarkerBuilder.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.kjs.builders.worldgen; -import com.gregtechceu.gtceu.api.worldgen.DimensionMarker; +import com.gregtechceu.gtceu.api.data.DimensionMarker; import com.gregtechceu.gtceu.integration.kjs.Validator; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java index 54af1291dd7..319de8ee77d 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.integration.kjs.builders.worldgen; -import com.gregtechceu.gtceu.api.worldgen.*; -import com.gregtechceu.gtceu.api.worldgen.generator.IndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.indicators.SurfaceIndicatorGenerator; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.*; +import com.gregtechceu.gtceu.api.data.worldgen.*; +import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.indicators.SurfaceIndicatorGenerator; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.*; import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation; import net.minecraft.core.HolderSet; @@ -31,7 +31,7 @@ import java.util.function.Supplier; @Accessors(chain = true, fluent = true) -public class OreVeinDefinitionBuilder extends BuilderBase { +public class OreVeinDefinitionBuilder extends BuilderBase { private final InferredProperties inferredProperties = new InferredProperties(); @@ -213,8 +213,8 @@ private static class InferredProperties { // It's simpler than doing the exact same thing via a ton of nested calls. @SuppressWarnings("UnstableApiUsage") @Override - public OreVeinDefinition createObject() { - return new OreVeinDefinition(clusterSize, density, weight, layer, + public GTOreDefinition createObject() { + return new GTOreDefinition(clusterSize, density, weight, layer, Set.copyOf(dimensionFilter), heightRange, discardChanceOnAirExposure, biomes, biomeWeightModifier, veinGenerator, indicatorGenerators, RegistryAccessContainer.current.access().lookupOrThrow(Registries.BIOME)); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/CraftingComponentsKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/CraftingComponentsEventJS.java similarity index 95% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/CraftingComponentsKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/CraftingComponentsEventJS.java index 403fa3a10f8..9313c5472d8 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/CraftingComponentsKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/CraftingComponentsEventJS.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.integration.kjs.events; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.recipe.component.CraftingComponent; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.data.recipe.CraftingComponent; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.core.registries.Registries; @@ -25,7 +25,7 @@ @SuppressWarnings({ "unused" }) @NoArgsConstructor -public class CraftingComponentsKubeEvent implements KubeStartupEvent { +public class CraftingComponentsEventJS implements KubeStartupEvent { private ComponentWrapper create(String id, Object fallback) { return ComponentWrapper.of(id, fallback); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinEventJS.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinEventJS.java index d4aad0b804a..5f88334ceb8 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinEventJS.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.kjs.events; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockFluidBuilder; import net.minecraft.core.RegistrationInfo; @@ -22,11 +22,11 @@ import java.util.function.Consumer; @SuppressWarnings("unused") -public class GTBedrockFluidVeinKubeEvent implements KubeEvent { +public class GTBedrockFluidVeinEventJS implements KubeEvent { private final WritableRegistry registry; - public GTBedrockFluidVeinKubeEvent(WritableRegistry registry) { + public GTBedrockFluidVeinEventJS(WritableRegistry registry) { this.registry = registry; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinEventJS.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinEventJS.java index 64e83b68759..f321c024654 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinEventJS.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.kjs.events; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockOreBuilder; import net.minecraft.core.RegistrationInfo; @@ -21,11 +21,11 @@ import java.util.function.BiPredicate; import java.util.function.Consumer; -public class GTBedrockOreVeinKubeEvent implements KubeEvent { +public class GTBedrockOreVeinEventJS implements KubeEvent { private final WritableRegistry registry; - public GTBedrockOreVeinKubeEvent(WritableRegistry registry) { + public GTBedrockOreVeinEventJS(WritableRegistry registry) { this.registry = registry; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTOreVeinKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTOreVeinEventJS.java similarity index 80% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTOreVeinKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTOreVeinEventJS.java index a865f245e70..8086e706271 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTOreVeinKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTOreVeinEventJS.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.integration.kjs.events; +import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.generator.veins.NoopVeinGenerator; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.generator.veins.NoopVeinGenerator; -import com.gregtechceu.gtceu.data.worldgen.GTOreVeins; +import com.gregtechceu.gtceu.common.data.GTOreVeins; import net.minecraft.core.RegistrationInfo; import net.minecraft.core.Registry; @@ -26,28 +26,28 @@ import java.util.function.Consumer; @SuppressWarnings("unused") -public class GTOreVeinKubeEvent implements KubeEvent { +public class GTOreVeinEventJS implements KubeEvent { - private final WritableRegistry registry; + private final WritableRegistry registry; - public GTOreVeinKubeEvent(WritableRegistry registry) { + public GTOreVeinEventJS(WritableRegistry registry) { this.registry = registry; } - public void add(Context cx, ResourceLocation id, Consumer consumer) { + public void add(Context cx, ResourceLocation id, Consumer consumer) { RegistryAccessContainer registries = RegistryAccessContainer.of(cx); var biomes = registries.access().lookupOrThrow(Registries.BIOME); - OreVeinDefinition vein = GTOreVeins.blankOreDefinition(biomes); + GTOreDefinition vein = GTOreVeins.blankOreDefinition(biomes); consumer.accept(vein); register(id, vein); } - private void register(ResourceLocation id, OreVeinDefinition def) { + private void register(ResourceLocation id, GTOreDefinition def) { registry.register(createKey(id), def, RegistrationInfo.BUILT_IN); } - public void modify(Context cx, ResourceLocation id, Consumer consumer) { + public void modify(Context cx, ResourceLocation id, Consumer consumer) { RegistryAccessContainer registries = RegistryAccessContainer.of(cx); var registry = registries.access().registryOrThrow(GTRegistries.ORE_VEIN_REGISTRY); var biomes = registries.access().lookupOrThrow(Registries.BIOME); @@ -59,7 +59,7 @@ public void modify(Context cx, ResourceLocation id, Consumer consumer.accept(vein); } - public void modifyAll(Context cx, BiConsumer consumer) { + public void modifyAll(Context cx, BiConsumer consumer) { RegistryAccessContainer registries = RegistryAccessContainer.of(cx); var registry = registries.access().registryOrThrow(GTRegistries.ORE_VEIN_REGISTRY); var biomes = registries.access().lookupOrThrow(Registries.BIOME); @@ -87,7 +87,7 @@ public void removeAll(Context cx) { keys.forEach(key -> remove(cx, registry, key)); } - public void removeAll(Context cx, BiPredicate predicate) { + public void removeAll(Context cx, BiPredicate predicate) { RegistryAccessContainer registries = RegistryAccessContainer.of(cx); var registry = registries.access().registryOrThrow(GTRegistries.ORE_VEIN_REGISTRY); @@ -97,7 +97,7 @@ public void removeAll(Context cx, BiPredicate remove(cx, registry, key)); } - private void remove(Context cx, Registry registry, ResourceLocation id) { + private void remove(Context cx, Registry registry, ResourceLocation id) { if (!registry.containsKey(id)) { ConsoleJS.SERVER.error("", new KubeRuntimeException("Trying to remove nonexistent bedrock ore vein " + id) .source(SourceLine.of(cx))); @@ -110,7 +110,7 @@ private void remove(Context cx, Registry registry, ResourceLo holder.value().weight(0); } - public static ResourceKey createKey(ResourceLocation id) { + public static ResourceKey createKey(ResourceLocation id) { return ResourceKey.create(GTRegistries.ORE_VEIN_REGISTRY, id); } } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialIconInfoKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialIconInfoEventJS.java similarity index 76% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialIconInfoKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialIconInfoEventJS.java index 5cc286260bb..bd27a47a5eb 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialIconInfoKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialIconInfoEventJS.java @@ -1,13 +1,13 @@ package com.gregtechceu.gtceu.integration.kjs.events; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; import dev.latvian.mods.kubejs.event.KubeStartupEvent; import dev.latvian.mods.kubejs.typings.Info; @SuppressWarnings("unused") -public class MaterialIconInfoKubeEvent implements KubeStartupEvent { +public class MaterialIconInfoEventJS implements KubeStartupEvent { @Info("Create a new material icon set with the default parent.") public MaterialIconSet createIconSet(String name) { diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialModificationKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialModificationEventJS.java similarity index 66% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialModificationKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialModificationEventJS.java index b72c8bed175..0f2efaf2660 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialModificationKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/MaterialModificationEventJS.java @@ -5,4 +5,4 @@ /** * Modify any material here. */ -public class MaterialModificationKubeEvent implements KubeStartupEvent {} +public class MaterialModificationEventJS implements KubeStartupEvent {} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterCapesKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterCapesEventJS.java similarity index 93% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterCapesKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterCapesEventJS.java index ed86f702d2c..ee702dc11b6 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterCapesKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterCapesEventJS.java @@ -13,11 +13,11 @@ @Info(""" Invoked when the server is first loaded. """) -public class RegisterCapesKubeEvent implements KubeEvent { +public class RegisterCapesEventJS implements KubeEvent { private final RegisterGTCapesEvent event; - public RegisterCapesKubeEvent(RegisterGTCapesEvent event) { + public RegisterCapesEventJS(RegisterGTCapesEvent event) { this.event = event; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterWoodsKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterWoodsEventJS.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterWoodsKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterWoodsEventJS.java index e1e1728dbd2..ae667833dd3 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterWoodsKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterWoodsEventJS.java @@ -12,9 +12,9 @@ import java.util.ArrayList; -public class RegisterWoodsKubeEvent implements KubeEvent { +public class RegisterWoodsEventJS implements KubeEvent { - public RegisterWoodsKubeEvent() { + public RegisterWoodsEventJS() { this.woods = new ArrayList<>(); this.wrapped = new ArrayList<>(); } @@ -26,7 +26,7 @@ public RegisterWoodsKubeEvent() { public class Wrapped { - RegisterWoodsKubeEvent evt; + RegisterWoodsEventJS evt; String modId; String woodName; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerKubeEvent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerEventJS.java similarity index 70% rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerKubeEvent.java rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerEventJS.java index 1c8bc90a7f0..c6e0f92d03c 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerKubeEvent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerEventJS.java @@ -1,14 +1,14 @@ package com.gregtechceu.gtceu.integration.kjs.events; -import com.gregtechceu.gtceu.api.worldgen.SimpleWorldGenLayer; -import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.WorldGenLayerBuilder; +import com.gregtechceu.gtceu.api.data.worldgen.SimpleWorldGenLayer; +import com.gregtechceu.gtceu.integration.kjs.builders.WorldGenLayerBuilder; import dev.latvian.mods.kubejs.event.KubeEvent; import dev.latvian.mods.kubejs.typings.Info; import java.util.function.Consumer; -public class WorldGenLayerKubeEvent implements KubeEvent { +public class WorldGenLayerEventJS implements KubeEvent { @Info("Create a new material icon set with the default parent.") public SimpleWorldGenLayer create(String name, Consumer consumer) { diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MaterialStackWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MaterialStackWrapper.java index ef9f791a2ae..cf0256f06dd 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MaterialStackWrapper.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MaterialStackWrapper.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.kjs.helpers; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.common.data.GTMaterials; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java index 004d75948c2..eb6d1253d2a 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java @@ -6,27 +6,27 @@ import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; +import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.ResearchData; import com.gregtechceu.gtceu.api.recipe.ResearchRecipeBuilder; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.*; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.common.recipe.condition.*; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.integration.kjs.recipe.components.CapabilityMap; import com.gregtechceu.gtceu.integration.kjs.recipe.components.CapabilityMapComponent; import com.gregtechceu.gtceu.integration.kjs.recipe.components.GTRecipeComponents; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/GTRecipeComponents.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/GTRecipeComponents.java index adb2065407a..c51f3ba3009 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/GTRecipeComponents.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/GTRecipeComponents.java @@ -3,10 +3,10 @@ import com.gregtechceu.gtceu.api.addon.AddonFinder; import com.gregtechceu.gtceu.api.addon.events.KJSRecipeKeyEvent; import com.gregtechceu.gtceu.api.capability.recipe.*; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.data.recipe.GTRecipeCapabilities; +import com.gregtechceu.gtceu.common.data.GTRecipeCapabilities; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/RecipeConditionComponent.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/RecipeConditionComponent.java index 42afdb2f969..c697ff9e089 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/RecipeConditionComponent.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/components/RecipeConditionComponent.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.kjs.recipe.components; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.mojang.serialization.Codec; import dev.latvian.mods.kubejs.recipe.component.RecipeComponent; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ldlib/GTLDLibPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/ldlib/GTLDLibPlugin.java index 90930c8c66a..9e38e14b543 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ldlib/GTLDLibPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ldlib/GTLDLibPlugin.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.ldlib; -import com.gregtechceu.gtceu.data.inject.GTSyncedFieldAccessors; +import com.gregtechceu.gtceu.common.data.GTSyncedFieldAccessors; import com.lowdragmc.lowdraglib.plugin.ILDLibPlugin; import com.lowdragmc.lowdraglib.plugin.LDLibPlugin; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/GenericMapRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/GenericMapRenderer.java index bef9d891c12..da03ebbd6c9 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/GenericMapRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/GenericMapRenderer.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.integration.map.layer.Layers; import com.gregtechceu.gtceu.integration.map.layer.MapRenderLayer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/GroupingMapRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/GroupingMapRenderer.java index 59154e38dbd..bea0399c3c2 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/GroupingMapRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/GroupingMapRenderer.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.ftbchunks.FTBChunksRenderer; import com.gregtechceu.gtceu.integration.map.journeymap.JourneymapRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/DimensionCache.java b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/DimensionCache.java index dfe78a5b159..15313d5eacb 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/DimensionCache.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/DimensionCache.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.map.cache; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/GridCache.java b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/GridCache.java index 0df918d8552..eb765a9637d 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/GridCache.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/GridCache.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.map.cache; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/WorldCache.java b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/WorldCache.java index 4662cbc7c06..6779580f1ef 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/WorldCache.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/WorldCache.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map.cache; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; @@ -42,12 +42,12 @@ public void clear() { cache.clear(); } - public void oreVeinDefinitionsChanged(Registry registry) { + public void oreVeinDefinitionsChanged(Registry registry) { // Existing instances of vein definitions referenced by the cache are now invalid. Repopulate them here. for (DimensionCache levelCache : cache.values()) { for (GridCache gridCache : levelCache.getCache().values()) { gridCache.getVeins().removeIf(vein -> { - Optional> def = registry.getHolder(vein.definition().getKey()); + Optional> def = registry.getHolder(vein.definition().getKey()); def.ifPresent(vein::definition); return def.isEmpty(); }); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/client/GTClientCache.java b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/client/GTClientCache.java index 69e1dbb931e..d33454f3a41 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/client/GTClientCache.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/client/GTClientCache.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map.cache.client; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.integration.map.GenericMapRenderer; import com.gregtechceu.gtceu.integration.map.GroupingMapRenderer; import com.gregtechceu.gtceu.integration.map.cache.DimensionCache; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/server/ServerCache.java b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/server/ServerCache.java index 22ed1c126d2..7e79d2c23b6 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/cache/server/ServerCache.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/cache/server/ServerCache.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.map.cache.server; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.common.network.packets.prospecting.SPacketProspectOre; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.cache.DimensionCache; @@ -98,7 +98,7 @@ public void prospectByOreMaterial(ResourceKey dim, Material material, Blo PacketDistributor.sendToPlayer(player, new SPacketProspectOre(dim, foundVeins)); } - public void prospectByDepositName(ResourceKey dim, ResourceKey veinId, BlockPos origin, + public void prospectByDepositName(ResourceKey dim, ResourceKey veinId, BlockPos origin, ServerPlayer player, int radius) { if (radius < 0) return; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/FTBChunksRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/FTBChunksRenderer.java index 948fee7e4e2..6ea64c9c1bd 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/FTBChunksRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/FTBChunksRenderer.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map.ftbchunks; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.integration.map.GenericMapRenderer; import com.gregtechceu.gtceu.integration.map.ftbchunks.veins.fluid.FluidVeinIcon; import com.gregtechceu.gtceu.integration.map.ftbchunks.veins.ore.OreVeinIcon; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/fluid/FluidVeinIcon.java b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/fluid/FluidVeinIcon.java index 84cf3d1d9b2..8eacea00397 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/fluid/FluidVeinIcon.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/fluid/FluidVeinIcon.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map.ftbchunks.veins.fluid; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; import com.gregtechceu.gtceu.integration.map.ftbchunks.FTBChunksOptions; import com.gregtechceu.gtceu.integration.map.layer.builtin.FluidRenderLayer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/ore/OreVeinIcon.java b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/ore/OreVeinIcon.java index 270f7608891..c6cd4331c23 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/ore/OreVeinIcon.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/ore/OreVeinIcon.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.map.ftbchunks.veins.ore; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.client.util.DrawUtil; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.ftbchunks.FTBChunksOptions; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/journeymap/JourneymapRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/journeymap/JourneymapRenderer.java index 2f0f2aeef18..ddb58f24d3a 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/journeymap/JourneymapRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/journeymap/JourneymapRenderer.java @@ -1,11 +1,11 @@ package com.gregtechceu.gtceu.integration.map.journeymap; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.GenericMapRenderer; import com.gregtechceu.gtceu.integration.map.WaypointManager; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java index 80b3edd6a00..e5115d499a8 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.integration.map.layer.builtin; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.material.GTMaterials; import com.gregtechceu.gtceu.integration.map.GenericMapRenderer; import com.gregtechceu.gtceu.integration.map.layer.MapRenderLayer; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; @@ -42,7 +42,7 @@ public static MutableComponent getName(GeneratedVeinMetadata vein) { public static @NotNull Material getMaterial(@NotNull GeneratedVeinMetadata vein) { Material firstMaterial = null; - OreVeinDefinition definition = vein.definition().value(); + GTOreDefinition definition = vein.definition().value(); if (!definition.indicatorGenerators().isEmpty()) { var blockOrMaterial = definition.indicatorGenerators().getFirst().block(); firstMaterial = blockOrMaterial == null ? null : blockOrMaterial.map( diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/XaerosRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/XaerosRenderer.java index b30fdea4331..2f078d750fe 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/XaerosRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/XaerosRenderer.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map.xaeros; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.integration.map.GenericMapRenderer; import com.gregtechceu.gtceu.integration.map.xaeros.minimap.ore.OreVeinElement; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/fluid/FluidChunkHighlighter.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/fluid/FluidChunkHighlighter.java index 03adaacb1ff..102cfcc50e1 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/fluid/FluidChunkHighlighter.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/fluid/FluidChunkHighlighter.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.map.xaeros.minimap.fluid; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.integration.map.GroupingMapRenderer; import com.gregtechceu.gtceu.integration.map.xaeros.XaerosRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElement.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElement.java index 78952be4a82..619dd821548 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElement.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElement.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map.xaeros.minimap.ore; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java index 4f007d2445e..85419841a59 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.map.xaeros.minimap.ore; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.client.util.DrawUtil; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.GroupingMapRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/fluid/FluidChunkHighlighter.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/fluid/FluidChunkHighlighter.java index 8d09b549504..e4bf09f8a3d 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/fluid/FluidChunkHighlighter.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/fluid/FluidChunkHighlighter.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.map.xaeros.worldmap.fluid; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.integration.map.GroupingMapRenderer; import com.gregtechceu.gtceu.integration.map.layer.builtin.FluidRenderLayer; import com.gregtechceu.gtceu.integration.map.xaeros.XaerosRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElement.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElement.java index cda7add1840..62dd2c91b82 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElement.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElement.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.map.xaeros.worldmap.ore; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.integration.map.WaypointManager; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java index b48c398176c..b5f7cbdf439 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.integration.map.xaeros.worldmap.ore; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.worldgen.ores.GeneratedVeinMetadata; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.worldgen.ores.GeneratedVeinMetadata; import com.gregtechceu.gtceu.client.util.DrawUtil; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.map.GroupingMapRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/GTREIPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/GTREIPlugin.java index 63c10717573..d3bbd72ad56 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/GTREIPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/GTREIPlugin.java @@ -1,18 +1,18 @@ package com.gregtechceu.gtceu.integration.rei; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTFluids; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluid; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluidHelper; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.block.GTMaterialBlocks; -import com.gregtechceu.gtceu.data.fluid.GTFluids; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.integration.rei.circuit.GTProgrammedCircuitCategory; import com.gregtechceu.gtceu.integration.rei.multipage.MultiblockInfoDisplayCategory; import com.gregtechceu.gtceu.integration.rei.oreprocessing.GTOreProcessingDisplayCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/circuit/GTProgrammedCircuitCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/circuit/GTProgrammedCircuitCategory.java index 4da09f31f8a..2198a5b60ad 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/circuit/GTProgrammedCircuitCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/circuit/GTProgrammedCircuitCategory.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.integration.rei.circuit; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.integration.xei.widgets.GTProgrammedCircuitWidget; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/multipage/MultiblockInfoDisplayCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/multipage/MultiblockInfoDisplayCategory.java index 9574d0aa997..af0f5299971 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/multipage/MultiblockInfoDisplayCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/multipage/MultiblockInfoDisplayCategory.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.machine.GTMultiMachines; +import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; import com.lowdragmc.lowdraglib.rei.IGui2Renderer; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplay.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplay.java index 5a43c24d7e9..0e47c68a237 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplay.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplay.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.rei.oreprocessing; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreByProductWidget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplayCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplayCategory.java index 13716c90bc6..ed42a8a158e 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplayCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/oreprocessing/GTOreProcessingDisplayCategory.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; import com.lowdragmc.lowdraglib.rei.IGui2Renderer; @@ -22,8 +22,8 @@ import me.shedaniel.rei.api.common.util.EntryStacks; import org.jetbrains.annotations.NotNull; -import static com.gregtechceu.gtceu.api.material.material.properties.PropertyKey.ORE; -import static com.gregtechceu.gtceu.data.machine.GTMachines.*; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.ORE; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; public class GTOreProcessingDisplayCategory extends ModularUIDisplayCategory { diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplay.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplay.java index e4b32eb12d8..2ddbc100468 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplay.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplay.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.rei.orevein; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplayCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplayCategory.java index d1a5ee09918..c5d4cd0d936 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplayCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockFluidDisplayCategory.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplay.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplay.java index b187718bf80..0f42e80efde 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplay.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplay.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.rei.orevein; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplayCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplayCategory.java index 4f2ee7e5595..362ff41fdd4 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplayCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTBedrockOreDisplayCategory.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplay.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplay.java index 8d4201d20e7..b2a3106a6e0 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplay.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplay.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.rei.orevein; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; @@ -17,9 +17,9 @@ public class GTOreVeinDisplay extends ModularDisplay { - private final Holder oreDefinition; + private final Holder oreDefinition; - public GTOreVeinDisplay(Holder oreDefinition) { + public GTOreVeinDisplay(Holder oreDefinition) { super(() -> new GTOreVeinWidget(oreDefinition), GTOreVeinDisplayCategory.CATEGORY); this.oreDefinition = oreDefinition; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplayCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplayCategory.java index 405a80e7f0c..5fd7f942589 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplayCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/orevein/GTOreVeinDisplayCategory.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.integration.xei.widgets.GTOreVeinWidget; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeDisplay.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeDisplay.java index 93126d71276..d017e7aec76 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeDisplay.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeDisplay.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.rei.recipe; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.integration.xei.widgets.GTRecipeWidget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeREICategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeREICategory.java index 771df3be65f..b79a00e7bc0 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeREICategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeREICategory.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.lowdragmc.lowdraglib.rei.IGui2Renderer; import com.lowdragmc.lowdraglib.rei.ModularUIDisplayCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/TheOneProbePlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/top/TheOneProbePlugin.java deleted file mode 100644 index e221c396472..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/TheOneProbePlugin.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gregtechceu.gtceu.integration.top; - -import com.gregtechceu.gtceu.integration.top.element.FluidStackElement; -import com.gregtechceu.gtceu.integration.top.element.ProgressElement; -import com.gregtechceu.gtceu.integration.top.provider.*; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; - -import mcjty.theoneprobe.api.IElement; -import mcjty.theoneprobe.api.IElementFactory; -import mcjty.theoneprobe.api.ITheOneProbe; - -public class TheOneProbePlugin { - - // whose idea was it to make the expected object a Function and not a Consumer??? - public static Void init(ITheOneProbe probe) { - probe.registerElementFactory(new IElementFactory() { - - @Override - public IElement createElement(RegistryFriendlyByteBuf friendlyByteBuf) { - return new FluidStackElement(friendlyByteBuf); - } - - @Override - public ResourceLocation getId() { - return FluidStackElement.ID; - } - }); - probe.registerElementFactory(new ProgressElement.Factory()); - - probe.registerProvider(new ElectricContainerInfoProvider()); - // probe.registerProvider(new FuelableInfoProvider()); - probe.registerProvider(new WorkableInfoProvider()); - probe.registerProvider(new ControllableInfoProvider()); - // probe.registerProvider(new DebugPipeNetInfoProvider()); - // probe.registerProvider(new DiodeInfoProvider()); - // probe.registerProvider(new MultiblockInfoProvider()); - // probe.registerProvider(new MultiRecipeMapInfoProvider()); - // probe.registerProvider(new ConverterInfoProvider()); - probe.registerProvider(new RecipeLogicInfoProvider()); - probe.registerProvider(new ParallelProvider()); - probe.registerProvider(new RecipeOutputProvider()); - probe.registerProvider(new MultiblockStructureProvider()); - probe.registerProvider(new MaintenanceInfoProvider()); - probe.registerProvider(new ExhaustVentInfoProvider()); - probe.registerProvider(new SteamBoilerInfoProvider()); - probe.registerProvider(new AutoOutputInfoProvider()); - probe.registerProvider(new CableInfoProvider()); - probe.registerProvider(new MachineModeProvider()); - probe.registerProvider(new StainedColorProvider()); - probe.registerProvider(new PrimitivePumpProvider()); - probe.registerProvider(new DataBankInfoProvider()); - probe.registerProvider(new CoverProvider()); - probe.registerProvider(new HazardCleanerInfoProvider()); - probe.registerProvider(new TransformerInfoProvider()); - probe.registerProvider(new EnergyConverterModeProvider()); - return null; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/element/FluidStackElement.java b/src/main/java/com/gregtechceu/gtceu/integration/top/element/FluidStackElement.java deleted file mode 100644 index ca86d764904..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/element/FluidStackElement.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.element; - -import com.gregtechceu.gtceu.GTCEu; - -import com.lowdragmc.lowdraglib.gui.util.DrawerHelper; -import com.lowdragmc.lowdraglib.gui.util.TextFormattingUtil; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.fluids.FluidStack; - -import com.mojang.blaze3d.systems.RenderSystem; -import mcjty.theoneprobe.api.IElement; - -public class FluidStackElement implements IElement { - - public static final ResourceLocation ID = GTCEu.id("fluid_element"); - - private final FluidStack fluidStack; - private final IFluidStyle style; - - public FluidStackElement(FluidStack fluidStack, IFluidStyle style) { - this.fluidStack = fluidStack; - this.style = style; - } - - public FluidStackElement(RegistryFriendlyByteBuf buf) { - this.fluidStack = FluidStack.OPTIONAL_STREAM_CODEC.decode(buf); - - this.style = new FluidStyle().width(buf.readInt()).height(buf.readInt()); - } - - @Override - public void render(GuiGraphics guiGraphics, int x, int y) { - RenderSystem.disableBlend(); - if (!fluidStack.isEmpty()) { - x += 2; - y += 2; - int width = style.getWidth() - 4; - int height = style.getHeight() - 4; - DrawerHelper.drawFluidForGui(guiGraphics, fluidStack, x, y, width, height); - - guiGraphics.pose().pushPose(); - guiGraphics.pose().scale(0.5F, 0.5F, 1); - String s = TextFormattingUtil.formatLongToCompactStringBuckets(fluidStack.getAmount(), 3) + "B"; - Font fontRenderer = Minecraft.getInstance().font; - guiGraphics.drawString(fontRenderer, s, (x + (width / 3f)) * 2 - fontRenderer.width(s) + 21, - (y + (height / 3f) + 6) * 2, 0xFFFFFF, true); - guiGraphics.pose().popPose(); - } - RenderSystem.enableBlend(); - RenderSystem.setShaderColor(1, 1, 1, 1); - } - - @Override - public int getWidth() { - return style.getWidth(); - } - - @Override - public int getHeight() { - return style.getHeight(); - } - - @Override - public void toBytes(RegistryFriendlyByteBuf buf) { - FluidStack.OPTIONAL_STREAM_CODEC.encode(buf, fluidStack); - - buf.writeInt(this.style.getWidth()); - buf.writeInt(this.style.getHeight()); - } - - @Override - public ResourceLocation getID() { - return ID; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/element/FluidStyle.java b/src/main/java/com/gregtechceu/gtceu/integration/top/element/FluidStyle.java deleted file mode 100644 index 94bd75ca39e..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/element/FluidStyle.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.element; - -import lombok.Getter; - -@Getter -public class FluidStyle implements IFluidStyle { - - private int width = 20; - - private int height = 20; - - public FluidStyle() {/**/} - - public IFluidStyle copy() { - return new FluidStyle().bounds(this.width, this.height); - } - - public IFluidStyle width(int w) { - this.width = w; - return this; - } - - public IFluidStyle height(int h) { - this.height = h; - return this; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/element/IFluidStyle.java b/src/main/java/com/gregtechceu/gtceu/integration/top/element/IFluidStyle.java deleted file mode 100644 index e23a4d6e9c9..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/element/IFluidStyle.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.element; - -public interface IFluidStyle { - - IFluidStyle copy(); - - IFluidStyle width(int var1); - - IFluidStyle height(int var1); - - default IFluidStyle bounds(int width, int height) { - return this.width(width).height(height); - } - - int getWidth(); - - int getHeight(); -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/element/ProgressElement.java b/src/main/java/com/gregtechceu/gtceu/integration/top/element/ProgressElement.java deleted file mode 100644 index f064f11d6ae..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/element/ProgressElement.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.element; - -import com.gregtechceu.gtceu.GTCEu; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentSerialization; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.Mth; - -import mcjty.theoneprobe.api.*; -import mcjty.theoneprobe.apiimpl.styles.ProgressStyle; -import mcjty.theoneprobe.rendering.RenderHelper; -import org.jetbrains.annotations.Nullable; - -public class ProgressElement implements IElement { - - private final float progress; - private final @Nullable Component text; - private final IProgressStyle style; - - public ProgressElement(float progress, Component text, IProgressStyle style) { - this.progress = Mth.clamp(progress, 0.0F, 1.0F); - this.text = text; - this.style = style; - } - - public ProgressElement(RegistryFriendlyByteBuf buf) { - this.progress = buf.readFloat(); - this.text = ComponentSerialization.STREAM_CODEC.decode(buf); - this.style = (new ProgressStyle()) - .width(buf.readInt()) - .height(buf.readInt()) - .prefix(ComponentSerialization.STREAM_CODEC.decode(buf)) - .suffix(ComponentSerialization.STREAM_CODEC.decode(buf)) - .borderColor(buf.readInt()) - .filledColor(buf.readInt()) - .alternateFilledColor(buf.readInt()) - .backgroundColor(buf.readInt()) - .showText(buf.readBoolean()) - .numberFormat(NumberFormat.values()[buf.readByte()]) - .lifeBar(buf.readBoolean()) - .armorBar(buf.readBoolean()) - .alignment(buf.readEnum(ElementAlignment.class)); - } - - @Override - public void render(GuiGraphics guiGraphics, int x, int y) { - RenderHelper.drawThickBeveledBox(guiGraphics, x, y, x + getWidth(), y + getHeight(), 1, style.getBorderColor(), - style.getBorderColor(), style.getBackgroundColor()); - if (progress > 0.0F) { - var dx = (int) Math.min(progress * (getWidth() - 2), getWidth() - 2); - if (style.getFilledColor() == style.getAlternatefilledColor()) { - if (dx > 0) { - RenderHelper.drawThickBeveledBox(guiGraphics, x + 1, y + 1, x + dx + 1, y + getHeight() - 1, 1, - style.getFilledColor(), style.getFilledColor(), style.getFilledColor()); - } - } else { - for (int xx = 0; xx < x + dx; xx++) { - int color = (xx & 1) == 0 ? style.getFilledColor() : style.getAlternatefilledColor(); - RenderHelper.drawVerticalLine(guiGraphics, xx, y + 1, y + getHeight() - 1, color); - } - } - } - if (style.isShowText()) { - Minecraft mc = Minecraft.getInstance(); - Font render = mc.font; - int textWidth = render.width(text.getVisualOrderText()); - switch (style.getAlignment()) { - case ALIGN_BOTTOMRIGHT -> RenderHelper.renderText(mc, guiGraphics, (x + getWidth() - 3) - textWidth, - y + 3, text); - case ALIGN_CENTER -> RenderHelper.renderText(mc, guiGraphics, (x + (getWidth() / 2)) - (textWidth / 2), - y + 3, - text); - case ALIGN_TOPLEFT -> RenderHelper.renderText(mc, guiGraphics, x + 3, y + 3, text); - } - } - } - - @Override - public int getWidth() { - float width = 0.0F; - width += 1 * 2.0F; // Add Border width - if (text != null) { - Font font = Minecraft.getInstance().font; - width += (float) (font.width(this.text) + 3); - } - return (int) Math.max(this.style.getWidth(), width); - } - - @Override - public int getHeight() { - return this.text == null ? 8 : 14; - } - - @Override - public void toBytes(RegistryFriendlyByteBuf buf) { - buf.writeFloat(progress); - ComponentSerialization.STREAM_CODEC.encode(buf, text); - buf.writeInt(this.style.getWidth()); - buf.writeInt(this.style.getHeight()); - ComponentSerialization.STREAM_CODEC.encode(buf, this.style.getPrefixComp()); - ComponentSerialization.STREAM_CODEC.encode(buf, this.style.getSuffixComp()); - buf.writeInt(this.style.getBorderColor()); - buf.writeInt(this.style.getFilledColor()); - buf.writeInt(this.style.getAlternatefilledColor()); - buf.writeInt(this.style.getBackgroundColor()); - buf.writeBoolean(this.style.isShowText()); - buf.writeByte(this.style.getNumberFormat().ordinal()); - buf.writeBoolean(this.style.isLifeBar()); - buf.writeBoolean(this.style.isArmorBar()); - buf.writeEnum(this.style.getAlignment()); - } - - @Override - public ResourceLocation getID() { - return GTCEu.id("progress"); - } - - public static class Factory implements IElementFactory { - - @Override - public IElement createElement(RegistryFriendlyByteBuf friendlyByteBuf) { - return new ProgressElement(friendlyByteBuf); - } - - @Override - public ResourceLocation getId() { - return GTCEu.id("progress"); - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/AutoOutputInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/AutoOutputInfoProvider.java deleted file mode 100644 index a03da600981..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/AutoOutputInfoProvider.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputFluid; -import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputItem; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; -import mcjty.theoneprobe.api.TextStyleClass; -import mcjty.theoneprobe.apiimpl.styles.ItemStyle; -import org.apache.commons.lang3.StringUtils; - -public class AutoOutputInfoProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("auto_output_info"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - var pos = iProbeHitData.getPos(); - - if (MetaMachine.getMachine(level, pos) instanceof IAutoOutputItem outputItem) { - var direction = outputItem.getOutputFacingItems(); - addAutoOutputInfo(iProbeInfo, player, level, pos, direction, "gtceu.top.item_auto_output", - outputItem.isAllowInputFromOutputSideItems(), outputItem.isAutoOutputItems()); - - } - if (MetaMachine.getMachine(level, pos) instanceof IAutoOutputFluid outputFluid) { - var direction = outputFluid.getOutputFacingFluids(); - addAutoOutputInfo(iProbeInfo, player, level, pos, direction, "gtceu.top.item_auto_output", - outputFluid.isAllowInputFromOutputSideFluids(), outputFluid.isAutoOutputFluids()); - - } - } - - private void addAutoOutputInfo(IProbeInfo iProbeInfo, Player player, Level level, BlockPos blockPos, - Direction direction, String text, boolean allowInput, boolean auto) { - if (direction != null) { - IProbeInfo horizontalPane = iProbeInfo - .horizontal(iProbeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - horizontalPane.text(CompoundText.create() - .info(Component.translatable(text, StringUtils.capitalize(direction.getName()) + " "))); - if (player.isShiftKeyDown()) { - if (level != null) { - var pos = blockPos.relative(direction); - var block = level.getBlockState(pos).getBlock().asItem().getDefaultInstance(); - if (!block.isEmpty()) { - horizontalPane.item(block, new ItemStyle().width(16).height(16)).text(" "); - } - } - } - - if (allowInput || auto) { - var compoundText = CompoundText.create().text("("); - if (auto) { - compoundText.ok(Component.translatable("gtceu.top.auto_output")); - } - - if (allowInput && auto) { - compoundText.style(TextStyleClass.INFO).text("/"); - } - - if (allowInput) { - compoundText.ok(Component.translatable("gtceu.top.allow_output_input")); - } - compoundText.style(TextStyleClass.INFO).text(")"); - horizontalPane.text(compoundText); - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CableInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CableInfoProvider.java deleted file mode 100644 index f8190345702..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CableInfoProvider.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.common.block.CableBlock; -import com.gregtechceu.gtceu.common.blockentity.CableBlockEntity; -import com.gregtechceu.gtceu.utils.GTUtil; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.*; - -import static com.gregtechceu.gtceu.utils.FormattingUtil.DECIMAL_FORMAT_1F; - -public class CableInfoProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("cable_info"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - if (blockState.getBlock() instanceof CableBlock cableBlock) { - CableBlockEntity cable = (CableBlockEntity) cableBlock.getPipeTile(level, iProbeHitData.getPos()); - if (cable != null) { - long voltage = cable.getCurrentMaxVoltage(); - double amperage = cable.getAverageAmperage(); - IProbeInfo horizontalPane = iProbeInfo - .horizontal(iProbeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - horizontalPane.text(Component.translatable("gtceu.top.cable_voltage")); - if (voltage != 0) { - horizontalPane.text(GTValues.VNF[GTUtil.getTierByVoltage(voltage)]).text(" / "); - } - horizontalPane.text(GTValues.VNF[GTUtil.getTierByVoltage(cable.getMaxVoltage())]); - - horizontalPane = iProbeInfo - .horizontal(iProbeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - horizontalPane.text(Component.translatable("gtceu.top.cable_amperage")); - if (amperage != 0) { - horizontalPane.text(DECIMAL_FORMAT_1F.format(cable.getAverageAmperage()) + "A / "); - } - horizontalPane.text(DECIMAL_FORMAT_1F.format(cable.getMaxAmperage()) + "A"); - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CapabilityInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CapabilityInfoProvider.java deleted file mode 100644 index 67681ee0dd7..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CapabilityInfoProvider.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; -import org.jetbrains.annotations.Nullable; - -public abstract class CapabilityInfoProvider implements IProbeInfoProvider { - - @Nullable - protected abstract T getCapability(Level level, BlockPos pos, @Nullable Direction side); - - protected abstract void addProbeInfo(T capability, IProbeInfo probeInfo, Player player, BlockEntity blockEntity, - IProbeHitData data); - - protected boolean allowDisplaying(T capability) { - return true; - } - - @Override - public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, Player player, Level world, BlockState blockState, - IProbeHitData data) { - if (blockState.hasBlockEntity()) { - BlockEntity blockEntity = world.getBlockEntity(data.getPos()); - if (blockEntity == null) return; - T resultCapability = getCapability(world, data.getPos(), data.getSideHit()); - if (resultCapability != null && allowDisplaying(resultCapability)) { - addProbeInfo(resultCapability, probeInfo, player, blockEntity, data); - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ControllableInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ControllableInfoProvider.java deleted file mode 100644 index eb9e751c3c7..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ControllableInfoProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; -import com.gregtechceu.gtceu.api.capability.IControllable; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import org.jetbrains.annotations.Nullable; - -public class ControllableInfoProvider extends CapabilityInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("controllable_provider"); - } - - @Nullable - @Override - protected IControllable getCapability(Level level, BlockPos pos, @Nullable Direction side) { - return GTCapabilityHelper.getControllable(level, pos, side); - } - - @Override - protected void addProbeInfo(IControllable capability, IProbeInfo probeInfo, Player player, BlockEntity blockEntity, - IProbeHitData data) { - IProbeInfo horizontalPane = probeInfo - .horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - if (capability.isSuspendAfterFinish()) - horizontalPane.text(CompoundText.create().warning("behaviour.soft_hammer.disabled_cycle")); - else if (!capability.isWorkingEnabled()) - horizontalPane.text(CompoundText.create().warning("behaviour.soft_hammer.disabled")); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CoverProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CoverProvider.java deleted file mode 100644 index 538a576f047..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/CoverProvider.java +++ /dev/null @@ -1,262 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; -import com.gregtechceu.gtceu.api.capability.ICoverable; -import com.gregtechceu.gtceu.api.cover.CoverBehavior; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import org.jetbrains.annotations.Nullable; - -public class CoverProvider extends CapabilityInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("coverable_provider"); - } - - // /** - // * Displays text for {@link CoverConveyor} related covers - // * - // * @param probeInfo the info to add the text to - // * @param conveyor the conveyor to get data from - // */ - // private static void conveyorInfo(@NotNull IProbeInfo probeInfo, @NotNull CoverConveyor conveyor) { - // String rateUnit = " {*cover.conveyor.transfer_rate*}"; - // - // if (conveyor instanceof CoverItemVoiding) { - // itemVoidingInfo(probeInfo, (CoverItemVoiding) conveyor); - // } else if (!(conveyor instanceof CoverRoboticArm) || ((CoverRoboticArm) conveyor).getTransferMode() == - // TransferMode.TRANSFER_ANY) { - // // only display the regular rate if the cover does not have a specialized rate - // transferRateText(probeInfo, conveyor.getConveyorMode(), rateUnit, conveyor.getTransferRate()); - // } - // - // ItemFilterContainer filter = conveyor.getItemFilterContainer(); - // if (conveyor instanceof CoverRoboticArm) { - // CoverRoboticArm roboticArm = (CoverRoboticArm) conveyor; - // transferModeText(probeInfo, roboticArm.getTransferMode(), rateUnit, filter.getTransferStackSize(), - // filter.getFilterWrapper().getItemFilter() != null); - // } - // itemFilterText(probeInfo, filter.getFilterWrapper().getItemFilter()); - // } - // - // /** - // * Displays info for {@link CoverItemVoiding} related covers - // * - // * @param probeInfo the info to add the text to - // * @param voiding the voiding cover to get data from - // */ - // private static void itemVoidingInfo(@NotNull IProbeInfo probeInfo, @NotNull CoverItemVoiding voiding) { - // String unit = " {*gtceu.top.unit.items*}"; - // - // ItemFilterContainer container = voiding.getItemFilterContainer(); - // if (voiding instanceof CoverItemVoidingAdvanced) { - // CoverItemVoidingAdvanced advanced = (CoverItemVoidingAdvanced) voiding; - // VoidingMode mode = advanced.getVoidingMode(); - // voidingText(probeInfo, mode, unit, container.getTransferStackSize(), container.getFilterWrapper().getItemFilter() - // != null); - // } - // } - // - // /** - // * Displays text for {@link CoverPump} related covers - // * - // * @param probeInfo the info to add the text to - // * @param pump the pump to get data from - // */ - // private static void pumpInfo(@NotNull IProbeInfo probeInfo, @NotNull CoverPump pump) { - // String rateUnit = IProbeInfo.STARTLOC + pump.getBucketMode().getName() + IProbeInfo.ENDLOC; - // - // if (pump instanceof CoverFluidVoiding) { - // fluidVoidingInfo(probeInfo, (CoverFluidVoiding) pump); - // } else if (!(pump instanceof CoverFluidRegulator) || ((CoverFluidRegulator) pump).getTransferMode() == - // TransferMode.TRANSFER_ANY) { - // // do not display the regular rate if the cover has a specialized rate - // transferRateText(probeInfo, pump.getPumpMode(), " " + rateUnit, pump.getBucketMode() == - // CoverPump.BucketMode.BUCKET ? pump.getTransferRate() / 1000 : pump.getTransferRate()); - // } - // - // FluidFilterContainer filter = pump.getFluidFilterContainer(); - // if (pump instanceof CoverFluidRegulator) { - // CoverFluidRegulator regulator = (CoverFluidRegulator) pump; - // transferModeText(probeInfo, regulator.getTransferMode(), rateUnit, regulator.getTransferAmount(), - // filter.getFilterWrapper().getFluidFilter() != null); - // } - // fluidFilterText(probeInfo, filter.getFilterWrapper().getFluidFilter()); - // } - // - // /** - // * Displays info for {@link CoverFluidVoiding} related covers - // * - // * @param probeInfo the info to add the text to - // * @param voiding the voiding cover to get data from - // */ - // private static void fluidVoidingInfo(@NotNull IProbeInfo probeInfo, @NotNull CoverFluidVoiding voiding) { - // String unit = voiding.getBucketMode() == CoverPump.BucketMode.BUCKET ? " {*gtceu.top.unit.fluid_buckets*}" : " - // {*gtceu.top.unit.fluid_milibuckets*}"; - // - // if (voiding instanceof CoverFluidVoidingAdvanced) { - // CoverFluidVoidingAdvanced advanced = (CoverFluidVoidingAdvanced) voiding; - // VoidingMode mode = advanced.getVoidingMode(); - // // do not display amount in overflow when a filter is present - // voidingText(probeInfo, mode, unit, voiding.getBucketMode() == CoverPump.BucketMode.BUCKET ? - // advanced.getTransferAmount() / 1000 : advanced.getTransferAmount(), - // voiding.getFluidFilterContainer().getFilterWrapper().getFluidFilter() != null); - // } - // } - // - // /** - // * Displays text for {@link CoverItemFilter} related covers - // * - // * @param probeInfo the info to add the text to - // * @param itemFilter the filter to get data from - // */ - // private static void itemFilterInfo(@NotNull IProbeInfo probeInfo, @NotNull CoverItemFilter itemFilter) { - // filterModeText(probeInfo, itemFilter.getFilterMode()); - // itemFilterText(probeInfo, itemFilter.getItemFilter().getItemFilter()); - // } - // - // /** - // * Displays text for {@link CoverFluidFilter} related covers - // * - // * @param probeInfo the info to add the text to - // * @param fluidFilter the filter to get data from - // */ - // private static void fluidFilterInfo(@NotNull IProbeInfo probeInfo, @NotNull CoverFluidFilter fluidFilter) { - // filterModeText(probeInfo, fluidFilter.getFilterMode()); - // fluidFilterText(probeInfo, fluidFilter.getFluidFilter().getFluidFilter()); - // } - // - // /** - // * Displays text for {@link CoverEnderFluidLink} related covers - // * - // * @param probeInfo the info to add the text to - // * @param enderFluidLink the ender fluid link cover to get data from - // */ - // private static void enderFluidLinkInfo(@NotNull IProbeInfo probeInfo, @NotNull CoverEnderFluidLink - // enderFluidLink) { - // transferRateText(probeInfo, enderFluidLink.getPumpMode(), " {*cover.bucket.mode.milli_bucket*}", - // enderFluidLink.isIOEnabled() ? CoverEnderFluidLink.TRANSFER_RATE : 0); - // fluidFilterText(probeInfo, enderFluidLink.getFluidFilterContainer().getFilterWrapper().getFluidFilter()); - // - // if (!enderFluidLink.getColorStr().isEmpty()) { - // probeInfo.text(TextStyleClass.INFO + "{*gtceu.top.link_cover.color*} " + enderFluidLink.getColorStr()); - // } - // } - // - // - // /** - // * Displays text for {@link IIOMode} covers - // * - // * @param probeInfo the info to add the text to - // * @param mode the transfer mode of the cover - // * @param rateUnit the unit of what is transferred - // * @param rate the transfer rate of the mode - // */ - // private static void transferRateText(@NotNull IProbeInfo probeInfo, @NotNull IIOMode mode, @NotNull String - // rateUnit, int rate) { - // String modeText = mode.isImport() ? "{*gtceu.top.mode.import*} " : "{*gtceu.top.mode.export*} "; - // probeInfo.text(TextStyleClass.OK + modeText + TextStyleClass.LABEL + GTUtility.formatNumbers(rate) + rateUnit); - // } - // - // /** - // * Displays text for {@link TransferMode} covers - // * - // * @param probeInfo the info to add the text to - // * @param mode the transfer mode of the cover - // * @param rateUnit the unit of what is transferred - // * @param rate the transfer rate of the mode - // * @param hasFilter whether the cover has a filter installed - // */ - // private static void transferModeText(@NotNull IProbeInfo probeInfo, @NotNull TransferMode mode, @NotNull String - // rateUnit, int rate, boolean hasFilter) { - // String text = TextStyleClass.OK + IProbeInfo.STARTLOC + mode.getName() + IProbeInfo.ENDLOC; - // if (!hasFilter && mode != TransferMode.TRANSFER_ANY) text += TextStyleClass.LABEL + " " + rate + rateUnit; - // probeInfo.text(text); - // } - // - // /** - // * Displays text for {@link VoidingMode} covers - // * - // * @param probeInfo the info to add the text to - // * @param mode the transfer mode of the cover - // * @param unit the unit of what is transferred - // * @param amount the transfer rate of the mode - // * @param hasFilter whether the cover has a filter in it or not - // */ - // private static void voidingText(@NotNull IProbeInfo probeInfo, @NotNull VoidingMode mode, @NotNull String unit, - // int amount, boolean hasFilter) { - // String text = TextFormatting.RED + IProbeInfo.STARTLOC + mode.getName() + IProbeInfo.ENDLOC; - // if (mode != VoidingMode.VOID_ANY && !hasFilter) text += " " + amount + unit; - // probeInfo.text(text); - // } - // - // /** - // * Displays text for {@link IFilterMode} covers - // * - // * @param probeInfo the info to add the text to - // * @param mode the filter mode of the cover - // */ - // private static void filterModeText(@NotNull IProbeInfo probeInfo, @NotNull IFilterMode mode) { - // probeInfo.text(TextStyleClass.WARNING + IProbeInfo.STARTLOC + mode.getName() + IProbeInfo.ENDLOC); - // } - // - // /** - // * Displays text for {@link ItemFilter} covers - // * - // * @param probeInfo the info to add the text to - // * @param filter the filter to display info from - // */ - // private static void itemFilterText(@NotNull IProbeInfo probeInfo, @Nullable ItemFilter filter) { - // String label = TextStyleClass.INFO + "{*gtceu.top.filter.label*} "; - // if (filter instanceof TagItemFilter tagFilter) { - // String expression = tagFilter.getTagFilterExpression(); - // if (!expression.isEmpty()) probeInfo.text(label + expression); - // } else if (filter instanceof SmartItemFilter) { - // probeInfo.text(label + IProbeInfo.STARTLOC + ((SmartItemFilter) filter).getFilteringMode().getName() + - // IProbeInfo.ENDLOC); - // } - // } - // - // /** - // * Displays text for {@link FluidFilter} covers - // * - // * @param probeInfo the info to add the text to - // * @param filter the filter to display info from - // */ - // private static void fluidFilterText(@NotNull IProbeInfo probeInfo, @Nullable FluidFilter filter) { - // // TODO If more unique fluid filtration is added, providers for it go here - // } - - @Nullable - @Override - protected ICoverable getCapability(Level level, BlockPos pos, @org.jetbrains.annotations.Nullable Direction side) { - return GTCapabilityHelper.getCoverable(level, pos, side); - } - - @Override - protected void addProbeInfo(ICoverable capability, IProbeInfo probeInfo, Player player, BlockEntity blockEntity, - IProbeHitData data) { - CoverBehavior coverBehavior = capability.getCoverAtSide(data.getSideHit()); - // if (coverBehavior instanceof CoverConveyor) { - // conveyorInfo(probeInfo, (CoverConveyor) coverBehavior); - // } else if (coverBehavior instanceof CoverPump) { - // pumpInfo(probeInfo, (CoverPump) coverBehavior); - // } else if (coverBehavior instanceof CoverItemFilter) { - // itemFilterInfo(probeInfo, (CoverItemFilter) coverBehavior); - // } else if (coverBehavior instanceof CoverFluidFilter) { - // fluidFilterInfo(probeInfo, (CoverFluidFilter) coverBehavior); - // } else if (coverBehavior instanceof CoverEnderFluidLink) { - // enderFluidLinkInfo(probeInfo, (CoverEnderFluidLink) coverBehavior); - // } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/DataBankInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/DataBankInfoProvider.java deleted file mode 100644 index 5ecfa5bedbe..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/DataBankInfoProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.common.machine.multiblock.electric.research.DataBankMachine; -import com.gregtechceu.gtceu.utils.FormattingUtil; -import com.gregtechceu.gtceu.utils.GTUtil; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class DataBankInfoProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("data_bank_provider"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - if (MetaMachine.getMachine(level, iProbeHitData.getPos()) instanceof DataBankMachine dataBank) { - IProbeInfo verticalPane = iProbeInfo.vertical(iProbeInfo.defaultLayoutStyle().spacing(0)); - int energyUsage = dataBank.getEnergyUsage(); - String energyFormatted = FormattingUtil.formatNumbers(energyUsage); - // wrap in text component to keep it from being formatted - Component voltageName = Component.literal(GTValues.VNF[GTUtil.getTierByVoltage(energyUsage)]); - Component text = Component.translatable( - "gtceu.multiblock.energy_consumption", - energyFormatted, - voltageName); - verticalPane.text(text); - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ElectricContainerInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ElectricContainerInfoProvider.java deleted file mode 100644 index d234cbbfe76..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ElectricContainerInfoProvider.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; -import com.gregtechceu.gtceu.api.capability.IEnergyInfoProvider; -import com.gregtechceu.gtceu.integration.top.element.ProgressElement; -import com.gregtechceu.gtceu.utils.FormattingUtil; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.math.MathContext; - -public class ElectricContainerInfoProvider extends CapabilityInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("energy_container_provider"); - } - - @Nullable - @Override - protected IEnergyInfoProvider getCapability(Level level, BlockPos pos, @Nullable Direction side) { - return GTCapabilityHelper.getEnergyInfoProvider(level, pos, side); - } - - @Override - protected void addProbeInfo(IEnergyInfoProvider capability, IProbeInfo probeInfo, Player player, - BlockEntity blockEntity, IProbeHitData data) { - var energyInfo = capability.getEnergyInfo(); - if (energyInfo.capacity().compareTo(BigInteger.ZERO) <= 0) return; - var threshold = BigInteger.valueOf((long) 1e12); - var energyStr = FormattingUtil.formatNumberOrSic(energyInfo.stored(), threshold); - var maxEnergyStr = FormattingUtil.formatNumberOrSic(energyInfo.capacity(), threshold); - var progress = getProgress(energyInfo.stored(), energyInfo.capacity()); - - probeInfo.element(new ProgressElement( - progress, - Component.translatable("gtceu.jade.energy_stored", energyStr, maxEnergyStr), - probeInfo.defaultProgressStyle() - .filledColor(0xFFEEE600) - .alternateFilledColor(0xFFEEE600) - .borderColor(0xFF555555))); - } - - protected float getProgress(long progress, long maxProgress) { - return maxProgress == 0 ? 0 : (float) ((double) progress / maxProgress); - } - - protected float getProgress(BigInteger progress, BigInteger maxProgress) { - if (maxProgress.compareTo(BigInteger.ZERO) <= 0) return 0; - return new BigDecimal(progress).divide(new BigDecimal(maxProgress), MathContext.DECIMAL32).floatValue(); - } - - @Override - protected boolean allowDisplaying(@NotNull IEnergyInfoProvider capability) { - return !capability.isOneProbeHidden(); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/EnergyConverterModeProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/EnergyConverterModeProvider.java deleted file mode 100644 index 6d978358f5a..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/EnergyConverterModeProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; -import com.gregtechceu.gtceu.common.machine.electric.ConverterMachine; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class EnergyConverterModeProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("energy_converter_top"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - if (level.getBlockEntity(iProbeHitData.getPos()) instanceof MetaMachineBlockEntity blockEntity && - blockEntity.getMetaMachine() instanceof ConverterMachine converter) { - if (converter.isFeToEu()) { - iProbeInfo.text(Component.translatable("gtceu.top.convert_fe")); - } else { - iProbeInfo.text(Component.translatable("gtceu.top.convert_eu")); - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ExhaustVentInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ExhaustVentInfoProvider.java deleted file mode 100644 index 7c643f601f2..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ExhaustVentInfoProvider.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.api.machine.feature.IExhaustVentMachine; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.TextStyleClass; -import mcjty.theoneprobe.apiimpl.styles.ItemStyle; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; - -public class ExhaustVentInfoProvider extends CapabilityInfoProvider { - - @Nullable - @Override - protected IExhaustVentMachine getCapability(Level level, BlockPos blockPos, @Nullable Direction direction) { - if (MetaMachine.getMachine(level, blockPos) instanceof IExhaustVentMachine exhaustVentMachine) { - return exhaustVentMachine; - } - return null; - } - - @Override - protected boolean allowDisplaying(IExhaustVentMachine capability) { - return super.allowDisplaying(capability); - } - - @Override - protected void addProbeInfo(IExhaustVentMachine iExhaustVentMachine, IProbeInfo iProbeInfo, Player player, - BlockEntity blockEntity, IProbeHitData iProbeHitData) { - IProbeInfo horizontalPane = iProbeInfo - .horizontal(iProbeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - var direction = iExhaustVentMachine.getVentingDirection(); - horizontalPane.text(CompoundText.create().info(Component.translatable("gtceu.top.exhaust_vent_direction", - StringUtils.capitalize(direction.getName()) + " "))); - if (!iExhaustVentMachine.isVentingBlocked()) return; - - if (player.isShiftKeyDown()) { - var level = blockEntity.getLevel(); - var pos = blockEntity.getBlockPos().relative(direction); - if (level != null) { - var block = level.getBlockState(pos).getBlock().asItem().getDefaultInstance(); - horizontalPane.item(block, new ItemStyle().width(16).height(16)).text(" "); - } - } - if (iExhaustVentMachine.isNeedsVenting()) { - horizontalPane.text( - CompoundText.create().text("(").error(Component.translatable("gtceu.top.exhaust_vent_blocked")) - .style(TextStyleClass.INFO).text(")")); - } - } - - @Override - public ResourceLocation getID() { - return GTCEu.id("exhaust_vent_info"); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/HazardCleanerInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/HazardCleanerInfoProvider.java deleted file mode 100644 index 6fb64aa38f1..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/HazardCleanerInfoProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; -import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardCleaner; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.apiimpl.elements.ElementText; -import org.jetbrains.annotations.Nullable; - -public class HazardCleanerInfoProvider extends CapabilityInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("hazard_cleaner_provider"); - } - - @Nullable - @Override - protected IEnvironmentalHazardCleaner getCapability(Level level, BlockPos pos, @Nullable Direction side) { - return level.getBlockEntity(pos) instanceof MetaMachineBlockEntity mte && - mte.getMetaMachine() instanceof IEnvironmentalHazardCleaner cleaner ? cleaner : null; - } - - @Override - protected void addProbeInfo(IEnvironmentalHazardCleaner capability, IProbeInfo probeInfo, Player player, - BlockEntity blockEntity, IProbeHitData data) { - float cleaned = capability.getRemovedLastSecond(); - probeInfo.element(new ElementText(Component.translatable("gtceu.jade.cleaned_this_second", cleaned), - probeInfo.defaultTextStyle())); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MachineModeProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MachineModeProvider.java deleted file mode 100644 index 8050bda6b7e..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MachineModeProvider.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; -import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; -import com.gregtechceu.gtceu.api.recipe.GTRecipeType; - -import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class MachineModeProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("machine_mode"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - if (level.getBlockEntity(iProbeHitData.getPos()) instanceof MetaMachineBlockEntity blockEntity) { - GTRecipeType[] recipeTypes = blockEntity.getMetaMachine().getDefinition().getRecipeTypes(); - if (recipeTypes.length > 1) { - if (blockEntity.getMetaMachine() instanceof IRecipeLogicMachine recipeLogicMachine) { - GTRecipeType currentRecipeType = recipeLogicMachine.getRecipeType(); - if (player.isShiftKeyDown()) { - iProbeInfo.text(Component.translatable("gtceu.top.machine_mode")); - - for (GTRecipeType recipeType : recipeTypes) { - IProbeInfo horizontalPane = iProbeInfo.horizontal( - iProbeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - - if (recipeType == currentRecipeType) { - horizontalPane.text(ChatFormatting.BLUE + " > "); - horizontalPane.text(CompoundText.create().important("%s.%s".formatted( - recipeType.registryName.getNamespace(), recipeType.registryName.getPath()))); - } else { - horizontalPane.text(" "); - horizontalPane.text(CompoundText.create().label("%s.%s".formatted( - recipeType.registryName.getNamespace(), recipeType.registryName.getPath()))); - } - } - } else { - iProbeInfo.text(Component.translatable("gtceu.top.machine_mode") - .append(Component.translatable(currentRecipeType.registryName.toLanguageKey()))); - } - } - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MaintenanceInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MaintenanceInfoProvider.java deleted file mode 100644 index 071e9e0917a..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MaintenanceInfoProvider.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine; -import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; -import com.gregtechceu.gtceu.utils.GTUtil; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.apiimpl.styles.ItemStyle; -import org.jetbrains.annotations.Nullable; - -public class MaintenanceInfoProvider extends CapabilityInfoProvider { - - @Nullable - @Override - protected IMaintenanceMachine getCapability(Level level, BlockPos blockPos, @Nullable Direction direction) { - var cap = GTCapabilityHelper.getMaintenanceMachine(level, blockPos, direction); - if (cap != null) { - return cap; - } - if (MetaMachine.getMachine(level, blockPos) instanceof IMultiController controller) { - for (var part : controller.getParts()) { - if (part instanceof IMaintenanceMachine maintenanceMachine) { - return maintenanceMachine; - } - } - } - return null; - } - - @Override - protected void addProbeInfo(IMaintenanceMachine maintenanceMachine, IProbeInfo iProbeInfo, Player player, - BlockEntity blockEntity, IProbeHitData iProbeHitData) { - IProbeInfo verticalPane = iProbeInfo.vertical(iProbeInfo.defaultLayoutStyle().spacing(0)); - if (maintenanceMachine.hasMaintenanceProblems()) { - if (player.isShiftKeyDown()) { - int problems = maintenanceMachine.getMaintenanceProblems(); - for (byte i = 0; i < 6; i++) { - if (((problems >> i) & 1) == 0) { - IProbeInfo horizontalPane = verticalPane - .horizontal(verticalPane.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - var tuple = GTUtil.getMaintenanceText(i); - horizontalPane.item(tuple.getA(), new ItemStyle().width(16).height(16)) - .text(tuple.getB()); - } - } - } else { - verticalPane.text(CompoundText.create().error(Component.translatable("gtceu.top.maintenance_broken"))); - } - } else { - verticalPane.text(CompoundText.create().ok(Component.translatable("gtceu.top.maintenance_fixed"))); - } - } - - @Override - public ResourceLocation getID() { - return GTCEu.id("maintenance_info"); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MultiblockStructureProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MultiblockStructureProvider.java deleted file mode 100644 index 1b0a999953b..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/MultiblockStructureProvider.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; -import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class MultiblockStructureProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("multiblock_structure"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - if (level.getBlockEntity(iProbeHitData.getPos()) instanceof MetaMachineBlockEntity blockEntity) { - if (blockEntity.getMetaMachine() instanceof IMultiController controller) { - if (!controller.isFormed()) { - iProbeInfo.text(CompoundText.create().error("gtceu.top.invalid_structure")); - } else { - iProbeInfo.text(CompoundText.create().ok("gtceu.top.valid_structure")); - } - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ParallelProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ParallelProvider.java deleted file mode 100644 index a7eb257361d..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/ParallelProvider.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; -import com.gregtechceu.gtceu.api.capability.IParallelHatch; -import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; -import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; -import com.gregtechceu.gtceu.utils.FormattingUtil; - -import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class ParallelProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("parallel"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - BlockEntity blockEntity = level.getBlockEntity(iProbeHitData.getPos()); - if (blockEntity instanceof MetaMachineBlockEntity machineBlockEntity) { - int parallel = 0; - int batch = 0; - int subtickParallel = 0; - int totalRuns = 0; - boolean exact = false; - if (machineBlockEntity.getMetaMachine() instanceof IParallelHatch parallelHatch) { - parallel = parallelHatch.getCurrentParallel(); - } else if (machineBlockEntity.getMetaMachine() instanceof IMultiController controller) { - if (controller instanceof IRecipeLogicMachine rlm && - rlm.getRecipeLogic().isActive() && - rlm.getRecipeLogic().getLastRecipe() != null) { - parallel = rlm.getRecipeLogic().getLastRecipe().parallels; - batch = rlm.getRecipeLogic().getLastRecipe().batchParallels; - subtickParallel = rlm.getRecipeLogic().getLastRecipe().subtickParallels; - totalRuns = rlm.getRecipeLogic().getLastRecipe().getTotalRuns(); - exact = true; - } else { - parallel = controller.getParallelHatch() - .map(IParallelHatch::getCurrentParallel) - .orElse(0); - } - } - - if (!exact && parallel > 1) { - Component parallels = Component.literal(FormattingUtil.formatNumbers(parallel)) - .withStyle(ChatFormatting.DARK_PURPLE); - String key = "gtceu.multiblock.parallel"; - iProbeInfo.text(Component.translatable(key, parallels)); - } else if (totalRuns > 1) { - Component runs = Component.literal(FormattingUtil.formatNumbers(totalRuns)) - .withStyle(ChatFormatting.DARK_PURPLE); - String key = "gtceu.multiblock.total_runs"; - iProbeInfo.text(Component.translatable(key, runs)); - - if (parallel > 1) { - Component parallels = Component.literal(FormattingUtil.formatNumbers(parallel)) - .withStyle(ChatFormatting.DARK_PURPLE); - String keyParallel = "gtceu.multiblock.parallel.exact"; - iProbeInfo.text(Component.translatable(keyParallel, parallels)); - } - if (batch > 1) { - Component batches = Component.literal(FormattingUtil.formatNumbers(batch)) - .withStyle(ChatFormatting.DARK_PURPLE); - String keyBatch = "gtceu.multiblock.batch_enabled"; - iProbeInfo.text(Component.translatable(keyBatch, batches)); - } - if (subtickParallel > 1) { - Component subticks = Component.literal(FormattingUtil.formatNumbers(subtickParallel)) - .withStyle(ChatFormatting.DARK_PURPLE); - String keySubtick = "gtceu.multiblock.subtick_parallels"; - iProbeInfo.text(Component.translatable(keySubtick, subticks)); - } - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/PrimitivePumpProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/PrimitivePumpProvider.java deleted file mode 100644 index 894ae80d7b1..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/PrimitivePumpProvider.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.common.machine.multiblock.primitive.PrimitivePumpMachine; -import com.gregtechceu.gtceu.utils.FormattingUtil; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class PrimitivePumpProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("primitive_pump_provider"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - if (MetaMachine.getMachine(level, iProbeHitData.getPos()) instanceof PrimitivePumpMachine pump) { - IProbeInfo verticalPane = iProbeInfo.vertical(iProbeInfo.defaultLayoutStyle().spacing(0)); - verticalPane.text(Component.translatable("gtceu.top.primitive_pump_production", - FormattingUtil.formatNumbers(pump.getFluidProduction()))); - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeLogicInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeLogicInfoProvider.java deleted file mode 100644 index 7ff00ff3db1..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeLogicInfoProvider.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; -import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; -import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine; -import com.gregtechceu.gtceu.api.machine.steam.SteamMachine; -import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine; -import com.gregtechceu.gtceu.integration.jade.provider.RecipeLogicProvider; -import com.gregtechceu.gtceu.utils.FormattingUtil; -import com.gregtechceu.gtceu.utils.GTUtil; - -import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.TextStyleClass; -import org.jetbrains.annotations.Nullable; - -public class RecipeLogicInfoProvider extends CapabilityInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("recipe_logic_provider"); - } - - @Nullable - @Override - protected RecipeLogic getCapability(Level level, BlockPos pos, @Nullable Direction side) { - return GTCapabilityHelper.getRecipeLogic(level, pos, side); - } - - @Override - protected void addProbeInfo(RecipeLogic capability, IProbeInfo probeInfo, Player player, BlockEntity blockEntity, - IProbeHitData data) { - if (capability.isWorking()) { - var recipe = capability.getLastRecipe(); - if (recipe != null) { - var EUt = RecipeHelper.getRealEUtWithIO(recipe); - if (EUt.isEmpty()) { - // do not show energy usage on machines that do not use energy - return; - } - Component text = null; - - if (blockEntity instanceof IMachineBlockEntity machineBlockEntity) { - var machine = machineBlockEntity.getMetaMachine(); - long MBt = 0; - if (machine instanceof SimpleSteamMachine ssm) { - MBt = (long) Math.ceil(EUt.getTotalEU() * ssm.getConversionRate()); - } else if (machine instanceof SteamParallelMultiblockMachine smb) { - MBt = (long) Math.ceil(EUt.getTotalEU() * smb.getConversionRate()); - } - if (machine instanceof SteamMachine) { - text = Component.translatable("gtceu.jade.fluid_use", - FormattingUtil.formatNumbers(MBt) + TextStyleClass.INFO) - .withStyle(ChatFormatting.GREEN); - } - } - - if (text == null) { - var tier = GTUtil.getTierByVoltage(RecipeLogicProvider.getVoltage(capability)); - String minAmperage = FormattingUtil - .formatNumber2Places((float) (EUt.getTotalEU()) / GTValues.V[tier]) + TextStyleClass.INFO; - - text = Component.translatable("gtceu.jade.amperage_use", minAmperage).withStyle(ChatFormatting.RED) - .append(Component.translatable("gtceu.jade.at").withStyle(ChatFormatting.GREEN)) - .append(GTValues.VNF[tier]) - .append(Component.translatable("gtceu.universal.padded_parentheses", - (Component.translatable("gtceu.recipe.eu.total", - FormattingUtil.formatNumbers(EUt.getTotalEU()) + TextStyleClass.INFO))) - .withStyle(ChatFormatting.WHITE)); - } - - if (EUt.isInput()) { - probeInfo.text(CompoundText.create() - .text(Component.translatable("gtceu.top.energy_consumption").append(" ").append(text)) - .style(TextStyleClass.INFO)); - } else { - probeInfo.text(CompoundText.create() - .text(Component.translatable("gtceu.top.energy_production").append(" ").append(text)) - .style(TextStyleClass.INFO)); - } - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeOutputProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeOutputProvider.java deleted file mode 100644 index 296d2edae5c..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeOutputProvider.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; -import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; -import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; -import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; -import com.gregtechceu.gtceu.api.recipe.RecipeHelper; -import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderFluidIngredient; -import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderIngredient; -import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions; -import com.gregtechceu.gtceu.integration.top.element.FluidStackElement; -import com.gregtechceu.gtceu.integration.top.element.FluidStyle; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.neoforged.neoforge.common.crafting.SizedIngredient; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; - -import lombok.experimental.ExtensionMethod; -import mcjty.theoneprobe.api.CompoundText; -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.apiimpl.styles.ItemStyle; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; - -@ExtensionMethod(SizedIngredientExtensions.class) -public class RecipeOutputProvider extends CapabilityInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("recipe_output_info"); - } - - @Nullable - @Override - protected RecipeLogic getCapability(Level level, BlockPos blockPos, @Nullable Direction direction) { - return GTCapabilityHelper.getRecipeLogic(level, blockPos, direction); - } - - @Override - protected void addProbeInfo(RecipeLogic recipeLogic, IProbeInfo iProbeInfo, Player player, BlockEntity blockEntity, - IProbeHitData iProbeHitData) { - if (recipeLogic.isWorking()) { - var recipe = recipeLogic.getLastRecipe(); - if (recipe != null) { - int recipeTier = RecipeHelper.getPreOCRecipeEuTier(recipe); - int chanceTier = recipeTier + recipe.ocLevel; - var function = recipe.getType().getChanceFunction(); - var itemContents = recipe.getOutputContents(ItemRecipeCapability.CAP); - var fluidContents = recipe.getOutputContents(FluidRecipeCapability.CAP); - - List itemOutputs = new ArrayList<>(); - for (var item : itemContents) { - ItemStack[] stacks; - SizedIngredient content = ItemRecipeCapability.CAP.of(item.content); - // if (content instanceof IntProviderIngredient provider) { - // stacks = provider.getInner().getItems(); - // } else { - stacks = content.getItems(); - // } - if (stacks.length == 0) continue; - if (stacks[0].isEmpty()) continue; - var stack = stacks[0].copy(); - - if (item.chance < item.maxChance) { - int count = stack.getCount(); - double countD = (double) count * recipe.parallels * - function.getBoostedChance(item, recipeTier, chanceTier) / item.maxChance; - count = Math.max(1, (int) Math.round(countD)); - stack.setCount(count); - } - itemOutputs.add(RecipeHelper.makeSizedIngredient(stack)); - } - - List fluidOutputs = new ArrayList<>(); - for (var fluid : fluidContents) { - var stacks = FluidRecipeCapability.CAP.of(fluid.content).getFluids(); - if (stacks.length == 0) continue; - if (stacks[0].isEmpty()) continue; - var stack = stacks[0].copy(); - - if (fluid.chance < fluid.maxChance) { - int amount = stack.getAmount(); - double amountD = (double) amount * recipe.parallels * - function.getBoostedChance(fluid, recipeTier, chanceTier) / fluid.maxChance; - amount = Math.max(1, (int) Math.round(amountD)); - stack.setAmount(amount); - } - fluidOutputs.add(RecipeHelper.makeSizedFluidIngredient(stack)); - } - - if (!itemOutputs.isEmpty() || !fluidOutputs.isEmpty()) { - IProbeInfo verticalPane = iProbeInfo.vertical(iProbeInfo.defaultLayoutStyle().spacing(0)); - verticalPane.text( - CompoundText.create().info(Component.translatable("gtceu.top.recipe_output").append(" "))); - addItemInfo(verticalPane, itemOutputs); - addFluidInfo(verticalPane, fluidOutputs); - } - } - } - } - - private void addItemInfo(IProbeInfo verticalPane, List outputItems) { - for (SizedIngredient itemOutput : outputItems) { - if (itemOutput != null && !itemOutput.ingredient().hasNoItems()) { - ItemStack stack = itemOutput.getItems()[0]; - - IProbeInfo horizontalPane = verticalPane - .horizontal(verticalPane.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - String spacer = " "; - - if (itemOutput.getContainedCustom() instanceof IntProviderIngredient provider) { - spacer += (Component.translatable("gtceu.gui.content.range", - String.valueOf(provider.getCountProvider().getMinValue()), - String.valueOf(provider.getCountProvider().getMaxValue()))) + " "; - provider.setItemStacks(null); // no roll - provider.setSampledCount(1); - } - horizontalPane.item(stack, - new ItemStyle().width(16).height(16)) - .text(spacer) - .itemLabel(stack); - } - } - } - - private void addFluidInfo(IProbeInfo verticalPane, List outputFluids) { - for (SizedFluidIngredient fluidOutput : outputFluids) { - if (fluidOutput != null && !fluidOutput.ingredient().hasNoFluids()) { - FluidStack stack = fluidOutput.getFluids()[0]; - - IProbeInfo horizontalPane = verticalPane - .horizontal(verticalPane.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - String spacer = " "; - if (fluidOutput.ingredient() instanceof IntProviderFluidIngredient provider) { - spacer += (Component.translatable("gtceu.gui.content.range", - String.valueOf(provider.getCountProvider().getMinValue()), - String.valueOf(provider.getCountProvider().getMaxValue()))) + " "; - provider.setFluidStacks(null); // no roll - provider.setSampledCount(1); - stack.setAmount(provider.getCountProvider().getMaxValue()); // no roll - } - horizontalPane.element(new FluidStackElement(stack, new FluidStyle())) - .text(spacer) - .text(stack.getHoverName()); - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/StainedColorProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/StainedColorProvider.java deleted file mode 100644 index c977bdd90ab..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/StainedColorProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.blockentity.IPaintable; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class StainedColorProvider implements IProbeInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("stained_color"); - } - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - BlockEntity blockEntity = level.getBlockEntity(iProbeHitData.getPos()); - if (!(blockEntity instanceof IPaintable paintable)) { - return; - } - if (!paintable.isPainted()) return; - int paintingColor = paintable.getPaintingColor(); - - IProbeInfo horizontal = iProbeInfo.horizontal(iProbeInfo - .defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - horizontal.mcText(Component.translatable("gtceu.top.stained", String.format("#%06X", paintingColor)) - .withStyle(style -> style.withColor(paintingColor))); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/SteamBoilerInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/SteamBoilerInfoProvider.java deleted file mode 100644 index 1ad3a5517f0..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/SteamBoilerInfoProvider.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.api.machine.steam.SteamBoilerMachine; -import com.gregtechceu.gtceu.utils.FormattingUtil; - -import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.ElementAlignment; -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import org.jetbrains.annotations.Nullable; - -public class SteamBoilerInfoProvider extends CapabilityInfoProvider { - - @Override - protected @Nullable SteamBoilerMachine getCapability(Level level, BlockPos blockPos, @Nullable Direction side) { - if (MetaMachine.getMachine(level, blockPos) instanceof SteamBoilerMachine steamBoilerMachine) { - return steamBoilerMachine; - } - return null; - } - - @Override - protected void addProbeInfo(SteamBoilerMachine capability, IProbeInfo probeInfo, Player player, - BlockEntity blockEntity, IProbeHitData data) { - IProbeInfo horizontalPane = probeInfo - .horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER)); - - boolean isBurning = capability.getRecipeLogic().isWorking(); - boolean hasWater = !capability.isHasNoWater(); - long production = capability.getTotalSteamOutput(); - int temperature = capability.getCurrentTemperature(); - int maxTemperature = capability.getMaxTemperature(); - - boolean makingSteam = hasWater && temperature >= 100; - - // Determine the first section - MutableComponent root; - if (isBurning && temperature < maxTemperature) { - // Heating up - root = Component.translatable("gtceu.machine.boiler.info.heating.up"); - } else if (!isBurning && temperature > 0) { - // Cooling down - root = Component.translatable("gtceu.machine.boiler.info.cooling.down"); - } else { - root = null; // neither heating nor cooling, is either max temperature or temperature of zero - } - - // Determine the second section - MutableComponent extra; - if (makingSteam) { - // Producing some amount of steam - extra = Component.translatable("gtceu.machine.boiler.info.production.data", - Component.literal(FormattingUtil.formatNumbers(production / 10)) - .withStyle(ChatFormatting.GREEN)); - if (root != null) { - // append some nice separation here to the root - extra = Component.literal(" | ").append(extra); - } - } else if (temperature > 0 && temperature < 100) { - // Still warming up (or cooling down) - extra = Component.literal(String.format(" %s(%s%%)", - // Either heating up or cooling down - isBurning ? ChatFormatting.RED : ChatFormatting.BLUE, - temperature)); - } else { - // Nothing to add - extra = null; - } - - if (root != null && extra != null) { - horizontalPane.text(root.append(extra)); - } else if (root != null) { - horizontalPane.text(root); - } else if (extra != null) { - horizontalPane.text(extra); - } - } - - @Override - public ResourceLocation getID() { - return GTCEu.id("steam_boiler_info"); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/TransformerInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/TransformerInfoProvider.java deleted file mode 100644 index 6eb178a9c8d..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/TransformerInfoProvider.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.common.machine.electric.TransformerMachine; - -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import mcjty.theoneprobe.api.IProbeInfoProvider; -import mcjty.theoneprobe.api.ProbeMode; - -public class TransformerInfoProvider implements IProbeInfoProvider { - - @Override - public void addProbeInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player player, Level level, - BlockState blockState, IProbeHitData iProbeHitData) { - if (MetaMachine.getMachine(level, iProbeHitData.getPos()) instanceof TransformerMachine transformer) { - - boolean transformUp = transformer.isTransformUp(); - int voltage = transformer.getTier(); - int amp = transformer.getBaseAmp(); - int side = transformer.getFrontFacing().get3DDataValue(); - - IProbeInfo verticalPane = iProbeInfo.vertical(iProbeInfo.defaultLayoutStyle().spacing(0)); - if (transformUp) { - verticalPane.text(Component.translatable("gtceu.top.transform_up", - (GTValues.VNF[voltage] + " §r(" + amp * 4 + "A) -> " + GTValues.VNF[voltage + 1] + " §r(" + - amp + - "A)"))); - } else { - verticalPane.text(Component.translatable("gtceu.top.transform_down", - (GTValues.VNF[voltage + 1] + " §r(" + amp + "A) -> " + GTValues.VNF[voltage] + " §r(" + - amp * 4 + - "A)"))); - } - - if (iProbeHitData.getSideHit() == Direction.from3DDataValue(side)) { - verticalPane.text( - Component.translatable( - (transformUp ? "gtceu.top.transform_output" : "gtceu.top.transform_input"), - (GTValues.VNF[voltage + 1] + " §r(" + amp + "A)"))); - } else { - verticalPane.text( - Component.translatable( - (transformUp ? "gtceu.top.transform_input" : "gtceu.top.transform_output"), - (GTValues.VNF[voltage] + " §r(" + amp * 4 + "A)"))); - } - } - } - - @Override - public ResourceLocation getID() { - return GTCEu.id("transformer_provider"); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/WorkableInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/top/provider/WorkableInfoProvider.java deleted file mode 100644 index 66130a8f78a..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/integration/top/provider/WorkableInfoProvider.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gregtechceu.gtceu.integration.top.provider; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; -import com.gregtechceu.gtceu.api.capability.IWorkable; -import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; - -import mcjty.theoneprobe.api.IProbeHitData; -import mcjty.theoneprobe.api.IProbeInfo; -import org.jetbrains.annotations.Nullable; - -public class WorkableInfoProvider extends CapabilityInfoProvider { - - @Override - public ResourceLocation getID() { - return GTCEu.id("workable_provider"); - } - - @Nullable - @Override - protected IWorkable getCapability(Level level, BlockPos pos, @Nullable Direction side) { - return GTCapabilityHelper.getWorkable(level, pos, side); - } - - @Override - protected void addProbeInfo(IWorkable capability, IProbeInfo probeInfo, Player player, BlockEntity blockEntity, - IProbeHitData data) { - if (!capability.isActive()) return; - - int currentProgress = capability.getProgress(); - int maxProgress = capability.getMaxProgress(); - Component text; - - if (capability instanceof RecipeLogic logic && - logic.getLastRecipe() != null && - logic.getLastRecipe().data.getBoolean("duration_is_total_cwu")) { - // show as total computation instead - int color = capability.isWorkingEnabled() ? 0xFF00D4CE : 0xFFBB1C28; - probeInfo.progress(currentProgress, maxProgress, probeInfo.defaultProgressStyle() - .suffix(Component.translatable("gtceu.top.progress_computation", maxProgress)) - .filledColor(color) - .alternateFilledColor(color) - .borderColor(0xFF555555)); - return; - } - - if (maxProgress < 20) { - text = Component.translatable("gtceu.top.progress_tick", maxProgress); - } else { - currentProgress = Math.round(currentProgress / 20.0F); - maxProgress = Math.round(maxProgress / 20.0F); - text = Component.translatable("gtceu.top.progress_sec", maxProgress); - } - - if (maxProgress > 0) { - int color = capability.isWorkingEnabled() ? 0xFF4CBB17 : 0xFFBB1C28; - probeInfo.progress(currentProgress, maxProgress, probeInfo.defaultProgressStyle() - .suffix(text) - .filledColor(color) - .alternateFilledColor(color) - .borderColor(0xFF555555)); - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProduct.java b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProduct.java index 60f025ac3d4..ba4f6cf336c 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProduct.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProduct.java @@ -1,16 +1,16 @@ package com.gregtechceu.gtceu.integration.xei.widgets; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.material.material.properties.OreProperty; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; import com.gregtechceu.gtceu.api.recipe.content.Content; -import com.gregtechceu.gtceu.api.tag.TagPrefix; -import com.gregtechceu.gtceu.data.machine.GTMachines; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.integration.xei.entry.fluid.FluidEntryList; import com.gregtechceu.gtceu.integration.xei.entry.fluid.FluidStackList; import com.gregtechceu.gtceu.integration.xei.entry.fluid.FluidTagList; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProductWidget.java b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProductWidget.java index 1a23638a75a..750baa14cc2 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProductWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProductWidget.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.integration.xei.widgets; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.gui.widget.TankWidget; -import com.gregtechceu.gtceu.api.material.material.Material; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreVeinWidget.java b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreVeinWidget.java index fed07bdd3f2..3bde46fca75 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreVeinWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreVeinWidget.java @@ -1,16 +1,16 @@ package com.gregtechceu.gtceu.integration.xei.widgets; +import com.gregtechceu.gtceu.api.data.DimensionMarker; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.gui.widget.TankWidget; -import com.gregtechceu.gtceu.api.material.ChemicalHelper; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.api.transfer.fluid.CustomFluidTank; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.api.worldgen.DimensionMarker; -import com.gregtechceu.gtceu.api.worldgen.OreVeinDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition; -import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.common.recipe.condition.DimensionCondition; import com.gregtechceu.gtceu.config.ConfigHolder; @@ -49,7 +49,7 @@ public class GTOreVeinWidget extends WidgetGroup { private final Set> dimensionFilter; public final static int width = 120; - public GTOreVeinWidget(Holder ore) { + public GTOreVeinWidget(Holder ore) { super(0, 0, width, 160); this.translationKey = getOreName(ore); this.weight = ore.value().weight(); @@ -83,7 +83,7 @@ public GTOreVeinWidget(Holder bedrockOre, Void marker) { } @SuppressWarnings("all") - private String range(OreVeinDefinition oreDefinition) { + private String range(GTOreDefinition oreDefinition) { HeightProvider height = oreDefinition.heightRange().height; int minHeight = 0, maxHeight = 0; if (height instanceof UniformHeight uniform) { @@ -93,7 +93,7 @@ private String range(OreVeinDefinition oreDefinition) { return String.format("%d - %d", minHeight, maxHeight); } - private void setupBaseGui(OreVeinDefinition oreDefinition) { + private void setupBaseGui(GTOreDefinition oreDefinition) { NonNullList containedOresAsItemStacks = NonNullList.create(); IntList chances = oreDefinition.veinGenerator().getAllChances(); containedOresAsItemStacks.addAll(getRawMaterialList(oreDefinition)); @@ -137,7 +137,7 @@ private void setupBaseGui(BedrockOreDefinition bedrockOreDefinition) { } } - private void setupText(OreVeinDefinition ignored) { + private void setupText(GTOreDefinition ignored) { addWidget(new ImageWidget(5, 0, width - 10, 16, new TextTexture(translationKey).setType(TextTexture.TextType.LEFT_ROLL) .setWidth(width - 10))); @@ -208,7 +208,7 @@ private void setupDimensionMarker(int yPosition) { } } - public static List getContainedOresAndBlocks(OreVeinDefinition oreDefinition) { + public static List getContainedOresAndBlocks(GTOreDefinition oreDefinition) { return oreDefinition.veinGenerator().getAllEntries().stream() .flatMap(entry -> entry.map(state -> Stream.of(state.getBlock().asItem().getDefaultInstance()), material -> { @@ -222,7 +222,7 @@ public static List getContainedOresAndBlocks(OreVeinDefinition oreDef .toList(); } - public static List getRawMaterialList(OreVeinDefinition oreDefinition) { + public static List getRawMaterialList(GTOreDefinition oreDefinition) { return oreDefinition.veinGenerator().getAllEntries().stream() .map(entry -> entry.map(state -> state.getBlock().asItem().getDefaultInstance(), material -> ChemicalHelper.get(TagPrefix.rawOre, material))) @@ -235,7 +235,7 @@ public static List getRawMaterialList(BedrockOreDefinition bedrockOre .toList(); } - public static String getOreName(Holder ore) { + public static String getOreName(Holder ore) { return ore.getKey().location().toLanguageKey("ore_vein"); } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTRecipeWidget.java b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTRecipeWidget.java index 6534f5473a5..01abfd66815 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTRecipeWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTRecipeWidget.java @@ -8,18 +8,18 @@ import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.WidgetUtils; import com.gregtechceu.gtceu.api.gui.widget.PredicatedButtonWidget; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.OverclockingLogic; +import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.chance.boost.ChanceBoostFunction; import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic; -import com.gregtechceu.gtceu.api.recipe.condition.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.electric.FusionReactorMachine; import com.gregtechceu.gtceu.common.recipe.condition.DimensionCondition; -import com.gregtechceu.gtceu.data.datagen.lang.LangHandler; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/syncdata/GTRecipePayload.java b/src/main/java/com/gregtechceu/gtceu/syncdata/GTRecipePayload.java index 22b8a95736e..0be68572968 100644 --- a/src/main/java/com/gregtechceu/gtceu/syncdata/GTRecipePayload.java +++ b/src/main/java/com/gregtechceu/gtceu/syncdata/GTRecipePayload.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.syncdata; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeSerializer; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.lowdragmc.lowdraglib.syncdata.payload.ObjectTypedPayload; diff --git a/src/main/java/com/gregtechceu/gtceu/syncdata/MaterialPayload.java b/src/main/java/com/gregtechceu/gtceu/syncdata/MaterialPayload.java index f7fd468d499..9bbe83c05e8 100644 --- a/src/main/java/com/gregtechceu/gtceu/syncdata/MaterialPayload.java +++ b/src/main/java/com/gregtechceu/gtceu/syncdata/MaterialPayload.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.syncdata; import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.material.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.lowdragmc.lowdraglib.syncdata.payload.ObjectTypedPayload; diff --git a/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java index 80a837e427f..4b603a8d310 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.utils; -import com.gregtechceu.gtceu.data.damagesource.GTDamageTypes; -import com.gregtechceu.gtceu.data.tag.CustomTags; +import com.gregtechceu.gtceu.common.data.GTDamageTypes; +import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.EntityTypeTags; diff --git a/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java index ccf95aa07f3..c7e03ea5e18 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java @@ -2,11 +2,11 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.fluid.store.FluidStorageKeys; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.material.material.Material; -import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.tag.TagPrefix; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.MapColorAccessor; @@ -58,7 +58,7 @@ import java.util.*; import java.util.function.Function; -import static com.gregtechceu.gtceu.api.material.material.properties.PropertyKey.HAZARD; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.HAZARD; import static com.gregtechceu.gtceu.utils.FormattingUtil.DECIMAL_FORMAT_SIC_2F; public class GTUtil { diff --git a/src/main/java/com/gregtechceu/gtceu/utils/InfiniteFluidTransfer.java b/src/main/java/com/gregtechceu/gtceu/utils/InfiniteFluidTransfer.java deleted file mode 100644 index 1ecdcc861c4..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/utils/InfiniteFluidTransfer.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gregtechceu.gtceu.utils; - -import com.lowdragmc.lowdraglib.side.fluid.IFluidHandlerModifiable; - -import net.neoforged.neoforge.fluids.FluidStack; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import org.jetbrains.annotations.NotNull; - -@RequiredArgsConstructor -public class InfiniteFluidTransfer implements IFluidHandlerModifiable { - - @Getter - private final int tanks; - - @Override - public void setFluidInTank(int tank, @NotNull FluidStack fluidStack) {} - - @Override - public FluidStack getFluidInTank(int tank) { - return null; - } - - @Override - public int getTankCapacity(int tank) { - return Integer.MAX_VALUE; - } - - @Override - public int fill(FluidStack resource, FluidAction action) { - return 0; - } - - @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - return resource; - } - - @Override - public FluidStack drain(int maxDrain, FluidAction action) { - return FluidStack.EMPTY; - } - - @Override - public boolean isFluidValid(int tank, @NotNull FluidStack stack) { - return true; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/utils/ResearchManager.java b/src/main/java/com/gregtechceu/gtceu/utils/ResearchManager.java index a6d8fcc7cab..55d92c3dfb8 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/ResearchManager.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/ResearchManager.java @@ -3,16 +3,16 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeSerializer; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.item.datacomponents.DataItem; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.core.component.DataComponents; import net.minecraft.data.recipes.RecipeOutput; diff --git a/src/main/java/com/gregtechceu/gtceu/api/tag/TagUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/TagUtil.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/tag/TagUtil.java rename to src/main/java/com/gregtechceu/gtceu/utils/TagUtil.java index 9acecc8390e..9efb6eb5be6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/tag/TagUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/TagUtil.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.tag; +package com.gregtechceu.gtceu.utils; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/utils/ToolItemHelper.java b/src/main/java/com/gregtechceu/gtceu/utils/ToolItemHelper.java index 1f780a6c772..48af39ee371 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/ToolItemHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/ToolItemHelper.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.item.capability.ElectricItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.data.item.GTMaterialItems; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterialItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/utils/codec/DispatchedMapCodec.java b/src/main/java/com/gregtechceu/gtceu/utils/codec/DispatchedMapCodec.java new file mode 100644 index 00000000000..cc65a071539 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/utils/codec/DispatchedMapCodec.java @@ -0,0 +1,78 @@ +package com.gregtechceu.gtceu.utils.codec; + +import com.gregtechceu.gtceu.GTCEu; + +import com.mojang.datafixers.util.Pair; +import com.mojang.datafixers.util.Unit; +import com.mojang.serialization.*; +import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; + +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Stream; + +public record DispatchedMapCodec( + Codec keyCodec, + Function> valueCodecFunction) + implements Codec> { + + @Override + public DataResult encode(final Map input, final DynamicOps ops, final T prefix) { + final RecordBuilder mapBuilder = ops.mapBuilder(); + for (final Map.Entry entry : input.entrySet()) { + mapBuilder.add(keyCodec.encodeStart(ops, entry.getKey()), + encodeValue(valueCodecFunction.apply(entry.getKey()), entry.getValue(), ops)); + } + return mapBuilder.build(prefix); + } + + @SuppressWarnings("unchecked") + private DataResult encodeValue(final Codec codec, final V input, final DynamicOps ops) { + return codec.encodeStart(ops, (V2) input); + } + + @Override + public DataResult, T>> decode(final DynamicOps ops, final T input) { + return ops.getMap(input).flatMap(map -> { + final Map entries = new Object2ObjectArrayMap<>(); + final Stream.Builder> failed = Stream.builder(); + + final DataResult finalResult = map.entries().reduce( + DataResult.success(Unit.INSTANCE, Lifecycle.stable()), + (result, entry) -> parseEntry(result, ops, entry, entries, failed), + (r1, r2) -> r1.apply2stable((u1, u2) -> u1, r2)); + + final Pair, T> pair = Pair.of(new Object2ObjectArrayMap<>(entries), input); + final T errors = ops.createMap(failed.build()); + + return finalResult.map(ignored -> pair).setPartial(pair) + .mapError(error -> error + " missed input: " + errors); + }); + } + + private DataResult parseEntry(final DataResult result, final DynamicOps ops, + final Pair input, final Map entries, + final Stream.Builder> failed) { + final DataResult keyResult = keyCodec.parse(ops, input.getFirst()); + final DataResult valueResult = keyResult.map(valueCodecFunction) + .flatMap(valueCodec -> valueCodec.parse(ops, input.getSecond()).map(Function.identity())); + final DataResult> entryResult = keyResult.apply2stable(Pair::of, valueResult); + + final Optional> entry = entryResult.resultOrPartial(GTCEu.LOGGER::error); + if (entry.isPresent()) { + final K key = entry.get().getFirst(); + final V value = entry.get().getSecond(); + if (entries.putIfAbsent(key, value) != null) { + failed.add(input); + return result.apply2stable((u, p) -> u, + DataResult.error(() -> "Duplicate entry for key: '" + key + "'")); + } + } + if (entryResult.error().isPresent()) { + failed.add(input); + } + + return result.apply2stable((u, p) -> u, entryResult); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/api/codec/GTCodecUtils.java b/src/main/java/com/gregtechceu/gtceu/utils/codec/GTCodecUtils.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/codec/GTCodecUtils.java rename to src/main/java/com/gregtechceu/gtceu/utils/codec/GTCodecUtils.java index 434aed84ac7..68008ae9a2b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/codec/GTCodecUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/codec/GTCodecUtils.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.codec; +package com.gregtechceu.gtceu.utils.codec; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; diff --git a/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeBlockstateProvider.java b/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeBlockstateProvider.java index 42f0168d5d5..0df83dcb7e0 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeBlockstateProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/data/RuntimeBlockstateProvider.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; -import com.gregtechceu.gtceu.common.pack.GTDynamicResourcePack; import com.gregtechceu.gtceu.common.registry.GTRegistration; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; diff --git a/src/main/java/com/gregtechceu/gtceu/utils/memoization/MemoizedBlockSupplier.java b/src/main/java/com/gregtechceu/gtceu/utils/memoization/MemoizedBlockSupplier.java index 461956ed218..3eced82a54a 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/memoization/MemoizedBlockSupplier.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/memoization/MemoizedBlockSupplier.java @@ -1,6 +1,7 @@ package com.gregtechceu.gtceu.utils.memoization; -import com.gregtechceu.gtceu.api.material.material.stack.MaterialEntry; +import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import net.minecraft.world.level.block.Block; @@ -9,7 +10,7 @@ /** * A variant of the memoized supplier that stores a block explicitly. * Use this to save blocks to - * {@link com.gregtechceu.gtceu.api.material.material.ItemMaterialData#registerMaterialEntry(Supplier, MaterialEntry)}} + * {@link ItemMaterialData#registerMaterialEntry(Supplier, MaterialEntry)}} */ public class MemoizedBlockSupplier extends MemoizedSupplier { diff --git a/src/main/resources/gtceu.mixins.json b/src/main/resources/gtceu.mixins.json index 55025576a2e..5b4efb8bc20 100644 --- a/src/main/resources/gtceu.mixins.json +++ b/src/main/resources/gtceu.mixins.json @@ -13,7 +13,6 @@ "client.FaceBakeryMixin", "client.GuiGraphicsAccessor", "client.GuiGraphicsMixin", - "client.HotbarManagerMixin", "client.ItemEntityMixin", "client.LevelRendererMixin", "client.ModelManagerMixin", @@ -39,14 +38,11 @@ "BlockMixin", "BlockPropertiesAccessor", "ChunkGeneratorMixin", - "ChunkSerializerMixin", - "DataFixTypesMixin", "EntityMixin", "FluidStackAccessor", "GrowingPlantBlockAccessor", "IntegerPropertyAccessor", "InventoryMixin", - "IOWorkerMixin", "LevelAccessor", "LevelMixin", "LootPoolAccessor", @@ -61,12 +57,10 @@ "ReloadableServerResourcesMixin", "RepairItemRecipeMixin", "ResourceKeyArgumentAccessor", - "ResourceLocationMixin", "ServerChunkProviderMixin", "ServerGamePacketListenerImplAccessor", "ShapedRecipeAccessor", "SidedRedstoneConnectivityMixin", - "StructureMixin", "TagLoaderMixin", "TagManagerMixin", "WorldLoaderMixin", @@ -85,8 +79,7 @@ "registrate.AbstractRegistrateAccessor", "registrate.RegistrateDataProviderAccessor", "rei.InputSlotCrafterMixin", - "rei.RecipeFinderMixin", - "top.ConfigMixin" + "rei.RecipeFinderMixin" ], "injectors": { "defaultRequire": 1, diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index c4bd9a60ce1..e55dff426ac 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -81,13 +81,6 @@ enumExtensions = "META-INF/enum_extensions.json" ordering = "AFTER" side = "BOTH" -[[dependencies.${mod_id}]] - modId = "theoneprobe" - type = "optional" - versionRange = "[${top_version},)" - ordering = "NONE" - side = "BOTH" - [[dependencies.${mod_id}]] modId = "jade" type = "optional" diff --git a/src/test/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogicTest.java b/src/test/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogicTest.java index 35a4dda7b14..73c6f4d1b8a 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogicTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogicTest.java @@ -3,10 +3,10 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializerTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializerTest.java index c2073da6df2..d62064f5d13 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializerTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializerTest.java @@ -1,11 +1,10 @@ package com.gregtechceu.gtceu.api.recipe; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.common.recipe.builder.GTRecipeBuilder; import com.gregtechceu.gtceu.common.recipe.condition.AdjacentBlockCondition; import com.gregtechceu.gtceu.common.recipe.condition.AdjacentFluidCondition; +import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/InputSeparationTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/InputSeparationTest.java index 683f99515a5..9752df2fd9e 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/InputSeparationTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/InputSeparationTest.java @@ -3,9 +3,9 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.FluidHatchPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/MultipleEnergyHatchTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/MultipleEnergyHatchTest.java index c8847cf9e5e..85d2c19fcea 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/MultipleEnergyHatchTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/MultipleEnergyHatchTest.java @@ -5,9 +5,9 @@ import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.misc.EnergyContainerList; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.EnergyHatchPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/OverclockLogicTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/OverclockLogicTest.java index bb1d8e13b13..3a7e5e74c1a 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/OverclockLogicTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/OverclockLogicTest.java @@ -3,9 +3,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; @@ -21,8 +20,8 @@ import net.neoforged.testframework.annotation.TestHolder; import static com.gregtechceu.gtceu.api.recipe.OverclockingLogic.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeModifiers.*; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeModifiers.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; import static com.gregtechceu.gtceu.gametest.util.TestUtils.getMetaMachine; @PrefixGameTestTemplate(false) diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredientTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredientTest.java index c2b69fd5102..3e075954b58 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredientTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredientTest.java @@ -11,11 +11,11 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; +import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.FluidHatchPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ParallelHatchPartMachine; -import com.gregtechceu.gtceu.data.material.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredientTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredientTest.java index c26456dfbeb..00ca1940884 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredientTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredientTest.java @@ -10,10 +10,10 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.FluidHatchPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ParallelHatchPartMachine; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookupTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookupTest.java index 050593c7e27..e13ca8a03b3 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookupTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookupTest.java @@ -2,14 +2,14 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.fluid.FluidStackMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.item.ItemStackMapIngredient; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.material.GTMaterials; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.MappedRegistry; diff --git a/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/item/NBTItemStackMapIngredientLookupTest.java b/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/item/NBTItemStackMapIngredientLookupTest.java index 7d2c58dbf19..b7dcfc83bfa 100644 --- a/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/item/NBTItemStackMapIngredientLookupTest.java +++ b/src/test/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/item/NBTItemStackMapIngredientLookupTest.java @@ -3,7 +3,7 @@ // spotless:off import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.recipe.kind.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.gametest.util.TestUtils; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/AdvancedDetectorCoverTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/AdvancedDetectorCoverTest.java index 3cd4dd6d491..ea5bf98d180 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/AdvancedDetectorCoverTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/AdvancedDetectorCoverTest.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine; import com.gregtechceu.gtceu.common.cover.detector.AdvancedFluidDetectorCover; import com.gregtechceu.gtceu.common.cover.detector.AdvancedItemDetectorCover; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/ConveyorCoverTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/ConveyorCoverTest.java index 704b51bb4d7..59fa8d2643e 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/ConveyorCoverTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/ConveyorCoverTest.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.storage.BufferMachine; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/DetectorCoverTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/DetectorCoverTest.java index 6ece25d71e0..fe21911d699 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/DetectorCoverTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/DetectorCoverTest.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine; -import com.gregtechceu.gtceu.data.item.GTItems; +import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/EnderCoversTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/EnderCoversTest.java index 409504e3f84..e006e4dbf7a 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/EnderCoversTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/EnderCoversTest.java @@ -5,10 +5,10 @@ import com.gregtechceu.gtceu.common.cover.ender.EnderFluidLinkCover; import com.gregtechceu.gtceu.common.cover.ender.EnderItemLinkCover; import com.gregtechceu.gtceu.common.cover.ender.EnderRedstoneLinkCover; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.storage.QuantumChestMachine; import com.gregtechceu.gtceu.common.machine.storage.QuantumTankMachine; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/ItemFilterCoverTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/ItemFilterCoverTest.java index f9da0738ee1..d468164733f 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/ItemFilterCoverTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/ItemFilterCoverTest.java @@ -6,10 +6,10 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.cover.filter.SimpleItemFilter; import com.gregtechceu.gtceu.common.cover.data.FilterMode; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; +import com.gregtechceu.gtceu.common.data.item.GTDataComponents; import com.gregtechceu.gtceu.common.machine.storage.BufferMachine; -import com.gregtechceu.gtceu.data.item.GTDataComponents; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/MonitorCoverTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/MonitorCoverTest.java index a53aaec9954..8e66822bb9a 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/MonitorCoverTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/MonitorCoverTest.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.electric.BatteryBufferMachine; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/PumpCoverTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/PumpCoverTest.java index 6a87be34f3e..0913bc631df 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/PumpCoverTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/PumpCoverTest.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.storage.BufferMachine; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/RobotArmTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/RobotArmTest.java index e35755ee4d9..a07237f1dfa 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/RobotArmTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/RobotArmTest.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.common.cover.data.TransferMode; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.storage.CrateMachine; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; @@ -21,8 +21,6 @@ import net.neoforged.testframework.annotation.TestHolder; import net.neoforged.testframework.gametest.EmptyTemplate; -import static com.gregtechceu.gtceu.data.cover.GTCovers.*; - @PrefixGameTestTemplate(false) @GameTestHolder(GTCEu.MOD_ID) @ForEachTest(groups = "coverTests") diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/ShutterCoverTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/ShutterCoverTest.java index 5cc3ed0dfe9..ffeb1251c54 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/ShutterCoverTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/ShutterCoverTest.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.storage.BufferMachine; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/cover/SolarPanelTest.java b/src/test/java/com/gregtechceu/gtceu/common/cover/SolarPanelTest.java index 301e3b73928..f1bfc3f5f6b 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/cover/SolarPanelTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/cover/SolarPanelTest.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MetaMachine; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.electric.BatteryBufferMachine; -import com.gregtechceu.gtceu.data.item.GTItems; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineTests.java b/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineTests.java index 0e86e12176e..bf3adda2f6b 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineTests.java +++ b/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/AssemblyLineTests.java @@ -22,7 +22,7 @@ import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; import net.neoforged.testframework.annotation.TestHolder; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; import static com.gregtechceu.gtceu.gametest.util.TestUtils.getMetaMachine; @PrefixGameTestTemplate(false) diff --git a/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachineTest.java b/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachineTest.java index a28cea5193a..10615b543d0 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachineTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachineTest.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.machine.storage.CrateMachine; -import com.gregtechceu.gtceu.data.machine.GTMachines; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidConditionTest.java b/src/test/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidConditionTest.java index 6709041155d..1fd0aacb8f6 100644 --- a/src/test/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidConditionTest.java +++ b/src/test/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidConditionTest.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/gametest/stresstest/RecipeIteratorStressTest.java b/src/test/java/com/gregtechceu/gtceu/gametest/stresstest/RecipeIteratorStressTest.java index f63c5949800..7e86ef0b5c2 100644 --- a/src/test/java/com/gregtechceu/gtceu/gametest/stresstest/RecipeIteratorStressTest.java +++ b/src/test/java/com/gregtechceu/gtceu/gametest/stresstest/RecipeIteratorStressTest.java @@ -8,9 +8,9 @@ import com.gregtechceu.gtceu.api.recipe.lookup.RecipeDB; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.MapIngredientTypeManager; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.FluidHatchPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos; diff --git a/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java b/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java index f4cf2626078..b722214e18f 100644 --- a/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java +++ b/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Objects; -import static com.gregtechceu.gtceu.data.recipe.GTRecipeTypes.ELECTRIC; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ELECTRIC; public class TestUtils { diff --git a/src/test/java/com/gregtechceu/gtceu/integration/ae2/machine/PatternBufferTest.java b/src/test/java/com/gregtechceu/gtceu/integration/ae2/machine/PatternBufferTest.java index 7c4925facfd..fbfe973d979 100644 --- a/src/test/java/com/gregtechceu/gtceu/integration/ae2/machine/PatternBufferTest.java +++ b/src/test/java/com/gregtechceu/gtceu/integration/ae2/machine/PatternBufferTest.java @@ -4,9 +4,9 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; +import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.machine.multiblock.part.FluidHatchPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; -import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes; import com.gregtechceu.gtceu.gametest.util.TestUtils; import net.minecraft.core.BlockPos;