diff --git a/dependencies.gradle b/dependencies.gradle index f5f11f2..21bcb5c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -60,8 +60,8 @@ dependencies { if (System.getenv("RUN_SERVER") == null) { modRuntimeOnly(forge.shimmer.forge) { transitive = false } // Shimmer - modRuntimeOnly("maven.modrinth:embeddium:0.2.10+mc1.20.1") // Embeddium - modRuntimeOnly("maven.modrinth:oculus:1.20.1-1.6.9") // Oculus + modRuntimeOnly("maven.modrinth:embeddium:0.3.19+mc1.20.1") // Embeddium + modRuntimeOnly("maven.modrinth:oculus:1.20.1-1.7.0") // Oculus } // Runtime only testing mods diff --git a/settings.gradle b/settings.gradle index ea80a26..2903b5d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,13 +18,13 @@ dependencyResolutionManagement { // Mod Dependencies Versions // Common - def jeiVersion = "15.2.0.27" - def reiVersion = "12.0.684" - def emiVersion = "1.0.30" - def ae2Version = "15.0.18" + def jeiVersion = "15.8.0.11" + def reiVersion = "12.1.725" + def emiVersion = "1.1.10" + def ae2Version = "15.2.11" def kjsVersion = "2001.6.4-build.120" def auVersion = "1.20.1-0.6.0" - def gtmVersion = "1.2.3.a" + def gtmVersion = "1.3.1" // Forge def forgeVersion = "47.2.0" @@ -42,10 +42,10 @@ dependencyResolutionManagement { def vineFlowerVersion = "1.+" def macheteVersion = "1.+" def configurationVersion = "2.2.0" - def ldLibVersion = "1.0.25.j" + def ldLibVersion = "1.0.26" def mixinextrasVersion = "0.2.0" - def shimmerVersion = "0.2.2" - def monomorphismLibVersion = "1.1.0-build.22" + def shimmerVersion = "0.2.4" + def monomorphismLibVersion = "1.1.1-build.27" def spotlessVersion = "7.0.0.BETA1" forge { diff --git a/src/main/java/com/epimorphismmc/epimorphism/EPGTAddon.java b/src/main/java/com/epimorphismmc/epimorphism/EPGTAddon.java index 970e013..155a940 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/EPGTAddon.java +++ b/src/main/java/com/epimorphismmc/epimorphism/EPGTAddon.java @@ -2,11 +2,15 @@ import com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialIconSet; import com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialIconType; +import com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix; +import com.epimorphismmc.epimorphism.common.data.EPDimensionTypes; +import com.epimorphismmc.epimorphism.common.data.EPItems; +import com.epimorphismmc.epimorphism.common.data.EPParticleTypes; import com.epimorphismmc.epimorphism.data.recipe.GTRecipeManager; -import com.epimorphismmc.monomorphism.MOGTAddon; - import com.gregtechceu.gtceu.api.addon.GTAddon; +import com.gregtechceu.gtceu.api.addon.IGTAddon; +import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; @@ -14,10 +18,16 @@ import java.util.function.Consumer; @GTAddon -public class EPGTAddon extends MOGTAddon { +public class EPGTAddon implements IGTAddon { + + @Override + public String addonModId() { + return Epimorphism.MOD_ID; + } - public EPGTAddon() { - super(Epimorphism.MOD_ID); + @Override + public GTRegistrate getRegistrate() { + return EpimorphismCommon.registrate(); } @Override @@ -29,9 +39,16 @@ public boolean requiresHighTier() { public void initializeAddon() { EPMaterialIconSet.init(); EPMaterialIconType.init(); - Epimorphism.proxy().init(); GTRecipeManager.onGTPostInitialization(); - Epimorphism.logger().info("Epimorphism's GT Addon Loaded!"); + EPItems.init(); + EPDimensionTypes.init(); + EPParticleTypes.init(); + Epimorphism.LOGGER.info("Epimorphism's GT Addon Loaded!"); + } + + @Override + public void registerTagPrefixes() { + EPTagPrefix.init(); } @Override diff --git a/src/main/java/com/epimorphismmc/epimorphism/Epimorphism.java b/src/main/java/com/epimorphismmc/epimorphism/Epimorphism.java index 1bc8475..2c9ff69 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/Epimorphism.java +++ b/src/main/java/com/epimorphismmc/epimorphism/Epimorphism.java @@ -1,92 +1,24 @@ package com.epimorphismmc.epimorphism; -import com.epimorphismmc.epimorphism.client.ClientProxy; -import com.epimorphismmc.epimorphism.common.CommonProxy; -import com.epimorphismmc.epimorphism.config.EPConfigHolder; -import com.epimorphismmc.epimorphism.data.lang.EPLangHandler; -import com.epimorphismmc.epimorphism.network.s2c.PacketVajraDestroy; - -import com.epimorphismmc.monomorphism.MOMod; -import com.epimorphismmc.monomorphism.datagen.MOProviderTypes; -import com.epimorphismmc.monomorphism.registry.registrate.MORegistrate; +import com.epimorphismmc.monomorphism.utility.DistLogger; import com.gregtechceu.gtceu.utils.FormattingUtil; -import com.lowdragmc.lowdraglib.networking.INetworking; - import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.common.Mod; import org.slf4j.Logger; -@Mod(Epimorphism.MOD_ID) -public class Epimorphism extends MOMod { - public static final String MOD_ID = "epimorphism"; - public static final String NAME = "Epimorphism"; - - public static Epimorphism instance; - - public Epimorphism() { - super(); - } - - @Override - public String getModId() { - return MOD_ID; - } - - @Override - public String getModName() { - return NAME; - } - - @Override - protected void onModConstructed() { - instance = this; - EPConfigHolder.init(); - } - - @Override - @OnlyIn(Dist.CLIENT) - protected CommonProxy createClientProxy() { - return new ClientProxy(); - } - - @Override - @OnlyIn(Dist.DEDICATED_SERVER) - protected CommonProxy createServerProxy() { - return new CommonProxy(); - } +public interface Epimorphism { + String MOD_ID = "epimorphism"; + String NAME = "Epimorphism"; - @Override - public void addDataGenerator(MORegistrate registrate) { - registrate.addDataGenerator(MOProviderTypes.MO_LANG, EPLangHandler::init); - } + Logger LOGGER = new DistLogger(NAME); - @Override - public void registerPackets(INetworking network) { - network.registerS2C(PacketVajraDestroy.class); + static Epimorphism instance() { + return EpimorphismCommon.instance(); } - public static ResourceLocation id(String path) { + static ResourceLocation id(String path) { return new ResourceLocation(MOD_ID, FormattingUtil.toLowerCaseUnder(path)); } - - public static Logger logger() { - return instance.getLogger(); - } - - public static CommonProxy proxy() { - return instance.getProxy(); - } - - public static MORegistrate registrate() { - return instance.getRegistrate(); - } - - public static INetworking network() { - return instance.getNetwork(); - } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/EpimorphismBootstrap.java b/src/main/java/com/epimorphismmc/epimorphism/EpimorphismBootstrap.java new file mode 100644 index 0000000..54493dc --- /dev/null +++ b/src/main/java/com/epimorphismmc/epimorphism/EpimorphismBootstrap.java @@ -0,0 +1,13 @@ +package com.epimorphismmc.epimorphism; + +import com.epimorphismmc.epimorphism.client.EpimorphismClient; + +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.common.Mod; + +@Mod(Epimorphism.MOD_ID) +public class EpimorphismBootstrap { + public EpimorphismBootstrap() { + DistExecutor.unsafeRunForDist(() -> EpimorphismClient::new, () -> EpimorphismServer::new); + } +} diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/CommonProxy.java b/src/main/java/com/epimorphismmc/epimorphism/EpimorphismCommon.java similarity index 62% rename from src/main/java/com/epimorphismmc/epimorphism/common/CommonProxy.java rename to src/main/java/com/epimorphismmc/epimorphism/EpimorphismCommon.java index adb369f..91b6ef1 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/CommonProxy.java +++ b/src/main/java/com/epimorphismmc/epimorphism/EpimorphismCommon.java @@ -1,26 +1,26 @@ -package com.epimorphismmc.epimorphism.common; +package com.epimorphismmc.epimorphism; -import com.epimorphismmc.epimorphism.Epimorphism; -import com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix; import com.epimorphismmc.epimorphism.api.event.GTRecipeEvent; import com.epimorphismmc.epimorphism.common.block.BlockMaps; import com.epimorphismmc.epimorphism.common.block.BlockTypeAdditions; import com.epimorphismmc.epimorphism.common.data.EPBlocks; import com.epimorphismmc.epimorphism.common.data.EPCovers; import com.epimorphismmc.epimorphism.common.data.EPCreativeModeTabs; -import com.epimorphismmc.epimorphism.common.data.EPDimensionTypes; import com.epimorphismmc.epimorphism.common.data.EPElements; -import com.epimorphismmc.epimorphism.common.data.EPItems; import com.epimorphismmc.epimorphism.common.data.EPMachines; import com.epimorphismmc.epimorphism.common.data.EPMaterials; import com.epimorphismmc.epimorphism.common.data.EPParticleTypes; import com.epimorphismmc.epimorphism.common.data.EPRecipeConditions; import com.epimorphismmc.epimorphism.common.data.EPRecipeTypes; import com.epimorphismmc.epimorphism.common.data.EPRecipes; +import com.epimorphismmc.epimorphism.config.EPConfigHolder; +import com.epimorphismmc.epimorphism.data.lang.EPLangHandler; import com.epimorphismmc.epimorphism.data.recipe.GTRecipeManager; import com.epimorphismmc.epimorphism.data.recipe.handler.GTRecipeHandlerManager; +import com.epimorphismmc.epimorphism.network.s2c.PacketVajraDestroy; -import com.epimorphismmc.monomorphism.proxy.base.ICommonProxyBase; +import com.epimorphismmc.monomorphism.registry.registrate.MORegistrate; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOProviderTypes; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.cover.CoverDefinition; @@ -30,55 +30,79 @@ import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.RecipeCondition; -import com.gregtechceu.gtceu.common.data.GTCreativeModeTabs; import com.gregtechceu.gtceu.common.unification.material.MaterialRegistryManager; +import com.lowdragmc.lowdraglib.networking.INetworking; +import com.lowdragmc.lowdraglib.networking.LDLNetworking; + import net.minecraft.resources.ResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -public class CommonProxy implements ICommonProxyBase { +public class EpimorphismCommon implements Epimorphism { + + private static EpimorphismCommon instance; + private static final MORegistrate REGISTRATE = MORegistrate.create(MOD_ID); + private static final INetworking NETWORK = + LDLNetworking.createNetworking(new ResourceLocation(MOD_ID, "networking"), "0.0.1"); + + public EpimorphismCommon() { + instance = this; + + EPConfigHolder.init(); + + registerPackets(NETWORK); + registerEventHandlers(); + + REGISTRATE.addDataGenerator(MOProviderTypes.MO_LANG, EPLangHandler::init); + + Epimorphism.LOGGER.info("Epimorphism's Initialization Completed!"); + } + + public void registerPackets(INetworking network) { + network.registerS2C(PacketVajraDestroy.class); + } - public CommonProxy() { + public void registerEventHandlers() { IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus(); eventBus.register(this); + + REGISTRATE.registerEventListeners(eventBus); + EPParticleTypes.register(eventBus); - Epimorphism.logger().info("Epimorphism's Initialization Completed!"); - } - public void init() { - EPItems.init(); - EPDimensionTypes.init(); - EPParticleTypes.init(); + eventBus.addGenericListener(Element.class, this::registerElements); + eventBus.addGenericListener(GTRecipeType.class, this::registerRecipeTypes); + eventBus.addGenericListener( + (Class>) RecipeCondition.class.getClass(), + this::registerRecipeConditions); + eventBus.addGenericListener(MachineDefinition.class, this::registerMachineDefinitions); + eventBus.addGenericListener(CoverDefinition.class, this::registerCoverDefinitions); } - /* -------------------------------------------------- Registration Methods -------------------------------------------------- */ - - @Override - public void registerEventHandlers() {} + public static EpimorphismCommon instance() { + return instance; + } - @Override - public void registerCapabilities() {} + public static MORegistrate registrate() { + return REGISTRATE; + } - @Override - public void registerTagPrefixes() { - EPTagPrefix.init(); + public static INetworking network() { + return NETWORK; } - @Override public void registerElements(GTCEuAPI.RegisterEvent event) { EPElements.init(); } - @Override public void registerCoverDefinitions( GTCEuAPI.RegisterEvent event) { EPCovers.init(); } - @Override public void registerMachineDefinitions( GTCEuAPI.RegisterEvent event) { EPCreativeModeTabs.init(); @@ -86,25 +110,22 @@ public void registerMachineDefinitions( EPMachines.init(); } - @Override public void registerRecipeTypes(GTCEuAPI.RegisterEvent event) { EPRecipeTypes.init(); } - @Override public void registerRecipeConditions( GTCEuAPI.RegisterEvent> event) { EPRecipeConditions.init(); } - @Override + @SubscribeEvent public void registerMaterials(MaterialEvent event) { EPMaterials.init(); } - @Override + @SubscribeEvent public void registerMaterialRegistry(MaterialRegistryEvent event) { - Epimorphism.registrate().creativeModeTab(GTCreativeModeTabs.MATERIAL_ITEM); MaterialRegistryManager.getInstance().createRegistry(Epimorphism.MOD_ID); } diff --git a/src/main/java/com/epimorphismmc/epimorphism/EpimorphismServer.java b/src/main/java/com/epimorphismmc/epimorphism/EpimorphismServer.java new file mode 100644 index 0000000..1e2c373 --- /dev/null +++ b/src/main/java/com/epimorphismmc/epimorphism/EpimorphismServer.java @@ -0,0 +1,7 @@ +package com.epimorphismmc.epimorphism; + +public class EpimorphismServer extends EpimorphismCommon { + public EpimorphismServer() { + super(); + } +} diff --git a/src/main/java/com/epimorphismmc/epimorphism/api/block/tier/ITierGlassType.java b/src/main/java/com/epimorphismmc/epimorphism/api/block/tier/ITierGlassType.java index 354ffc3..ab31ed4 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/api/block/tier/ITierGlassType.java +++ b/src/main/java/com/epimorphismmc/epimorphism/api/block/tier/ITierGlassType.java @@ -3,7 +3,7 @@ import com.epimorphismmc.monomorphism.block.tier.ITierType; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.client.TooltipHelper; +import com.gregtechceu.gtceu.client.util.TooltipHelper; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/epimorphismmc/epimorphism/api/data/tag/EPTagPrefix.java b/src/main/java/com/epimorphismmc/epimorphism/api/data/tag/EPTagPrefix.java index f7e5db6..fa07b8d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/api/data/tag/EPTagPrefix.java +++ b/src/main/java/com/epimorphismmc/epimorphism/api/data/tag/EPTagPrefix.java @@ -21,12 +21,18 @@ import java.util.function.Predicate; import java.util.function.UnaryOperator; -import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.*; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.DISABLE_CRYSTALLIZATION; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.GENERATE_BOULE; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.GENERATE_LASER_EMITTER; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.GENERATE_MILLED; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.GENERATE_NANITES; import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.Conditions.hasGas; import static com.gregtechceu.gtceu.api.GTValues.M; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.CRYSTALLIZABLE; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_SMASHING; -import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.Conditions.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.Conditions.hasDustProperty; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.Conditions.hasGemProperty; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.Conditions.hasOreProperty; public class EPTagPrefix { public static final TagPrefix singularity = new MOTagPrefix( diff --git a/src/main/java/com/epimorphismmc/epimorphism/api/item/component/IReactorComponent.java b/src/main/java/com/epimorphismmc/epimorphism/api/item/component/IReactorComponent.java index a73f60d..56ef78a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/api/item/component/IReactorComponent.java +++ b/src/main/java/com/epimorphismmc/epimorphism/api/item/component/IReactorComponent.java @@ -5,7 +5,8 @@ import com.epimorphismmc.monomorphism.item.component.IMODurabilityBar; import com.gregtechceu.gtceu.api.item.ComponentItem; -import com.gregtechceu.gtceu.api.item.component.*; +import com.gregtechceu.gtceu.api.item.component.IAddInformation; +import com.gregtechceu.gtceu.api.item.component.IItemComponent; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/com/epimorphismmc/epimorphism/client/ClientProxy.java b/src/main/java/com/epimorphismmc/epimorphism/client/EpimorphismClient.java similarity index 73% rename from src/main/java/com/epimorphismmc/epimorphism/client/ClientProxy.java rename to src/main/java/com/epimorphismmc/epimorphism/client/EpimorphismClient.java index d2fbd2f..3571e87 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/client/ClientProxy.java +++ b/src/main/java/com/epimorphismmc/epimorphism/client/EpimorphismClient.java @@ -1,22 +1,16 @@ package com.epimorphismmc.epimorphism.client; +import com.epimorphismmc.epimorphism.EpimorphismCommon; import com.epimorphismmc.epimorphism.client.model.GrindBallModel; import com.epimorphismmc.epimorphism.client.particle.CropFX; -import com.epimorphismmc.epimorphism.common.CommonProxy; import com.epimorphismmc.epimorphism.common.data.EPParticleTypes; -import com.epimorphismmc.monomorphism.proxy.base.IClientProxyBase; - -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.ModelEvent; import net.minecraftforge.client.event.RegisterParticleProvidersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -@OnlyIn(Dist.CLIENT) -public class ClientProxy extends CommonProxy implements IClientProxyBase { - - public ClientProxy() { +public class EpimorphismClient extends EpimorphismCommon { + public EpimorphismClient() { super(); } diff --git a/src/main/java/com/epimorphismmc/epimorphism/client/particle/CropFX.java b/src/main/java/com/epimorphismmc/epimorphism/client/particle/CropFX.java index f49a9cc..de0dbd3 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/client/particle/CropFX.java +++ b/src/main/java/com/epimorphismmc/epimorphism/client/particle/CropFX.java @@ -28,8 +28,8 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.epimorphismmc.monomorphism.client.utils.ClientUtils.getBlockRenderer; -import static com.epimorphismmc.monomorphism.client.utils.ClientUtils.getBlockRendererDispatcher; +import static com.epimorphismmc.monomorphism.client.utils.ClientUtils.blockRenderer; +import static com.epimorphismmc.monomorphism.client.utils.ClientUtils.blockRendererDispatcher; @OnlyIn(Dist.CLIENT) @ParametersAreNonnullByDefault @@ -53,10 +53,10 @@ public void render(VertexConsumer buffer, Camera renderInfo, float partialTicks) float z = (float) (Mth.lerp(partialTicks, this.zo, this.z) - vec3.z()); var state = getState(Blocks.WHEAT, cropAge); - BakedModel bakedmodel = getBlockRendererDispatcher().getBlockModel(state); + BakedModel bakedmodel = blockRendererDispatcher().getBlockModel(state); POSE_STACK.pushPose(); POSE_STACK.translate(x, y, z); - getBlockRenderer() + blockRenderer() .renderModel( POSE_STACK.last(), buffer, diff --git a/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/StructureSelectRenderer.java b/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/StructureSelectRenderer.java index 6b52870..3817dc8 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/StructureSelectRenderer.java +++ b/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/StructureSelectRenderer.java @@ -15,7 +15,11 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.VertexFormat; @OnlyIn(Dist.CLIENT) public class StructureSelectRenderer { diff --git a/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/LightningRodRenderer.java b/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/LightningRodRenderer.java index 5812031..ce4ebe1 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/LightningRodRenderer.java +++ b/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/LightningRodRenderer.java @@ -7,6 +7,7 @@ import com.gregtechceu.gtceu.api.capability.IWorkable; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; +import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController; import com.gregtechceu.gtceu.client.model.WorkableOverlayModel; import com.gregtechceu.gtceu.client.renderer.machine.MachineRenderer; import com.gregtechceu.gtceu.client.renderer.machine.TransformerRenderer; @@ -74,12 +75,15 @@ public void renderMachine( modelState, 2)); } - + Direction upwardsFacing = Direction.NORTH; + if (machine instanceof IMultiController multi) { + upwardsFacing = multi.self().getUpwardsFacing(); + } if (machine instanceof IWorkable workable) { quads.addAll(this.overlayModel.bakeQuads( - side, frontFacing, workable.isActive(), workable.isWorkingEnabled())); + side, frontFacing, upwardsFacing, workable.isActive(), workable.isWorkingEnabled())); } else { - quads.addAll(this.overlayModel.bakeQuads(side, frontFacing, false, false)); + quads.addAll(this.overlayModel.bakeQuads(side, frontFacing, upwardsFacing, false, false)); } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/TankMachineRenderer.java b/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/TankMachineRenderer.java index 381a0a9..cab9aac 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/TankMachineRenderer.java +++ b/src/main/java/com/epimorphismmc/epimorphism/client/renderer/handler/machine/TankMachineRenderer.java @@ -2,9 +2,9 @@ import com.epimorphismmc.epimorphism.api.machine.feature.multiblock.ITankMachine; -import com.epimorphismmc.monomorphism.client.renderer.CubeRenderer; +import com.epimorphismmc.monomorphism.client.utils.Cuboid; +import com.epimorphismmc.monomorphism.client.utils.CuboidRenderer; import com.epimorphismmc.monomorphism.client.utils.MORenderUtils; -import com.epimorphismmc.monomorphism.client.utils.Model3D; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IWorkableMultiController; @@ -22,7 +22,7 @@ import com.mojang.blaze3d.vertex.PoseStack; -import static com.epimorphismmc.monomorphism.client.utils.ClientUtils.*; +import static com.epimorphismmc.monomorphism.client.utils.ClientUtils.mainCamera; public class TankMachineRenderer extends WorkableCasingMachineRenderer { public TankMachineRenderer(ResourceLocation baseCasing, ResourceLocation workableModel) { @@ -59,13 +59,13 @@ public void render( poseStack.translate(-0.5, 0, -0.5); MORenderUtils.renderStillFluidInWorld( fluid, - new Model3D().bounds(-1, -3, -3, 2, -1, 0), + new Cuboid(-1, -3, -3, 2, -1, 0), poseStack, buffer, - getMainCamera(), + mainCamera(), LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, - CubeRenderer.FaceDisplay.BACK); + CuboidRenderer.FaceDisplay.BACK); poseStack.popPose(); } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/ForgeCommonEventHandler.java b/src/main/java/com/epimorphismmc/epimorphism/common/ForgeCommonEventHandler.java index fa36dd1..6b059e4 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/ForgeCommonEventHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/ForgeCommonEventHandler.java @@ -1,16 +1,17 @@ package com.epimorphismmc.epimorphism.common; import com.epimorphismmc.epimorphism.Epimorphism; +import com.epimorphismmc.epimorphism.EpimorphismCommon; import com.epimorphismmc.epimorphism.api.event.GTRecipeEvent; import com.epimorphismmc.epimorphism.common.data.EPRecipes; import com.epimorphismmc.epimorphism.common.item.VajraItem; import com.epimorphismmc.epimorphism.network.s2c.PacketVajraDestroy; import com.epimorphismmc.epimorphism.utils.EPBlockUtil; -import com.epimorphismmc.monomorphism.utility.MOTransferUtils; - import com.gregtechceu.gtceu.common.data.GTDamageTypes; +import com.lowdragmc.lowdraglib.side.item.ItemTransferHelper; + import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; @@ -23,7 +24,8 @@ import com.google.common.collect.ImmutableMap; -import static com.epimorphismmc.epimorphism.common.data.EPItems.*; +import static com.epimorphismmc.epimorphism.common.data.EPItems.MITTS; +import static com.epimorphismmc.epimorphism.common.data.EPItems.VAJRA; @Mod.EventBusSubscriber(modid = Epimorphism.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class ForgeCommonEventHandler { @@ -43,8 +45,10 @@ public static void onPlayerLeftClickBlock(PlayerInteractEvent.LeftClickBlock eve (ServerLevel) level, pos, player, ImmutableMap.of(Enchantments.BLOCK_FORTUNE, 5)); if (level.destroyBlock(pos, false)) { VajraItem.discharge(event.getItemStack()); - MOTransferUtils.fillPlayerInventory(player, list); - Epimorphism.network().sendToPlayer(new PacketVajraDestroy(true), (ServerPlayer) player); + list.forEach(s -> ItemTransferHelper.giveItemToPlayer(player, s)); + + EpimorphismCommon.network() + .sendToPlayer(new PacketVajraDestroy(true), (ServerPlayer) player); } } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockMaps.java b/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockMaps.java index b132c34..a9e1017 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockMaps.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockMaps.java @@ -16,7 +16,19 @@ import java.util.Map; import java.util.function.Supplier; -import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_ALUMINIUM_FROSTPROOF; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_BRONZE_BRICKS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_BRONZE_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STAINLESS_CLEAN; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_SOLID; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TITANIUM_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TITANIUM_STABLE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TUNGSTENSTEEL_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TUNGSTENSTEEL_ROBUST; +import static com.gregtechceu.gtceu.common.data.GTBlocks.FIREBOX_BRONZE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.FIREBOX_STEEL; +import static com.gregtechceu.gtceu.common.data.GTBlocks.FIREBOX_TITANIUM; import static com.gregtechceu.gtceu.common.data.GTBlocks.FIREBOX_TUNGSTENSTEEL; public class BlockMaps { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockTypeAdditions.java b/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockTypeAdditions.java index 079b974..b83577a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockTypeAdditions.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/block/BlockTypeAdditions.java @@ -11,8 +11,28 @@ import java.util.function.Supplier; -import static com.gregtechceu.gtceu.common.data.GTBlocks.*; -import static net.minecraft.world.level.block.Blocks.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_LAMINATED_GLASS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TEMPERED_GLASS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CLEANROOM_GLASS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.FUSION_GLASS; +import static net.minecraft.world.level.block.Blocks.BLACK_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.BLUE_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.BROWN_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.CYAN_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.GLASS; +import static net.minecraft.world.level.block.Blocks.GRAY_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.GREEN_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.LIGHT_BLUE_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.LIGHT_GRAY_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.LIME_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.MAGENTA_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.ORANGE_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.PINK_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.PURPLE_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.RED_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.TINTED_GLASS; +import static net.minecraft.world.level.block.Blocks.WHITE_STAINED_GLASS; +import static net.minecraft.world.level.block.Blocks.YELLOW_STAINED_GLASS; public class BlockTypeAdditions { public static void init() { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/block/EPFusionCasingBlock.java b/src/main/java/com/epimorphismmc/epimorphism/common/block/EPFusionCasingBlock.java index 1364d6b..666f750 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/block/EPFusionCasingBlock.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/block/EPFusionCasingBlock.java @@ -13,8 +13,13 @@ import lombok.Getter; import org.jetbrains.annotations.NotNull; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.UHV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; +import static com.gregtechceu.gtceu.common.data.GTBlocks.FUSION_CASING; +import static com.gregtechceu.gtceu.common.data.GTBlocks.FUSION_CASING_MK2; +import static com.gregtechceu.gtceu.common.data.GTBlocks.FUSION_CASING_MK3; public class EPFusionCasingBlock extends FusionCasingBlock { public EPFusionCasingBlock(Properties properties, IFusionCasingType casingType) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPBlocks.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPBlocks.java index eba2cd6..5c861cf 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPBlocks.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPBlocks.java @@ -81,7 +81,7 @@ import javax.annotation.Nonnull; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; import static com.epimorphismmc.epimorphism.common.block.BlockMaps.*; import static com.gregtechceu.gtceu.common.data.GTBlocks.*; import static com.gregtechceu.gtceu.common.data.GTModels.*; @@ -107,7 +107,7 @@ public class EPBlocks { // Crucible Blocks private static void generateCrucibleBlocks() { - Epimorphism.logger().debug("Generating Epimorphism Crucible Blocks..."); + Epimorphism.LOGGER.debug("Generating Epimorphism Crucible Blocks..."); for (MaterialRegistry registry : GTCEuAPI.materialManager.getRegistries()) { GTRegistrate registrate = registry.getRegistrate(); for (Material material : registry.getAllMaterials()) { @@ -117,7 +117,7 @@ private static void generateCrucibleBlocks() { } } CRUCIBLE_BLOCKS = CRUCIBLE_BLOCKS_BUILDER.build(); - Epimorphism.logger().debug("Generating Epimorphism Crucible Blocks... Complete!"); + Epimorphism.LOGGER.debug("Generating Epimorphism Crucible Blocks... Complete!"); } private static boolean allowCrucibleBlock(Material material) { @@ -125,7 +125,7 @@ private static boolean allowCrucibleBlock(Material material) { } private static void generateFenceBlocks() { - Epimorphism.logger().debug("Generating Epimorphism Fence Blocks..."); + Epimorphism.LOGGER.debug("Generating Epimorphism Fence Blocks..."); for (MaterialRegistry registry : GTCEuAPI.materialManager.getRegistries()) { GTRegistrate registrate = registry.getRegistrate(); for (Material material : registry.getAllMaterials()) { @@ -135,7 +135,7 @@ private static void generateFenceBlocks() { } } FENCE_BLOCKS = FENCE_BLOCKS_BUILDER.build(); - Epimorphism.logger().debug("Generating Epimorphism Fence Blocks... Complete!"); + Epimorphism.LOGGER.debug("Generating Epimorphism Fence Blocks... Complete!"); } private static boolean allowFenceBlock(Material material) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPCreativeModeTabs.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPCreativeModeTabs.java index 6264c29..3b10ba6 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPCreativeModeTabs.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPCreativeModeTabs.java @@ -20,7 +20,7 @@ import com.tterrag.registrate.util.entry.RegistryEntry; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; public class EPCreativeModeTabs { public static final RegistryEntry EP_ITEM = registrate() @@ -163,7 +163,7 @@ public class EPCreativeModeTabs { .title(registrate() .addLang("itemGroup", Epimorphism.id("tool"), Epimorphism.NAME + " | Tool")) .icon(() -> ToolHelper.get(GTToolType.WRENCH, EPMaterials.Draconium)) - .withTabsBefore(EP_MATERIAL_PIPE.getKey()) + .withTabsBefore(EP_MATERIAL_FLUID.getKey()) .build()) .register(); diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPItems.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPItems.java index 4282219..45b1b95 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPItems.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPItems.java @@ -40,7 +40,7 @@ import java.util.Arrays; import java.util.List; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; import static com.gregtechceu.gtceu.common.data.GTItems.attach; public class EPItems { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPMachines.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPMachines.java index fb50ba6..d8a1511 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/EPMachines.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/EPMachines.java @@ -109,7 +109,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; import static com.epimorphismmc.epimorphism.common.block.BlockMaps.*; import static com.epimorphismmc.monomorphism.block.MOBlockMaps.ALL_COIL_BLOCKS; import static com.epimorphismmc.monomorphism.block.MOBlockMaps.ALL_MACHINE_CASINGS; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPBiologyItems.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPBiologyItems.java index 8024115..ccdc93a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPBiologyItems.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPBiologyItems.java @@ -8,8 +8,9 @@ import com.tterrag.registrate.util.entry.ItemEntry; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; -import static com.epimorphismmc.epimorphism.common.data.EPItems.*; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; +import static com.epimorphismmc.epimorphism.common.data.EPItems.registerItem; +import static com.epimorphismmc.epimorphism.common.data.EPItems.registerItemWithTooltip; public class EPBiologyItems { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPChemistryItem.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPChemistryItem.java index f1fb477..ff8062f 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPChemistryItem.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPChemistryItem.java @@ -26,7 +26,7 @@ import com.tterrag.registrate.util.entry.ItemEntry; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.catalyst; import static com.epimorphismmc.epimorphism.common.data.EPItems.registerItemWithTooltip; import static com.gregtechceu.gtceu.common.data.GTItems.attach; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPPhysicsItems.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPPhysicsItems.java index cb6d5a9..d2d8ae6 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPPhysicsItems.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPPhysicsItems.java @@ -23,8 +23,9 @@ import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.util.entry.ItemEntry; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; -import static com.epimorphismmc.epimorphism.common.data.EPItems.*; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; +import static com.epimorphismmc.epimorphism.common.data.EPItems.registerItem; +import static com.epimorphismmc.epimorphism.common.data.EPItems.registerItemWithTooltip; import static com.gregtechceu.gtceu.common.data.GTItems.attach; public class EPPhysicsItems { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPWrapItem.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPWrapItem.java index 454f527..a8902d7 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPWrapItem.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/items/EPWrapItem.java @@ -18,11 +18,68 @@ import com.tterrag.registrate.util.entry.ItemEntry; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; import static com.epimorphismmc.epimorphism.common.data.EPCreativeModeTabs.EP_CIRCUIT_REFORM; -import static com.epimorphismmc.epimorphism.common.data.EPItems.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.epimorphismmc.epimorphism.common.data.EPItems.COSMIC_CAPACITOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.COSMIC_DIODE; +import static com.epimorphismmc.epimorphism.common.data.EPItems.COSMIC_INDUCTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.COSMIC_RESISTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.COSMIC_TRANSISTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.GOOWARE_BOARD; +import static com.epimorphismmc.epimorphism.common.data.EPItems.GOOWARE_CIRCUIT_BOARD; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_BOARD; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_CAPACITOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_CIRCUIT_BOARD; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_DIODE; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_INDUCTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_RESISTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_TRANSISTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.SPINTRONIC_BOARD; +import static com.epimorphismmc.epimorphism.common.data.EPItems.SPINTRONIC_CAPACITOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.SPINTRONIC_CIRCUIT_BOARD; +import static com.epimorphismmc.epimorphism.common.data.EPItems.SPINTRONIC_DIODE; +import static com.epimorphismmc.epimorphism.common.data.EPItems.SPINTRONIC_INDUCTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.SPINTRONIC_RESISTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.SPINTRONIC_TRANSISTOR; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.MAX; +import static com.gregtechceu.gtceu.api.GTValues.MV; +import static com.gregtechceu.gtceu.api.GTValues.OpV; +import static com.gregtechceu.gtceu.api.GTValues.UEV; +import static com.gregtechceu.gtceu.api.GTValues.UHV; +import static com.gregtechceu.gtceu.api.GTValues.UIV; +import static com.gregtechceu.gtceu.api.GTValues.ULV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.UXV; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; +import static com.gregtechceu.gtceu.common.data.GTItems.ADVANCED_CIRCUIT_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.ADVANCED_SMD_CAPACITOR; +import static com.gregtechceu.gtceu.common.data.GTItems.ADVANCED_SMD_DIODE; +import static com.gregtechceu.gtceu.common.data.GTItems.ADVANCED_SMD_INDUCTOR; +import static com.gregtechceu.gtceu.common.data.GTItems.ADVANCED_SMD_RESISTOR; +import static com.gregtechceu.gtceu.common.data.GTItems.ADVANCED_SMD_TRANSISTOR; +import static com.gregtechceu.gtceu.common.data.GTItems.BASIC_CIRCUIT_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.COATED_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.ELITE_CIRCUIT_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.EPOXY_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.EXTREME_CIRCUIT_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.FIBER_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.GOOD_CIRCUIT_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.MULTILAYER_FIBER_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.PHENOLIC_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.PLASTIC_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.PLASTIC_CIRCUIT_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.SMD_CAPACITOR; +import static com.gregtechceu.gtceu.common.data.GTItems.SMD_DIODE; +import static com.gregtechceu.gtceu.common.data.GTItems.SMD_INDUCTOR; +import static com.gregtechceu.gtceu.common.data.GTItems.SMD_RESISTOR; +import static com.gregtechceu.gtceu.common.data.GTItems.SMD_TRANSISTOR; +import static com.gregtechceu.gtceu.common.data.GTItems.WETWARE_BOARD; +import static com.gregtechceu.gtceu.common.data.GTItems.WETWARE_CIRCUIT_BOARD; public class EPWrapItem { public static final Object2ObjectOpenHashMap WRAP_ITEM_MAP = diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/AdvancedMachines.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/AdvancedMachines.java index 172a1c0..d87a52a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/AdvancedMachines.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/AdvancedMachines.java @@ -40,7 +40,12 @@ import com.gregtechceu.gtceu.api.pattern.Predicates; import com.gregtechceu.gtceu.api.recipe.OverclockingLogic; import com.gregtechceu.gtceu.client.renderer.machine.LargeMinerRenderer; -import com.gregtechceu.gtceu.common.data.*; +import com.gregtechceu.gtceu.common.data.GCyMBlocks; +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.GTRecipeModifiers; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; @@ -58,18 +63,49 @@ import java.util.Comparator; import java.util.List; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; -import static com.epimorphismmc.epimorphism.common.block.BlockMaps.*; -import static com.epimorphismmc.monomorphism.block.MOBlockMaps.*; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; +import static com.epimorphismmc.epimorphism.common.block.BlockMaps.ALL_CA_TIRED_CASINGS; +import static com.epimorphismmc.epimorphism.common.block.BlockMaps.ALL_FIREBOXS; +import static com.epimorphismmc.epimorphism.common.block.BlockMaps.ALL_PA_CASINGS; +import static com.epimorphismmc.epimorphism.common.block.BlockMaps.SHAPE_GLASSES; +import static com.epimorphismmc.monomorphism.block.MOBlockMaps.ALL_COIL_BLOCKS; +import static com.epimorphismmc.monomorphism.block.MOBlockMaps.ALL_MACHINE_CASINGS; import static com.epimorphismmc.monomorphism.pattern.MOPredicates.coilBlock; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.*; -import static com.gregtechceu.gtceu.api.pattern.Predicates.*; -import static com.gregtechceu.gtceu.common.data.GCyMBlocks.*; -import static com.gregtechceu.gtceu.common.data.GTBlocks.*; -import static com.gregtechceu.gtceu.common.data.GTMaterials.*; -import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.MV; +import static com.gregtechceu.gtceu.api.GTValues.VNF; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.frameGt; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.MAINTENANCE; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.MUFFLER; +import static com.gregtechceu.gtceu.api.pattern.Predicates.abilities; +import static com.gregtechceu.gtceu.api.pattern.Predicates.air; +import static com.gregtechceu.gtceu.api.pattern.Predicates.any; +import static com.gregtechceu.gtceu.api.pattern.Predicates.autoAbilities; +import static com.gregtechceu.gtceu.api.pattern.Predicates.blocks; +import static com.gregtechceu.gtceu.api.pattern.Predicates.controller; +import static com.gregtechceu.gtceu.api.pattern.Predicates.frames; +import static com.gregtechceu.gtceu.common.data.GCyMBlocks.HEAT_VENT; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_ASSEMBLY_LINE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_LAMINATED_GLASS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_POLYTETRAFLUOROETHYLENE_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_PTFE_INERT; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STAINLESS_CLEAN; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_GEARBOX; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_SOLID; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TUNGSTENSTEEL_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CLEANROOM_GLASS; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HSLASteel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Neutronium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.TungstenSteel; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.BLAST_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CRACKING_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DUMMY_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.PYROLYSE_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.VACUUM_RECIPES; public class AdvancedMachines { public static final MultiblockMachineDefinition[] PROCESSING_ARRAY = diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/BiologyMachines.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/BiologyMachines.java index 59ac638..4005dc6 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/BiologyMachines.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/BiologyMachines.java @@ -30,11 +30,16 @@ import java.util.ArrayList; import java.util.Comparator; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; import static com.epimorphismmc.epimorphism.common.block.BlockMaps.SHAPE_GLASSES; import static com.epimorphismmc.monomorphism.block.MOBlockMaps.ALL_MACHINE_CASINGS; import static com.epimorphismmc.monomorphism.pattern.MOPredicates.machineCasingBlock; -import static com.gregtechceu.gtceu.api.pattern.Predicates.*; +import static com.gregtechceu.gtceu.api.pattern.Predicates.abilities; +import static com.gregtechceu.gtceu.api.pattern.Predicates.air; +import static com.gregtechceu.gtceu.api.pattern.Predicates.any; +import static com.gregtechceu.gtceu.api.pattern.Predicates.blocks; +import static com.gregtechceu.gtceu.api.pattern.Predicates.controller; +import static com.gregtechceu.gtceu.api.pattern.Predicates.frames; import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_POLYTETRAFLUOROETHYLENE_PIPE; import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STAINLESS_CLEAN; import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DUMMY_RECIPES; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/EPAEMachines.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/EPAEMachines.java index d2f2b33..40db08b 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/EPAEMachines.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/EPAEMachines.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; -import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; +import static com.gregtechceu.gtceu.api.GTValues.UHV; public class EPAEMachines { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/GeneratorMachines.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/GeneratorMachines.java index a99ebed..0077832 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/GeneratorMachines.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/machine/GeneratorMachines.java @@ -37,14 +37,54 @@ import java.util.function.Supplier; -import static com.epimorphismmc.epimorphism.Epimorphism.registrate; -import static com.epimorphismmc.epimorphism.common.data.EPBlocks.*; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.*; -import static com.gregtechceu.gtceu.api.pattern.Predicates.*; -import static com.gregtechceu.gtceu.common.data.GTBlocks.*; -import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import static com.epimorphismmc.epimorphism.EpimorphismCommon.registrate; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CASING_SUPERCRITICAL_FLUID_GEARBOX; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CASING_SUPERCRITICAL_FLUID_TURBINE; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CASING_TURBO_ENGINE_GEARBOX; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.TITANIUM_PLATED_CYLINDER; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.TURBO_ENGINE_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.HIGH_PRESSURE_STEAM_TURBINE_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.LARGE_NAQUADAH_COOLANT_LIST; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.LARGE_NAQUADAH_EXCITED_FLUID_LIST; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.LARGE_NAQUADAH_REACTOR_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.ROCKET_ENGINE_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.SUPERCRITICAL_STEAM_TURBINE_FUELS; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.V; +import static com.gregtechceu.gtceu.api.GTValues.VN; +import static com.gregtechceu.gtceu.api.GTValues.VNF; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.EXPORT_FLUIDS; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.IMPORT_FLUIDS; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.IMPORT_ITEMS; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.MAINTENANCE; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.MUFFLER; +import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.OUTPUT_ENERGY; +import static com.gregtechceu.gtceu.api.pattern.Predicates.abilities; +import static com.gregtechceu.gtceu.api.pattern.Predicates.air; +import static com.gregtechceu.gtceu.api.pattern.Predicates.autoAbilities; +import static com.gregtechceu.gtceu.api.pattern.Predicates.blocks; +import static com.gregtechceu.gtceu.api.pattern.Predicates.controller; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_ENGINE_INTAKE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_LAMINATED_GLASS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STAINLESS_CLEAN; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STAINLESS_STEEL_GEARBOX; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_GEARBOX; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_TURBINE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TITANIUM_GEARBOX; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TITANIUM_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TITANIUM_STABLE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TITANIUM_TURBINE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TUNGSTENSTEEL_GEARBOX; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TUNGSTENSTEEL_TURBINE; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.COMBUSTION_GENERATOR_FUELS; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.GAS_TURBINE_FUELS; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.PLASMA_GENERATOR_FUELS; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.STEAM_TURBINE_FUELS; import static com.gregtechceu.gtceu.utils.FormattingUtil.toRomanNumeral; public class GeneratorMachines { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPBiologicalMaterials.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPBiologicalMaterials.java index fbc8201..9338e4d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPBiologicalMaterials.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPBiologicalMaterials.java @@ -1,6 +1,14 @@ package com.epimorphismmc.epimorphism.common.data.materials; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.BrownAlgae; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Builder; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DryBrownAlgae; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DryGoldenAlgae; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DryGreenAlgae; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DryRedAlgae; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.GoldenAlgae; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.GreenAlgae; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.RedAlgae; public class EPBiologicalMaterials { public static void register() { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPElementMaterials.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPElementMaterials.java index cf47506..b8fab86 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPElementMaterials.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPElementMaterials.java @@ -13,10 +13,56 @@ import net.minecraft.world.item.enchantment.Enchantments; -import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialIconSet.*; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialIconSet.CUSTOM_INFINITY; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialIconSet.CUSTOM_NEUTRONIUM; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Adamantium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.AstralTitanium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.AwakenedDraconium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Bismuth209; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Builder; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Californium252; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CelestialTungsten; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ChaoticDraconium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CosmicNeutronium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CrystalMatrix; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DegenerateRhenium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Draconium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Hypogen; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.IchorLiquid; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Ichorium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Infinity; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Lead209; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MetastableFlerovium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MetastableHassium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MetastableOganesson; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Mithril; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Orichalcum; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Plutonium244; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Rhugnor; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Taranium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Vibranium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.VoidMetal; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Ytterbium178; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.UXV; +import static com.gregtechceu.gtceu.api.GTValues.V; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_BOLT_SCREW; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_DENSE; +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_FOIL; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_FRAME; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_LONG_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_PLATE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_RING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROTOR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROUND; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SMALL_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SPRING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_SMASHING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_SMELTING; public class EPElementMaterials { public static void register() { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPFirstDegreeMaterials.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPFirstDegreeMaterials.java index 32a3238..459bb31 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPFirstDegreeMaterials.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPFirstDegreeMaterials.java @@ -12,10 +12,36 @@ import net.minecraft.ChatFormatting; -import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.*; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.DISABLE_CRYSTALLIZATION; import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -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.chemical.material.info.MaterialFlags.CRYSTALLIZABLE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.DECOMPOSITION_BY_CENTRIFUGING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.DECOMPOSITION_BY_ELECTROLYZING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.DISABLE_DECOMPOSITION; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.EXPLOSIVE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.FLAMMABLE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_BOLT_SCREW; +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_FOIL; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_FRAME; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_LENS; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_LONG_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_PLATE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_RING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROTOR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROUND; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SMALL_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SPRING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.IS_MAGNETIC; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_SMASHING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_SMELTING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.NO_WORKING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.DULL; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.FINE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.METALLIC; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.ROUGH; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class EPFirstDegreeMaterials { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMachineCasingMaterials.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMachineCasingMaterials.java index 90460f0..f42661b 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMachineCasingMaterials.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMachineCasingMaterials.java @@ -8,8 +8,77 @@ import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Abyssalloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ActiniumSuperhydride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Adamantium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.AusteniticStainlessSteel904L; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.BETSPerrhenate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.BabbittAlloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.BlackPlutonium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.BlackTitanium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.BoronFranciumMixture; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Builder; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Cinobite; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.EglinSteel; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.EglinSteelBase; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.FullereneSuperconductor; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Grisium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HG1223; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HMS1J22Alloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HMS1J79Alloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HY1301; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HastelloyC59; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HastelloyK243; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HastelloyN; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HastelloyX78; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Hdcs; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Incoloy020; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.IncoloyDS; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.IncoloyMA813; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Inconel625; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Inconel690; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Inconel792; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Lafium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.LanthanumFullereneNanotube; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Legendarium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MARM200CeSteel; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MARM200Steel; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MagnetoResonatic; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MaragingSteel250; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MetastableFlerovium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MetastableHassium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MetastableOganesson; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Orichalcum; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Pikyonium64B; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.PlatinumGroupAlloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Plutonium244; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.QuantumAlloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Staballoy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.StellarAlloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Stellite; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.SuperheavyHAlloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.SuperheavyLAlloy; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Talonite; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.TanmolyiumBetaC; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Tantalloy61; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Taranium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.TitanSteel; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Vibranium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ZirconiumCarbide; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_BOLT_SCREW; +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_FOIL; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_FRAME; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_LONG_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_PLATE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_RING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROTOR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROUND; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SMALL_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SPRING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SPRING_SMALL; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; public class EPMachineCasingMaterials { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialFlagAddition.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialFlagAddition.java index 247bbdd..d41f657 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialFlagAddition.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialFlagAddition.java @@ -1,9 +1,91 @@ package com.epimorphismmc.epimorphism.common.data.materials; -import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.*; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; -import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.DISABLE_CRYSTALLIZATION; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.GENERATE_LASER_EMITTER; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.GENERATE_MILLED; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.GENERATE_NANITES; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HeliumNeon; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.CRYSTALLIZABLE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.DISABLE_DECOMPOSITION; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_BOLT_SCREW; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_DENSE; +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_FOIL; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_FRAME; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_LONG_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_PLATE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_RING; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_ROTOR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SMALL_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_SPRING; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Almandine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Amethyst; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Argon; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Bohrium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Brass; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Carbon; +import static com.gregtechceu.gtceu.common.data.GTMaterials.CarbonDioxide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Chalcopyrite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Chromium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.CobaltBrass; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Cupronickel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.DamascusSteel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Darmstadtium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Dubnium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Duranium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Emerald; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Germanium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Gold; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Grossular; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Helium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.IronMagnetic; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Krypton; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Livermorium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Molybdenite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Monazite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Naquadria; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NeodymiumMagnetic; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Neon; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Neutronium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Nichrome; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Nickel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Olivine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Opal; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Pentlandite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Platinum; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Plutonium241; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Pollucite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Polybenzimidazole; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Powellite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Pyrochlore; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Pyrope; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Redstone; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rhenium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rhodium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.RhodiumPlatedPalladium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.RockSalt; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Ruby; +import static com.gregtechceu.gtceu.common.data.GTMaterials.RutheniumTriniumAmericiumNeutronate; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rutherfordium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Salt; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Sapphire; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Silver; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Spessartine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Sphalerite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Steel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SteelMagnetic; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Tantalite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.TinAlloy; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Titanium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Trinium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Tritanium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Tungsten; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Uranium238; +import static com.gregtechceu.gtceu.common.data.GTMaterials.WroughtIron; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Wulfenite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Xenon; public class EPMaterialFlagAddition { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialPropertyAddition.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialPropertyAddition.java index 2a1a202..7843793 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialPropertyAddition.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPMaterialPropertyAddition.java @@ -8,17 +8,113 @@ import com.epimorphismmc.epimorphism.common.item.behaviors.renderer.HaloItemBehavior; 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.properties.BlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.IngotProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; import com.gregtechceu.gtceu.api.fluids.FluidBuilder; import net.minecraft.resources.ResourceLocation; -import static com.epimorphismmc.epimorphism.api.data.chemical.material.properties.EPPropertyKeys.*; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.*; -import static com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys.*; -import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.properties.EPPropertyKeys.CATALYST; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.properties.EPPropertyKeys.CRUCIBLE; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.properties.EPPropertyKeys.FENCE; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.properties.EPPropertyKeys.GRIND_BALL; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CosmicNeutronium; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HexagonalBoronNitride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.PalladiumOnCarbon; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.UEV; +import static com.gregtechceu.gtceu.api.GTValues.UIV; +import static com.gregtechceu.gtceu.api.GTValues.V; +import static com.gregtechceu.gtceu.api.GTValues.VA; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.BLAST; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.DUST; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.FLUID; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.INGOT; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.ORE; +import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.WIRE; +import static com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys.LIQUID; +import static com.gregtechceu.gtceu.common.data.GTMaterials.AcidicOsmiumSolution; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Actinium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Aluminium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.AmmoniumChloride; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Astatine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Bohrium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Bromine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Bronze; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Caesium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Calcium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Californium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Chromium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Copernicium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Curium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Dubnium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Dysprosium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Erbium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Fermium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Francium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Gadolinium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Germanium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Gold; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Graphite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Hafnium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Holmium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Invar; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Iodine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Iridium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.IridiumMetalResidue; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Iron; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Livermorium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Meitnerium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Mendelevium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Molybdenite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Molybdenum; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Moscovium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Neptunium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NetherStar; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Neutronium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Nihonium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NiobiumTitanium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Osmium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.PalladiumRaw; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Pollucite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Polonium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Potassium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Praseodymium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Promethium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Protactinium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Quartzite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Radium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.RarestMetalMixture; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rhenium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Roentgenium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rubidium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Ruridit; +import static com.gregtechceu.gtceu.common.data.GTMaterials.RutheniumTriniumAmericiumNeutronate; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rutherfordium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Scandium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Seaborgium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Selenium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Soapstone; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Sodium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SodiumBisulfate; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SodiumHydroxide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Steel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Strontium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Tellurium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Tennessine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Terbium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Thallium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Thulium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Titanium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Tungsten; +import static com.gregtechceu.gtceu.common.data.GTMaterials.TungstenSteel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Vanadium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Ytterbium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Zirconium; public class EPMaterialPropertyAddition { public static void init() { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPSecondDegreeMaterials.java b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPSecondDegreeMaterials.java index 29815c9..4fe4c3a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPSecondDegreeMaterials.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/data/materials/EPSecondDegreeMaterials.java @@ -5,7 +5,11 @@ import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Builder; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ConcentrateDragonBreath; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DragonBlood; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DragonBreath; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DragonTear; public class EPSecondDegreeMaterials { public static void register() { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/CleanCultureBehavior.java b/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/CleanCultureBehavior.java index eab83b8..9824f8e 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/CleanCultureBehavior.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/CleanCultureBehavior.java @@ -3,7 +3,10 @@ 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.ComponentItem; -import com.gregtechceu.gtceu.api.item.component.*; +import com.gregtechceu.gtceu.api.item.component.IAddInformation; +import com.gregtechceu.gtceu.api.item.component.ICustomDescriptionId; +import com.gregtechceu.gtceu.api.item.component.IItemComponent; +import com.gregtechceu.gtceu.api.item.component.ISubItemHandler; import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.client.color.item.ItemColor; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/GrindBallBehaviour.java b/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/GrindBallBehaviour.java index dcb0506..c69b29d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/GrindBallBehaviour.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/GrindBallBehaviour.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.List; import javax.annotation.Nullable; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/StructureWriteBehavior.java b/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/StructureWriteBehavior.java index 5edbf25..db1e272 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/StructureWriteBehavior.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/item/behaviors/StructureWriteBehavior.java @@ -17,7 +17,10 @@ import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.TextTexture; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ButtonWidget; +import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.utils.LocalizationUtils; import net.minecraft.core.BlockPos; @@ -137,7 +140,7 @@ private void exportLog(HeldItemUIFactory.HeldItemHolder playerInventoryHolder) { String[] strings = blockPattern.pattern[i]; builder.append(".aisle(\"%s\")\n".formatted(Joiner.on("\", \"").join(strings))); } - Epimorphism.logger().info(builder.toString()); + Epimorphism.LOGGER.info(builder.toString()); } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/NuclearReactorMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/NuclearReactorMachine.java index 779776a..f36c9d3 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/NuclearReactorMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/NuclearReactorMachine.java @@ -16,7 +16,11 @@ import com.gregtechceu.gtceu.api.machine.feature.IMachineModifyDrops; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.ProgressWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/ReactorChamberMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/ReactorChamberMachine.java index 74baacc..23e3955 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/ReactorChamberMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/generator/ReactorChamberMachine.java @@ -69,7 +69,7 @@ public boolean shouldOpenUI(Player player, InteractionHand hand, BlockHitResult @Override public @Nullable ModularUI createUI(Player entityPlayer) { - Epimorphism.logger().warn("'createUI' of the Reactor Chamber was incorrectly called!"); + Epimorphism.LOGGER.warn("'createUI' of the Reactor Chamber was incorrectly called!"); return null; } diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/DigesterMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/DigesterMachine.java index 3dc9fc6..d887769 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/DigesterMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/DigesterMachine.java @@ -16,7 +16,7 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.epimorphismmc.monomorphism.utility.MOMathUtils.*; +import static com.epimorphismmc.monomorphism.math.MOMath.randomRectanglePoint; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @@ -41,7 +41,7 @@ public void clientTick() { int stepX = facing.getStepX(); int stepZ = facing.getStepZ(); - var randPos = getRandomPointInRectangle( + var randPos = randomRectanglePoint( new Vec2( stepX * 1.86F + pos.getX() + 0.5F + (Math.abs(stepX) - 1) * 1.26F, stepZ * 1.86F + pos.getZ() + 0.5F + (Math.abs(stepZ) - 1) * 1.26F), diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoForgeMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoForgeMachine.java index 436ecb3..761827e 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoForgeMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoForgeMachine.java @@ -50,9 +50,13 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.api.pattern.Predicates.*; -import static com.gregtechceu.gtceu.common.data.GTBlocks.*; -import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.api.pattern.Predicates.air; +import static com.gregtechceu.gtceu.api.pattern.Predicates.autoAbilities; +import static com.gregtechceu.gtceu.api.pattern.Predicates.blocks; +import static com.gregtechceu.gtceu.api.pattern.Predicates.controller; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_ASSEMBLY_LINE; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Carbon; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Neutronium; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoscaleFabricatorMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoscaleFabricatorMachine.java index 90b404a..88156f6 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoscaleFabricatorMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/NanoscaleFabricatorMachine.java @@ -33,7 +33,8 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.common.data.GCyMBlocks.*; +import static com.gregtechceu.gtceu.common.data.GCyMBlocks.CASING_LASER_SAFE_ENGRAVING; +import static com.gregtechceu.gtceu.common.data.GCyMBlocks.CASING_NONCONDUCTING; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/CompressedFusionReactorMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/CompressedFusionReactorMachine.java index 0ca4b8e..21bebc2 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/CompressedFusionReactorMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/CompressedFusionReactorMachine.java @@ -8,7 +8,10 @@ import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.common.data.GTMaterials; -import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.UHV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; public class CompressedFusionReactorMachine extends WorkableElectricMultiblockMachine implements ITieredMachine { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/IntegratedOreFactoryMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/IntegratedOreFactoryMachine.java index ac8c2de..9196e86 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/IntegratedOreFactoryMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/advanced/IntegratedOreFactoryMachine.java @@ -22,7 +22,7 @@ import com.gregtechceu.gtceu.common.machine.multiblock.part.EnergyHatchPartMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.ItemBusPartMachine; -import com.lowdragmc.lowdraglib.gui.texture.*; +import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; import com.lowdragmc.lowdraglib.misc.FluidTransferList; import com.lowdragmc.lowdraglib.misc.ItemTransferList; import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/agriculture/IndustrialFishingPondMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/agriculture/IndustrialFishingPondMachine.java index 4f29f30..041c3f6 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/agriculture/IndustrialFishingPondMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/electric/agriculture/IndustrialFishingPondMachine.java @@ -11,7 +11,7 @@ import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.utils.GTUtil; -import com.lowdragmc.lowdraglib.gui.texture.*; +import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java index e5d798b..d22ab8e 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/LargeNaquadahReactorMachine.java @@ -29,7 +29,13 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMaps; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/MegaTurbineMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/MegaTurbineMachine.java index f760de3..485df25 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/MegaTurbineMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/MegaTurbineMachine.java @@ -44,12 +44,18 @@ import lombok.Setter; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.stream.Collectors; import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.api.machine.feature.multiblock.IRotorHolderMachine.*; +import static com.gregtechceu.gtceu.api.machine.feature.multiblock.IRotorHolderMachine.SPEED_DECREMENT; +import static com.gregtechceu.gtceu.api.machine.feature.multiblock.IRotorHolderMachine.SPEED_INCREMENT; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/SolidOxideFuelCellMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/SolidOxideFuelCellMachine.java index 4e5d2d1..a9f984c 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/SolidOxideFuelCellMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/SolidOxideFuelCellMachine.java @@ -32,8 +32,9 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STAINLESS_CLEAN; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TUNGSTENSTEEL_ROBUST; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/UniversalChemicalFuelEngineMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/UniversalChemicalFuelEngineMachine.java index 6f7e3b9..a191724 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/UniversalChemicalFuelEngineMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/generator/UniversalChemicalFuelEngineMachine.java @@ -49,7 +49,7 @@ public UniversalChemicalFuelEngineMachine(IMachineBlockEntity holder, Object... @Override protected @Nullable GTRecipe getRealRecipe(GTRecipe recipe) { - var list = MORecipeHelper.getInputFluid(recipe); + var list = RecipeHelper.getInputFluids(recipe); if (list.isEmpty()) return recipe; var inputFluid = list.get(0); diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/noenergy/NeutronActivatorMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/noenergy/NeutronActivatorMachine.java index a8bae25..82c86ce 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/noenergy/NeutronActivatorMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/noenergy/NeutronActivatorMachine.java @@ -11,7 +11,9 @@ import com.epimorphismmc.monomorphism.utility.MOFormattingUtils; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; -import com.gregtechceu.gtceu.api.capability.recipe.*; +import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; +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.machine.ConditionalSubscriptionHandler; @@ -36,11 +38,16 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import javax.annotation.ParametersAreNonnullByDefault; -import static com.epimorphismmc.monomorphism.MOValues.*; +import static com.epimorphismmc.monomorphism.MOValues.K; +import static com.epimorphismmc.monomorphism.MOValues.M; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/CatalystHatchPartMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/CatalystHatchPartMachine.java index 41bf5a4..8d42c6a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/CatalystHatchPartMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/CatalystHatchPartMachine.java @@ -29,11 +29,15 @@ import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.RNG; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/InfiniteWaterHatchPartMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/InfiniteWaterHatchPartMachine.java index 7409ba1..e31d18d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/InfiniteWaterHatchPartMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/InfiniteWaterHatchPartMachine.java @@ -10,7 +10,11 @@ import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.TankWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.side.fluid.FluidStack; import com.lowdragmc.lowdraglib.syncdata.ISubscription; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/IntakeHatchPartMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/IntakeHatchPartMachine.java index c697fbb..506686a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/IntakeHatchPartMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/IntakeHatchPartMachine.java @@ -1,8 +1,7 @@ package com.epimorphismmc.epimorphism.common.machine.multiblock.part; -import com.epimorphismmc.monomorphism.recipe.MORecipeHelper; +import com.epimorphismmc.monomorphism.math.MOMath; import com.epimorphismmc.monomorphism.utility.MOFormattingUtils; -import com.epimorphismmc.monomorphism.utility.MOMathUtils; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.IO; @@ -11,12 +10,18 @@ import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; +import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.recipe.DimensionCondition; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.utils.GTMath; import com.lowdragmc.lowdraglib.gui.editor.ColorPattern; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.TankWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.side.fluid.FluidHelper; import com.lowdragmc.lowdraglib.side.fluid.FluidStack; import com.lowdragmc.lowdraglib.syncdata.ISubscription; @@ -76,7 +81,7 @@ public static void initMap(GTRecipeBuilder recipeBuilder) { for (var condition : recipeBuilder.conditions) { if (condition instanceof DimensionCondition dimensionCondition) { var dim = dimensionCondition.getDimension(); - var fluids = MORecipeHelper.getOutputFluid(recipeBuilder); + var fluids = RecipeHelper.getOutputFluids(recipeBuilder); if (!fluids.isEmpty()) { AIR_MAP.put(dim, fluids.get(0).getFluid()); break; @@ -135,7 +140,7 @@ public void clientTick() { double offset = 2 * GTValues.RNG.nextDouble() + 2; var pos = this.getPos().getCenter().add(stepX * 0.5, stepY * 0.5, stepZ * 0.5); var center = pos.add(stepX * offset, stepY * offset, stepZ * offset); - var point = MOMathUtils.randomCirclePoint(1.5F); + var point = MOMath.randomCirclePoint(1.5F); var randPos = center.add( stepY * point.y + stepZ * point.x, stepX * point.x + stepZ * point.y, @@ -167,7 +172,7 @@ protected void intake() { } public static long getIntakeAmount(int tier) { - return FluidHelper.getBucket() * (1L << MOMathUtils.clamp(tier - 5, 0, 9)); + return FluidHelper.getBucket() * (1L << GTMath.clamp(tier - 5, 0, 9)); } private void unsubscribe() { diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/NeutronSensorPartMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/NeutronSensorPartMachine.java index 3e92cbd..5a69afa 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/NeutronSensorPartMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/NeutronSensorPartMachine.java @@ -9,7 +9,11 @@ import com.gregtechceu.gtceu.utils.RedstoneUtil; import com.lowdragmc.lowdraglib.gui.editor.ColorPattern; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.TextBoxWidget; +import com.lowdragmc.lowdraglib.gui.widget.TextFieldWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; @@ -29,7 +33,7 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.epimorphismmc.monomorphism.MOValues.*; +import static com.epimorphismmc.monomorphism.MOValues.K; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/RadiationHatchPartMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/RadiationHatchPartMachine.java index 74fb52e..416a2ea 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/RadiationHatchPartMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/part/RadiationHatchPartMachine.java @@ -2,14 +2,23 @@ import com.epimorphismmc.epimorphism.api.gui.EPGuiTextures; -import com.gregtechceu.gtceu.api.capability.recipe.*; +import com.gregtechceu.gtceu.api.capability.recipe.IO; +import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder; +import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; +import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; +import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.ProgressWidget; +import com.lowdragmc.lowdraglib.gui.widget.SlotWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.syncdata.ISubscription; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; @@ -27,7 +36,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/TFFTMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/TFFTMachine.java index 7bf450b..cfcf611 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/TFFTMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/TFFTMachine.java @@ -11,7 +11,11 @@ import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.api.gui.fancy.*; +import com.gregtechceu.gtceu.api.gui.fancy.ConfiguratorPanel; +import com.gregtechceu.gtceu.api.gui.fancy.FancyMachineUIWidget; +import com.gregtechceu.gtceu.api.gui.fancy.IFancyUIProvider; +import com.gregtechceu.gtceu.api.gui.fancy.TabsWidget; +import com.gregtechceu.gtceu.api.gui.fancy.TooltipsPanel; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine; @@ -23,7 +27,12 @@ import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ComponentPanelWidget; +import com.lowdragmc.lowdraglib.gui.widget.DraggableScrollableWidgetGroup; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.SlotWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.misc.FluidStorage; import com.lowdragmc.lowdraglib.misc.FluidTransferList; import com.lowdragmc.lowdraglib.side.fluid.FluidStack; diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/YottaFluidTankMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/YottaFluidTankMachine.java index 213386a..6ee7811 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/YottaFluidTankMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/multiblock/storage/YottaFluidTankMachine.java @@ -16,7 +16,11 @@ import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.api.gui.fancy.*; +import com.gregtechceu.gtceu.api.gui.fancy.ConfiguratorPanel; +import com.gregtechceu.gtceu.api.gui.fancy.FancyMachineUIWidget; +import com.gregtechceu.gtceu.api.gui.fancy.IFancyConfiguratorButton; +import com.gregtechceu.gtceu.api.gui.fancy.IFancyUIProvider; +import com.gregtechceu.gtceu.api.gui.fancy.TooltipsPanel; import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine; @@ -31,7 +35,11 @@ import com.gregtechceu.gtceu.utils.FormattingUtil; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ComponentPanelWidget; +import com.lowdragmc.lowdraglib.gui.widget.DraggableScrollableWidgetGroup; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.misc.FluidTransferList; import com.lowdragmc.lowdraglib.side.fluid.FluidStack; import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; @@ -53,11 +61,16 @@ import org.jetbrains.annotations.NotNull; import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; import javax.annotation.ParametersAreNonnullByDefault; -import static com.epimorphismmc.monomorphism.utility.BigIntMath.*; +import static com.epimorphismmc.monomorphism.math.BigIntMath.LONG_MAX; +import static com.epimorphismmc.monomorphism.math.BigIntMath.getLongValue; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @@ -338,10 +351,10 @@ private void transferFluid() { FluidStack inputFluidStack; if (fluidTank.hasFluid()) { var free = isVoiding - ? LONG_MAX_VALUE + ? LONG_MAX : fluidTank.getMaxStorage().subtract(fluidTank.getCurrentStorage()); - inputFluidStack = FluidStack.create( - fluidTank.getCurrentFluid(), free.min(LONG_MAX_VALUE).longValue()); + inputFluidStack = + FluidStack.create(fluidTank.getCurrentFluid(), free.min(LONG_MAX).longValue()); List> handlers = Objects.requireNonNullElseGet( capabilitiesProxy.get(IO.IN, GTRecipeCapabilities.FLUID), Collections::emptyList); List list = List.of(FluidIngredient.of(inputFluidStack)); @@ -373,7 +386,7 @@ private void transferFluid() { // Debank to Fluid Output Hatches FluidStack outputFluidStack = FluidStack.create( fluidTank.getCurrentFluid(), - fluidTank.getCurrentStorage().min(LONG_MAX_VALUE).longValue()); + fluidTank.getCurrentStorage().min(LONG_MAX).longValue()); if (!EPFluidUtil.isDefaultFluid(outputFluidStack) && outputFluidStack.getAmount() >= 0) { List list = List.of(FluidIngredient.of(outputFluidStack)); List> handlers = Objects.requireNonNullElseGet( diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/storage/InfinityCrateMachine.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/storage/InfinityCrateMachine.java index 9d1b504..ed8f87c 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/storage/InfinityCrateMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/storage/InfinityCrateMachine.java @@ -3,7 +3,6 @@ import com.epimorphismmc.monomorphism.gui.utils.MODrawerHelper; import com.epimorphismmc.monomorphism.gui.widget.PagedWidget; import com.epimorphismmc.monomorphism.utility.MOFormattingUtils; -import com.epimorphismmc.monomorphism.utility.MONBTUtils; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.data.chemical.material.Material; @@ -15,13 +14,18 @@ import com.gregtechceu.gtceu.api.machine.feature.IUIMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.utils.FormattingUtil; +import com.gregtechceu.gtceu.utils.GTUtil; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; import com.lowdragmc.lowdraglib.gui.modular.ModularUIGuiContainer; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.TextTexture; import com.lowdragmc.lowdraglib.gui.util.DrawerHelper; -import com.lowdragmc.lowdraglib.gui.widget.*; +import com.lowdragmc.lowdraglib.gui.widget.ButtonWidget; +import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; +import com.lowdragmc.lowdraglib.gui.widget.SlotWidget; +import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; import com.lowdragmc.lowdraglib.misc.ItemStackTransfer; import com.lowdragmc.lowdraglib.side.item.IItemTransfer; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; @@ -99,7 +103,7 @@ public CompoundTag serializeNBT() { if (!stacks.get(i).isEmpty()) { CompoundTag itemTag = new CompoundTag(); itemTag.putInt("Slot", i); - MONBTUtils.writeItemStack(stacks.get(i), itemTag); + GTUtil.saveItemStack(stacks.get(i), itemTag); nbtTagList.add(itemTag); } } @@ -118,7 +122,7 @@ public void deserializeNBT(CompoundTag nbt) { int slot = itemTags.getInt("Slot"); if (slot >= 0 && slot < stacks.size()) { - stacks.set(slot, MONBTUtils.readItemStack(itemTags)); + stacks.set(slot, GTUtil.loadItemStack(itemTags)); } } onLoad(); diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/machine/trait/OreProcessingRecipeLogic.java b/src/main/java/com/epimorphismmc/epimorphism/common/machine/trait/OreProcessingRecipeLogic.java index a0ab3ae..ba0913f 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/machine/trait/OreProcessingRecipeLogic.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/machine/trait/OreProcessingRecipeLogic.java @@ -4,16 +4,17 @@ import com.epimorphismmc.epimorphism.utils.EPUtil; import com.epimorphismmc.monomorphism.misc.SimpleCapabilityHolder; -import com.epimorphismmc.monomorphism.recipe.MORecipeHelper; import com.epimorphismmc.monomorphism.utility.MOUtils; import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.capability.recipe.*; +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.data.tag.TagUtil; 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.common.data.GTMaterials; import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; @@ -31,11 +32,20 @@ import com.google.common.primitives.Ints; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; import java.util.function.Predicate; import java.util.stream.Collectors; -import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.crushed; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.crushedPurified; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.crushedRefined; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dustImpure; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dustPure; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.ore; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.rawOre; public class OreProcessingRecipeLogic extends RecipeLogic { @@ -317,8 +327,8 @@ private void doChemWash(TagPrefix... tags) { GTRecipe recipe = GTRecipeTypes.CHEMICAL_BATH_RECIPES.getLookup().findRecipe(holder); holder.clear(); if (recipe != null) { - var inputFluids = MORecipeHelper.getInputFluid(recipe); - var outputFluids = MORecipeHelper.getOutputFluid(recipe); + var inputFluids = RecipeHelper.getInputFluids(recipe); + var outputFluids = RecipeHelper.getOutputFluids(recipe); int washed = stack.getCount(); if (!inputFluids.isEmpty()) { var inputFluid = inputFluids.get(0); diff --git a/src/main/java/com/epimorphismmc/epimorphism/common/recipe/TierCasingCondition.java b/src/main/java/com/epimorphismmc/epimorphism/common/recipe/TierCasingCondition.java index 61a25d4..b4e40dd 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/common/recipe/TierCasingCondition.java +++ b/src/main/java/com/epimorphismmc/epimorphism/common/recipe/TierCasingCondition.java @@ -19,7 +19,7 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.gregtechceu.gtceu.api.GTValues.VN; @NoArgsConstructor @ParametersAreNonnullByDefault diff --git a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTBlocksMixin.java b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTBlocksMixin.java index ef21a7f..7f460ff 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTBlocksMixin.java +++ b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTBlocksMixin.java @@ -1,6 +1,6 @@ package com.epimorphismmc.epimorphism.core.mixins.gtm; -import com.epimorphismmc.epimorphism.Epimorphism; +import com.epimorphismmc.epimorphism.EpimorphismCommon; import com.epimorphismmc.epimorphism.common.data.EPCreativeModeTabs; import com.gregtechceu.gtceu.common.data.GTBlocks; @@ -23,7 +23,7 @@ public class GTBlocksMixin { "Lcom/gregtechceu/gtceu/api/registry/registrate/GTRegistrate;creativeModeTab(Ljava/util/function/Supplier;)V", ordinal = 0)) private static void setBlockCreativeModeTab(CallbackInfo ci) { - Epimorphism.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_BLOCK); + EpimorphismCommon.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_BLOCK); } @Inject( @@ -35,6 +35,6 @@ private static void setBlockCreativeModeTab(CallbackInfo ci) { "Lcom/gregtechceu/gtceu/api/registry/registrate/GTRegistrate;creativeModeTab(Ljava/util/function/Supplier;)V", ordinal = 1)) private static void setPipeCreativeModeTab(CallbackInfo ci) { - Epimorphism.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_PIPE); + EpimorphismCommon.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_PIPE); } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTFluidsMixin.java b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTFluidsMixin.java index 7f349e0..cc65f5f 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTFluidsMixin.java +++ b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTFluidsMixin.java @@ -1,6 +1,6 @@ package com.epimorphismmc.epimorphism.core.mixins.gtm; -import com.epimorphismmc.epimorphism.Epimorphism; +import com.epimorphismmc.epimorphism.EpimorphismCommon; import com.epimorphismmc.epimorphism.common.data.EPCreativeModeTabs; import com.gregtechceu.gtceu.common.data.GTFluids; @@ -22,6 +22,6 @@ public class GTFluidsMixin { "Lcom/gregtechceu/gtceu/api/registry/registrate/GTRegistrate;creativeModeTab(Ljava/util/function/Supplier;)V", ordinal = 0)) private static void setFluidCreativeModeTab(CallbackInfo ci) { - Epimorphism.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_FLUID); + EpimorphismCommon.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_FLUID); } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTItemsMixin.java b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTItemsMixin.java index 590bd49..3c067c6 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTItemsMixin.java +++ b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/gtm/GTItemsMixin.java @@ -1,6 +1,6 @@ package com.epimorphismmc.epimorphism.core.mixins.gtm; -import com.epimorphismmc.epimorphism.Epimorphism; +import com.epimorphismmc.epimorphism.EpimorphismCommon; import com.epimorphismmc.epimorphism.common.data.EPCreativeModeTabs; import com.gregtechceu.gtceu.common.data.GTItems; @@ -22,7 +22,7 @@ public class GTItemsMixin { "Lcom/gregtechceu/gtceu/api/registry/registrate/GTRegistrate;creativeModeTab(Ljava/util/function/Supplier;)V", ordinal = 0)) private static void setItemCreativeModeTab(CallbackInfo ci) { - Epimorphism.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_ITEM); + EpimorphismCommon.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_MATERIAL_ITEM); } @Inject( @@ -34,6 +34,6 @@ private static void setItemCreativeModeTab(CallbackInfo ci) { "Lcom/gregtechceu/gtceu/api/registry/registrate/GTRegistrate;creativeModeTab(Ljava/util/function/Supplier;)V", ordinal = 0)) private static void setToolCreativeModeTab(CallbackInfo ci) { - Epimorphism.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_TOOL); + EpimorphismCommon.registrate().creativeModeTab(() -> EPCreativeModeTabs.EP_TOOL); } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/mc/ModelManagerMixin.java b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/mc/ModelManagerMixin.java index a6a56d1..0ea67df 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/core/mixins/mc/ModelManagerMixin.java +++ b/src/main/java/com/epimorphismmc/epimorphism/core/mixins/mc/ModelManagerMixin.java @@ -34,7 +34,7 @@ private void loadDynamicModels( // turns out these do have to be init in here after all, as they check for asset existence. // whoops. FenceBlockRenderer.reinitModels(); - Epimorphism.logger() - .info("Epimorphism Model loading took {}ms", System.currentTimeMillis() - startTime); + Epimorphism.LOGGER.info( + "Epimorphism Model loading took {}ms", System.currentTimeMillis() - startTime); } } diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/BlockLang.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/BlockLang.java index 4c9bd41..6e061f0 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/BlockLang.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/BlockLang.java @@ -1,12 +1,78 @@ package com.epimorphismmc.epimorphism.data.lang; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; import java.util.List; import java.util.Locale; -import static com.epimorphismmc.epimorphism.common.data.EPBlocks.*; -import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ADVANCED_ALUMINIUM_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ADVANCED_FILTER_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ADVANCED_HIGH_ENERGY_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ADVANCED_INVAR_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ADVANCED_SUBSTRATE_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.BPA_POLYCARBONATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.BREEDING_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CASING_ISA_MILL_GEARBOX; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CASING_ISA_MILL_PIPE; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CASING_POLYBENZIMIDAZOLE_PIPE; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CBDO_POLYCARBONATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.CONTAINMENT_FIELD_GENERATOR; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.DIMENSIONAL_BRIDGE_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.DIMENSIONAL_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.DIMENSIONAL_LINK_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.DRILL_HEAD; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.FLOTATION_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.FLOTATION_CELL; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.GENERAL_PROCESSING_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.HOLLOW_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.HYPERDIMENSIONAL_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.HYPER_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.INFINITY_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.IRIDIUM_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ISA_MILL_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.MARAGING_STEEL_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.NAQ_BORON_SILICATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.NEUTRONIUM_MINING_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.NEU_PMMA_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.OSMIR_BORON_SILICATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PINE_LEAVES; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PINE_LOG; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PINE_PLANK; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PINE_SAPLING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PMMA_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PRECISE_ASSEMBLER_CASING_MK1; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PRECISE_ASSEMBLER_CASING_MK2; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PRECISE_ASSEMBLER_CASING_MK3; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.PROCESS_MACHINE_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.SILICATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.SPACETIME_DISTORTION_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.SPEEDING_PIPE; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.SUBSTRATE_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.TFFT_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.THY_BORON_SILICATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.TI_BORON_SILICATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ULTIMATE_CONTAINMENT_FIELD_GENERATOR; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.ULTIMATE_HIGH_ENERGY_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.VACUUM_CASING; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.W_BORON_SILICATE_GLASS; +import static com.epimorphismmc.epimorphism.common.data.EPBlocks.YOTTA_FLUID_TANK_CASING; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.MAX; +import static com.gregtechceu.gtceu.api.GTValues.MV; +import static com.gregtechceu.gtceu.api.GTValues.OpV; +import static com.gregtechceu.gtceu.api.GTValues.UEV; +import static com.gregtechceu.gtceu.api.GTValues.UHV; +import static com.gregtechceu.gtceu.api.GTValues.UIV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.UXV; +import static com.gregtechceu.gtceu.api.GTValues.VN; +import static com.gregtechceu.gtceu.api.GTValues.VNF; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; +import static com.gregtechceu.gtceu.api.GTValues.tiersBetween; public class BlockLang { public static void init(MOLangProvider provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/EPLangHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/EPLangHandler.java index 663aa0c..5bcfbc4 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/EPLangHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/EPLangHandler.java @@ -1,6 +1,6 @@ package com.epimorphismmc.epimorphism.data.lang; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; public class EPLangHandler { private EPLangHandler() { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/ItemLang.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/ItemLang.java index 54f0b08..b3cbf83 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/ItemLang.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/ItemLang.java @@ -1,15 +1,35 @@ package com.epimorphismmc.epimorphism.data.lang; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; import com.gregtechceu.gtceu.api.GTValues; import java.util.Locale; import static com.epimorphismmc.epimorphism.common.data.EPItems.*; -import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.*; -import static com.epimorphismmc.epimorphism.common.data.items.EPChemistryItem.*; -import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.*; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.BROWN_ALGA; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.CHRYSOPHYCEAE; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.ELECTROCHEMICAL_GRADIENT_RECORDER; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.GREEN_ALGA; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.HYPERRIBOSOME; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.NEUTRON_ABSORBING_PROTEIN; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.ORDINARY_ALGAE; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.PINECONE; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.QUANTUM_TUNNELING_MICROTUBULE; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.RED_ALGA; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.STERILIZED_PETRI_DISH; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.SUPEREXCITED_CONDUCTIVE_POLYMER; +import static com.epimorphismmc.epimorphism.common.data.items.EPBiologyItems.ULTRA_MICRO_PHASE_SEPARATOR; +import static com.epimorphismmc.epimorphism.common.data.items.EPChemistryItem.CATALYST_CARRIER; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.ACTINIUM_SUPERHYDRIDE_PLASMA_CONTAINMENT_CELL; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.ELECTRON_SOURCE; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.EMPTY_PARTICLE_CAPSULE; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.HYPOGEN_PLASMA_CONTAINMENT_CELL; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.NEUTRON_PLASMA_CONTAINMENT_CELL; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.PLASMA_CONTAINMENT_CELL; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.QUANTUM_ANOMALY; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.RADIOACTIVE_WASTE; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.RHENIUM_PLASMA_CONTAINMENT_CELL; public class ItemLang { public static void init(MOLangProvider provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/MachineLang.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/MachineLang.java index c74bff1..954526d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/MachineLang.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/MachineLang.java @@ -4,18 +4,53 @@ import com.epimorphismmc.epimorphism.common.data.machine.BiologyMachines; import com.epimorphismmc.epimorphism.common.data.machine.GeneratorMachines; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; import com.gregtechceu.gtceu.api.GTValues; import java.util.List; -import static com.epimorphismmc.epimorphism.common.data.EPMachines.*; -import static com.epimorphismmc.epimorphism.common.data.machine.AdvancedMachines.*; -import static com.epimorphismmc.epimorphism.common.data.machine.EPAEMachines.*; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.BURNER_REACTOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.CATALYTIC_REFORMER; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.CHEMICAL_PLANT; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.CRYOGENIC_REACTOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.CRYSTALLIZATION_CRUCIBLE; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.CVD_UNIT; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.DIGESTER; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.FRACKER; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.GRIND_BALL_HATCH; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.INDUSTRIAL_DRILL; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.INDUSTRIAL_FLOTATION_CELL; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.INFINITE_WATER_HATCH; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.INFINITY_CRATE; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.ISA_MILL; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.LASER_CVD; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.NANOSCALE_FABRICATOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.NEUTRON_ACTIVATOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.NEUTRON_SENSOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.PLASMA_CVD; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.ROASTER; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.STEAM_FOUNDRY; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.STEAM_PISTON_HAMMER; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.STEAM_PRESSOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.STEAM_SEPARATOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.TFFT; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.VACUUM_DRYING_FURNACE; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.YOTTA_FLUID_TANK; +import static com.epimorphismmc.epimorphism.common.data.machine.AdvancedMachines.INFINITE_FLUID_DRILLING_RIG; +import static com.epimorphismmc.epimorphism.common.data.machine.AdvancedMachines.INTEGRATED_ORE_FACTORY; +import static com.epimorphismmc.epimorphism.common.data.machine.EPAEMachines.TANK_ACCESS_HATCH; import static com.epimorphismmc.monomorphism.MOValues.CVLVH; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.MV; +import static com.gregtechceu.gtceu.api.GTValues.UHV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.VLVT; +import static com.gregtechceu.gtceu.api.GTValues.tiersBetween; +import static com.gregtechceu.gtceu.common.data.GTMachines.ELECTRIC_TIERS; public class MachineLang { public static void init(MOLangProvider provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/MaterialLang.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/MaterialLang.java index 243469c..dd24b6d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/MaterialLang.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/MaterialLang.java @@ -1,10 +1,18 @@ package com.epimorphismmc.epimorphism.data.lang; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; import com.gregtechceu.gtceu.api.data.chemical.material.Material; -import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.*; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.boule; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.catalyst; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.crucible; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.fence; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.laserEmitter; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.milled; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.nanites; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.seedCrystal; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.singularity; import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; public class MaterialLang { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/MiscLang.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/MiscLang.java index 5641ada..1d37b97 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/MiscLang.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/MiscLang.java @@ -1,6 +1,6 @@ package com.epimorphismmc.epimorphism.data.lang; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; public class MiscLang { public static void init(MOLangProvider provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/RecipeLang.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/RecipeLang.java index 25ec19c..bdcbfb5 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/RecipeLang.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/RecipeLang.java @@ -1,10 +1,27 @@ package com.epimorphismmc.epimorphism.data.lang; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; import com.gregtechceu.gtceu.api.GTValues; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.COMPONENT_ASSEMBLY_LINE_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.CRYSTALLIZATION_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.DIGESTER_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.DRILLING_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.FERMENTATION_TANK_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.GENERAL_RECIPES_A; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.GENERAL_RECIPES_B; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.GENERAL_RECIPES_C; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.LARGE_NAQUADAH_COOLANT_LIST; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.LARGE_NAQUADAH_EXCITED_FLUID_LIST; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.MOLECULAR_BEAM_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.NEUTRON_ACTIVATOR_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.ORE_MILLING_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.PRECISE_ASSEMBLER_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.RADIATION_HATCH_LIST; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.ROASTER_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.UNIVERSAL_CHEMICAL_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.VACUUM_DRYING_FURNACE_RECIPES; public class RecipeLang { public static void init(MOLangProvider provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/lang/WrapItemLang.java b/src/main/java/com/epimorphismmc/epimorphism/data/lang/WrapItemLang.java index df66a1d..085634d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/lang/WrapItemLang.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/lang/WrapItemLang.java @@ -2,7 +2,7 @@ import com.epimorphismmc.epimorphism.common.data.items.EPWrapItem; -import com.epimorphismmc.monomorphism.datagen.lang.MOLangProvider; +import com.epimorphismmc.monomorphism.registry.registrate.providers.MOLangProvider; import com.gregtechceu.gtceu.api.GTValues; @@ -13,7 +13,30 @@ import java.lang.reflect.Field; import java.util.Map; -import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.*; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_BOARD_COATED; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_BOARD_EPOXY; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_BOARD_FIBER; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_BOARD_MULTILAYER_FIBER; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_BOARD_PHENOLIC; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_BOARD_PLASTIC; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_BOARD_WETWARE; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_CIRCUIT_BOARD_ADVANCED; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_CIRCUIT_BOARD_BASIC; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_CIRCUIT_BOARD_ELITE; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_CIRCUIT_BOARD_EXTREME; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_CIRCUIT_BOARD_GOOD; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_CIRCUIT_BOARD_PLASTIC; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_CIRCUIT_BOARD_WETWARE; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_CAPACITOR; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_CAPACITOR_ADVANCED; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_DIODE; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_DIODE_ADVANCED; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_INDUCTOR; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_INDUCTOR_ADVANCED; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_RESISTOR; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_RESISTOR_ADVANCED; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_TRANSISTOR; +import static com.epimorphismmc.epimorphism.common.data.items.EPWrapItem.WRAP_SMD_TRANSISTOR_ADVANCED; public class WrapItemLang { public static void init(MOLangProvider provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/EPRecipeUtil.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/EPRecipeUtil.java index 3833052..10e9571 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/EPRecipeUtil.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/EPRecipeUtil.java @@ -10,7 +10,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.CHEMICAL_PLANT_RECIPES; @SuppressWarnings("all") public class EPRecipeUtil { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/GTRecipeManager.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/GTRecipeManager.java index 754a419..26e7327 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/GTRecipeManager.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/GTRecipeManager.java @@ -13,7 +13,9 @@ import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.ApiStatus; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Predicate; diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/ChlorineChain.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/ChlorineChain.java index b5c5cdd..a0137d6 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/ChlorineChain.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/ChlorineChain.java @@ -4,10 +4,12 @@ import java.util.function.Consumer; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.common.data.GTMaterials.*; -import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ChlorinatedSolvents; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.VA; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Chlorine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Methane; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES; public class ChlorineChain { public static void init(Consumer provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/CosmicCircuits.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/CosmicCircuits.java index 8e5f349..9c77e6a 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/CosmicCircuits.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/CosmicCircuits.java @@ -4,11 +4,59 @@ import java.util.function.Consumer; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -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.*; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.AcetylatingReagent; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Acetylene; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Anthracene; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CadmiumSulfide; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CadmiumTungstate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CaesiumIodide; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Dichlorodicyanobenzoquinone; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Dichlorodicyanohydroquinone; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Dimethylnaphthalene; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HighlyPurifiedCoalTar; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HydrogenPeroxide; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.IodineMonochloride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.IsopropylAlcohol; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.PolycyclicAromaticMixture; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.RhReNqCatalyst; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.SodiumPhosphomolybdate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.SodiumPhosphotungstate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Tetracene; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.TlTmDropedCaesiumIodide; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Trimethylchlorosilane; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.TungstenTrioxide; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.MV; +import static com.gregtechceu.gtceu.api.GTValues.VA; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; +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.common.data.GTMaterials.Bromine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Caesium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Chlorine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HydrochloricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Iodine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.MagnesiumChloride; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Methanol; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Naphthalene; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Naquadah; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Oxygen; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Propene; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rhenium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Rhodium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SulfurDioxide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Thallium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Thulium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Vanadium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Water; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.BLAST_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.DISTILLERY_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LARGE_CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES; public class CosmicCircuits { public static void init(Consumer provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/OpticalCircuitRecipeHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/OpticalCircuitRecipeHandler.java index b8f959c..7c606c5 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/OpticalCircuitRecipeHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/circuits/OpticalCircuitRecipeHandler.java @@ -8,14 +8,42 @@ import java.util.function.Consumer; -import static com.epimorphismmc.epimorphism.common.data.EPItems.*; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; -import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -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.*; +import static com.epimorphismmc.epimorphism.common.data.EPItems.NON_LINEAR_OPTICAL_LENS; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_CAPACITOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_DIODE; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_FIBER; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_RESISTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.OPTICAL_TRANSISTOR; +import static com.epimorphismmc.epimorphism.common.data.EPItems.PERIODICALLY_POLED_LITHIUM_NIOBATE_BOULE; +import static com.epimorphismmc.epimorphism.common.data.EPItems.ROTATING_TRANSPARENT_SURFACE; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CadmiumSulfide; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ErbiumDopedZBLANGlass; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.KaptonE; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.LithiumCarbonate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.LithiumNiobate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NiobiumPentoxide; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.CRYSTALLIZATION_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.LASER_CVD_RECIPES; +import static com.epimorphismmc.epimorphism.common.data.items.EPPhysicsItems.ELECTRON_SOURCE; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.L; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.VA; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.foil; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.plate; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.wireFine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.BorosilicateGlass; +import static com.gregtechceu.gtceu.common.data.GTMaterials.CarbonDioxide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Germanium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Iridium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Naquadah; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Terbium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Xenon; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.BLAST_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.LATHE_RECIPES; public class OpticalCircuitRecipeHandler { public static void init(Consumer provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/oreprocessing/NaquadahProcessing.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/oreprocessing/NaquadahProcessing.java index c066061..56b379f 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/oreprocessing/NaquadahProcessing.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/chains/oreprocessing/NaquadahProcessing.java @@ -11,12 +11,82 @@ import java.util.function.Consumer; import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.catalyst; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -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.*; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.AcidicNaquadriaCaesiumfluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CaesiumFluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.CaesiumXenontrioxideFluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ConcentrateEnrichedNaquadahMixture; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DeepIron; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DiethylhexylPhosphoricAcid; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.EnrichedNaquadahResidueSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.Ethylhexanol; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ExtractiveNaquadahOxide; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.GoldTrifluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HexafluorideEnrichedNaquadahSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.HexafluorideNaquadriaSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.ImpureNaquadahMixtureSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.LowPurityNaquadahSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NaquadahHydroxidesSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NaquadahOxideMixture; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NaquadriaCaesiumXenonnonfluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NaquadriaCaesiumfluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NaquadriaResidueSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NitrosoniumOctafluoroxenate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.NitrylFluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.PalladiumChloride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.PalladiumOnCarbon; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.PureNaquadriaMixtureSolution; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.RadonDifluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.RadonNaquadriaOctafluoride; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.RadonTrioxide; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.XenoauricFluoroantimonicAcid; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.XenonHexafluoroEnrichedNaquadate; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.XenonTrioxide; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.DIGESTER_RECIPES; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.MV; +import static com.gregtechceu.gtceu.api.GTValues.VA; +import static com.gregtechceu.gtceu.api.GTValues.VH; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.crushed; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTMaterials.AcidicNaquadriaSolution; +import static com.gregtechceu.gtceu.common.data.GTMaterials.AquaRegia; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Butane; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Butyraldehyde; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Caesium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Chlorine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.EnrichedNaquadahSolution; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Fluorine; +import static com.gregtechceu.gtceu.common.data.GTMaterials.FluoroantimonicAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Gold; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HydrochloricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HydrofluoricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Hydrogen; +import static com.gregtechceu.gtceu.common.data.GTMaterials.ImpureEnrichedNaquadahSolution; +import static com.gregtechceu.gtceu.common.data.GTMaterials.IndiumPhosphide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Naquadah; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NaquadriaSolution; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NaquadriaSulfate; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NaquadriaWaste; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NitricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NitrogenDioxide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Oxygen; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Palladium; +import static com.gregtechceu.gtceu.common.data.GTMaterials.PhosphorusPentoxide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Radon; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SodiumHydroxide; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Sulfur; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SulfuricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.TitaniumTrifluoride; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Water; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Xenon; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CENTRIFUGE_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CHEMICAL_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ELECTROLYZER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES; /** * Naquadah Processing diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/BouleRecipeHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/BouleRecipeHandler.java index cf04546..00131bb 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/BouleRecipeHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/BouleRecipeHandler.java @@ -23,14 +23,19 @@ import javax.annotation.Nonnull; -import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.*; -import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.*; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -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.*; +import static com.epimorphismmc.epimorphism.api.data.chemical.material.info.EPMaterialFlags.DISABLE_CRYSTALLIZATION; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.boule; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.seedCrystal; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.CRYSTALLIZATION_RECIPES; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.VA; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.CRYSTALLIZABLE; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.gem; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.gemExquisite; +import static com.gregtechceu.gtceu.common.data.GTMaterials.DistilledWater; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.AUTOCLAVE_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CUTTER_RECIPES; /** * 人造宝石相关配方 diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/ComponentAsslineRecipeHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/ComponentAsslineRecipeHandler.java index c8b20c1..4497bf3 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/ComponentAsslineRecipeHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/ComponentAsslineRecipeHandler.java @@ -3,8 +3,6 @@ import com.epimorphismmc.epimorphism.common.data.items.EPWrapItem; import com.epimorphismmc.epimorphism.common.recipe.TierCasingCondition; -import com.epimorphismmc.monomorphism.recipe.MORecipeHelper; - import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; @@ -13,6 +11,7 @@ import com.gregtechceu.gtceu.api.data.chemical.material.stack.UnificationEntry; import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.item.MaterialPipeBlockItem; +import com.gregtechceu.gtceu.api.recipe.RecipeHelper; import com.gregtechceu.gtceu.api.recipe.content.Content; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient; import com.gregtechceu.gtceu.api.recipe.ingredient.IntCircuitIngredient; @@ -34,19 +33,42 @@ import net.minecraft.world.level.material.Fluids; import net.minecraftforge.registries.ForgeRegistries; -import it.unimi.dsi.fastutil.objects.*; +import it.unimi.dsi.fastutil.objects.AbstractObject2IntMap; +import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import lombok.Data; import lombok.experimental.Accessors; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; -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.data.recipe.CraftingComponent.*; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.COMPONENT_ASSEMBLY_LINE_RECIPES; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_DENSE; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_GEAR; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.GENERATE_LONG_ROD; +import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.IS_MAGNETIC; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.cableGtHex; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.gear; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.gearSmall; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.plate; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.plateDense; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.rod; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.rodLong; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.wireGtHex; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.CONVEYOR; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.EMITTER; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.FIELD_GENERATOR; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.MOTOR; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.PISTON; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.PUMP; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.ROBOT_ARM; +import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.SENSOR; /** * 部件装配线相关配方 @@ -69,7 +91,7 @@ public class ComponentAsslineRecipeHandler { public static void init(GTRecipeBuilder recipeBuilder) { initializeGTItems(); - var outputItems = MORecipeHelper.getOutputItem(recipeBuilder); + var outputItems = RecipeHelper.getOutputItems(recipeBuilder); if (outputItems.isEmpty()) return; var item = outputItems.get(0).getItem(); diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/GTRecipeHandlerManager.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/GTRecipeHandlerManager.java index 6ea2591..024f086 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/GTRecipeHandlerManager.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/GTRecipeHandlerManager.java @@ -4,7 +4,11 @@ import com.epimorphismmc.epimorphism.common.machine.multiblock.part.IntakeHatchPartMachine; import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.ROCKET_ENGINE_FUELS; -import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.COMBUSTION_GENERATOR_FUELS; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.GAS_COLLECTOR_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.GAS_TURBINE_FUELS; public class GTRecipeHandlerManager { public static void register(GTRecipeEvent.RegisterHandler event) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/PartsRecipeHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/PartsRecipeHandler.java index 54b8fc0..6de586b 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/PartsRecipeHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/PartsRecipeHandler.java @@ -11,13 +11,16 @@ import java.util.function.Consumer; -import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.*; -import static com.epimorphismmc.epimorphism.common.data.EPItems.*; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.catalyst; +import static com.epimorphismmc.epimorphism.api.data.tag.EPTagPrefix.laserEmitter; +import static com.epimorphismmc.epimorphism.common.data.EPItems.EMPTY_GAS_LASER_EMITTER; import static com.epimorphismmc.epimorphism.common.data.items.EPChemistryItem.CATALYST_CARRIER; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys.*; -import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import static com.gregtechceu.gtceu.api.GTValues.HV; +import static com.gregtechceu.gtceu.api.GTValues.VA; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys.GAS; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.CANNER_RECIPES; /** * 零件相关配方 diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/UniversalChemicalFuelHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/UniversalChemicalFuelHandler.java index 0e0b40d..12a3a8d 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/UniversalChemicalFuelHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/handler/UniversalChemicalFuelHandler.java @@ -7,7 +7,8 @@ import java.util.function.Consumer; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.ROCKET_ENGINE_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.UNIVERSAL_CHEMICAL_FUELS; /** * 通用化学燃料相关配方 diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/machine/multi/SteamMachineHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/machine/multi/SteamMachineHandler.java index be4d660..ed86c20 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/machine/multi/SteamMachineHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/machine/multi/SteamMachineHandler.java @@ -11,10 +11,17 @@ import java.util.function.Consumer; -import static com.epimorphismmc.epimorphism.common.data.EPMachines.*; -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.epimorphismmc.epimorphism.common.data.EPMachines.STEAM_FOUNDRY; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.STEAM_PRESSOR; +import static com.epimorphismmc.epimorphism.common.data.EPMachines.STEAM_SEPARATOR; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.gear; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.rotor; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_BRONZE_BRICKS; +import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_SOLID; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Brass; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Cupronickel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Steel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.TinAlloy; public class SteamMachineHandler { diff --git a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/misc/FuelRecipeHandler.java b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/misc/FuelRecipeHandler.java index 169a014..5d574f8 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/data/recipe/misc/FuelRecipeHandler.java +++ b/src/main/java/com/epimorphismmc/epimorphism/data/recipe/misc/FuelRecipeHandler.java @@ -7,10 +7,44 @@ import java.util.function.Consumer; -import static com.epimorphismmc.epimorphism.common.data.EPMaterials.*; -import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.*; -import static com.gregtechceu.gtceu.api.GTValues.*; -import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.DenseHydrazineMixtureFuel; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.MethylhydrazineNitrateRocketFuel; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.RP1RocketFuel; +import static com.epimorphismmc.epimorphism.common.data.EPMaterials.UDMHRocketFuel; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.ACIDIC_FUEL_CELL_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.NAQUADAH_REACTOR_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.ROCKET_ENGINE_FUELS; +import static com.epimorphismmc.epimorphism.common.data.EPRecipeTypes.SEMILIQUID_GENERATOR_FUELS; +import static com.gregtechceu.gtceu.api.GTValues.EV; +import static com.gregtechceu.gtceu.api.GTValues.IV; +import static com.gregtechceu.gtceu.api.GTValues.LV; +import static com.gregtechceu.gtceu.api.GTValues.LuV; +import static com.gregtechceu.gtceu.api.GTValues.UV; +import static com.gregtechceu.gtceu.api.GTValues.V; +import static com.gregtechceu.gtceu.api.GTValues.ZPM; +import static com.gregtechceu.gtceu.common.data.GTMaterials.AceticAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Biomass; +import static com.gregtechceu.gtceu.common.data.GTMaterials.CoalTar; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Creosote; +import static com.gregtechceu.gtceu.common.data.GTMaterials.DilutedHydrochloricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.DilutedSulfuricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.FishOil; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Glycerol; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HeavyFuel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HydrochloricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HydrofluoricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Hydrogen; +import static com.gregtechceu.gtceu.common.data.GTMaterials.HypochlorousAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.NitricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Oil; +import static com.gregtechceu.gtceu.common.data.GTMaterials.OilHeavy; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Oxygen; +import static com.gregtechceu.gtceu.common.data.GTMaterials.PhosphoricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SeedOil; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SulfuricAcid; +import static com.gregtechceu.gtceu.common.data.GTMaterials.SulfuricHeavyFuel; +import static com.gregtechceu.gtceu.common.data.GTMaterials.Water; +import static com.gregtechceu.gtceu.common.data.GTMaterials.WoodTar; public class FuelRecipeHandler { public static void init(Consumer provider) { diff --git a/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/MEPartMachine.java b/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/MEPartMachine.java index 4cea6bd..72ca7ad 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/MEPartMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/MEPartMachine.java @@ -1,6 +1,9 @@ package com.epimorphismmc.epimorphism.integration.ae2.machine; -import appeng.api.networking.*; +import appeng.api.networking.GridFlags; +import appeng.api.networking.IGrid; +import appeng.api.networking.IInWorldGridNodeHost; +import appeng.api.networking.IManagedGridNode; import appeng.api.networking.security.IActionSource; import appeng.me.helpers.BlockEntityNodeListener; import appeng.me.helpers.IGridConnectedBlockEntity; diff --git a/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/TankAccessHatchMachine.java b/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/TankAccessHatchMachine.java index c585a91..23d1818 100644 --- a/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/TankAccessHatchMachine.java +++ b/src/main/java/com/epimorphismmc/epimorphism/integration/ae2/machine/TankAccessHatchMachine.java @@ -5,7 +5,11 @@ import com.epimorphismmc.epimorphism.utils.EPFluidUtil; import appeng.api.config.Actionable; -import appeng.api.stacks.*; +import appeng.api.stacks.AEFluidKey; +import appeng.api.stacks.AEKey; +import appeng.api.stacks.AEKeyType; +import appeng.api.stacks.GenericStack; +import appeng.api.stacks.KeyCounter; import appeng.api.storage.IStorageMounts; import appeng.api.storage.IStorageProvider; import appeng.me.storage.ExternalStorageFacade;