diff options
author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-07-18 09:58:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-18 20:58:41 +0700 |
commit | e3a650785887866e4b8533b61044479ecb80aee7 (patch) | |
tree | a5dcc2993f3f234f93e5891286d18fdc426070b4 /src/main/java/gtPlusPlus/xmod | |
parent | dcc8dac94e6d5a5561cf8bf38fc7f87e222b40e3 (diff) | |
download | GT5-Unofficial-e3a650785887866e4b8533b61044479ecb80aee7.tar.gz GT5-Unofficial-e3a650785887866e4b8533b61044479ecb80aee7.tar.bz2 GT5-Unofficial-e3a650785887866e4b8533b61044479ecb80aee7.zip |
Add a Multiblock Electromagnetic Separator (#2726)
* Built multi template with required methods in gt++.
* Filled out template based on gt++ electrolyzer code
* Refactored into gregtech. Not supposed to add multis to gt++, whoops!
* IntelliJ "smartly" deleted all of the imports in GT_Loader_MetaTileEntities and replaced it with a wildcard import... which caused it to fail checkstyle. Thanks so much, IntelliJ.
* Figured out how to make IntelliJ Stop Doing That
* Added author tag and vac freezer texture for testing.
* Registered casing, working on getting texture functional
* Added casing texture
* Fixed structure check and added processing logic. Multi now forms and can run EMS recipes
* Added overlay textures
* Made new Casings10 class and added EMS Casings to it. Texture mesh now functions
* Made controller match casing mesh
* Shifted Casings10 to an actual page number instead of magic number. Now sits on page 16, following where waterline casings will be implemented in future
* Added Electromagnet Housing. Has no texture, but you can place an open its inventory
* Added electromagnets and their texture files
* Multi now requires EM housing and breaks if there are 2
* Electromagnet Housing has proper texture and can be wrenched. Also has a placeholder overlay
* Tooltip updates. Added pollution
* Electromagnet tiers modify processing logic. Some issues remaining
* Prettier switch & spotlessApply
* Multi now validates electromagnet before recipe check. Also added a machine casing texture
* Pollution fix
* Support for exotic energy hatches added. Recipe check fails if electromagnet is too weak
* Stack size of 1 for electromagnets
* New electromagnet textures
* Final pass on EM textures. Also, EM Housing uses IV hull as base texture instead of ULV
* Put in placeholder-ish recipes for controller/casings/EM housing
* Placeholder recipes for electromagnets. Also fixed structure check, whoops
* Renamed multi to Magnetic Flux Exhibitor
* MFE can run as a polarizer
* Fixed exotic warning getting stuck
* Attempted to add assline recipes, not working
* Fixed assembling line recipe templates. Thank you chochem <3
* Fancied up tooltips
* Fixed parallel issue
* Updated recipes. Will have to move them to coremod
* Nerfed speed on all electromagnets
* sa
* Restricted MFE to multiamp non-laser.
* Spotless
* Animated Mag hatch
* Added glow
* Removed pollution. I am a gentle soul
* Addition to structure check
* Disabled wireless laser compatibility
* sa
(cherry picked from commit 155cf4dd7284ca84bd9be79f11b6f577b38a4e0d)
* spotless
* Removed all recipes. These have been replaced in the coremod
* -Removed unnecessary structure check
-MIN_CASING final
-Baps author tag
-Refactored mMagHatch to not be a list
-Added tooltip builder in MagnetTiers
* Forgot to run spotless
* Last minute tooltip fix for structure accuracy
---------
Co-authored-by: Dream Master <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
3 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index e1f7c415ef..71274e0091 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -242,6 +242,9 @@ public enum GregtechItemList implements GregtechItemContainer { Industrial_Electrolyzer, Casing_Electrolyzer, + // Industrial Electromagnetic Separator + Industrial_Electromagnetic_Separator, + // Industrial Maceration Stack Industrial_MacerationStack, Casing_MacerationStack, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java index 84aa3cf77f..544df5821e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; import static gregtech.api.GregTech_API.sBlockCasings1; import static gregtech.api.GregTech_API.sBlockCasings2; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java index d84003bb0f..b03c7b2a7a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; import static gregtech.api.GregTech_API.sBlockCasings1; import static gregtech.api.GregTech_API.sBlockCasings2; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; |