From 626685a6803890504385fccd918c99e4c610c71c Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Sun, 10 Sep 2023 15:59:45 -0400 Subject: [PATCH] enable spotless formatting --- gradle.properties | 2 +- spotless.importorder | 8 + .../multiblocks/GregicalityMultiblocks.java | 25 ++- .../multiblocks/api/AlloyBlastUtil.java | 11 +- .../impl/GCYMMultiblockRecipeLogic.java | 17 +- .../api/fluids/GCYMMetaFluids.java | 26 +-- .../api/fluids/fluidType/FluidTypeMolten.java | 7 +- .../api/fluids/fluidType/GCYMFluidTypes.java | 3 +- .../metatileentity/GCYMMultiblockAbility.java | 3 +- .../GCYMRecipeMapMultiblockController.java | 43 +++-- .../api/recipes/GCYMRecipeMaps.java | 17 +- .../alloyblast/AlloyBlastRecipeProducer.java | 19 +- .../CustomAlloyBlastRecipeProducer.java | 7 +- .../multiblocks/api/render/GCYMTextures.java | 11 +- .../unification/GCYMFirstDegreeMaterials.java | 10 +- .../unification/GCYMMaterialFlagAddition.java | 7 +- .../api/unification/GCYMMaterials.java | 1 - .../GCYMSecondDegreeMaterials.java | 10 +- .../properties/AlloyBlastProperty.java | 12 +- .../properties/GCYMLatePropertyAddition.java | 8 +- .../properties/GCYMPropertyKey.java | 3 +- .../multiblocks/api/utils/GCYMLog.java | 1 - .../multiblocks/common/ClientProxy.java | 11 +- .../multiblocks/common/CommonProxy.java | 21 +- .../multiblocks/common/GCYMConfigHolder.java | 6 +- .../multiblocks/common/GCYMEventHandlers.java | 12 +- .../common/block/GCYMMetaBlocks.java | 14 +- .../blocks/BlockLargeMultiblockCasing.java | 7 +- .../block/blocks/BlockUniqueCasing.java | 11 +- .../GCYMMetaTileEntities.java | 50 +++-- .../generator/MetaTileEntitySteamEngine.java | 30 +-- .../MetaTileEntityAlloyBlastSmelter.java | 70 ++++--- ...TileEntityElectricImplosionCompressor.java | 15 +- .../MetaTileEntityLargeArcFurnace.java | 22 ++- .../MetaTileEntityLargeAssembler.java | 29 +-- .../MetaTileEntityLargeAutoclave.java | 17 +- .../standard/MetaTileEntityLargeBender.java | 24 ++- .../standard/MetaTileEntityLargeBrewery.java | 29 +-- .../MetaTileEntityLargeCentrifuge.java | 25 ++- .../MetaTileEntityLargeChemicalBath.java | 26 ++- .../MetaTileEntityLargeCircuitAssembler.java | 19 +- .../standard/MetaTileEntityLargeCutter.java | 29 +-- .../MetaTileEntityLargeDistillery.java | 64 ++++--- .../MetaTileEntityLargeElectrolyzer.java | 22 ++- .../standard/MetaTileEntityLargeEngraver.java | 17 +- .../MetaTileEntityLargeExtractor.java | 21 +- .../standard/MetaTileEntityLargeExtruder.java | 20 +- .../MetaTileEntityLargeMacerator.java | 19 +- .../MetaTileEntityLargeMassFabricator.java | 20 +- .../standard/MetaTileEntityLargeMixer.java | 19 +- .../standard/MetaTileEntityLargePackager.java | 13 +- .../MetaTileEntityLargePolarizer.java | 25 ++- .../MetaTileEntityLargeReplicator.java | 19 +- .../standard/MetaTileEntityLargeSifter.java | 32 ++-- .../MetaTileEntityLargeSolidifier.java | 19 +- .../standard/MetaTileEntityLargeWiremill.java | 22 ++- .../MetaTileEntityMegaBlastFurnace.java | 131 +++++++++---- .../MetaTileEntityMegaVacuumFreezer.java | 35 ++-- .../MetaTileEntityParallelHatch.java | 58 +++--- .../MetaTileEntityTieredHatch.java | 39 ++-- .../loaders/recipe/GCYMCasingLoader.java | 179 ++++++++++++++---- .../recipe/GCYMMetaTileEntityLoader.java | 86 +++++---- .../loaders/recipe/GCYMMiscRecipes.java | 6 +- .../loaders/recipe/GCYMMixerRecipes.java | 6 +- .../loaders/recipe/ManualABSRecipes.java | 6 +- .../handlers/GCYMMaterialRecipeHandler.java | 13 +- .../gregicality/multiblocks/Bootstrap.java | 41 ++-- .../api/material/AlloyBlastTest.java | 20 +- 68 files changed, 1027 insertions(+), 643 deletions(-) create mode 100644 spotless.importorder diff --git a/gradle.properties b/gradle.properties index 72565eda..06e2f2f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -142,7 +142,7 @@ customMavenPublishUrl = # By default this will use the files found here: https://github.com/GregTechCEu/Buildscripts/tree/master/spotless # to format your code. However, you can create your own version of these files and place them in your project's # root directory to apply your own formatting options instead. -enableSpotless = false +enableSpotless = true # Enable JUnit testing platform used for testing your code. # Uses JUnit 5. See guide and documentation here: https://junit.org/junit5/docs/current/user-guide/ diff --git a/spotless.importorder b/spotless.importorder new file mode 100644 index 00000000..a7d66410 --- /dev/null +++ b/spotless.importorder @@ -0,0 +1,8 @@ +#Organize Import Order +0=java +1=javax +2=net +3=org +4=com +5=gregtech +6=gregicality diff --git a/src/main/java/gregicality/multiblocks/GregicalityMultiblocks.java b/src/main/java/gregicality/multiblocks/GregicalityMultiblocks.java index c9d32239..3432c14c 100644 --- a/src/main/java/gregicality/multiblocks/GregicalityMultiblocks.java +++ b/src/main/java/gregicality/multiblocks/GregicalityMultiblocks.java @@ -1,28 +1,33 @@ package gregicality.multiblocks; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +import org.jetbrains.annotations.NotNull; + +import gregtech.GTInternalTags; + import gregicality.GCYMInternalTags; import gregicality.multiblocks.api.fluids.GCYMMetaFluids; import gregicality.multiblocks.api.utils.GCYMLog; import gregicality.multiblocks.common.CommonProxy; import gregicality.multiblocks.common.block.GCYMMetaBlocks; import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; -import gregtech.GTInternalTags; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import org.jetbrains.annotations.NotNull; -@Mod( modid = GregicalityMultiblocks.MODID, - name = GregicalityMultiblocks.NAME, - version = GregicalityMultiblocks.VERSION, - dependencies = GTInternalTags.DEP_VERSION_STRING) +@Mod(modid = GregicalityMultiblocks.MODID, + name = GregicalityMultiblocks.NAME, + version = GregicalityMultiblocks.VERSION, + dependencies = GTInternalTags.DEP_VERSION_STRING) public class GregicalityMultiblocks { public static final String MODID = "gcym"; public static final String NAME = "Gregicality Multiblocks"; public static final String VERSION = GCYMInternalTags.VERSION; - @SidedProxy(modId = MODID, clientSide = "gregicality.multiblocks.common.ClientProxy", serverSide = "gregicality.multiblocks.common.CommonProxy") + @SidedProxy(modId = MODID, + clientSide = "gregicality.multiblocks.common.ClientProxy", + serverSide = "gregicality.multiblocks.common.CommonProxy") public static CommonProxy proxy; @Mod.EventHandler diff --git a/src/main/java/gregicality/multiblocks/api/AlloyBlastUtil.java b/src/main/java/gregicality/multiblocks/api/AlloyBlastUtil.java index ac8cf50b..ca855bce 100644 --- a/src/main/java/gregicality/multiblocks/api/AlloyBlastUtil.java +++ b/src/main/java/gregicality/multiblocks/api/AlloyBlastUtil.java @@ -1,13 +1,16 @@ package gregicality.multiblocks.api; -import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.properties.PropertyKey; -import gregtech.api.unification.ore.OrePrefix; import net.minecraftforge.fluids.Fluid; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import gregtech.api.unification.material.Material; +import gregtech.api.unification.material.properties.PropertyKey; +import gregtech.api.unification.ore.OrePrefix; + +import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; + public final class AlloyBlastUtil { private AlloyBlastUtil() {} diff --git a/src/main/java/gregicality/multiblocks/api/capability/impl/GCYMMultiblockRecipeLogic.java b/src/main/java/gregicality/multiblocks/api/capability/impl/GCYMMultiblockRecipeLogic.java index 4902d00f..bef09b8f 100644 --- a/src/main/java/gregicality/multiblocks/api/capability/impl/GCYMMultiblockRecipeLogic.java +++ b/src/main/java/gregicality/multiblocks/api/capability/impl/GCYMMultiblockRecipeLogic.java @@ -1,16 +1,18 @@ package gregicality.multiblocks.api.capability.impl; -import gregicality.multiblocks.api.capability.IParallelMultiblock; -import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.common.GCYMConfigHolder; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.GTValues; import gregtech.api.capability.impl.MultiblockRecipeLogic; import gregtech.api.metatileentity.ITieredMetaTileEntity; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; -import org.jetbrains.annotations.NotNull; -import java.util.List; +import gregicality.multiblocks.api.capability.IParallelMultiblock; +import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.common.GCYMConfigHolder; public class GCYMMultiblockRecipeLogic extends MultiblockRecipeLogic { @@ -36,7 +38,8 @@ protected long getMaxVoltage() { if (!GCYMConfigHolder.globalMultiblocks.enableTieredCasings) return super.getMaxVoltage(); - if (getMetaTileEntity() instanceof GCYMRecipeMapMultiblockController && !((GCYMRecipeMapMultiblockController) getMetaTileEntity()).isTiered()) + if (getMetaTileEntity() instanceof GCYMRecipeMapMultiblockController && + !((GCYMRecipeMapMultiblockController) getMetaTileEntity()).isTiered()) return super.getMaxVoltage(); List list = getMetaTileEntity().getAbilities(GCYMMultiblockAbility.TIERED_HATCH); diff --git a/src/main/java/gregicality/multiblocks/api/fluids/GCYMMetaFluids.java b/src/main/java/gregicality/multiblocks/api/fluids/GCYMMetaFluids.java index 94f29002..42073216 100644 --- a/src/main/java/gregicality/multiblocks/api/fluids/GCYMMetaFluids.java +++ b/src/main/java/gregicality/multiblocks/api/fluids/GCYMMetaFluids.java @@ -1,23 +1,27 @@ package gregicality.multiblocks.api.fluids; -import gregicality.multiblocks.GregicalityMultiblocks; -import gregicality.multiblocks.api.fluids.fluidType.GCYMFluidTypes; -import gregicality.multiblocks.api.unification.GCYMMaterialFlags; -import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty; -import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; +import java.util.Collection; + +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.GregTechAPI; import gregtech.api.fluids.MetaFluids; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.properties.BlastProperty; import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.OrePrefix; -import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.Fluid; -import org.jetbrains.annotations.NotNull; -import java.util.Collection; +import gregicality.multiblocks.GregicalityMultiblocks; +import gregicality.multiblocks.api.fluids.fluidType.GCYMFluidTypes; +import gregicality.multiblocks.api.unification.GCYMMaterialFlags; +import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty; +import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; + +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; public final class GCYMMetaFluids { diff --git a/src/main/java/gregicality/multiblocks/api/fluids/fluidType/FluidTypeMolten.java b/src/main/java/gregicality/multiblocks/api/fluids/fluidType/FluidTypeMolten.java index cb4791b6..fe893e57 100644 --- a/src/main/java/gregicality/multiblocks/api/fluids/fluidType/FluidTypeMolten.java +++ b/src/main/java/gregicality/multiblocks/api/fluids/fluidType/FluidTypeMolten.java @@ -1,13 +1,16 @@ package gregicality.multiblocks.api.fluids.fluidType; -import gregtech.api.fluids.fluidType.FluidTypeLiquid; import net.minecraftforge.fluids.Fluid; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import gregtech.api.fluids.fluidType.FluidTypeLiquid; + public class FluidTypeMolten extends FluidTypeLiquid { - public FluidTypeMolten(@NotNull String name, @Nullable String prefix, @Nullable String suffix, @NotNull String localization) { + public FluidTypeMolten(@NotNull String name, @Nullable String prefix, @Nullable String suffix, + @NotNull String localization) { super(name, prefix, suffix, localization); } diff --git a/src/main/java/gregicality/multiblocks/api/fluids/fluidType/GCYMFluidTypes.java b/src/main/java/gregicality/multiblocks/api/fluids/fluidType/GCYMFluidTypes.java index 1a67568a..2a6e5dde 100644 --- a/src/main/java/gregicality/multiblocks/api/fluids/fluidType/GCYMFluidTypes.java +++ b/src/main/java/gregicality/multiblocks/api/fluids/fluidType/GCYMFluidTypes.java @@ -1,7 +1,8 @@ package gregicality.multiblocks.api.fluids.fluidType; -import crafttweaker.annotations.ZenRegister; import gregtech.api.fluids.fluidType.FluidType; + +import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMMultiblockAbility.java b/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMMultiblockAbility.java index bb7898a8..eedf12a0 100644 --- a/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMMultiblockAbility.java +++ b/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMMultiblockAbility.java @@ -1,9 +1,10 @@ package gregicality.multiblocks.api.metatileentity; -import gregicality.multiblocks.api.capability.IParallelHatch; import gregtech.api.metatileentity.ITieredMetaTileEntity; import gregtech.api.metatileentity.multiblock.MultiblockAbility; +import gregicality.multiblocks.api.capability.IParallelHatch; + @SuppressWarnings("InstantiationOfUtilityClass") public final class GCYMMultiblockAbility { diff --git a/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMRecipeMapMultiblockController.java b/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMRecipeMapMultiblockController.java index e113da4f..b7e30791 100644 --- a/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMRecipeMapMultiblockController.java +++ b/src/main/java/gregicality/multiblocks/api/metatileentity/GCYMRecipeMapMultiblockController.java @@ -1,28 +1,32 @@ package gregicality.multiblocks.api.metatileentity; -import gregicality.multiblocks.api.capability.IParallelMultiblock; -import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; -import gregicality.multiblocks.common.GCYMConfigHolder; -import gregtech.api.GTValues; -import gregtech.api.metatileentity.ITieredMetaTileEntity; -import gregtech.api.metatileentity.multiblock.MultiMapMultiblockController; -import gregtech.api.pattern.TraceabilityPredicate; -import gregtech.api.recipes.RecipeMap; +import java.util.List; + import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; +import gregtech.api.GTValues; +import gregtech.api.metatileentity.ITieredMetaTileEntity; +import gregtech.api.metatileentity.multiblock.MultiMapMultiblockController; +import gregtech.api.pattern.TraceabilityPredicate; +import gregtech.api.recipes.RecipeMap; + +import gregicality.multiblocks.api.capability.IParallelMultiblock; +import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; +import gregicality.multiblocks.common.GCYMConfigHolder; -public abstract class GCYMRecipeMapMultiblockController extends MultiMapMultiblockController implements IParallelMultiblock { +public abstract class GCYMRecipeMapMultiblockController extends MultiMapMultiblockController + implements IParallelMultiblock { public GCYMRecipeMapMultiblockController(ResourceLocation metaTileEntityId, RecipeMap recipeMap) { - this(metaTileEntityId, new RecipeMap[]{recipeMap}); + this(metaTileEntityId, new RecipeMap[] { recipeMap }); } public GCYMRecipeMapMultiblockController(ResourceLocation metaTileEntityId, RecipeMap[] recipeMaps) { @@ -44,7 +48,8 @@ protected void addDisplayText(List textList) { super.addDisplayText(textList); List list = getAbilities(GCYMMultiblockAbility.TIERED_HATCH); if (GCYMConfigHolder.globalMultiblocks.enableTieredCasings && !list.isEmpty()) { - long maxVoltage = Math.min(GTValues.V[list.get(0).getTier()], Math.max(energyContainer.getInputVoltage(), energyContainer.getOutputVoltage())); + long maxVoltage = Math.min(GTValues.V[list.get(0).getTier()], + Math.max(energyContainer.getInputVoltage(), energyContainer.getOutputVoltage())); String voltageName = GTValues.VNF[list.get(0).getTier()]; textList.add(new TextComponentTranslation("gcym.multiblock.tiered_hatch.tooltip", maxVoltage, voltageName)); } @@ -66,14 +71,20 @@ public boolean isTiered() { } @Override - public TraceabilityPredicate autoAbilities(boolean checkEnergyIn, boolean checkMaintenance, boolean checkItemIn, boolean checkItemOut, boolean checkFluidIn, boolean checkFluidOut, boolean checkMuffler) { - TraceabilityPredicate predicate = super.autoAbilities(checkEnergyIn, checkMaintenance, checkItemIn, checkItemOut, checkFluidIn, checkFluidOut, checkMuffler); + public TraceabilityPredicate autoAbilities(boolean checkEnergyIn, boolean checkMaintenance, boolean checkItemIn, + boolean checkItemOut, boolean checkFluidIn, boolean checkFluidOut, + boolean checkMuffler) { + TraceabilityPredicate predicate = super.autoAbilities(checkEnergyIn, checkMaintenance, checkItemIn, + checkItemOut, checkFluidIn, checkFluidOut, checkMuffler); if (isParallel()) - predicate = predicate.or(abilities(GCYMMultiblockAbility.PARALLEL_HATCH).setMaxGlobalLimited(1).setPreviewCount(1)); + predicate = predicate + .or(abilities(GCYMMultiblockAbility.PARALLEL_HATCH).setMaxGlobalLimited(1).setPreviewCount(1)); return predicate; } public static @NotNull TraceabilityPredicate tieredCasing() { - return new TraceabilityPredicate(abilities(GCYMMultiblockAbility.TIERED_HATCH).setMinGlobalLimited(GCYMConfigHolder.globalMultiblocks.enableTieredCasings ? 1 : 0).setMaxGlobalLimited(1)); + return new TraceabilityPredicate(abilities(GCYMMultiblockAbility.TIERED_HATCH) + .setMinGlobalLimited(GCYMConfigHolder.globalMultiblocks.enableTieredCasings ? 1 : 0) + .setMaxGlobalLimited(1)); } } diff --git a/src/main/java/gregicality/multiblocks/api/recipes/GCYMRecipeMaps.java b/src/main/java/gregicality/multiblocks/api/recipes/GCYMRecipeMaps.java index 832ed818..8f9d3593 100644 --- a/src/main/java/gregicality/multiblocks/api/recipes/GCYMRecipeMaps.java +++ b/src/main/java/gregicality/multiblocks/api/recipes/GCYMRecipeMaps.java @@ -7,14 +7,15 @@ public final class GCYMRecipeMaps { - public static final RecipeMap ALLOY_BLAST_RECIPES = new RecipeMap<>("alloy_blast_smelter", 9, 0, 3, 1, new BlastRecipeBuilder(), false) - .setSlotOverlay(false, false, false, GuiTextures.FURNACE_OVERLAY_1) - .setSlotOverlay(false, false, true, GuiTextures.FURNACE_OVERLAY_1) - .setSlotOverlay(false, true, false, GuiTextures.FURNACE_OVERLAY_2) - .setSlotOverlay(false, true, true, GuiTextures.FURNACE_OVERLAY_2) - .setSlotOverlay(true, true, false, GuiTextures.FURNACE_OVERLAY_2) - .setSlotOverlay(true, true, true, GuiTextures.FURNACE_OVERLAY_2) - .setSound(GTSoundEvents.FURNACE); + public static final RecipeMap ALLOY_BLAST_RECIPES = new RecipeMap<>("alloy_blast_smelter", 9, 0, + 3, 1, new BlastRecipeBuilder(), false) + .setSlotOverlay(false, false, false, GuiTextures.FURNACE_OVERLAY_1) + .setSlotOverlay(false, false, true, GuiTextures.FURNACE_OVERLAY_1) + .setSlotOverlay(false, true, false, GuiTextures.FURNACE_OVERLAY_2) + .setSlotOverlay(false, true, true, GuiTextures.FURNACE_OVERLAY_2) + .setSlotOverlay(true, true, false, GuiTextures.FURNACE_OVERLAY_2) + .setSlotOverlay(true, true, true, GuiTextures.FURNACE_OVERLAY_2) + .setSound(GTSoundEvents.FURNACE); private GCYMRecipeMaps() {} } diff --git a/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/AlloyBlastRecipeProducer.java b/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/AlloyBlastRecipeProducer.java index 4030d435..73735ad1 100644 --- a/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/AlloyBlastRecipeProducer.java +++ b/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/AlloyBlastRecipeProducer.java @@ -1,8 +1,10 @@ package gregicality.multiblocks.api.recipes.alloyblast; -import gregicality.multiblocks.api.AlloyBlastUtil; -import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import gregicality.multiblocks.api.unification.GCYMMaterialFlags; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.GTValues; import gregtech.api.recipes.RecipeBuilder; import gregtech.api.recipes.RecipeMaps; @@ -16,9 +18,10 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.MetaItems; import gregtech.loaders.recipe.CraftingComponent; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.AlloyBlastUtil; +import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; +import gregicality.multiblocks.api.unification.GCYMMaterialFlags; public class AlloyBlastRecipeProducer { @@ -114,7 +117,8 @@ protected int addInputs(@NotNull Material material, @NotNull RecipeBuilder builder) { // add the fluid output with the correct amount builder.fluidOutputs(new FluidStack(molten, GTValues.L * outputAmount)); @@ -163,7 +167,6 @@ protected int getGasCircuitNum(int componentAmount) { */ @SuppressWarnings("MethodMayBeStatic") protected void addFreezerRecipes(@NotNull Material material, @NotNull Fluid molten, int temperature) { - // build the freezer recipe RecipeBuilder freezerBuilder = RecipeMaps.VACUUM_RECIPES.recipeBuilder() .fluidInputs(new FluidStack(molten, GTValues.L)) diff --git a/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/CustomAlloyBlastRecipeProducer.java b/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/CustomAlloyBlastRecipeProducer.java index cb2df12b..5265eae2 100644 --- a/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/CustomAlloyBlastRecipeProducer.java +++ b/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/CustomAlloyBlastRecipeProducer.java @@ -1,10 +1,12 @@ package gregicality.multiblocks.api.recipes.alloyblast; +import org.jetbrains.annotations.NotNull; + import com.google.common.base.Preconditions; + import gregtech.api.recipes.RecipeBuilder; import gregtech.api.recipes.builders.BlastRecipeBuilder; import gregtech.api.unification.material.Material; -import org.jetbrains.annotations.NotNull; public class CustomAlloyBlastRecipeProducer extends AlloyBlastRecipeProducer { @@ -15,7 +17,8 @@ public class CustomAlloyBlastRecipeProducer extends AlloyBlastRecipeProducer { /** * @param circuitNum the custom circuit number to use * @param gasCircuitNum the custom gas circuit number to use - * @param outputAmount the custom output amount in quantities of {@link gregtech.api.unification.ore.OrePrefix#ingot} + * @param outputAmount the custom output amount in quantities of + * {@link gregtech.api.unification.ore.OrePrefix#ingot} * / {@link gregtech.api.GTValues#M}) to use */ public CustomAlloyBlastRecipeProducer(int circuitNum, int gasCircuitNum, int outputAmount) { diff --git a/src/main/java/gregicality/multiblocks/api/render/GCYMTextures.java b/src/main/java/gregicality/multiblocks/api/render/GCYMTextures.java index 5303ac4f..c3a286ce 100644 --- a/src/main/java/gregicality/multiblocks/api/render/GCYMTextures.java +++ b/src/main/java/gregicality/multiblocks/api/render/GCYMTextures.java @@ -1,11 +1,13 @@ package gregicality.multiblocks.api.render; -import gregicality.multiblocks.GregicalityMultiblocks; -import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; -import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; +import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; +import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer; + +import gregicality.multiblocks.GregicalityMultiblocks; + @Mod.EventBusSubscriber(modid = GregicalityMultiblocks.MODID, value = Side.CLIENT) public final class GCYMTextures { @@ -40,7 +42,6 @@ public final class GCYMTextures { public static OrientedOverlayRenderer MEGA_VACUUM_FREEZER_OVERLAY; public static OrientedOverlayRenderer STEAM_ENGINE_OVERLAY; - // Hatches public static OrientedOverlayRenderer PARALLEL_HATCH_MK1_OVERLAY; public static OrientedOverlayRenderer PARALLEL_HATCH_MK2_OVERLAY; @@ -48,7 +49,6 @@ public final class GCYMTextures { public static OrientedOverlayRenderer PARALLEL_HATCH_MK4_OVERLAY; public static OrientedOverlayRenderer TIERED_HATCH_OVERLAY; - // Casings public static SimpleOverlayRenderer MACERATOR_CASING; public static SimpleOverlayRenderer BLAST_CASING; @@ -66,7 +66,6 @@ public final class GCYMTextures { private GCYMTextures() {} - public static void preInit() { // Multiblock Controllers LARGE_MACERATOR_OVERLAY = new OrientedOverlayRenderer("multiblock/large_macerator"); diff --git a/src/main/java/gregicality/multiblocks/api/unification/GCYMFirstDegreeMaterials.java b/src/main/java/gregicality/multiblocks/api/unification/GCYMFirstDegreeMaterials.java index 1d46910e..b6b8bf53 100644 --- a/src/main/java/gregicality/multiblocks/api/unification/GCYMFirstDegreeMaterials.java +++ b/src/main/java/gregicality/multiblocks/api/unification/GCYMFirstDegreeMaterials.java @@ -1,15 +1,15 @@ package gregicality.multiblocks.api.unification; -import gregtech.api.GTValues; -import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.info.MaterialIconSet; -import gregtech.api.unification.material.properties.BlastProperty; - import static gregicality.multiblocks.api.unification.GCYMMaterials.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; import static gregtech.api.util.GTUtility.gregtechId; +import gregtech.api.GTValues; +import gregtech.api.unification.material.Material; +import gregtech.api.unification.material.info.MaterialIconSet; +import gregtech.api.unification.material.properties.BlastProperty; + public final class GCYMFirstDegreeMaterials { private GCYMFirstDegreeMaterials() {} diff --git a/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterialFlagAddition.java b/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterialFlagAddition.java index 5101a619..79d75e7b 100644 --- a/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterialFlagAddition.java +++ b/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterialFlagAddition.java @@ -1,17 +1,17 @@ package gregicality.multiblocks.api.unification; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.material.info.MaterialFlags; + import gregicality.multiblocks.api.recipes.alloyblast.CustomAlloyBlastRecipeProducer; import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.material.info.MaterialFlags; public final class GCYMMaterialFlagAddition { private GCYMMaterialFlagAddition() {} public static void init() { - // Frames Materials.TungstenCarbide.addFlags(MaterialFlags.GENERATE_FRAME); Materials.Tungsten.addFlags(MaterialFlags.GENERATE_FRAME); @@ -34,7 +34,6 @@ public static void init() { // Foils Materials.Graphene.addFlags(MaterialFlags.GENERATE_FOIL); - } public static void initLate() { diff --git a/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterials.java b/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterials.java index 95016eac..b2e6a791 100644 --- a/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterials.java +++ b/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterials.java @@ -31,7 +31,6 @@ private GCYMMaterials() {} * High Degree Materials 3040-3059 */ - /* * Gregicality: 3000-19999 */ diff --git a/src/main/java/gregicality/multiblocks/api/unification/GCYMSecondDegreeMaterials.java b/src/main/java/gregicality/multiblocks/api/unification/GCYMSecondDegreeMaterials.java index 8bf49e41..0d0c9eff 100644 --- a/src/main/java/gregicality/multiblocks/api/unification/GCYMSecondDegreeMaterials.java +++ b/src/main/java/gregicality/multiblocks/api/unification/GCYMSecondDegreeMaterials.java @@ -1,15 +1,15 @@ package gregicality.multiblocks.api.unification; -import gregtech.api.GTValues; -import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.info.MaterialIconSet; -import gregtech.api.unification.material.properties.BlastProperty; - import static gregicality.multiblocks.api.unification.GCYMMaterials.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; import static gregtech.api.util.GTUtility.gregtechId; +import gregtech.api.GTValues; +import gregtech.api.unification.material.Material; +import gregtech.api.unification.material.info.MaterialIconSet; +import gregtech.api.unification.material.properties.BlastProperty; + public final class GCYMSecondDegreeMaterials { private GCYMSecondDegreeMaterials() {} diff --git a/src/main/java/gregicality/multiblocks/api/unification/properties/AlloyBlastProperty.java b/src/main/java/gregicality/multiblocks/api/unification/properties/AlloyBlastProperty.java index 62137466..b4a737c2 100644 --- a/src/main/java/gregicality/multiblocks/api/unification/properties/AlloyBlastProperty.java +++ b/src/main/java/gregicality/multiblocks/api/unification/properties/AlloyBlastProperty.java @@ -1,13 +1,17 @@ package gregicality.multiblocks.api.unification.properties; +import net.minecraftforge.fluids.Fluid; + +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + import com.google.common.base.Preconditions; -import gregicality.multiblocks.api.recipes.alloyblast.AlloyBlastRecipeProducer; + import gregtech.api.unification.material.properties.IMaterialProperty; import gregtech.api.unification.material.properties.MaterialProperties; import gregtech.api.unification.material.properties.PropertyKey; -import net.minecraftforge.fluids.Fluid; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.recipes.alloyblast.AlloyBlastRecipeProducer; public class AlloyBlastProperty implements IMaterialProperty { diff --git a/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMLatePropertyAddition.java b/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMLatePropertyAddition.java index 5bfe2ff1..86ef44f5 100644 --- a/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMLatePropertyAddition.java +++ b/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMLatePropertyAddition.java @@ -1,14 +1,16 @@ package gregicality.multiblocks.api.unification.properties; -import gregicality.multiblocks.api.unification.GCYMMaterialFlags; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.GregTechAPI; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.properties.BlastProperty; import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.stack.MaterialStack; -import org.jetbrains.annotations.NotNull; -import java.util.List; +import gregicality.multiblocks.api.unification.GCYMMaterialFlags; public final class GCYMLatePropertyAddition { diff --git a/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMPropertyKey.java b/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMPropertyKey.java index 468904e5..456dac1f 100644 --- a/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMPropertyKey.java +++ b/src/main/java/gregicality/multiblocks/api/unification/properties/GCYMPropertyKey.java @@ -4,7 +4,8 @@ public final class GCYMPropertyKey { - public static final PropertyKey ALLOY_BLAST = new PropertyKey<>("blast_alloy", AlloyBlastProperty.class); + public static final PropertyKey ALLOY_BLAST = new PropertyKey<>("blast_alloy", + AlloyBlastProperty.class); private GCYMPropertyKey() {} } diff --git a/src/main/java/gregicality/multiblocks/api/utils/GCYMLog.java b/src/main/java/gregicality/multiblocks/api/utils/GCYMLog.java index 7bdef004..3e082e93 100644 --- a/src/main/java/gregicality/multiblocks/api/utils/GCYMLog.java +++ b/src/main/java/gregicality/multiblocks/api/utils/GCYMLog.java @@ -12,5 +12,4 @@ private GCYMLog() {} public static void init(@NotNull Logger modLogger) { logger = modLogger; } - } diff --git a/src/main/java/gregicality/multiblocks/common/ClientProxy.java b/src/main/java/gregicality/multiblocks/common/ClientProxy.java index 49c4e2d8..f5c7beec 100644 --- a/src/main/java/gregicality/multiblocks/common/ClientProxy.java +++ b/src/main/java/gregicality/multiblocks/common/ClientProxy.java @@ -1,14 +1,16 @@ package gregicality.multiblocks.common; -import codechicken.lib.texture.TextureUtils; -import gregicality.multiblocks.api.fluids.GCYMMetaFluids; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; +import gregicality.multiblocks.api.fluids.GCYMMetaFluids; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; + +import codechicken.lib.texture.TextureUtils; + @Mod.EventBusSubscriber(Side.CLIENT) public class ClientProxy extends CommonProxy { @@ -19,7 +21,6 @@ public void preLoad() { TextureUtils.addIconRegister(GCYMMetaFluids::registerSprites); } - @SubscribeEvent public static void registerModels(ModelRegistryEvent event) { GCYMMetaBlocks.registerItemModels(); diff --git a/src/main/java/gregicality/multiblocks/common/CommonProxy.java b/src/main/java/gregicality/multiblocks/common/CommonProxy.java index 3d5031fa..0e927db1 100644 --- a/src/main/java/gregicality/multiblocks/common/CommonProxy.java +++ b/src/main/java/gregicality/multiblocks/common/CommonProxy.java @@ -1,10 +1,8 @@ package gregicality.multiblocks.common; -import gregicality.multiblocks.GregicalityMultiblocks; -import gregicality.multiblocks.api.utils.GCYMLog; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.loaders.recipe.GCYMRecipeLoader; -import gregtech.api.block.VariantItemBlock; +import java.util.Objects; +import java.util.function.Function; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -17,15 +15,17 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; -import java.util.Objects; -import java.util.function.Function; +import gregtech.api.block.VariantItemBlock; + +import gregicality.multiblocks.GregicalityMultiblocks; +import gregicality.multiblocks.api.utils.GCYMLog; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.loaders.recipe.GCYMRecipeLoader; @Mod.EventBusSubscriber(modid = GregicalityMultiblocks.MODID) public class CommonProxy { - public void preLoad() { - - } + public void preLoad() {} @SubscribeEvent public static void syncConfigValues(ConfigChangedEvent.OnConfigChangedEvent event) { @@ -43,7 +43,6 @@ public static void registerBlocks(RegistryEvent.Register event) { registry.register(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING); } - @SubscribeEvent public static void registerItems(RegistryEvent.Register event) { GCYMLog.logger.info("Registering Items..."); diff --git a/src/main/java/gregicality/multiblocks/common/GCYMConfigHolder.java b/src/main/java/gregicality/multiblocks/common/GCYMConfigHolder.java index 61fcbeea..d7132e23 100644 --- a/src/main/java/gregicality/multiblocks/common/GCYMConfigHolder.java +++ b/src/main/java/gregicality/multiblocks/common/GCYMConfigHolder.java @@ -1,8 +1,9 @@ package gregicality.multiblocks.common; -import gregicality.multiblocks.GregicalityMultiblocks; import net.minecraftforge.common.config.Config; +import gregicality.multiblocks.GregicalityMultiblocks; + @Config(modid = GregicalityMultiblocks.MODID) public class GCYMConfigHolder { @@ -12,7 +13,8 @@ public class GCYMConfigHolder { public static class GlobalMultiblocks { - @Config.Comment({"Makes nearly every GCYM Multiblock require blocks which set their maximum voltages.", "Default: false"}) + @Config.Comment({ "Makes nearly every GCYM Multiblock require blocks which set their maximum voltages.", + "Default: false" }) public boolean enableTieredCasings = false; } } diff --git a/src/main/java/gregicality/multiblocks/common/GCYMEventHandlers.java b/src/main/java/gregicality/multiblocks/common/GCYMEventHandlers.java index db23c240..f7c51bb8 100644 --- a/src/main/java/gregicality/multiblocks/common/GCYMEventHandlers.java +++ b/src/main/java/gregicality/multiblocks/common/GCYMEventHandlers.java @@ -1,14 +1,16 @@ package gregicality.multiblocks.common; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import gregtech.api.unification.material.event.MaterialEvent; +import gregtech.api.unification.material.event.PostMaterialEvent; + import gregicality.multiblocks.GregicalityMultiblocks; import gregicality.multiblocks.api.unification.GCYMMaterialFlagAddition; import gregicality.multiblocks.api.unification.GCYMMaterials; import gregicality.multiblocks.api.unification.properties.GCYMLatePropertyAddition; -import gregtech.api.unification.material.event.MaterialEvent; -import gregtech.api.unification.material.event.PostMaterialEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber(modid = GregicalityMultiblocks.MODID) public final class GCYMEventHandlers { diff --git a/src/main/java/gregicality/multiblocks/common/block/GCYMMetaBlocks.java b/src/main/java/gregicality/multiblocks/common/block/GCYMMetaBlocks.java index 6175156b..513fdcc5 100644 --- a/src/main/java/gregicality/multiblocks/common/block/GCYMMetaBlocks.java +++ b/src/main/java/gregicality/multiblocks/common/block/GCYMMetaBlocks.java @@ -1,8 +1,5 @@ package gregicality.multiblocks.common.block; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; -import gregtech.common.blocks.MetaBlocks; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; @@ -11,8 +8,14 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import org.jetbrains.annotations.NotNull; +import gregtech.common.blocks.MetaBlocks; + +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; + public final class GCYMMetaBlocks { private GCYMMetaBlocks() {} @@ -36,7 +39,7 @@ public static void registerItemModels() { @SideOnly(Side.CLIENT) private static void registerItemModel(@NotNull Block block) { for (IBlockState state : block.getBlockState().getValidStates()) { - //noinspection ConstantConditions + // noinspection ConstantConditions ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), block.getMetaFromState(state), new ModelResourceLocation(block.getRegistryName(), @@ -45,7 +48,8 @@ private static void registerItemModel(@NotNull Block block) { } @SuppressWarnings("unchecked") - private static > @NotNull String getPropertyName(@NotNull IProperty property, Comparable value) { + private static > @NotNull String getPropertyName(@NotNull IProperty property, + Comparable value) { return property.getName((T) value); } } diff --git a/src/main/java/gregicality/multiblocks/common/block/blocks/BlockLargeMultiblockCasing.java b/src/main/java/gregicality/multiblocks/common/block/blocks/BlockLargeMultiblockCasing.java index 425f684b..14e6a0f9 100644 --- a/src/main/java/gregicality/multiblocks/common/block/blocks/BlockLargeMultiblockCasing.java +++ b/src/main/java/gregicality/multiblocks/common/block/blocks/BlockLargeMultiblockCasing.java @@ -1,6 +1,5 @@ package gregicality.multiblocks.common.block.blocks; -import gregtech.api.block.VariantBlock; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -8,8 +7,11 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; + import org.jetbrains.annotations.NotNull; +import gregtech.api.block.VariantBlock; + public class BlockLargeMultiblockCasing extends VariantBlock { public BlockLargeMultiblockCasing() { @@ -23,7 +25,8 @@ public BlockLargeMultiblockCasing() { } @Override - public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos, @NotNull EntityLiving.SpawnPlacementType type) { + public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos, + @NotNull EntityLiving.SpawnPlacementType type) { return false; } diff --git a/src/main/java/gregicality/multiblocks/common/block/blocks/BlockUniqueCasing.java b/src/main/java/gregicality/multiblocks/common/block/blocks/BlockUniqueCasing.java index 646ace15..789c7a39 100644 --- a/src/main/java/gregicality/multiblocks/common/block/blocks/BlockUniqueCasing.java +++ b/src/main/java/gregicality/multiblocks/common/block/blocks/BlockUniqueCasing.java @@ -1,8 +1,5 @@ package gregicality.multiblocks.common.block.blocks; -import gregtech.api.block.VariantActiveBlock; -import gregtech.client.utils.BloomEffectUtil; -import gregtech.common.ConfigHolder; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -11,8 +8,13 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; + import org.jetbrains.annotations.NotNull; +import gregtech.api.block.VariantActiveBlock; +import gregtech.client.utils.BloomEffectUtil; +import gregtech.common.ConfigHolder; + public class BlockUniqueCasing extends VariantActiveBlock { public BlockUniqueCasing() { @@ -26,7 +28,8 @@ public BlockUniqueCasing() { } @Override - public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos, @NotNull EntityLiving.SpawnPlacementType type) { + public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos, + @NotNull EntityLiving.SpawnPlacementType type) { return false; } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/GCYMMetaTileEntities.java b/src/main/java/gregicality/multiblocks/common/metatileentities/GCYMMetaTileEntities.java index 341e5633..91a03182 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/GCYMMetaTileEntities.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/GCYMMetaTileEntities.java @@ -1,15 +1,17 @@ package gregicality.multiblocks.common.metatileentities; +import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; + +import net.minecraft.util.ResourceLocation; + +import gregtech.api.GTValues; +import gregtech.api.GregTechAPI; + import gregicality.multiblocks.GregicalityMultiblocks; import gregicality.multiblocks.common.metatileentities.multiblock.generator.MetaTileEntitySteamEngine; import gregicality.multiblocks.common.metatileentities.multiblock.standard.*; import gregicality.multiblocks.common.metatileentities.multiblockpart.MetaTileEntityParallelHatch; import gregicality.multiblocks.common.metatileentities.multiblockpart.MetaTileEntityTieredHatch; -import gregtech.api.GTValues; -import gregtech.api.GregTechAPI; -import net.minecraft.util.ResourceLocation; - -import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; public final class GCYMMetaTileEntities { @@ -50,19 +52,23 @@ private GCYMMetaTileEntities() {} public static void init() { // Multiblocks LARGE_MACERATOR = registerMetaTileEntity(2000, new MetaTileEntityLargeMacerator(gcymId("large_macerator"))); - ALLOY_BLAST_SMELTER = registerMetaTileEntity(2001, new MetaTileEntityAlloyBlastSmelter(gcymId("alloy_blast_smelter"))); - LARGE_ARC_FURNACE = registerMetaTileEntity(2002, new MetaTileEntityLargeArcFurnace(gcymId("large_arc_furnace"))); + ALLOY_BLAST_SMELTER = registerMetaTileEntity(2001, + new MetaTileEntityAlloyBlastSmelter(gcymId("alloy_blast_smelter"))); + LARGE_ARC_FURNACE = registerMetaTileEntity(2002, + new MetaTileEntityLargeArcFurnace(gcymId("large_arc_furnace"))); LARGE_ASSEMBLER = registerMetaTileEntity(2003, new MetaTileEntityLargeAssembler(gcymId("large_assembler"))); LARGE_AUTOCLAVE = registerMetaTileEntity(2004, new MetaTileEntityLargeAutoclave(gcymId("large_autoclave"))); LARGE_BENDER = registerMetaTileEntity(2005, new MetaTileEntityLargeBender(gcymId("large_bender"))); LARGE_BREWERY = registerMetaTileEntity(2006, new MetaTileEntityLargeBrewery(gcymId("large_brewer"))); LARGE_CENTRIFUGE = registerMetaTileEntity(2007, new MetaTileEntityLargeCentrifuge(gcymId("large_centrifuge"))); - LARGE_CHEMICAL_BATH = registerMetaTileEntity(2008, new MetaTileEntityLargeChemicalBath(gcymId("large_chemical_bath"))); + LARGE_CHEMICAL_BATH = registerMetaTileEntity(2008, + new MetaTileEntityLargeChemicalBath(gcymId("large_chemical_bath"))); // FREE ID: 2009 LARGE_EXTRACTOR = registerMetaTileEntity(2010, new MetaTileEntityLargeExtractor(gcymId("large_extractor"))); LARGE_CUTTER = registerMetaTileEntity(2011, new MetaTileEntityLargeCutter(gcymId("large_cutter"))); LARGE_DISTILLERY = registerMetaTileEntity(2012, new MetaTileEntityLargeDistillery(gcymId("large_distillery"))); - LARGE_ELECTROLYZER = registerMetaTileEntity(2013, new MetaTileEntityLargeElectrolyzer(gcymId("large_electrolyzer"))); + LARGE_ELECTROLYZER = registerMetaTileEntity(2013, + new MetaTileEntityLargeElectrolyzer(gcymId("large_electrolyzer"))); LARGE_POLARIZER = registerMetaTileEntity(2014, new MetaTileEntityLargePolarizer(gcymId("large_polarizer"))); LARGE_EXTRUDER = registerMetaTileEntity(2015, new MetaTileEntityLargeExtruder(gcymId("large_extruder"))); LARGE_SOLIDIFIER = registerMetaTileEntity(2016, new MetaTileEntityLargeSolidifier(gcymId("large_solidifier"))); @@ -71,26 +77,32 @@ public static void init() { LARGE_ENGRAVER = registerMetaTileEntity(2019, new MetaTileEntityLargeEngraver(gcymId("large_engraver"))); LARGE_SIFTER = registerMetaTileEntity(2020, new MetaTileEntityLargeSifter(gcymId("large_sifter"))); LARGE_WIREMILL = registerMetaTileEntity(2021, new MetaTileEntityLargeWiremill(gcymId("large_wiremill"))); - ELECTRIC_IMPLOSION_COMPRESSOR = registerMetaTileEntity(2022, new MetaTileEntityElectricImplosionCompressor(gcymId("electric_implosion_compressor"))); -// LARGE_MASS_FABRICATOR = registerMetaTileEntity(2023, new MetaTileEntityLargeMassFabricator(gcymId("large_mass_fabricator"))); todo replication system -// LARGE_REPLICATOR = registerMetaTileEntity(2024, new MetaTileEntityLargeReplicator(gcymId("large_replicator"))); - MEGA_BLAST_FURNACE = registerMetaTileEntity(2025, new MetaTileEntityMegaBlastFurnace(gcymId("mega_blast_furnace"))); - MEGA_VACUUM_FREEZER = registerMetaTileEntity(2026, new MetaTileEntityMegaVacuumFreezer(gcymId("mega_vacuum_freezer"))); + ELECTRIC_IMPLOSION_COMPRESSOR = registerMetaTileEntity(2022, + new MetaTileEntityElectricImplosionCompressor(gcymId("electric_implosion_compressor"))); + // LARGE_MASS_FABRICATOR = registerMetaTileEntity(2023, new + // MetaTileEntityLargeMassFabricator(gcymId("large_mass_fabricator"))); todo replication system + // LARGE_REPLICATOR = registerMetaTileEntity(2024, new + // MetaTileEntityLargeReplicator(gcymId("large_replicator"))); + MEGA_BLAST_FURNACE = registerMetaTileEntity(2025, + new MetaTileEntityMegaBlastFurnace(gcymId("mega_blast_furnace"))); + MEGA_VACUUM_FREEZER = registerMetaTileEntity(2026, + new MetaTileEntityMegaVacuumFreezer(gcymId("mega_vacuum_freezer"))); STEAM_ENGINE = registerMetaTileEntity(2027, new MetaTileEntitySteamEngine(gcymId("steam_engine"))); - LARGE_CIRCUIT_ASSEMBLER = registerMetaTileEntity(2028, new MetaTileEntityLargeCircuitAssembler(gcymId("large_circuit_assembler"))); - - + LARGE_CIRCUIT_ASSEMBLER = registerMetaTileEntity(2028, + new MetaTileEntityLargeCircuitAssembler(gcymId("large_circuit_assembler"))); // Hatches for (int i = 0; i < PARALLEL_HATCH.length; i++) { int tier = GTValues.IV + i; - PARALLEL_HATCH[i] = registerMetaTileEntity(2050 + i, new MetaTileEntityParallelHatch(gcymId(String.format("parallel_hatch.%s", GTValues.VN[tier])), tier)); + PARALLEL_HATCH[i] = registerMetaTileEntity(2050 + i, new MetaTileEntityParallelHatch( + gcymId(String.format("parallel_hatch.%s", GTValues.VN[tier])), tier)); } for (int i = 0; i < TIERED_HATCH.length; i++) { if (!GregTechAPI.isHighTier() && i > GTValues.UHV) break; - TIERED_HATCH[i] = registerMetaTileEntity(2054 + i, new MetaTileEntityTieredHatch(gcymId(String.format("tiered_hatch.%s", GTValues.VN[i])), i)); + TIERED_HATCH[i] = registerMetaTileEntity(2054 + i, + new MetaTileEntityTieredHatch(gcymId(String.format("tiered_hatch.%s", GTValues.VN[i])), i)); } } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/generator/MetaTileEntitySteamEngine.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/generator/MetaTileEntitySteamEngine.java index 7176d0c6..3ba27b6e 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/generator/MetaTileEntitySteamEngine.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/generator/MetaTileEntitySteamEngine.java @@ -1,8 +1,17 @@ package gregicality.multiblocks.common.metatileentities.multiblock.generator; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import gregtech.api.GTValues; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -15,16 +24,10 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.common.blocks.BlockTurbineCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.util.List; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntitySteamEngine extends FuelMultiblockController { @@ -63,7 +66,8 @@ private static IBlockState getCasingState2() { } @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, + boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gcym.machine.steam_engine.tooltip.1", GTValues.VNF[GTValues.MV])); } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityAlloyBlastSmelter.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityAlloyBlastSmelter.java index bb38970a..242319dd 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityAlloyBlastSmelter.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityAlloyBlastSmelter.java @@ -1,11 +1,24 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; -import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import gregtech.api.GTValues; import gregtech.api.GregTechAPI; import gregtech.api.block.IHeatingCoilBlockStats; @@ -28,23 +41,13 @@ import gregtech.common.ConfigHolder; import gregtech.common.blocks.BlockWireCoil; import gregtech.common.metatileentities.MetaTileEntities; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; +import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; public class MetaTileEntityAlloyBlastSmelter extends RecipeMapMultiblockController implements IHeatingCoil { @@ -63,8 +66,9 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol @Override protected void addDisplayText(List textList) { if (isStructureFormed()) { - textList.add(new TextComponentTranslation("gregtech.multiblock.blast_furnace.max_temperature", blastFurnaceTemperature) - .setStyle(new Style().setColor(TextFormatting.RED))); + textList.add(new TextComponentTranslation("gregtech.multiblock.blast_furnace.max_temperature", + blastFurnaceTemperature) + .setStyle(new Style().setColor(TextFormatting.RED))); } super.addDisplayText(textList); } @@ -79,7 +83,8 @@ protected void formStructure(PatternMatchContext context) { this.blastFurnaceTemperature = BlockWireCoil.CoilType.CUPRONICKEL.getCoilTemperature(); } - this.blastFurnaceTemperature += 100 * Math.max(0, GTUtility.getTierByVoltage(getEnergyContainer().getInputVoltage()) - GTValues.MV); + this.blastFurnaceTemperature += 100 * + Math.max(0, GTUtility.getTierByVoltage(getEnergyContainer().getInputVoltage()) - GTValues.MV); } @Override @@ -102,7 +107,9 @@ public boolean checkRecipe(@NotNull Recipe recipe, boolean consumeIfSuccess) { .aisle("XXXXX", "CAAAC", "GAAAG", "CAAAC", "XXXXX") .aisle("#XSX#", "#CCC#", "#GGG#", "#CCC#", "#XXX#") .where('S', selfPredicate()) - .where('X', states(getCasingState()).setMinGlobalLimited(30).or(autoAbilities(true, true, true, true, true, true, false))) + .where('X', + states(getCasingState()).setMinGlobalLimited(30) + .or(autoAbilities(true, true, true, true, true, true, false))) .where('C', heatingCoils()) .where('G', states(getCasingState2())) .where('M', abilities(MultiblockAbility.MUFFLER_HATCH)) @@ -128,7 +135,10 @@ public List getMatchingShapes() { .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.HV], EnumFacing.SOUTH) .where('O', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.HV], EnumFacing.SOUTH) .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.EV], EnumFacing.NORTH) - .where('H', () -> ConfigHolder.machines.enableMaintenance ? MetaTileEntities.MAINTENANCE_HATCH : getCasingState(), EnumFacing.SOUTH) + .where('H', + () -> ConfigHolder.machines.enableMaintenance ? MetaTileEntities.MAINTENANCE_HATCH : + getCasingState(), + EnumFacing.SOUTH) .where('#', Blocks.AIR.getDefaultState()); GregTechAPI.HEATING_COILS.entrySet().stream() @@ -138,7 +148,8 @@ public List getMatchingShapes() { } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING); } private static IBlockState getCasingState2() { @@ -146,7 +157,8 @@ private static IBlockState getCasingState2() { } @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, + boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.1")); tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.2")); diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityElectricImplosionCompressor.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityElectricImplosionCompressor.java index 02b22783..10738b1e 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityElectricImplosionCompressor.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityElectricImplosionCompressor.java @@ -1,6 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.render.GCYMTextures; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -17,9 +21,8 @@ import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.BlockMetalCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.render.GCYMTextures; public class MetaTileEntityElectricImplosionCompressor extends RecipeMapMultiblockController { @@ -41,7 +44,9 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol .aisle("XXXXX", "#PGP#", "#PGP#", "#PGP#", "#PGP#", "XXXXX") .aisle("XXSXX", "F###F", "F###F", "F###F", "F###F", "XXXXX") .where('S', selfPredicate()) - .where('X', states(getCasingState()).setMinGlobalLimited(40).or(autoAbilities(true, true, true, true, true, true, false))) + .where('X', + states(getCasingState()).setMinGlobalLimited(40) + .or(autoAbilities(true, true, true, true, true, true, false))) .where('P', states(getCasingState2())) .where('G', states(getCasingState3())) .where('F', frames(Materials.TungstenSteel)) diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeArcFurnace.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeArcFurnace.java index abc54bd8..5319d820 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeArcFurnace.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeArcFurnace.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -14,9 +14,12 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.client.renderer.ICubeRenderer; import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargeArcFurnace extends GCYMRecipeMapMultiblockController { @@ -49,7 +52,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAssembler.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAssembler.java index 24582bf9..45c872f3 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAssembler.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAssembler.java @@ -1,10 +1,13 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.GCYMValues; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Loader; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -16,12 +19,12 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Loader; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.GCYMValues; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeAssembler extends GCYMRecipeMapMultiblockController { @@ -76,11 +79,11 @@ public boolean canBeDistinct() { return true; } - private static @NotNull RecipeMap @NotNull[] determineRecipeMaps() { + private static @NotNull RecipeMap @NotNull [] determineRecipeMaps() { RecipeMap cuisineAssemblerMap = RecipeMap.getByName("cuisine_assembler"); if (Loader.isModLoaded(GCYMValues.GTFO_MODID) && cuisineAssemblerMap != null) { - return new RecipeMap[]{RecipeMaps.ASSEMBLER_RECIPES, cuisineAssemblerMap}; + return new RecipeMap[] { RecipeMaps.ASSEMBLER_RECIPES, cuisineAssemblerMap }; } - return new RecipeMap[]{RecipeMaps.ASSEMBLER_RECIPES}; + return new RecipeMap[] { RecipeMaps.ASSEMBLER_RECIPES }; } } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAutoclave.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAutoclave.java index e0c53860..afc3e656 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAutoclave.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAutoclave.java @@ -1,9 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -14,9 +15,11 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeAutoclave extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBender.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBender.java index 2c6b00a5..e52f19ea 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBender.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBender.java @@ -1,9 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -16,15 +17,17 @@ import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.BlockTurbineCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeBender extends GCYMRecipeMapMultiblockController { public MetaTileEntityLargeBender(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, new RecipeMap[]{RecipeMaps.BENDER_RECIPES, RecipeMaps.COMPRESSOR_RECIPES, - RecipeMaps.FORMING_PRESS_RECIPES, RecipeMaps.FORGE_HAMMER_RECIPES}); + super(metaTileEntityId, new RecipeMap[] { RecipeMaps.BENDER_RECIPES, RecipeMaps.COMPRESSOR_RECIPES, + RecipeMaps.FORMING_PRESS_RECIPES, RecipeMaps.FORGE_HAMMER_RECIPES }); } @Override @@ -47,7 +50,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBrewery.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBrewery.java index 5554a324..9b4d4e71 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBrewery.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeBrewery.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -17,14 +17,18 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargeBrewery extends GCYMRecipeMapMultiblockController { public MetaTileEntityLargeBrewery(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, new RecipeMap[]{RecipeMaps.BREWING_RECIPES, RecipeMaps.FERMENTING_RECIPES, RecipeMaps.FLUID_HEATER_RECIPES}); + super(metaTileEntityId, new RecipeMap[] { RecipeMaps.BREWING_RECIPES, RecipeMaps.FERMENTING_RECIPES, + RecipeMaps.FLUID_HEATER_RECIPES }); } @Override @@ -41,7 +45,9 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol .aisle("XXXXX", "XCCCX", "XAAAX", "XXAXX", "##X##") .aisle("#XXX#", "#XSX#", "#XXX#", "#XXX#", "#####") .where('S', selfPredicate()) - .where('X', states(getCasingState()).setMinGlobalLimited(50).or(autoAbilities(true, true, true, true, true, true, false))) + .where('X', + states(getCasingState()).setMinGlobalLimited(50) + .or(autoAbilities(true, true, true, true, true, true, false))) .where('C', states(getCasingState2())) .where('P', states(getCasingState3())) .where('M', abilities(MultiblockAbility.MUFFLER_HATCH)) @@ -52,7 +58,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.CORROSION_PROOF_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.CORROSION_PROOF_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCentrifuge.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCentrifuge.java index 57d91b80..1d12bfad 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCentrifuge.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCentrifuge.java @@ -1,9 +1,12 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -15,16 +18,17 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeCentrifuge extends GCYMRecipeMapMultiblockController { public MetaTileEntityLargeCentrifuge(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, new RecipeMap[]{RecipeMaps.CENTRIFUGE_RECIPES, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES}); + super(metaTileEntityId, + new RecipeMap[] { RecipeMaps.CENTRIFUGE_RECIPES, RecipeMaps.THERMAL_CENTRIFUGE_RECIPES }); } @Override @@ -48,7 +52,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeChemicalBath.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeChemicalBath.java index 2c5331c4..7b8d9bb9 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeChemicalBath.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeChemicalBath.java @@ -1,9 +1,12 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -15,16 +18,19 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -public class MetaTileEntityLargeChemicalBath extends GCYMRecipeMapMultiblockController { //todo render liquid in the structure that looks the same as what is in the fluid hatches +public class MetaTileEntityLargeChemicalBath extends GCYMRecipeMapMultiblockController { // todo render liquid in the + // structure that looks the + // same as what is in the fluid + // hatches public MetaTileEntityLargeChemicalBath(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, new RecipeMap[]{RecipeMaps.CHEMICAL_BATH_RECIPES, RecipeMaps.ORE_WASHER_RECIPES}); + super(metaTileEntityId, new RecipeMap[] { RecipeMaps.CHEMICAL_BATH_RECIPES, RecipeMaps.ORE_WASHER_RECIPES }); } @Override diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCircuitAssembler.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCircuitAssembler.java index 5e20c209..7cc24359 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCircuitAssembler.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCircuitAssembler.java @@ -1,9 +1,12 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -16,11 +19,11 @@ import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.BlockMultiblockCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeCircuitAssembler extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCutter.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCutter.java index 0d42963f..2e790d1c 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCutter.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCutter.java @@ -1,11 +1,13 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.GCYMValues; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Loader; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -17,12 +19,13 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Loader; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.GCYMValues; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargeCutter extends GCYMRecipeMapMultiblockController { @@ -78,8 +81,8 @@ public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) { private static @NotNull RecipeMap @NotNull [] determineRecipeMaps() { RecipeMap slicerMap = RecipeMap.getByName("slicer"); if (Loader.isModLoaded(GCYMValues.GTFO_MODID) && slicerMap != null) { - return new RecipeMap[]{RecipeMaps.CUTTER_RECIPES, RecipeMaps.LATHE_RECIPES, slicerMap}; + return new RecipeMap[] { RecipeMaps.CUTTER_RECIPES, RecipeMaps.LATHE_RECIPES, slicerMap }; } - return new RecipeMap[]{RecipeMaps.CUTTER_RECIPES, RecipeMaps.LATHE_RECIPES}; + return new RecipeMap[] { RecipeMaps.CUTTER_RECIPES, RecipeMaps.LATHE_RECIPES }; } } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeDistillery.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeDistillery.java index 58240e4d..787c1226 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeDistillery.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeDistillery.java @@ -1,10 +1,19 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import java.util.List; +import java.util.function.Function; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraftforge.fluids.FluidStack; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -20,23 +29,17 @@ import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.MetaBlocks; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiFluidHatch; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.fluids.FluidStack; -import org.jetbrains.annotations.NotNull; -import java.util.List; -import java.util.function.Function; - -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -public class MetaTileEntityLargeDistillery extends GCYMRecipeMapMultiblockController { //todo structure needs fixing +public class MetaTileEntityLargeDistillery extends GCYMRecipeMapMultiblockController { // todo structure needs fixing public MetaTileEntityLargeDistillery(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, new RecipeMap[]{RecipeMaps.DISTILLATION_RECIPES, RecipeMaps.DISTILLERY_RECIPES}); + super(metaTileEntityId, new RecipeMap[] { RecipeMaps.DISTILLATION_RECIPES, RecipeMaps.DISTILLERY_RECIPES }); } @Override @@ -51,9 +54,13 @@ protected Function multiblockPartSorter() { @Override protected @NotNull BlockPattern createStructurePattern() { - TraceabilityPredicate casingPredicate = states(getCasingState()).setMinGlobalLimited(40); // Different characters use common constraints - TraceabilityPredicate maintenancePredicate = this.hasMaintenanceMechanics() && ConfigHolder.machines.enableMaintenance ? - abilities(MultiblockAbility.MAINTENANCE_HATCH).setMinGlobalLimited(1).setMaxGlobalLimited(1) : casingPredicate; + TraceabilityPredicate casingPredicate = states(getCasingState()).setMinGlobalLimited(40); // Different + // characters use + // common constraints + TraceabilityPredicate maintenancePredicate = this.hasMaintenanceMechanics() && + ConfigHolder.machines.enableMaintenance ? + abilities(MultiblockAbility.MAINTENANCE_HATCH).setMinGlobalLimited(1).setMaxGlobalLimited(1) : + casingPredicate; return FactoryBlockPattern.start(RIGHT, FRONT, DOWN) .aisle("#####", "#ZZZ#", "#ZCZ#", "#ZZZ#", "#####") .aisle("##X##", "#XAX#", "XAPAX", "#XAX#", "##X##").setRepeatable(1, 12) @@ -66,10 +73,11 @@ protected Function multiblockPartSorter() { .or(abilities(MultiblockAbility.EXPORT_ITEMS)) .or(abilities(GCYMMultiblockAbility.PARALLEL_HATCH).setMaxGlobalLimited(1).setPreviewCount(1)) .or(maintenancePredicate)) - .where('X', casingPredicate.or(metaTileEntities(MultiblockAbility.REGISTRY.get(MultiblockAbility.EXPORT_FLUIDS).stream() - .filter(mte->!(mte instanceof MetaTileEntityMultiFluidHatch)) - .toArray(MetaTileEntity[]::new)) - .setMinLayerLimited(1).setMaxLayerLimited(1))) + .where('X', casingPredicate + .or(metaTileEntities(MultiblockAbility.REGISTRY.get(MultiblockAbility.EXPORT_FLUIDS).stream() + .filter(mte -> !(mte instanceof MetaTileEntityMultiFluidHatch)) + .toArray(MetaTileEntity[]::new)) + .setMinLayerLimited(1).setMaxLayerLimited(1))) .where('Z', casingPredicate) .where('P', states(getCasingState2())) .where('C', abilities(MultiblockAbility.MUFFLER_HATCH)) @@ -98,8 +106,10 @@ protected void addDisplayText(List textList) { if (isStructureFormed()) { FluidStack stackInTank = importFluids.drain(Integer.MAX_VALUE, false); if (stackInTank != null && stackInTank.amount > 0) { - TextComponentTranslation fluidName = new TextComponentTranslation(stackInTank.getFluid().getUnlocalizedName(stackInTank)); - textList.add(new TextComponentTranslation("gregtech.multiblock.distillation_tower.distilling_fluid", fluidName)); + TextComponentTranslation fluidName = new TextComponentTranslation( + stackInTank.getFluid().getUnlocalizedName(stackInTank)); + textList.add(new TextComponentTranslation("gregtech.multiblock.distillation_tower.distilling_fluid", + fluidName)); } } } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeElectrolyzer.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeElectrolyzer.java index c9f31053..cb35570e 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeElectrolyzer.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeElectrolyzer.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -13,9 +13,12 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.client.renderer.ICubeRenderer; import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargeElectrolyzer extends GCYMRecipeMapMultiblockController { @@ -43,7 +46,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeEngraver.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeEngraver.java index 97c298a6..7ba030f3 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeEngraver.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeEngraver.java @@ -1,9 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -16,9 +17,11 @@ import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.BlockMultiblockCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeEngraver extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtractor.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtractor.java index f6d61646..4c177931 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtractor.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtractor.java @@ -1,9 +1,12 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -15,16 +18,16 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeExtractor extends GCYMRecipeMapMultiblockController { public MetaTileEntityLargeExtractor(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, new RecipeMap[]{RecipeMaps.EXTRACTOR_RECIPES, RecipeMaps.CANNER_RECIPES}); + super(metaTileEntityId, new RecipeMap[] { RecipeMaps.EXTRACTOR_RECIPES, RecipeMaps.CANNER_RECIPES }); } @Override diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtruder.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtruder.java index 074dd300..59a7f490 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtruder.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeExtruder.java @@ -1,9 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -15,9 +16,11 @@ import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeExtruder extends GCYMRecipeMapMultiblockController { @@ -48,7 +51,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMacerator.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMacerator.java index d140d22f..56f8c048 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMacerator.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMacerator.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -13,9 +13,12 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.client.renderer.ICubeRenderer; import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargeMacerator extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMassFabricator.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMassFabricator.java index b9ee55d3..b42b2df4 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMassFabricator.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMassFabricator.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -16,11 +16,15 @@ import gregtech.common.blocks.BlockFusionCasing; import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargeMassFabricator extends GCYMRecipeMapMultiblockController { + public MetaTileEntityLargeMassFabricator(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.MASS_FABRICATOR_RECIPES); } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMixer.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMixer.java index 349f29e9..c46a671f 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMixer.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeMixer.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.api.unification.GCYMMaterials; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -17,9 +17,12 @@ import gregtech.common.blocks.BlockMetalCasing; import gregtech.common.blocks.BlockTurbineCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.api.unification.GCYMMaterials; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeMixer extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePackager.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePackager.java index 5119e815..eaefbb76 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePackager.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePackager.java @@ -1,7 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -13,9 +16,9 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockMetalCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; public class MetaTileEntityLargePackager extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePolarizer.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePolarizer.java index f56f3b57..c8b6d2e6 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePolarizer.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargePolarizer.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -14,14 +14,18 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.client.renderer.ICubeRenderer; import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargePolarizer extends GCYMRecipeMapMultiblockController { public MetaTileEntityLargePolarizer(ResourceLocation metaTileEntityId) { - super(metaTileEntityId, new RecipeMap[]{RecipeMaps.POLARIZER_RECIPES, RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES}); + super(metaTileEntityId, + new RecipeMap[] { RecipeMaps.POLARIZER_RECIPES, RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES }); } @Override @@ -45,7 +49,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeReplicator.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeReplicator.java index af566832..4864365e 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeReplicator.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeReplicator.java @@ -1,10 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -16,9 +16,12 @@ import gregtech.common.blocks.BlockFusionCasing; import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityLargeReplicator extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSifter.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSifter.java index 80d0faf0..d0cd7253 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSifter.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSifter.java @@ -1,10 +1,13 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.GCYMValues; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Loader; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -16,12 +19,12 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockMultiblockCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Loader; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.GCYMValues; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeSifter extends GCYMRecipeMapMultiblockController { @@ -52,7 +55,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING); } private static IBlockState getCasingState2() { @@ -69,11 +73,11 @@ public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) { return GCYMTextures.LARGE_SIFTER_OVERLAY; } - private static @NotNull RecipeMap @NotNull[] determineRecipeMaps() { + private static @NotNull RecipeMap @NotNull [] determineRecipeMaps() { RecipeMap sieveMap = RecipeMap.getByName("electric_sieve"); if (Loader.isModLoaded(GCYMValues.GREGIFICATION_MODID) && sieveMap != null) { - return new RecipeMap[]{RecipeMaps.SIFTER_RECIPES, sieveMap}; + return new RecipeMap[] { RecipeMaps.SIFTER_RECIPES, sieveMap }; } - return new RecipeMap[]{RecipeMaps.SIFTER_RECIPES}; + return new RecipeMap[] { RecipeMaps.SIFTER_RECIPES }; } } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSolidifier.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSolidifier.java index b703fc83..80a348c6 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSolidifier.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeSolidifier.java @@ -1,9 +1,12 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -14,11 +17,11 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockBoilerCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeSolidifier extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeWiremill.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeWiremill.java index c758ae25..0318967b 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeWiremill.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeWiremill.java @@ -1,9 +1,12 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import static gregtech.api.util.RelativeDirection.*; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -14,11 +17,11 @@ import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.BlockTurbineCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; -import static gregtech.api.util.RelativeDirection.*; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; public class MetaTileEntityLargeWiremill extends GCYMRecipeMapMultiblockController { @@ -48,7 +51,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING); } private static IBlockState getCasingState2() { diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaBlastFurnace.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaBlastFurnace.java index e335cf63..5a280049 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaBlastFurnace.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaBlastFurnace.java @@ -1,11 +1,22 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import static gregtech.api.recipes.logic.OverclockingLogic.heatingCoilOverclockingLogic; + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import gregtech.api.GTValues; import gregtech.api.block.IHeatingCoilBlockStats; import gregtech.api.capability.IHeatingCoil; @@ -29,21 +40,13 @@ import gregtech.client.renderer.texture.Textures; import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.blocks.*; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; -import static gregtech.api.recipes.logic.OverclockingLogic.heatingCoilOverclockingLogic; +import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityMegaBlastFurnace extends GCYMRecipeMapMultiblockController implements IHeatingCoil { @@ -62,8 +65,9 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol @Override protected void addDisplayText(List textList) { if (isStructureFormed()) { - textList.add(new TextComponentTranslation("gregtech.multiblock.blast_furnace.max_temperature", blastFurnaceTemperature) - .setStyle(new Style().setColor(TextFormatting.RED))); + textList.add(new TextComponentTranslation("gregtech.multiblock.blast_furnace.max_temperature", + blastFurnaceTemperature) + .setStyle(new Style().setColor(TextFormatting.RED))); } super.addDisplayText(textList); } @@ -78,7 +82,8 @@ protected void formStructure(PatternMatchContext context) { this.blastFurnaceTemperature = BlockWireCoil.CoilType.CUPRONICKEL.getCoilTemperature(); } - this.blastFurnaceTemperature += 100 * Math.max(0, GTUtility.getTierByVoltage(getEnergyContainer().getInputVoltage()) - GTValues.MV); + this.blastFurnaceTemperature += 100 * + Math.max(0, GTUtility.getTierByVoltage(getEnergyContainer().getInputVoltage()) - GTValues.MV); } @Override @@ -96,19 +101,58 @@ public boolean checkRecipe(@NotNull Recipe recipe, boolean consumeIfSuccess) { protected @NotNull BlockPattern createStructurePattern() { TraceabilityPredicate casing = states(getCasingState()).setMinGlobalLimited(360); return FactoryBlockPattern.start() - .aisle("##XXXXXXXXX##", "##XXXXXXXXX##", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############") - .aisle("#XXXXXXXXXXX#", "#XXXXXXXXXXX#", "###F#####F###", "###F#####F###", "###FFFFFFF###", "#############", "#############", "#############", "#############", "#############", "####FFFFF####", "#############", "#############", "#############", "#############", "#############", "#############") - .aisle("XXXXXXXXXXXXX", "XXXXVVVVVXXXX", "##F#######F##", "##F#######F##", "##FFFHHHFFF##", "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", "##FFFHHHFFF##", "#############", "#############", "#############", "#############", "#############", "###TTTTTTT###") - .aisle("XXXXXXXXXXXXX", "XXXXXXXXXXXXX", "#F####P####F#", "#F####P####F#", "#FFHHHPHHHFF#", "######P######", "######P######", "######P######", "######P######", "######P######", "##FHHHPHHHF##", "######P######", "######P######", "######P######", "######P######", "######P######", "##TTTTPTTTT##") - .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BBPBB####", "####TITIT####", "#FFHHHHHHHFF#", "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", "####BITIB####", "#FFHHHHHHHFF#", "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", "####BITIB####", "##TTTTPTTTT##") - .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BAAAB####", "####IAAAI####", "#FHHHAAAHHHF#", "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", "####IAAAI####", "#FHHHAAAHHHF#", "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", "####IAAAI####", "##TTTTPTTTT##") - .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "###PPAAAPP###", "###PTAAATP###", "#FHPHAAAHPHF#", "###PTAAATP###", "###PCAAACP###", "###PCAAACP###", "###PCAAACP###", "###PTAAATP###", "#FHPHAAAHPHF#", "###PTAAATP###", "###PCAAACP###", "###PCAAACP###", "###PCAAACP###", "###PTAAATP###", "##TPPPMPPPT##") - .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BAAAB####", "####IAAAI####", "#FHHHAAAHHHF#", "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", "####IAAAI####", "#FHHHAAAHHHF#", "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", "####IAAAI####", "##TTTTPTTTT##") - .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BBPBB####", "####TITIT####", "#FFHHHHHHHFF#", "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", "####BITIB####", "#FFHHHHHHHFF#", "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", "####BITIB####", "##TTTTPTTTT##") - .aisle("XXXXXXXXXXXXX", "XXXXXXXXXXXXX", "#F####P####F#", "#F####P####F#", "#FFHHHPHHHFF#", "######P######", "######P######", "######P######", "######P######", "######P######", "##FHHHPHHHF##", "######P######", "######P######", "######P######", "######P######", "######P######", "##TTTTPTTTT##") - .aisle("XXXXXXXXXXXXX", "XXXXVVVVVXXXX", "##F#######F##", "##F#######F##", "##FFFHHHFFF##", "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", "##FFFHHHFFF##", "#############", "#############", "#############", "#############", "#############", "###TTTTTTT###") - .aisle("#XXXXXXXXXXX#", "#XXXXXXXXXXX#", "###F#####F###", "###F#####F###", "###FFFFFFF###", "#############", "#############", "#############", "#############", "#############", "####FFFFF####", "#############", "#############", "#############", "#############", "#############", "#############") - .aisle("##XXXXXXXXX##", "##XXXXSXXXX##", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############") + .aisle("##XXXXXXXXX##", "##XXXXXXXXX##", "#############", "#############", "#############", + "#############", "#############", "#############", "#############", "#############", + "#############", "#############", "#############", "#############", "#############", + "#############", "#############") + .aisle("#XXXXXXXXXXX#", "#XXXXXXXXXXX#", "###F#####F###", "###F#####F###", "###FFFFFFF###", + "#############", "#############", "#############", "#############", "#############", + "####FFFFF####", "#############", "#############", "#############", "#############", + "#############", "#############") + .aisle("XXXXXXXXXXXXX", "XXXXVVVVVXXXX", "##F#######F##", "##F#######F##", "##FFFHHHFFF##", + "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", + "##FFFHHHFFF##", "#############", "#############", "#############", "#############", + "#############", "###TTTTTTT###") + .aisle("XXXXXXXXXXXXX", "XXXXXXXXXXXXX", "#F####P####F#", "#F####P####F#", "#FFHHHPHHHFF#", + "######P######", "######P######", "######P######", "######P######", "######P######", + "##FHHHPHHHF##", "######P######", "######P######", "######P######", "######P######", + "######P######", "##TTTTPTTTT##") + .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BBPBB####", "####TITIT####", "#FFHHHHHHHFF#", + "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", "####BITIB####", + "#FFHHHHHHHFF#", "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", + "####BITIB####", "##TTTTPTTTT##") + .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BAAAB####", "####IAAAI####", "#FHHHAAAHHHF#", + "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", "####IAAAI####", + "#FHHHAAAHHHF#", "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", + "####IAAAI####", "##TTTTPTTTT##") + .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "###PPAAAPP###", "###PTAAATP###", "#FHPHAAAHPHF#", + "###PTAAATP###", "###PCAAACP###", "###PCAAACP###", "###PCAAACP###", "###PTAAATP###", + "#FHPHAAAHPHF#", "###PTAAATP###", "###PCAAACP###", "###PCAAACP###", "###PCAAACP###", + "###PTAAATP###", "##TPPPMPPPT##") + .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BAAAB####", "####IAAAI####", "#FHHHAAAHHHF#", + "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", "####IAAAI####", + "#FHHHAAAHHHF#", "####IAAAI####", "####CAAAC####", "####CAAAC####", "####CAAAC####", + "####IAAAI####", "##TTTTPTTTT##") + .aisle("XXXXXXXXXXXXX", "XXVXXXXXXXVXX", "####BBPBB####", "####TITIT####", "#FFHHHHHHHFF#", + "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", "####BITIB####", + "#FFHHHHHHHFF#", "####BITIB####", "####CCCCC####", "####CCCCC####", "####CCCCC####", + "####BITIB####", "##TTTTPTTTT##") + .aisle("XXXXXXXXXXXXX", "XXXXXXXXXXXXX", "#F####P####F#", "#F####P####F#", "#FFHHHPHHHFF#", + "######P######", "######P######", "######P######", "######P######", "######P######", + "##FHHHPHHHF##", "######P######", "######P######", "######P######", "######P######", + "######P######", "##TTTTPTTTT##") + .aisle("XXXXXXXXXXXXX", "XXXXVVVVVXXXX", "##F#######F##", "##F#######F##", "##FFFHHHFFF##", + "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", "##F#######F##", + "##FFFHHHFFF##", "#############", "#############", "#############", "#############", + "#############", "###TTTTTTT###") + .aisle("#XXXXXXXXXXX#", "#XXXXXXXXXXX#", "###F#####F###", "###F#####F###", "###FFFFFFF###", + "#############", "#############", "#############", "#############", "#############", + "####FFFFF####", "#############", "#############", "#############", "#############", + "#############", "#############") + .aisle("##XXXXXXXXX##", "##XXXXSXXXX##", "#############", "#############", "#############", + "#############", "#############", "#############", "#############", "#############", + "#############", "#############", "#############", "#############", "#############", + "#############", "#############") .where('S', selfPredicate()) .where('X', casing.or(autoAbilities(true, true, true, true, true, true, false))) .where('F', frames(Materials.NaquadahAlloy)) @@ -126,7 +170,8 @@ public boolean checkRecipe(@NotNull Recipe recipe, boolean consumeIfSuccess) { } private static IBlockState getCasingState() { - return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING); + return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getState(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING); } private static IBlockState getCasingState2() { @@ -138,7 +183,8 @@ private static IBlockState getFireboxState() { } private static IBlockState getIntakeState() { - return MetaBlocks.MULTIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.EXTREME_ENGINE_INTAKE_CASING); + return MetaBlocks.MULTIBLOCK_CASING + .getState(BlockMultiblockCasing.MultiblockCasingType.EXTREME_ENGINE_INTAKE_CASING); } private static IBlockState getPipeState() { @@ -159,7 +205,8 @@ public void addInformation(ItemStack stack, @Nullable World player, List @Override public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) { - return iMultiblockPart instanceof IMufflerHatch ? Textures.ROBUST_TUNGSTENSTEEL_CASING : GCYMTextures.BLAST_CASING; + return iMultiblockPart instanceof IMufflerHatch ? Textures.ROBUST_TUNGSTENSTEEL_CASING : + GCYMTextures.BLAST_CASING; } @Override @@ -190,14 +237,14 @@ public MegaBlastFurnaceRecipeLogic(RecipeMapMultiblockController metaTileEntity) } @Override - protected int @NotNull [] runOverclockingLogic(@NotNull IRecipePropertyStorage propertyStorage, int recipeEUt, long maxVoltage, int duration, int maxOverclocks) { + protected int @NotNull [] runOverclockingLogic(@NotNull IRecipePropertyStorage propertyStorage, int recipeEUt, + long maxVoltage, int duration, int maxOverclocks) { return heatingCoilOverclockingLogic(Math.abs(recipeEUt), maxVoltage, duration, maxOverclocks, ((IHeatingCoil) metaTileEntity).getCurrentTemperature(), - propertyStorage.getRecipePropertyValue(TemperatureProperty.getInstance(), 0) - ); + propertyStorage.getRecipePropertyValue(TemperatureProperty.getInstance(), 0)); } } } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaVacuumFreezer.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaVacuumFreezer.java index c8822fc2..2f49f518 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaVacuumFreezer.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaVacuumFreezer.java @@ -1,9 +1,10 @@ package gregicality.multiblocks.common.metatileentities.multiblock.standard; -import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gregicality.multiblocks.api.render.GCYMTextures; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import org.jetbrains.annotations.NotNull; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockPart; @@ -17,9 +18,11 @@ import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.BlockMetalCasing; import gregtech.common.blocks.MetaBlocks; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import gregicality.multiblocks.api.render.GCYMTextures; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; public class MetaTileEntityMegaVacuumFreezer extends GCYMRecipeMapMultiblockController { @@ -35,12 +38,18 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol @Override protected @NotNull BlockPattern createStructurePattern() { return FactoryBlockPattern.start() - .aisle("XXXXXXX#KKK", "XXXXXXX#KVK", "XXXXXXX#KVK", "XXXXXXX#KVK", "XXXXXXX#KKK", "XXXXXXX####", "XXXXXXX####") - .aisle("XXXXXXX#KVK", "XPPPPPPPPPV", "XPAPAPX#VPV", "XPPPPPPPPPV", "XPAPAPX#KVK", "XPPPPPX####", "XXXXXXX####") - .aisle("XXXXXXX#KVK", "XPAPAPX#VPV", "XAAAAAX#VPV", "XPAAAPX#VPV", "XAAAAAX#KVK", "XPAPAPX####", "XXXXXXX####") - .aisle("XXXXXXX#KVK", "XPAPAPPPPPV", "XAAAAAX#VPV", "XPAAAPPPPPV", "XAAAAAX#KVK", "XPAPAPX####", "XXXXXXX####") - .aisle("XXXXXXX#KKK", "XPPPPPX#KVK", "XPAAAPX#KVK", "XPAAAPX#KVK", "XPAAAPX#KKK", "XPPPPPX####", "XXXXXXX####") - .aisle("#XXXXX#####", "#XXSXX#####", "#XGGGX#####", "#XGGGX#####", "#XGGGX#####", "#XXXXX#####", "###########") + .aisle("XXXXXXX#KKK", "XXXXXXX#KVK", "XXXXXXX#KVK", "XXXXXXX#KVK", "XXXXXXX#KKK", "XXXXXXX####", + "XXXXXXX####") + .aisle("XXXXXXX#KVK", "XPPPPPPPPPV", "XPAPAPX#VPV", "XPPPPPPPPPV", "XPAPAPX#KVK", "XPPPPPX####", + "XXXXXXX####") + .aisle("XXXXXXX#KVK", "XPAPAPX#VPV", "XAAAAAX#VPV", "XPAAAPX#VPV", "XAAAAAX#KVK", "XPAPAPX####", + "XXXXXXX####") + .aisle("XXXXXXX#KVK", "XPAPAPPPPPV", "XAAAAAX#VPV", "XPAAAPPPPPV", "XAAAAAX#KVK", "XPAPAPX####", + "XXXXXXX####") + .aisle("XXXXXXX#KKK", "XPPPPPX#KVK", "XPAAAPX#KVK", "XPAAAPX#KVK", "XPAAAPX#KKK", "XPPPPPX####", + "XXXXXXX####") + .aisle("#XXXXX#####", "#XXSXX#####", "#XGGGX#####", "#XGGGX#####", "#XGGGX#####", "#XXXXX#####", + "###########") .where('S', selfPredicate()) .where('X', states(getCasingState()).setMinGlobalLimited(140).or(autoAbilities())) .where('G', states(getCasingState2())) diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityParallelHatch.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityParallelHatch.java index e9c997af..62e4620a 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityParallelHatch.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityParallelHatch.java @@ -1,11 +1,21 @@ package gregicality.multiblocks.common.metatileentities.multiblockpart; -import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.vec.Matrix4; -import gregicality.multiblocks.api.capability.IParallelHatch; -import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; -import gregicality.multiblocks.api.render.GCYMTextures; +import java.util.List; +import java.util.function.Function; +import java.util.function.IntSupplier; + +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import gregtech.api.GTValues; import gregtech.api.capability.GregtechTileCapabilities; import gregtech.api.gui.GuiTextures; @@ -18,22 +28,17 @@ import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.util.List; -import java.util.function.Function; -import java.util.function.IntSupplier; +import gregicality.multiblocks.api.capability.IParallelHatch; +import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; +import gregicality.multiblocks.api.render.GCYMTextures; -public class MetaTileEntityParallelHatch extends MetaTileEntityMultiblockPart implements IMultiblockAbilityPart, IParallelHatch { +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.pipeline.IVertexOperation; +import codechicken.lib.vec.Matrix4; + +public class MetaTileEntityParallelHatch extends MetaTileEntityMultiblockPart + implements IMultiblockAbilityPart, IParallelHatch { private static final int MIN_PARALLEL = 1; @@ -70,9 +75,10 @@ protected ModularUI createUI(@NotNull EntityPlayer entityPlayer) { parallelAmountGroup.addWidget(new IncrementButtonWidget(118, 36, 30, 20, 1, 4, 16, 64, this::setCurrentParallel) .setDefaultTooltip() .setShouldClientCallback(false)); - parallelAmountGroup.addWidget(new IncrementButtonWidget(29, 36, 30, 20, -1, -4, -16, -64, this::setCurrentParallel) - .setDefaultTooltip() - .setShouldClientCallback(false)); + parallelAmountGroup + .addWidget(new IncrementButtonWidget(29, 36, 30, 20, -1, -4, -16, -64, this::setCurrentParallel) + .setDefaultTooltip() + .setShouldClientCallback(false)); parallelAmountGroup.addWidget(new TextFieldWidget2(63, 42, 51, 20, this::getParallelAmountToString, val -> { if (val != null && !val.isEmpty()) { @@ -115,7 +121,8 @@ public String getParallelAmountToString() { } @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, + boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gcym.machine.parallel_hatch.tooltip", this.maxParallel)); tooltip.add(I18n.format("gregtech.universal.disabled")); @@ -148,7 +155,8 @@ else if (getTier() == GTValues.ZPM) if (getController() != null && getController() instanceof RecipeMapMultiblockController) { overlayRenderer.renderOrientedState(renderState, translation, pipeline, getFrontFacing(), getController().isActive(), - getController().getCapability(GregtechTileCapabilities.CAPABILITY_CONTROLLABLE, null).isWorkingEnabled()); + getController().getCapability(GregtechTileCapabilities.CAPABILITY_CONTROLLABLE, null) + .isWorkingEnabled()); } else { overlayRenderer.renderOrientedState(renderState, translation, pipeline, getFrontFacing(), false, false); } diff --git a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityTieredHatch.java b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityTieredHatch.java index fa69e820..8dc3e985 100644 --- a/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityTieredHatch.java +++ b/src/main/java/gregicality/multiblocks/common/metatileentities/multiblockpart/MetaTileEntityTieredHatch.java @@ -1,10 +1,16 @@ package gregicality.multiblocks.common.metatileentities.multiblockpart; -import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.vec.Matrix4; -import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; -import gregicality.multiblocks.api.render.GCYMTextures; +import java.util.List; + +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import gregtech.api.GTValues; import gregtech.api.gui.ModularUI; import gregtech.api.metatileentity.ITieredMetaTileEntity; @@ -13,17 +19,16 @@ import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart; import gregtech.api.metatileentity.multiblock.MultiblockAbility; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.util.List; +import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility; +import gregicality.multiblocks.api.render.GCYMTextures; + +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.pipeline.IVertexOperation; +import codechicken.lib.vec.Matrix4; -public class MetaTileEntityTieredHatch extends MetaTileEntityMultiblockPart implements IMultiblockAbilityPart { +public class MetaTileEntityTieredHatch extends MetaTileEntityMultiblockPart + implements IMultiblockAbilityPart { public MetaTileEntityTieredHatch(ResourceLocation metaTileEntityId, int tier) { super(metaTileEntityId, tier); @@ -47,11 +52,13 @@ protected ModularUI createUI(EntityPlayer entityPlayer) { @Override public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) { super.renderMetaTileEntity(renderState, translation, pipeline); - GCYMTextures.TIERED_HATCH_OVERLAY.renderOrientedState(renderState, translation, pipeline, getFrontFacing(), false, false); + GCYMTextures.TIERED_HATCH_OVERLAY.renderOrientedState(renderState, translation, pipeline, getFrontFacing(), + false, false); } @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, + boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gcym.machine.tiered_hatch.tooltip.1", GTValues.VNF[getTier()])); } diff --git a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMCasingLoader.java b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMCasingLoader.java index d295366e..d78d3483 100644 --- a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMCasingLoader.java +++ b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMCasingLoader.java @@ -1,9 +1,5 @@ package gregicality.multiblocks.loaders.recipe; -import gregicality.multiblocks.api.unification.GCYMMaterials; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; import gregtech.api.GTValues; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -14,31 +10,90 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.items.MetaItems; +import gregicality.multiblocks.api.unification.GCYMMaterials; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing; + public final class GCYMCasingLoader { private GCYMCasingLoader() {} public static void init() { // Multiblock Casings - ModHandler.addShapedRecipe(true, "casing_large_macerator", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.Zeron100), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Titanium)); - ModHandler.addShapedRecipe(true, "casing_high_temperature", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING, 2), "DhD", "PFP", "DwD", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.TitaniumCarbide), 'D', new UnificationEntry(OrePrefix.plate, GCYMMaterials.HSLASteel), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.TungstenCarbide)); - ModHandler.addShapedRecipe(true, "casing_large_assembler", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.ASSEMBLING_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.Stellite100), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Tungsten)); - ModHandler.addShapedRecipe(true, "casing_stress_proof", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.MaragingSteel300), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.StainlessSteel)); - ModHandler.addShapedRecipe(true, "casing_corrosion_proof", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.CORROSION_PROOF_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.CobaltBrass), 'F', new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.HSLASteel)); - ModHandler.addShapedRecipe(true, "casing_vibration_safe", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.IncoloyMA956), 'F', new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.IncoloyMA956)); - ModHandler.addShapedRecipe(true, "casing_watertight", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.WATERTIGHT_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.WatertightSteel), 'F', new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.WatertightSteel)); - ModHandler.addShapedRecipe(true, "casing_large_cutter", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.HastelloyC276), 'F', new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.HastelloyC276)); - ModHandler.addShapedRecipe(true, "casing_nonconducting", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.HSLASteel), 'F', new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.HSLASteel)); - ModHandler.addShapedRecipe(true, "casing_large_mixer", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.MIXER_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.HastelloyX), 'F', new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.MaragingSteel300)); - ModHandler.addShapedRecipe(true, "casing_large_engraver", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.ENGRAVER_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.TitaniumTungstenCarbide), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Titanium)); - ModHandler.addShapedRecipe(true, "casing_atomic", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.ATOMIC_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plateDouble, GCYMMaterials.Trinaquadalloy), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.NaquadahAlloy)); - ModHandler.addShapedRecipe(true, "casing_steam", GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.STEAM_CASING, 2), "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Brass), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Brass)); + ModHandler.addShapedRecipe(true, "casing_large_macerator", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.Zeron100), 'F', + new UnificationEntry(OrePrefix.frameGt, Materials.Titanium)); + ModHandler.addShapedRecipe(true, "casing_high_temperature", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING, 2), + "DhD", "PFP", "DwD", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.TitaniumCarbide), 'D', + new UnificationEntry(OrePrefix.plate, GCYMMaterials.HSLASteel), 'F', + new UnificationEntry(OrePrefix.frameGt, Materials.TungstenCarbide)); + ModHandler.addShapedRecipe(true, "casing_large_assembler", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.ASSEMBLING_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.Stellite100), 'F', + new UnificationEntry(OrePrefix.frameGt, Materials.Tungsten)); + ModHandler.addShapedRecipe(true, "casing_stress_proof", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.MaragingSteel300), 'F', + new UnificationEntry(OrePrefix.frameGt, Materials.StainlessSteel)); + ModHandler.addShapedRecipe(true, "casing_corrosion_proof", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.CORROSION_PROOF_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.CobaltBrass), 'F', + new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.HSLASteel)); + ModHandler.addShapedRecipe(true, "casing_vibration_safe", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.IncoloyMA956), 'F', + new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.IncoloyMA956)); + ModHandler.addShapedRecipe(true, "casing_watertight", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.WATERTIGHT_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.WatertightSteel), 'F', + new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.WatertightSteel)); + ModHandler.addShapedRecipe(true, "casing_large_cutter", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.HastelloyC276), 'F', + new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.HastelloyC276)); + ModHandler.addShapedRecipe(true, "casing_nonconducting", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.HSLASteel), 'F', + new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.HSLASteel)); + ModHandler.addShapedRecipe(true, "casing_large_mixer", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.MIXER_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.HastelloyX), 'F', + new UnificationEntry(OrePrefix.frameGt, GCYMMaterials.MaragingSteel300)); + ModHandler.addShapedRecipe(true, "casing_large_engraver", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.ENGRAVER_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.TitaniumTungstenCarbide), + 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Titanium)); + ModHandler.addShapedRecipe(true, "casing_atomic", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.ATOMIC_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plateDouble, GCYMMaterials.Trinaquadalloy), + 'F', new UnificationEntry(OrePrefix.frameGt, Materials.NaquadahAlloy)); + ModHandler.addShapedRecipe(true, "casing_steam", + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.STEAM_CASING, 2), + "PhP", "PFP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Brass), 'F', + new UnificationEntry(OrePrefix.frameGt, Materials.Brass)); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.Zeron100, 6) .input(OrePrefix.frameGt, Materials.Titanium) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() @@ -46,114 +101,155 @@ public static void init() { .input(OrePrefix.plate, GCYMMaterials.TitaniumCarbide, 2) .input(OrePrefix.frameGt, Materials.TungstenCarbide) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.HIGH_TEMPERATURE_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.Stellite100, 6) .input(OrePrefix.frameGt, Materials.Tungsten) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.ASSEMBLING_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.ASSEMBLING_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.MaragingSteel300, 6) .input(OrePrefix.frameGt, Materials.StainlessSteel) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.STRESS_PROOF_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, Materials.CobaltBrass, 6) .input(OrePrefix.frameGt, GCYMMaterials.HSLASteel) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.CORROSION_PROOF_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.CORROSION_PROOF_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.IncoloyMA956, 6) .input(OrePrefix.frameGt, GCYMMaterials.IncoloyMA956) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.VIBRATION_SAFE_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.WatertightSteel, 6) .input(OrePrefix.frameGt, GCYMMaterials.WatertightSteel) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.WATERTIGHT_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.WATERTIGHT_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.HastelloyC276, 6) .input(OrePrefix.frameGt, GCYMMaterials.HastelloyC276) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.HSLASteel, 6) .input(OrePrefix.frameGt, GCYMMaterials.HSLASteel) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.HastelloyX, 6) .input(OrePrefix.frameGt, GCYMMaterials.MaragingSteel300) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.MIXER_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.MIXER_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, GCYMMaterials.TitaniumTungstenCarbide, 6) .input(OrePrefix.frameGt, Materials.Titanium) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.ENGRAVER_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.ENGRAVER_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plateDouble, GCYMMaterials.Trinaquadalloy, 6) .input(OrePrefix.frameGt, Materials.NaquadahAlloy) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.ATOMIC_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.ATOMIC_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, Materials.Brass, 6) .input(OrePrefix.frameGt, Materials.Brass) .notConsumable(new IntCircuitIngredient(6)) - .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.STEAM_CASING, 2)) + .outputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.STEAM_CASING, 2)) .duration(50).EUt(16).buildAndRegister(); // Unique Casings - ModHandler.addShapedRecipe(true, "casing_crushing_wheels", GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.CRUSHING_WHEELS, 2), "SSS", "GCG", "GMG", 'S', new UnificationEntry(OrePrefix.gearSmall, Materials.TungstenCarbide), 'G', new UnificationEntry(OrePrefix.gear, Materials.Ultimet), 'C', GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING), 'M', MetaItems.ELECTRIC_MOTOR_IV.getStackForm()); - ModHandler.addShapedRecipe(true, "casing_slicing_blades", GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.SLICING_BLADES, 2), "SSS", "GCG", "GMG", 'S', new UnificationEntry(OrePrefix.plate, Materials.TungstenCarbide), 'G', new UnificationEntry(OrePrefix.gear, Materials.Ultimet), 'C', GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING), 'M', MetaItems.ELECTRIC_MOTOR_IV.getStackForm()); - ModHandler.addShapedRecipe(true, "casing_electrolytic_cell", GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.ELECTROLYTIC_CELL, 2), "WWW", "WCW", "KAK", 'W', new UnificationEntry(OrePrefix.wireGtDouble, Materials.Platinum), 'C', GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING), 'K', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.IV), 'A', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten)); - ModHandler.addShapedRecipe(true, "casing_heat_vent", GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.HEAT_VENT, 2), "PDP", "RLR", "PDP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.TantalumCarbide), 'D', new UnificationEntry(OrePrefix.plateDouble, GCYMMaterials.MolybdenumDisilicide), 'R', new UnificationEntry(OrePrefix.rotor, Materials.Titanium), 'L', new UnificationEntry(OrePrefix.stickLong, GCYMMaterials.MolybdenumDisilicide)); + ModHandler.addShapedRecipe(true, "casing_crushing_wheels", + GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.CRUSHING_WHEELS, 2), + "SSS", "GCG", "GMG", 'S', new UnificationEntry(OrePrefix.gearSmall, Materials.TungstenCarbide), 'G', + new UnificationEntry(OrePrefix.gear, Materials.Ultimet), 'C', + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING), + 'M', MetaItems.ELECTRIC_MOTOR_IV.getStackForm()); + ModHandler.addShapedRecipe(true, "casing_slicing_blades", + GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.SLICING_BLADES, 2), + "SSS", "GCG", "GMG", 'S', new UnificationEntry(OrePrefix.plate, Materials.TungstenCarbide), 'G', + new UnificationEntry(OrePrefix.gear, Materials.Ultimet), 'C', + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING), + 'M', MetaItems.ELECTRIC_MOTOR_IV.getStackForm()); + ModHandler.addShapedRecipe(true, "casing_electrolytic_cell", + GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.ELECTROLYTIC_CELL, 2), + "WWW", "WCW", "KAK", 'W', new UnificationEntry(OrePrefix.wireGtDouble, Materials.Platinum), 'C', + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING), + 'K', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.IV), 'A', + new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten)); + ModHandler.addShapedRecipe(true, "casing_heat_vent", + GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.HEAT_VENT, 2), "PDP", + "RLR", "PDP", 'P', new UnificationEntry(OrePrefix.plate, GCYMMaterials.TantalumCarbide), 'D', + new UnificationEntry(OrePrefix.plateDouble, GCYMMaterials.MolybdenumDisilicide), 'R', + new UnificationEntry(OrePrefix.rotor, Materials.Titanium), 'L', + new UnificationEntry(OrePrefix.stickLong, GCYMMaterials.MolybdenumDisilicide)); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.gearSmall, Materials.TungstenCarbide, 3) .input(OrePrefix.gear, Materials.Ultimet, 4) .inputs(MetaItems.ELECTRIC_MOTOR_IV.getStackForm()) - .inputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING)) - .outputs(GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.CRUSHING_WHEELS, 2)) + .inputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.MACERATOR_CASING)) + .outputs(GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.CRUSHING_WHEELS, + 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plate, Materials.TungstenCarbide, 3) .input(OrePrefix.gear, Materials.Ultimet, 4) .inputs(MetaItems.ELECTRIC_MOTOR_IV.getStackForm()) - .inputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING)) - .outputs(GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.SLICING_BLADES, 2)) + .inputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.CUTTER_CASING)) + .outputs(GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.SLICING_BLADES, + 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.wireGtDouble, Materials.Platinum, 5) .input(OrePrefix.circuit, MarkerMaterials.Tier.IV, 2) .input(OrePrefix.cableGtSingle, Materials.Tungsten) - .inputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING)) - .outputs(GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.ELECTROLYTIC_CELL, 2)) + .inputs(GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.NONCONDUCTING_CASING)) + .outputs(GCYMMetaBlocks.UNIQUE_CASING + .getItemVariant(BlockUniqueCasing.UniqueCasingType.ELECTROLYTIC_CELL, 2)) .duration(50).EUt(16).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() @@ -168,7 +264,8 @@ public static void init() { .input(OrePrefix.ring, GCYMMaterials.MolybdenumDisilicide, 32) .input(OrePrefix.foil, Materials.Graphene, 16) .fluidInputs(GCYMMaterials.HSLASteel.getFluid(GTValues.L)) - .outputs(GCYMMetaBlocks.UNIQUE_CASING.getItemVariant(BlockUniqueCasing.UniqueCasingType.MOLYBDENUM_DISILICIDE_COIL)) + .outputs(GCYMMetaBlocks.UNIQUE_CASING + .getItemVariant(BlockUniqueCasing.UniqueCasingType.MOLYBDENUM_DISILICIDE_COIL)) .duration(500).EUt(GTValues.VA[GTValues.EV]).buildAndRegister(); } } diff --git a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMetaTileEntityLoader.java b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMetaTileEntityLoader.java index 80d75bb9..487bd164 100644 --- a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMetaTileEntityLoader.java +++ b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMetaTileEntityLoader.java @@ -1,9 +1,14 @@ package gregicality.multiblocks.loaders.recipe; -import gregicality.multiblocks.api.GCYMValues; -import gregicality.multiblocks.common.block.GCYMMetaBlocks; -import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; -import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; +import static gregicality.multiblocks.api.unification.GCYMMaterials.*; +import static gregtech.api.GTValues.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.*; + +import net.minecraftforge.fml.common.Loader; + +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.GregTechAPI; import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.MarkerMaterials; @@ -14,13 +19,11 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.loaders.recipe.CraftingComponent; import gregtech.loaders.recipe.MetaTileEntityLoader; -import net.minecraftforge.fml.common.Loader; -import org.apache.commons.lang3.ArrayUtils; -import static gregicality.multiblocks.api.unification.GCYMMaterials.*; -import static gregtech.api.GTValues.*; -import static gregtech.api.unification.material.Materials.*; -import static gregtech.api.unification.ore.OrePrefix.*; +import gregicality.multiblocks.api.GCYMValues; +import gregicality.multiblocks.common.block.GCYMMetaBlocks; +import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing; +import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; public final class GCYMMetaTileEntityLoader { @@ -67,7 +70,6 @@ public static void init() { 'S', MetaTileEntities.AUTOCLAVE[IV].getStackForm(), 'W', new UnificationEntry(cableGtSingle, Platinum)); - ModHandler.addShapedRecipe(true, "large_bender", GCYMMetaTileEntities.LARGE_BENDER.getStackForm(), "PWP", "BCS", "FWH", 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.IV), @@ -212,7 +214,8 @@ public static void init() { 'A', new UnificationEntry(plate, HSLASteel), 'W', new UnificationEntry(cableGtSingle, Platinum)); - ModHandler.addShapedRecipe(true, "electric_implosion_compressor", GCYMMetaTileEntities.ELECTRIC_IMPLOSION_COMPRESSOR.getStackForm(), + ModHandler.addShapedRecipe(true, "electric_implosion_compressor", + GCYMMetaTileEntities.ELECTRIC_IMPLOSION_COMPRESSOR.getStackForm(), "PCP", "FSF", "PCP", 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.ZPM), 'S', MetaTileEntities.IMPLOSION_COMPRESSOR.getStackForm(), @@ -220,25 +223,27 @@ public static void init() { 'F', MetaItems.FIELD_GENERATOR_IV.getStackForm()); // todo replication -// ModHandler.addShapedRecipe(true, "large_mass_fabricator", GCYMMetaTileEntities.LARGE_MASS_FABRICATOR.getStackForm(), -// "FCF", "ESE", "FWF", -// 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UHV), -// 'S', MetaTileEntities.MASS_FABRICATOR[ZPM].getStackForm(), //todo mid tier configs -// 'F', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), -// 'E', MetaItems.EMITTER_ZPM.getStackForm(), -// 'W', new UnificationEntry(cableGtDouble, VanadiumGallium)); + // ModHandler.addShapedRecipe(true, "large_mass_fabricator", + // GCYMMetaTileEntities.LARGE_MASS_FABRICATOR.getStackForm(), + // "FCF", "ESE", "FWF", + // 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UHV), + // 'S', MetaTileEntities.MASS_FABRICATOR[ZPM].getStackForm(), //todo mid tier configs + // 'F', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), + // 'E', MetaItems.EMITTER_ZPM.getStackForm(), + // 'W', new UnificationEntry(cableGtDouble, VanadiumGallium)); // todo replication -// ModHandler.addShapedRecipe(true, "large_replicator", GCYMMetaTileEntities.LARGE_REPLICATOR.getStackForm(), -// "FCF", "ESE", "FWF", -// 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UHV), -// 'S', MetaTileEntities.REPLICATOR[ZPM].getStackForm(), //todo mid tier configs -// 'F', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), -// 'E', MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL), -// 'W', new UnificationEntry(cableGtDouble, VanadiumGallium)); + // ModHandler.addShapedRecipe(true, "large_replicator", GCYMMetaTileEntities.LARGE_REPLICATOR.getStackForm(), + // "FCF", "ESE", "FWF", + // 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UHV), + // 'S', MetaTileEntities.REPLICATOR[ZPM].getStackForm(), //todo mid tier configs + // 'F', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), + // 'E', MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL), + // 'W', new UnificationEntry(cableGtDouble, VanadiumGallium)); if (!Loader.isModLoaded(GCYMValues.GCYS_MODID)) { - ModHandler.addShapedRecipe(true, "mega_blast_furnace", GCYMMetaTileEntities.MEGA_BLAST_FURNACE.getStackForm(), + ModHandler.addShapedRecipe(true, "mega_blast_furnace", + GCYMMetaTileEntities.MEGA_BLAST_FURNACE.getStackForm(), "PCP", "FSF", "DWD", 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UHV), 'S', MetaTileEntities.ELECTRIC_BLAST_FURNACE.getStackForm(), @@ -247,7 +252,8 @@ public static void init() { 'D', new UnificationEntry(plateDense, Neutronium), 'W', new UnificationEntry(wireGtQuadruple, RutheniumTriniumAmericiumNeutronate)); - ModHandler.addShapedRecipe(true, "mega_vacuum_freezer", GCYMMetaTileEntities.MEGA_VACUUM_FREEZER.getStackForm(), + ModHandler.addShapedRecipe(true, "mega_vacuum_freezer", + GCYMMetaTileEntities.MEGA_VACUUM_FREEZER.getStackForm(), "PCP", "FSF", "DWD", 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UHV), 'S', MetaTileEntities.VACUUM_FREEZER.getStackForm(), @@ -259,13 +265,16 @@ public static void init() { ModHandler.addShapedRecipe(true, "steam_engine", GCYMMetaTileEntities.STEAM_ENGINE.getStackForm(), "FPF", "PCP", "SGS", - 'C', GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getItemVariant(BlockLargeMultiblockCasing.CasingType.STEAM_CASING), + 'C', + GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING + .getItemVariant(BlockLargeMultiblockCasing.CasingType.STEAM_CASING), 'S', new UnificationEntry(gearSmall, Bronze), 'G', new UnificationEntry(gear, Steel), 'F', new UnificationEntry(pipeSmallFluid, Potin), 'P', new UnificationEntry(plate, Brass)); - ModHandler.addShapedRecipe(true, "large_circuit_assembler", GCYMMetaTileEntities.LARGE_CIRCUIT_ASSEMBLER.getStackForm(), + ModHandler.addShapedRecipe(true, "large_circuit_assembler", + GCYMMetaTileEntities.LARGE_CIRCUIT_ASSEMBLER.getStackForm(), "RER", "CSC", "WPW", 'R', MetaItems.ROBOT_ARM_LuV.getStackForm(), 'E', MetaItems.EMITTER_LuV.getStackForm(), @@ -283,7 +292,8 @@ public static void init() { 'E', MetaItems.EMITTER_IV.getStackForm(), 'W', new UnificationEntry(cableGtDouble, Platinum)); - ModHandler.addShapedRecipe(true, "parallel_hatch_luv", GCYMMetaTileEntities.PARALLEL_HATCH[LuV - IV].getStackForm(), + ModHandler.addShapedRecipe(true, "parallel_hatch_luv", + GCYMMetaTileEntities.PARALLEL_HATCH[LuV - IV].getStackForm(), "SCE", "CHC", "WCW", 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.ZPM), 'H', MetaTileEntities.HULL[LuV].getStackForm(), @@ -291,7 +301,8 @@ public static void init() { 'E', MetaItems.EMITTER_LuV.getStackForm(), 'W', new UnificationEntry(cableGtDouble, NiobiumTitanium)); - ModHandler.addShapedRecipe(true, "parallel_hatch_zpm", GCYMMetaTileEntities.PARALLEL_HATCH[ZPM - IV].getStackForm(), + ModHandler.addShapedRecipe(true, "parallel_hatch_zpm", + GCYMMetaTileEntities.PARALLEL_HATCH[ZPM - IV].getStackForm(), "SCE", "CHC", "WCW", 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UV), 'H', MetaTileEntities.HULL[ZPM].getStackForm(), @@ -299,7 +310,8 @@ public static void init() { 'E', MetaItems.EMITTER_ZPM.getStackForm(), 'W', new UnificationEntry(cableGtDouble, VanadiumGallium)); - ModHandler.addShapedRecipe(true, "parallel_hatch_uv", GCYMMetaTileEntities.PARALLEL_HATCH[UV - IV].getStackForm(), + ModHandler.addShapedRecipe(true, "parallel_hatch_uv", + GCYMMetaTileEntities.PARALLEL_HATCH[UV - IV].getStackForm(), "SCE", "CHC", "WCW", 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.UHV), 'H', MetaTileEntities.HULL[UV].getStackForm(), @@ -308,14 +320,16 @@ public static void init() { 'W', new UnificationEntry(cableGtDouble, YttriumBariumCuprate)); // Tiered Hatches - MetaTileEntityLoader.registerMachineRecipe(ArrayUtils.subarray(GCYMMetaTileEntities.TIERED_HATCH, 0, GregTechAPI.isHighTier() ? UHV : UV), "PPP", "PCP", "PPP", 'P', CraftingComponent.PLATE, 'C', CraftingComponent.BETTER_CIRCUIT); + MetaTileEntityLoader.registerMachineRecipe( + ArrayUtils.subarray(GCYMMetaTileEntities.TIERED_HATCH, 0, GregTechAPI.isHighTier() ? UHV : UV), "PPP", + "PCP", "PPP", 'P', CraftingComponent.PLATE, 'C', CraftingComponent.BETTER_CIRCUIT); if (!GregTechAPI.isHighTier()) { - ModHandler.addShapedRecipe(true, "gcym.machine.tiered_hatch.uhv", GCYMMetaTileEntities.TIERED_HATCH[UHV].getStackForm(), + ModHandler.addShapedRecipe(true, "gcym.machine.tiered_hatch.uhv", + GCYMMetaTileEntities.TIERED_HATCH[UHV].getStackForm(), "PPP", "PCP", "PPP", 'P', CraftingComponent.PLATE.getIngredient(UHV), 'C', CraftingComponent.CIRCUIT.getIngredient(UHV)); } - } } diff --git a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMiscRecipes.java b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMiscRecipes.java index 1dd47437..153e66c7 100644 --- a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMiscRecipes.java +++ b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMiscRecipes.java @@ -1,12 +1,12 @@ package gregicality.multiblocks.loaders.recipe; -import gregtech.api.recipes.RecipeMaps; -import gregtech.common.items.MetaItems; - import static gregtech.api.unification.material.Materials.Graphene; import static gregtech.api.unification.ore.OrePrefix.dust; import static gregtech.api.unification.ore.OrePrefix.foil; +import gregtech.api.recipes.RecipeMaps; +import gregtech.common.items.MetaItems; + public final class GCYMMiscRecipes { private GCYMMiscRecipes() {} diff --git a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMixerRecipes.java b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMixerRecipes.java index 9ce06491..5792206a 100644 --- a/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMixerRecipes.java +++ b/src/main/java/gregicality/multiblocks/loaders/recipe/GCYMMixerRecipes.java @@ -1,13 +1,13 @@ package gregicality.multiblocks.loaders.recipe; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.recipes.ingredients.IntCircuitIngredient; - import static gregicality.multiblocks.api.unification.GCYMMaterials.*; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.ore.OrePrefix.dust; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.recipes.ingredients.IntCircuitIngredient; + public final class GCYMMixerRecipes { private GCYMMixerRecipes() {} diff --git a/src/main/java/gregicality/multiblocks/loaders/recipe/ManualABSRecipes.java b/src/main/java/gregicality/multiblocks/loaders/recipe/ManualABSRecipes.java index 48371503..0a310bc3 100644 --- a/src/main/java/gregicality/multiblocks/loaders/recipe/ManualABSRecipes.java +++ b/src/main/java/gregicality/multiblocks/loaders/recipe/ManualABSRecipes.java @@ -1,12 +1,14 @@ package gregicality.multiblocks.loaders.recipe; -import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; +import org.jetbrains.annotations.NotNull; + import gregtech.api.GTValues; import gregtech.api.recipes.ingredients.IntCircuitIngredient; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; -import org.jetbrains.annotations.NotNull; + +import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; public final class ManualABSRecipes { diff --git a/src/main/java/gregicality/multiblocks/loaders/recipe/handlers/GCYMMaterialRecipeHandler.java b/src/main/java/gregicality/multiblocks/loaders/recipe/handlers/GCYMMaterialRecipeHandler.java index e5f6bf98..6b371995 100644 --- a/src/main/java/gregicality/multiblocks/loaders/recipe/handlers/GCYMMaterialRecipeHandler.java +++ b/src/main/java/gregicality/multiblocks/loaders/recipe/handlers/GCYMMaterialRecipeHandler.java @@ -1,19 +1,22 @@ package gregicality.multiblocks.loaders.recipe.handlers; -import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty; -import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import gregtech.api.unification.material.Material; import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.OrePrefix; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; + +import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty; +import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; public final class GCYMMaterialRecipeHandler { private GCYMMaterialRecipeHandler() {} public static void register() { - OrePrefix.ingot.addProcessingHandler(GCYMPropertyKey.ALLOY_BLAST, GCYMMaterialRecipeHandler::generateAlloyBlastRecipes); + OrePrefix.ingot.addProcessingHandler(GCYMPropertyKey.ALLOY_BLAST, + GCYMMaterialRecipeHandler::generateAlloyBlastRecipes); } /** diff --git a/src/test/java/gregicality/multiblocks/Bootstrap.java b/src/test/java/gregicality/multiblocks/Bootstrap.java index f47fedd7..fd68b3ea 100644 --- a/src/test/java/gregicality/multiblocks/Bootstrap.java +++ b/src/test/java/gregicality/multiblocks/Bootstrap.java @@ -1,17 +1,12 @@ package gregicality.multiblocks; -import gregicality.multiblocks.api.fluids.GCYMMetaFluids; -import gregicality.multiblocks.api.unification.GCYMMaterialFlagAddition; -import gregicality.multiblocks.api.unification.GCYMMaterials; -import gregicality.multiblocks.api.unification.properties.GCYMLatePropertyAddition; -import gregtech.api.GTValues; -import gregtech.api.GregTechAPI; -import gregtech.api.fluids.MetaFluids; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.material.materials.MaterialFlagAddition; -import gregtech.api.unification.ore.OrePrefix; -import gregtech.common.items.MetaItems; -import gregtech.core.unification.material.internal.MaterialRegistryManager; +import java.io.File; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.List; +import java.util.Set; + import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.Locale; import net.minecraft.network.INetHandler; @@ -24,12 +19,19 @@ import net.minecraftforge.fml.relauncher.CoreModManager; import net.minecraftforge.fml.relauncher.Side; -import java.io.File; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import gregtech.api.GTValues; +import gregtech.api.GregTechAPI; +import gregtech.api.fluids.MetaFluids; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.material.materials.MaterialFlagAddition; +import gregtech.api.unification.ore.OrePrefix; +import gregtech.common.items.MetaItems; +import gregtech.core.unification.material.internal.MaterialRegistryManager; + +import gregicality.multiblocks.api.fluids.GCYMMetaFluids; +import gregicality.multiblocks.api.unification.GCYMMaterialFlagAddition; +import gregicality.multiblocks.api.unification.GCYMMaterials; +import gregicality.multiblocks.api.unification.properties.GCYMLatePropertyAddition; public final class Bootstrap { @@ -165,7 +167,8 @@ public INetHandler getClientPlayHandler() { } @Override - public void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set channelSet, String channel, Side side) { + public void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set channelSet, + String channel, Side side) { throw new UnsupportedOperationException(); } diff --git a/src/test/java/gregicality/multiblocks/api/material/AlloyBlastTest.java b/src/test/java/gregicality/multiblocks/api/material/AlloyBlastTest.java index 3643890f..32d8e642 100644 --- a/src/test/java/gregicality/multiblocks/api/material/AlloyBlastTest.java +++ b/src/test/java/gregicality/multiblocks/api/material/AlloyBlastTest.java @@ -1,18 +1,22 @@ package gregicality.multiblocks.api.material; -import com.google.common.collect.Sets; -import gregicality.multiblocks.Bootstrap; -import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import gregtech.api.GregTechAPI; -import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.properties.PropertyKey; -import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; +import java.util.Set; + import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.util.Set; +import com.google.common.collect.Sets; + +import gregtech.api.GregTechAPI; +import gregtech.api.unification.material.Material; +import gregtech.api.unification.material.properties.PropertyKey; + +import gregicality.multiblocks.Bootstrap; +import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; + +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; public class AlloyBlastTest {