From e3a650785887866e4b8533b61044479ecb80aee7 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Thu, 18 Jul 2024 09:58:41 -0400 Subject: 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 --- src/main/resources/assets/gregtech/lang/en_US.lang | 4 ++++ .../textures/blocks/iconsets/MACHINE_CASING_EMS.png | Bin 0 -> 441 bytes .../textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png | Bin 0 -> 440 bytes .../blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta | 5 +++++ .../textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png | Bin 0 -> 345 bytes .../blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta | 5 +++++ .../textures/blocks/iconsets/OVERLAY_FRONT_EMS.png | Bin 0 -> 254 bytes .../textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png | Bin 0 -> 255 bytes .../blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png | Bin 0 -> 255 bytes .../textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png | Bin 0 -> 256 bytes .../assets/gregtech/textures/items/gt.metaitem.01/345.png | Bin 0 -> 565 bytes .../assets/gregtech/textures/items/gt.metaitem.01/346.png | Bin 0 -> 549 bytes .../assets/gregtech/textures/items/gt.metaitem.01/347.png | Bin 0 -> 524 bytes .../assets/gregtech/textures/items/gt.metaitem.01/348.png | Bin 0 -> 586 bytes .../assets/gregtech/textures/items/gt.metaitem.01/349.png | Bin 0 -> 587 bytes 15 files changed, 14 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 9d5a59264c..1136c50915 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -327,6 +327,8 @@ GT5U.GTPP_MULTI_WASH_PLANT.mode.1=Simple Washer GT5U.GTPP_MULTI_WASH_PLANT.mode.2=Chemical Bath GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.0=Forming Press GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.1=Bending +GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.0=Electromagnetic Separator +GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.1=Electromagnetic Polarizer GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.0=Metal GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.1=Fluid GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.2=Misc @@ -483,6 +485,8 @@ GT5U.gui.text.no_lubricant=§7No lubricant found GT5U.gui.text.fuel_quality_too_high=§7Fuel quality too high to run without boost GT5U.gui.text.no_data_sticks=§7No Data Sticks found GT5U.gui.text.bio_upgrade_missing=§7Recipe needs Bio Upgrade to start +GT5U.gui.text.electromagnet_missing=§7Needs an Electromagnet to run +GT5U.gui.text.electromagnet_insufficient=§7Electromagnet too weak to handle exotic energy hatches GT5U.gui.text.cleanroom_running=§aCleanroom running GT5U.gui.text.no_machine=§7No valid processing machine GT5U.gui.text.machine_mismatch=§7Machine doesn't match to locked recipe diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.png new file mode 100644 index 0000000000..32001ad716 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EMS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png new file mode 100644 index 0000000000..bd5cf275db Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta new file mode 100644 index 0000000000..0abd1dd96d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png new file mode 100644 index 0000000000..0de4105d57 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta new file mode 100644 index 0000000000..d2ce2e660a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_EMS_HOUSING_GLOW.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.png new file mode 100644 index 0000000000..6092ec4c18 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png new file mode 100644 index 0000000000..ffd43d8dc2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png new file mode 100644 index 0000000000..3bb29bbda6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png new file mode 100644 index 0000000000..b7955d63ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_EMS_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.png new file mode 100644 index 0000000000..a09e6770a0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/345.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.png new file mode 100644 index 0000000000..67452a2198 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/346.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.png new file mode 100644 index 0000000000..d77ba1974b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/347.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.png new file mode 100644 index 0000000000..115597c2ff Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/348.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.png new file mode 100644 index 0000000000..6b17d56df8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/349.png differ -- cgit