Skip to content

重做了应力离心厂 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uraniniteresidue wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

重做了应力离心厂 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8949561
update: 适配gtm750
illuciaz23 Apr 5, 2026
6a94741
Merge remote-tracking branch 'refs/remotes/origin/dev' into lixinchang
uraniniteresidue Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderScenes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/io/github/cpearl0/ctnhcore/client/ponder/CTNHPonderTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/cpearl0/ctnhcore/client/ponder/Electric/CarbonBrushes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
6 changes: 2 additions & 4 deletions ...java/io/github/cpearl0/ctnhcore/common/machine/trait/ScalableReservoirComputingLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/io/github/cpearl0/ctnhcore/common/recipe/NeutronActivatorCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/io/github/cpearl0/ctnhcore/common/recipe/PlantCasingCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/cpearl0/ctnhcore/common/recipe/TierCasingCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 5 additions & 8 deletions ...ava/io/github/cpearl0/ctnhcore/common/tconstruct/recipes/CTNHConstructCastingRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
26 changes: 12 additions & 14 deletions src/main/java/io/github/cpearl0/ctnhcore/data/CreateRecipeTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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("机械筛选")
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/io/github/cpearl0/ctnhcore/data/lang/old/ChineseLangHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,20 +14,15 @@
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;

import java.lang.reflect.Field;
import java.util.Map;

import static com.gregtechceu.gtceu.api.GTValues.*;
import static com.mo_guang.ctpp.registry.CTPPMultiblockMachines.MECHANICAL_CENTRIFUGE;

public class ChineseLangHandler {

Expand Down Expand Up @@ -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(), "机械筛选厂");
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/io/github/cpearl0/ctnhcore/data/recipe/chain/AlumiumChain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/io/github/cpearl0/ctnhcore/event/ForgeEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
70 changes: 33 additions & 37 deletions src/main/java/io/github/cpearl0/ctnhcore/registry/machines/multiblock/Mechanical.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Loading
Loading