diff --git a/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderScenes.java b/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderScenes.java index f062d017..491da892 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderScenes.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderScenes.java @@ -1,15 +1,15 @@ package io.github.cpearl0.ctnhcore.client.ponder; +import com.mo_guang.ctpp.registry.CTPPMachines; +import com.mo_guang.ctpp.registry.CTPPMultiblockMachines; import io.github.cpearl0.ctnhcore.CTNHCore; import io.github.cpearl0.ctnhcore.client.ponder.Electric.CarbonBrushes; -import io.github.cpearl0.ctnhcore.client.ponder.Kinetic.*; +import io.github.cpearl0.ctnhcore.client.ponder.Kinetic.BigDam; +import io.github.cpearl0.ctnhcore.client.ponder.Kinetic.Meadow; +import io.github.cpearl0.ctnhcore.client.ponder.Kinetic.SmashingFactory; import io.github.cpearl0.ctnhcore.registry.machines.multiblock.MultiblocksA; - import net.createmod.ponder.api.registration.PonderSceneRegistrationHelper; import net.minecraft.resources.ResourceLocation; - -import com.mo_guang.ctpp.registry.CTPPMachines; -import com.mo_guang.ctpp.registry.CTPPMultiblockMachines; import org.antarcticgardens.cna.CNABlocks; public final class CTNHPonderScenes { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderTags.java b/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderTags.java index e4863ff2..438362cc 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderTags.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderTags.java @@ -1,16 +1,13 @@ package io.github.cpearl0.ctnhcore.client.ponder; -import io.github.cpearl0.ctnhcore.CTNHCore; -import io.github.cpearl0.ctnhcore.registry.machines.multiblock.MultiblocksA; - import com.gregtechceu.gtceu.common.data.GTItems; - -import net.createmod.ponder.api.registration.PonderTagRegistrationHelper; -import net.minecraft.resources.ResourceLocation; - import com.mo_guang.ctpp.registry.CTPPMachines; import com.mo_guang.ctpp.registry.CTPPMultiblockMachines; import com.simibubi.create.AllBlocks; +import io.github.cpearl0.ctnhcore.CTNHCore; +import io.github.cpearl0.ctnhcore.registry.machines.multiblock.MultiblocksA; +import net.createmod.ponder.api.registration.PonderTagRegistrationHelper; +import net.minecraft.resources.ResourceLocation; import org.antarcticgardens.cna.CNABlocks; public final class CTNHPonderTags { diff --git a/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/Electric/CarbonBrushes.java b/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/Electric/CarbonBrushes.java index d21a4568..fa92a100 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/Electric/CarbonBrushes.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/client/ponder/Electric/CarbonBrushes.java @@ -1,13 +1,11 @@ package io.github.cpearl0.ctnhcore.client.ponder.Electric; import io.github.cpearl0.ctnhcore.client.ponder.CTNHPonderSceneBuilder; - import net.createmod.ponder.api.scene.SceneBuilder; import net.createmod.ponder.api.scene.SceneBuildingUtil; import net.createmod.ponder.api.scene.Selection; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; - import org.antarcticgardens.cna.CNABlocks; import static io.github.cpearl0.ctnhcore.client.ponder.Electric.CTNHElectricPondersLang.*; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/trait/ScalableReservoirComputingLogic.java b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/trait/ScalableReservoirComputingLogic.java index c4ddfe5d..3d34aea4 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/machine/trait/ScalableReservoirComputingLogic.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/machine/trait/ScalableReservoirComputingLogic.java @@ -1,14 +1,12 @@ package io.github.cpearl0.ctnhcore.common.machine.trait; -import io.github.cpearl0.ctnhcore.common.machine.multiblock.electric.ScalableReservoirComputingMachine; -import io.github.cpearl0.ctnhcore.registry.CTNHDamageTypes; - import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.recipe.ActionResult; import com.gregtechceu.gtceu.api.recipe.GTRecipe; - +import io.github.cpearl0.ctnhcore.common.machine.multiblock.electric.ScalableReservoirComputingMachine; +import io.github.cpearl0.ctnhcore.registry.CTNHDamageTypes; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/NeutronActivatorCondition.java b/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/NeutronActivatorCondition.java index 8af7fff8..71aea480 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/NeutronActivatorCondition.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/NeutronActivatorCondition.java @@ -1,18 +1,15 @@ package io.github.cpearl0.ctnhcore.common.recipe; -import io.github.cpearl0.ctnhcore.common.machine.multiblock.electric.NeutronActivatorMachine; -import io.github.cpearl0.ctnhcore.registry.CTNHRecipeConditions; - import com.gregtechceu.gtceu.api.machine.MetaMachine; 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.condition.RecipeConditionType; - -import net.minecraft.network.chat.Component; - import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import io.github.cpearl0.ctnhcore.common.machine.multiblock.electric.NeutronActivatorMachine; +import io.github.cpearl0.ctnhcore.registry.CTNHRecipeConditions; +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; import tech.vixhentx.mcmod.ctnhlib.langprovider.Lang; import tech.vixhentx.mcmod.ctnhlib.langprovider.annotation.CN; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/PlantCasingCondition.java b/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/PlantCasingCondition.java index 897ac8a2..f4610113 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/PlantCasingCondition.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/PlantCasingCondition.java @@ -1,17 +1,14 @@ package io.github.cpearl0.ctnhcore.common.recipe; -import io.github.cpearl0.ctnhcore.common.machine.multiblock.electric.ChemicalPlantMachine; -import io.github.cpearl0.ctnhcore.registry.CTNHRecipeConditions; - 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.condition.RecipeConditionType; - -import net.minecraft.network.chat.Component; - import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import io.github.cpearl0.ctnhcore.common.machine.multiblock.electric.ChemicalPlantMachine; +import io.github.cpearl0.ctnhcore.registry.CTNHRecipeConditions; +import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; import org.joml.Math; import tech.vixhentx.mcmod.ctnhlib.langprovider.Lang; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/TierCasingCondition.java b/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/TierCasingCondition.java index e571285e..860d4084 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/TierCasingCondition.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/recipe/TierCasingCondition.java @@ -4,9 +4,7 @@ import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; - import net.minecraft.network.chat.Component; - import org.jetbrains.annotations.NotNull; import tech.vixhentx.mcmod.ctnhlib.langprovider.Lang; import tech.vixhentx.mcmod.ctnhlib.langprovider.annotation.CN; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/common/tconstruct/recipes/CTNHConstructCastingRecipes.java b/src/main/java/io/github/cpearl0/ctnhcore/common/tconstruct/recipes/CTNHConstructCastingRecipes.java index aba814f2..e22b602e 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/common/tconstruct/recipes/CTNHConstructCastingRecipes.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/common/tconstruct/recipes/CTNHConstructCastingRecipes.java @@ -1,19 +1,16 @@ package io.github.cpearl0.ctnhcore.common.tconstruct.recipes; -import io.github.cpearl0.ctnhcore.registry.material.CTNHMaterials; -import io.github.cpearl0.ctnhcore.utils.CTNHConstructRecipeProvider; - import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.common.data.GTMaterials; - +import com.jesz.createdieselgenerators.CDGItems; +import com.mo_guang.ctpp.registry.CTPPMaterials; +import fr.lucreeper74.createmetallurgy.registries.CMItems; +import io.github.cpearl0.ctnhcore.registry.material.CTNHMaterials; +import io.github.cpearl0.ctnhcore.utils.CTNHConstructRecipeProvider; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.Items; import net.minecraftforge.fluids.FluidStack; - -import com.jesz.createdieselgenerators.CDGItems; -import com.mo_guang.ctpp.registry.CTPPMaterials; -import fr.lucreeper74.createmetallurgy.registries.CMItems; import slimeknights.tconstruct.library.recipe.casting.ItemCastingRecipeBuilder; import slimeknights.tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/data/CreateRecipeTypes.java b/src/main/java/io/github/cpearl0/ctnhcore/data/CreateRecipeTypes.java index 0952d767..00347d97 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/data/CreateRecipeTypes.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/data/CreateRecipeTypes.java @@ -1,7 +1,5 @@ package io.github.cpearl0.ctnhcore.data; -import io.github.cpearl0.ctnhcore.CTNHConfig; - import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.gui.GuiTextures; @@ -11,16 +9,16 @@ import com.gregtechceu.gtceu.common.data.GTRecipes; import com.gregtechceu.gtceu.common.data.GTSoundEntries; import com.gregtechceu.gtceu.utils.GTUtil; - +import com.mo_guang.ctpp.common.data.recipe.builder.CTPPRecipeBuilder; +import io.github.cpearl0.ctnhcore.CTNHConfig; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import com.mo_guang.ctpp.common.data.recipe.builder.CTPPRecipeBuilder; - import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; import static com.lowdragmc.lowdraglib.gui.texture.ProgressTexture.FillDirection.LEFT_TO_RIGHT; import static com.lowdragmc.lowdraglib.gui.texture.ProgressTexture.FillDirection.UP_TO_DOWN; +import static com.mo_guang.ctpp.registry.CTPPRecipeTypes.MECHANICAL_CENTRIFUGE_RECIPES; import static io.github.cpearl0.ctnhcore.registry.CTNHRecipeTypes.KINETIC; import static io.github.cpearl0.ctnhcore.registry.CTNHRegistration.REGISTRATE; @@ -155,15 +153,15 @@ public static void init() { .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, LEFT_TO_RIGHT) .setSound(GTSoundEntries.MIXER); - public static final GTRecipeType MECHANICAL_CENTRIFUGE_RECIPES = REGISTRATE - .recipeType("mechanical_centrifuge_recipes", KINETIC) - .cnlang("机械离心") - .setMaxIOSize(2, 6, 1, 6) - .setSlotOverlay(false, false, false, GuiTextures.EXTRACTOR_OVERLAY) - .setSlotOverlay(false, false, true, GuiTextures.CANISTER_OVERLAY) - .setSlotOverlay(false, true, true, GuiTextures.CENTRIFUGE_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, LEFT_TO_RIGHT) - .setSound(GTSoundEntries.CENTRIFUGE); + // public static final GTRecipeType MECHANICAL_CENTRIFUGE_RECIPES = REGISTRATE + // .recipeType("mechanical_centrifuge_recipes", KINETIC) + // .cnlang("机械离心") + // .setMaxIOSize(2, 6, 1, 6) + // .setSlotOverlay(false, false, false, GuiTextures.EXTRACTOR_OVERLAY) + // .setSlotOverlay(false, false, true, GuiTextures.CANISTER_OVERLAY) + // .setSlotOverlay(false, true, true, GuiTextures.CENTRIFUGE_OVERLAY) + // .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, LEFT_TO_RIGHT) + // .setSound(GTSoundEntries.CENTRIFUGE); public static final GTRecipeType MECHANICAL_SIFTER_RECIPES = REGISTRATE .recipeType("mechanical_sifter_recipes", KINETIC) .cnlang("机械筛选") diff --git a/src/main/java/io/github/cpearl0/ctnhcore/data/lang/old/ChineseLangHandler.java b/src/main/java/io/github/cpearl0/ctnhcore/data/lang/old/ChineseLangHandler.java index c233e6b9..7e226d45 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/data/lang/old/ChineseLangHandler.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/data/lang/old/ChineseLangHandler.java @@ -1,5 +1,8 @@ package io.github.cpearl0.ctnhcore.data.lang.old; +import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import io.github.cpearl0.ctnhcore.data.lang.Chinese.OreLang; import io.github.cpearl0.ctnhcore.data.lang.Chinese.VeinLang; import io.github.cpearl0.ctnhcore.data.machines.GTNNMachines; @@ -11,13 +14,7 @@ import io.github.cpearl0.ctnhcore.registry.machines.multiblock.MultiblocksA; import io.github.cpearl0.ctnhcore.registry.machines.multiblock.MultiblocksB; import io.github.cpearl0.ctnhcore.registry.machines.multiblock.MultiblocksC; - -import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.data.chemical.material.Material; -import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; - import net.minecraftforge.common.data.LanguageProvider; - import org.jetbrains.annotations.NotNull; import tech.vixhentx.mcmod.ctnhlib.registrate.lang.RegistrateCNLangProvider; @@ -25,6 +22,7 @@ import java.util.Map; import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.mo_guang.ctpp.registry.CTPPMultiblockMachines.MECHANICAL_CENTRIFUGE; public class ChineseLangHandler { @@ -901,7 +899,7 @@ public static void init(RegistrateCNLangProvider provider) { provider.add(MultiblocksB.ADVANCED_ASSEMBLY_LINE.getBlock(), "进阶装配线"); provider.add(MultiblocksB.CultivationRoom.getBlock(), "培养室"); provider.add(Mechanical.MECHANICAL_LATHE.getBlock(), "机械车床厂"); - provider.add(Mechanical.MECHANICAL_CENTRIFUGE.getBlock(), "机械离心厂"); + provider.add(MECHANICAL_CENTRIFUGE.getBlock(), "机械离心厂"); provider.add(Mechanical.MECHANICAL_EXTRACTOR.getBlock(), "机械熔炼厂"); provider.add(Mechanical.MECHANICAL_MIXER.getBlock(), "机械搅拌厂"); provider.add(Mechanical.MECHANICAL_SIFTER.getBlock(), "机械筛选厂"); diff --git a/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/AlumiumChain.java b/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/AlumiumChain.java index ef949483..80f93a40 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/AlumiumChain.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/AlumiumChain.java @@ -1,10 +1,8 @@ package io.github.cpearl0.ctnhcore.data.recipe.chain; -import io.github.cpearl0.ctnhcore.CTNHCore; - import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.common.data.GTRecipeTypes; - +import io.github.cpearl0.ctnhcore.CTNHCore; import net.minecraft.data.recipes.FinishedRecipe; import java.util.function.Consumer; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/event/ForgeEventHandler.java b/src/main/java/io/github/cpearl0/ctnhcore/event/ForgeEventHandler.java index 8aeb7554..22ad7954 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/event/ForgeEventHandler.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/event/ForgeEventHandler.java @@ -1,5 +1,9 @@ package io.github.cpearl0.ctnhcore.event; +import com.gregtechceu.gtceu.GTCEu; +import com.moguang.ctnhbio.CTNHBio; +import com.moguang.ctnhmana.CTNHMana; +import dev.latvian.mods.kubejs.KubeJS; import io.github.cpearl0.ctnhcore.CTNHConfig; import io.github.cpearl0.ctnhcore.CTNHCore; import io.github.cpearl0.ctnhcore.common.capability.EIOCapacitorProvider; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/Mechanical.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/Mechanical.java index 8a4656ca..f1b13e68 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/Mechanical.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/Mechanical.java @@ -1,20 +1,12 @@ package io.github.cpearl0.ctnhcore.registry.machines.multiblock; -import io.github.cpearl0.ctnhcore.data.CreateRecipeTypes; - import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.data.RotationState; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo; import com.gregtechceu.gtceu.api.pattern.Predicates; - import com.lowdragmc.lowdraglib.utils.BlockInfo; - -import net.minecraft.ChatFormatting; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; - import com.mo_guang.ctpp.CTPP; import com.mo_guang.ctpp.api.CTPPPartAbility; import com.mo_guang.ctpp.common.machine.multiblock.KineticWorkableMultiblockMachine; @@ -24,6 +16,10 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock; import fr.lucreeper74.createmetallurgy.registries.CMBlocks; +import io.github.cpearl0.ctnhcore.data.CreateRecipeTypes; +import net.minecraft.ChatFormatting; +import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TEMPERED_GLASS; import static io.github.cpearl0.ctnhcore.registry.CTNHRegistration.REGISTRATE; @@ -89,35 +85,35 @@ public class Mechanical { .workableCasingModel(CTPP.id("block/create/railway_casing"), GTCEu.id("block/multiblock/large_chemical_reactor")) .register(); - public final static MultiblockMachineDefinition MECHANICAL_CENTRIFUGE = REGISTRATE - .multiblock("mechanical_centrifuge", KineticWorkableMultiblockMachine::new) - .rotationState(RotationState.NON_Y_AXIS) - .recipeType(CreateRecipeTypes.MECHANICAL_CENTRIFUGE_RECIPES) - .appearanceBlock(AllBlocks.RAILWAY_CASING) - .recipeModifier(CTPPRecipeModifiers.KINETIC_PARALLEL) - .tooltips(CommonTooltips.KINETIC_OVERCLOCK) - .pattern(definition -> FactoryBlockPattern.start() - .aisle("AAAAA", "BCCCB", "B###B", "B###B", "B###B", "BBBBB", "AAAAA") - .aisle("AAAAA", "CDDDC", "#####", "#####", "#####", "BF#FB", "AAAAA") - .aisle("AAAAA", "CDDDC", "##G##", "##G##", "##G##", "B#H#B", "AAAAA") - .aisle("AAAAA", "CDDDC", "#####", "#####", "#####", "BF#FB", "AAAAA") - .aisle("AA@AA", "BCCCB", "B###B", "B###B", "B###B", "BBBBB", "AAAAA") - .where("A", Predicates.blocks(AllBlocks.RAILWAY_CASING.get()) - .or(Predicates.autoAbilities(definition.getRecipeTypes())) - .or(Predicates.abilities(CTPPPartAbility.INPUT_KINETIC)) - .or(Predicates.abilities(CTPPPartAbility.MECHANICAL_UPGRADE).setExactLimit(1))) - .where("B", Predicates.blocks(AllBlocks.METAL_GIRDER.get())) - .where("C", Predicates.blocks(AllBlocks.BRASS_CASING.get())) - .where("#", Predicates.any()) - .where("D", Predicates.blocks(AllBlocks.BASIN.get())) - .where("F", Predicates.blocks(AllBlocks.BRASS_ENCASED_COGWHEEL.get())) - .where("G", Predicates.blocks(VintageBlocks.CENTRIFUGE.get())) - .where("H", Predicates.blocks(AllBlocks.BRASS_ENCASED_LARGE_COGWHEEL.get())) - .where("@", Predicates.controller(Predicates.blocks(definition.get()))) - .build()) - .workableCasingModel(CTPP.id("block/create/railway_casing"), - GTCEu.id("block/multiblock/large_chemical_reactor")) - .register(); + // public final static MultiblockMachineDefinition MECHANICAL_CENTRIFUGE = REGISTRATE + // .multiblock("mechanical_centrifuge", KineticWorkableMultiblockMachine::new) + // .rotationState(RotationState.NON_Y_AXIS) + // .recipeType(CreateRecipeTypes.MECHANICAL_CENTRIFUGE_RECIPES) + // .appearanceBlock(AllBlocks.RAILWAY_CASING) + // .recipeModifier(CTPPRecipeModifiers.KINETIC_PARALLEL) + // .tooltips(CommonTooltips.KINETIC_OVERCLOCK) + // .pattern(definition -> FactoryBlockPattern.start() + // .aisle("AAAAA", "BCCCB", "B###B", "B###B", "B###B", "BBBBB", "AAAAA") + // .aisle("AAAAA", "CDDDC", "#####", "#####", "#####", "BF#FB", "AAAAA") + // .aisle("AAAAA", "CDDDC", "##G##", "##G##", "##G##", "B#H#B", "AAAAA") + // .aisle("AAAAA", "CDDDC", "#####", "#####", "#####", "BF#FB", "AAAAA") + // .aisle("AA@AA", "BCCCB", "B###B", "B###B", "B###B", "BBBBB", "AAAAA") + // .where("A", Predicates.blocks(AllBlocks.RAILWAY_CASING.get()) + // .or(Predicates.autoAbilities(definition.getRecipeTypes())) + // .or(Predicates.abilities(CTPPPartAbility.INPUT_KINETIC)) + // .or(Predicates.abilities(CTPPPartAbility.MECHANICAL_UPGRADE).setExactLimit(1))) + // .where("B", Predicates.blocks(AllBlocks.METAL_GIRDER.get())) + // .where("C", Predicates.blocks(AllBlocks.BRASS_CASING.get())) + // .where("#", Predicates.any()) + // .where("D", Predicates.blocks(AllBlocks.BASIN.get())) + // .where("F", Predicates.blocks(AllBlocks.BRASS_ENCASED_COGWHEEL.get())) + // .where("G", Predicates.blocks(VintageBlocks.CENTRIFUGE.get())) + // .where("H", Predicates.blocks(AllBlocks.BRASS_ENCASED_LARGE_COGWHEEL.get())) + // .where("@", Predicates.controller(Predicates.blocks(definition.get()))) + // .build()) + // .workableCasingModel(CTPP.id("block/create/railway_casing"), + // GTCEu.id("block/multiblock/large_chemical_reactor")) + // .register(); public final static MultiblockMachineDefinition MECHANICAL_SIFTER = REGISTRATE .multiblock("mechanical_sifter", KineticWorkableMultiblockMachine::new) .rotationState(RotationState.NON_Y_AXIS) diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java index 6e161026..657c9f6d 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java @@ -1,10 +1,7 @@ package io.github.cpearl0.ctnhcore.registry.material; -import io.github.cpearl0.ctnhcore.CTNHCore; -import io.github.cpearl0.ctnhcore.data.materials.*; -import io.github.cpearl0.ctnhcore.data.recipe.chain.BrineChain; -import io.github.cpearl0.ctnhcore.registry.CTNHElements; - +import com.aetherteam.aether.block.AetherBlocks; +import com.aetherteam.aether.item.AetherItems; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; @@ -21,6 +18,10 @@ import com.aetherteam.aether.block.AetherBlocks; import com.aetherteam.aether.item.AetherItems; import earth.terrarium.adastra.common.registry.ModBlocks; +import io.github.cpearl0.ctnhcore.CTNHCore; +import io.github.cpearl0.ctnhcore.data.materials.*; +import io.github.cpearl0.ctnhcore.data.recipe.chain.BrineChain; +import io.github.cpearl0.ctnhcore.registry.CTNHElements; import teamrazor.deepaether.init.DABlocks; import teamrazor.deepaether.init.DAItems; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java b/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java index 24a7ecab..06e6d31d 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/utils/CTNHMachineUtils.java @@ -1,9 +1,5 @@ package io.github.cpearl0.ctnhcore.utils; -import io.github.cpearl0.ctnhcore.CTNHCore; -import io.github.cpearl0.ctnhcore.common.machine.simple.EfficiencyGeneratorMachine; -import io.github.cpearl0.ctnhcore.common.machine.simple.SimpleComputationMachine; - import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.data.RotationState; @@ -20,12 +16,17 @@ import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.common.machine.multiblock.generator.LargeCombustionEngineMachine; import com.gregtechceu.gtceu.utils.FormattingUtil; - +import io.github.cpearl0.ctnhcore.CTNHCore; +import io.github.cpearl0.ctnhcore.common.machine.simple.EfficiencyGeneratorMachine; +import io.github.cpearl0.ctnhcore.common.machine.simple.SimpleComputationMachine; +import it.unimi.dsi.fastutil.ints.Int2IntFunction; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraftforge.fluids.FluidType; +import tech.vixhentx.mcmod.ctnhlib.registrate.builders.CTNHMachineBuilder; +import tech.vixhentx.mcmod.ctnhlib.registrate.builders.CTNHMultiblockMachineBuilder; import it.unimi.dsi.fastutil.ints.Int2IntFunction; import tech.vixhentx.mcmod.ctnhlib.registrate.builders.CTNHMachineBuilder; diff --git a/src/main/java/io/github/cpearl0/ctnhcore/utils/emi/TooltipBakeQueue.java b/src/main/java/io/github/cpearl0/ctnhcore/utils/emi/TooltipBakeQueue.java index c76fcebe..61225159 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/utils/emi/TooltipBakeQueue.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/utils/emi/TooltipBakeQueue.java @@ -1,12 +1,11 @@ package io.github.cpearl0.ctnhcore.utils.emi; -import net.minecraft.client.searchtree.SuffixArray; -import net.minecraft.network.chat.Component; - import dev.emi.emi.api.stack.EmiStack; import dev.emi.emi.runtime.EmiLog; import dev.emi.emi.search.EmiSearch; import dev.emi.emi.search.SearchStack; +import net.minecraft.client.searchtree.SuffixArray; +import net.minecraft.network.chat.Component; import java.util.Iterator; import java.util.List;