From 5686301665472ecabc11fcfce227dcdb27a50521 Mon Sep 17 00:00:00 2001 From: LittleCube Date: Sun, 16 Mar 2025 01:24:30 +0800 Subject: [PATCH 1/8] feature: EUV lithographer first design --- .../api/recipes/SuSyRecipeMaps.java | 2 +- .../renderer/textures/SusyTextures.java | 1 + .../supersymmetry/common/CommonProxy.java | 2 + .../blocks/BlockEUVLithographerComponent.java | 58 ++++++++++ .../blocks/BlockSuSyMultiblockCasing.java | 3 +- .../common/blocks/SuSyBlocks.java | 5 + .../SuSyMetaTileEntities.java | 4 + .../MetaTileEntityEUVLithographer.java | 108 ++++++++++++++++++ .../euv_component/carbon_dioxide_laser.png | Bin 0 -> 563 bytes .../euv_component/euv_laser_mirror.png | Bin 0 -> 473 bytes .../euv_component/euv_laser_reticle.png | Bin 0 -> 657 bytes .../euv_component/euv_laser_reticle_side.png | Bin 0 -> 596 bytes .../euv_component/euv_wafer_robot_arm.png | Bin 0 -> 610 bytes .../casings/euv_component/euv_wafer_stage.png | Bin 0 -> 587 bytes .../multiblock_casing/euv_safe_casing.png | Bin 0 -> 538 bytes .../euv_lithographer_component.json | 43 +++++++ .../blockstates/susy_multiblock_casing.json | 6 + .../resources/assets/susy/lang/en_us.lang | 9 ++ 18 files changed, 239 insertions(+), 2 deletions(-) create mode 100644 src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java create mode 100644 src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityEUVLithographer.java create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/carbon_dioxide_laser.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_mirror.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle_side.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_robot_arm.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_stage.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/multiblock_casing/euv_safe_casing.png create mode 100644 src/main/resources/assets/susy/blockstates/euv_lithographer_component.json diff --git a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java index 01263af5b..a4954f1d4 100644 --- a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java +++ b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java @@ -272,7 +272,7 @@ public class SuSyRecipeMaps { public static final RecipeMap IN_SITU_LEACHER = new RecipeMap<>("in_situ_leacher", 2, 2, 2, 2, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.COMPRESSOR); - public static final RecipeMap EUV_LITHOGRAPHY = new RecipeMap<>("euv_lithography", 3, 3, 3, 3, new SimpleRecipeBuilder(), false) + public static final RecipeMap EUV_LITHOGRAPHY = new RecipeMap<>("euv_lithography", 3, 3, 0, 0, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ELECTROLYZER); public static final RecipeMap ROTARY_KILN = new RecipeMap<>("rotary_kiln", 3, 2, 3, 2, new SimpleRecipeBuilder(), false) diff --git a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java index b9f95bc30..8e04d2cc2 100644 --- a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java +++ b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java @@ -85,6 +85,7 @@ public SusyTextures(){ public static final SimpleOverlayRenderer ULV_STRUCTURAL_CASING = new SimpleOverlayRenderer("multiblock_casing/ulv_structural_casing"); public static final SimpleOverlayRenderer SLAG_HOT = new SimpleOverlayRenderer("resource/slag_hot"); public static final SimpleOverlayRenderer RESTRICTIVE_FILTER_FILTER_OVERLAY = new SimpleOverlayRenderer("cover/overlay_restrictive_filter"); + public static final SimpleOverlayRenderer EUV_SAFE_CASING = new SimpleOverlayRenderer("multiblock_casing/euv_safe_casing"); public static final SimpleCubeRenderer MASONRY_BRICK = new SimpleCubeRenderer("gregtech:blocks/multiblock_casing/masonry_brick"); diff --git a/src/main/java/supersymmetry/common/CommonProxy.java b/src/main/java/supersymmetry/common/CommonProxy.java index 42afd0c2a..1701bf1d4 100644 --- a/src/main/java/supersymmetry/common/CommonProxy.java +++ b/src/main/java/supersymmetry/common/CommonProxy.java @@ -90,6 +90,7 @@ public static void registerBlocks(@NotNull RegistryEvent.Register event) registry.register(SuSyBlocks.HARDBLOCKS); registry.register(SuSyBlocks.CUSTOMSHEETS); registry.register(SuSyBlocks.CONVEYOR_BELT); + registry.register(SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT); SHEETED_FRAMES.values().stream().distinct().forEach(registry::register); } @@ -123,6 +124,7 @@ public static void registerItems(@NotNull RegistryEvent.Register event) { registry.register(createItemBlock(SuSyBlocks.HARDBLOCKS, VariantItemBlock::new)); registry.register(createItemBlock(SuSyBlocks.CUSTOMSHEETS, VariantItemBlock::new)); registry.register(createItemBlock(SuSyBlocks.CONVEYOR_BELT, VariantItemBlock::new)); + registry.register(createItemBlock(SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT, VariantItemBlock::new)); SHEETED_FRAMES.values() .stream().distinct() diff --git a/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java b/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java new file mode 100644 index 000000000..4662522c8 --- /dev/null +++ b/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java @@ -0,0 +1,58 @@ +package supersymmetry.common.blocks; + +import gregtech.api.block.VariantBlock; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.Nonnull; + +public class BlockEUVLithographerComponent extends VariantBlock { + + public BlockEUVLithographerComponent() { + super(Material.GLASS); + setTranslationKey("euv_lithographer_component"); + setHardness(5.0f); + setResistance(5.0f); + setSoundType(SoundType.GLASS); + setHarvestLevel("wrench", 1); + setDefaultState(getState(EUVComponentType.LASER)); + } + + @Nonnull + @Override + public BlockRenderLayer getRenderLayer() { + return BlockRenderLayer.SOLID; + } + + @Override + public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos, + @NotNull EntityLiving.SpawnPlacementType type) { + return false; + } + + public enum EUVComponentType implements IStringSerializable { + LASER("laser"), + RETICLE("reticle"), + MIRROR("mirror"), + TRAY("tray"), + HANDLER("handler"); + + private final String name; + + EUVComponentType(String name) { + this.name = name; + } + + @Nonnull + public String getName() { + return this.name; + } + } +} diff --git a/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java b/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java index 340bc6ee9..666491617 100644 --- a/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java +++ b/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java @@ -34,7 +34,8 @@ public enum CasingType implements IStringSerializable { SIEVE_TRAY("sieve_tray"), STRUCTURAL_PACKING("structural_packing"), ULV_STRUCTURAL_CASING("ulv_structural_casing"), - DRONE_PAD("drone_pad"); + DRONE_PAD("drone_pad"), + EUV_SAFE_CASING("euv_safe_casing"); private final String name; diff --git a/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java b/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java index 2b91b86c7..31eae7ebd 100644 --- a/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java +++ b/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java @@ -44,6 +44,7 @@ public class SuSyBlocks { public static BlocksHardened HARDBLOCKS; public static BlocksCustomSheets CUSTOMSHEETS; public static BlockConveyor CONVEYOR_BELT; + public static BlockEUVLithographerComponent EUV_LITHOGRAPHER_COMPONENT; public static void init() { COOLING_COIL = new BlockCoolingCoil(); @@ -116,6 +117,9 @@ public static void init() { CONVEYOR_BELT = new BlockConveyor(); CONVEYOR_BELT.setRegistryName("conveyor_belt"); + + EUV_LITHOGRAPHER_COMPONENT = new BlockEUVLithographerComponent(); + EUV_LITHOGRAPHER_COMPONENT.setRegistryName("euv_lithographer_component"); } @SideOnly(Side.CLIENT) @@ -144,6 +148,7 @@ public static void registerItemModels() { registerItemModel(HARDBLOCKS); registerItemModel(CUSTOMSHEETS); registerItemModel(CONVEYOR_BELT); + registerItemModel(EUV_LITHOGRAPHER_COMPONENT); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java index 937da8ea7..8c54cd24b 100644 --- a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java +++ b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java @@ -200,6 +200,8 @@ public class SuSyMetaTileEntities { //public static MetaTileEntityStockReader STOCK_CONTENT_READER; public static MetaTileEntityLocomotiveController STOCK_CONTROLLER; + public static MetaTileEntityEUVLithographer EUV_LITHOGRAPHER; + public static void init() { MAGNETIC_REFRIGERATOR = registerMetaTileEntity(14500, new MetaTileEntityMagneticRefrigerator(susyId("magnetic_refrigerator"))); COAGULATION_TANK = registerMetaTileEntity(14501, new MetaTileEntityCoagulationTank(susyId("coagulation_tank"))); @@ -283,6 +285,8 @@ public static void init() { CURTAIN_COATER = registerMetaTileEntity(14513, new MetaTileEntityCurtainCoater(susyId("curtain_coater"))); MILLING = registerMetaTileEntity(14514, new MetaTileEntityPreciseMillingMachine(susyId("milling"))); + EUV_LITHOGRAPHER = registerMetaTileEntity(14741, new MetaTileEntityEUVLithographer(susyId("euv_lithographer"))); +// 14742, 14743, 14744 ArrayList ids = new ArrayList<>(); for (int id = 14500; id < 15000; id++) { if (GregTechAPI.MTE_REGISTRY.getObjectById(id) == null) ids.add(id); diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityEUVLithographer.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityEUVLithographer.java new file mode 100644 index 000000000..610bf0eb7 --- /dev/null +++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityEUVLithographer.java @@ -0,0 +1,108 @@ +package supersymmetry.common.metatileentities.multi.electric; + + +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockPart; +import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import gregtech.api.pattern.BlockPattern; +import gregtech.api.pattern.FactoryBlockPattern; +import gregtech.api.pattern.TraceabilityPredicate; +import gregtech.client.renderer.ICubeRenderer; +import gregtech.client.renderer.texture.Textures; +import gregtech.common.blocks.BlockTurbineCasing; +import gregtech.common.blocks.MetaBlocks; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; +import supersymmetry.api.recipes.SuSyRecipeMaps; +import supersymmetry.client.renderer.textures.SusyTextures; +import supersymmetry.common.blocks.*; + +import javax.annotation.Nonnull; + + +import static gregtech.api.util.RelativeDirection.*; + +public class MetaTileEntityEUVLithographer extends RecipeMapMultiblockController { + + public MetaTileEntityEUVLithographer(ResourceLocation metaTileEntityId) { + super(metaTileEntityId, SuSyRecipeMaps.EUV_LITHOGRAPHY); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEntity) { + return new MetaTileEntityEUVLithographer(metaTileEntityId); + } + + @Override + protected BlockPattern createStructurePattern() { + TraceabilityPredicate casingPredicate = states(getCasingState()).setMinGlobalLimited(210); + return FactoryBlockPattern.start(RIGHT, FRONT, DOWN) + .aisle("CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX") + .aisle("CCCCCCCCCCXXXX", "C MMRMXLLX", "C XLLX", "CCCCCCCCCCXXXX") + .aisle("CCSCCCCCCCXXXX", "C XLLX", "CATTTA XLLX", "CCCCCCCCCCXXXX") + .aisle("CCCCCCCCCCXXXX", "CTATATMMMLLLLX", "CXXXXXXXXXXLLX", "CCCCCCCCCCXXXX") + .aisle("CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX") + .where('S', selfPredicate()) + .where('C', casingPredicate.or(autoAbilities())) + .where('X', casingPredicate) + .where('G', states(getGearBoxState())) + .where('L', states(getLaserEmitterState())) + .where('T', states(getTrayState())) + .where('A', states(getRobotArmState())) + .where('M', states(getMirrorState())) + .where('R', states(getReticleState())) + .where(' ', air()) + .build(); + } + + protected IBlockState getCasingState() { + return SuSyBlocks.MULTIBLOCK_CASING.getState(BlockSuSyMultiblockCasing.CasingType.EUV_SAFE_CASING); + } + + protected IBlockState getGearBoxState() { + return MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.TUNGSTENSTEEL_GEARBOX); + } + + protected IBlockState getTrayState() { + return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.TRAY); + } + + protected IBlockState getRobotArmState() { + return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.HANDLER); + } + + protected IBlockState getLaserEmitterState() { + return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.LASER); + } + + protected IBlockState getMirrorState() { + return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.MIRROR); + } + + protected IBlockState getReticleState() { + return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.RETICLE); + } + + + + @Override + public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) { + return SusyTextures.EUV_SAFE_CASING; + } + + @Nonnull + @Override + protected ICubeRenderer getFrontOverlay() { + return Textures.BLAST_FURNACE_OVERLAY; + } + + @Override + public boolean allowsExtendedFacing() { + return false; + } + + public boolean allowsFlip() { + return true; + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/carbon_dioxide_laser.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/carbon_dioxide_laser.png new file mode 100644 index 0000000000000000000000000000000000000000..596e7a471c9054ef43d5c478dba684e8befa98ab GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR5*=oQp;`=K@eNWbq|P zx#g66hLZ^804QD~A$d)_+uc>eVUk>+PBS$%-BZ)m`fz;dP6r94Yaj?EoOD`EM8@fL z2!XDtJ74c~)Tu@X)%diICE^`eLugfAC+1M+&F!5!Yvs@Hw`w#;R4-;%QC*c&!UHS~ zH1n|Ya_8#%2jQbU)~)a9=6-ks&ne?LK&bn>)?nTF2wFv$L;hDk2}{%23lJJzBJ=UMrMfm8_6`nOs`K$UddT|wu!gR!x1T=e{XM!?<&>_3 zKZGhEx{PGj-6nlGze!;$c(W|8vfh4do%i<$k148V(^zi#>s!{{rfU+20L!|&ahCDF zA2J8apABIR=~;I>`c4Dm6#xH{K%*<^bPX`l{{kDG7M)VMIZOZm002ovPDHLkV1hMj B{TBcL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_mirror.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_mirror.png new file mode 100644 index 0000000000000000000000000000000000000000..6bfca05c3f6512b0a4dcfe190c979b1b5001e7dd GIT binary patch literal 473 zcmV;~0Ve*5P)Px$lSxEDR5*=QlFe!tK@i0EKiwM$irzhnc=S1Z0w2ZaGv|oJqj*;$cna?9c72S8 z*#x~c!}PDJi@Lo3cte`9Rb~y#DvLIa-I^~n_c4Z9N&5Ax=S3Gxx!|XHBIb^8SoQGh zdx9$Z!@J*o?kS38C8L_Szk(v3(7ASx$48f|j9&c#zBr@3m z@hDNCcnC)u!Z3R8k&_**wdtD@Ns%Ob??V_?S|uC+GOuSWPrd<836LOssbQqWVGzhz zBig^dC;QX^bvew+S(R2Xi)X!u&NbFN&n%l}4Z-GLvCTxSMP#BL P00000NkvXXu0mjfqrliR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle.png new file mode 100644 index 0000000000000000000000000000000000000000..222fc4cd8a15ec40a8f782dd90c9c698bc8719dc GIT binary patch literal 657 zcmV;C0&e|@P)Px%OG!jQR5*=Ql1)!jVHAYh+L-vU!iC0#iGUhXAtJSW*cMu7rNy;B#UJ3G(H$#k zp#^$NA<%+EEhu3_TxcX37R3ABzBA{%E-oRuJDFsj%$!Vg{)=KkpOO;w~CT$57>zu@$ilzF#NhU`-yZhP9l-JxU7IL-vdbw1nF0bZunTEF+ ziAGfD1Ti5_I=611=uhrKV%Ed~x zo}0-uyw>=5a(8#%g2JAl7jpuqFvhetw`cRyVUjR+!)v8dW9|0dit83oBxkL8IaH4zg1%yVeQ^Zv06a?yZuQWgReraW9I=!~OamoJl`Cwq+zJP+B z(#FE6_(8BxE-qDS`CPW)wI(K>bvhqLh7$*eUk3;KPfou1#&=Fs8BM%=bG`3gy6>Yg z#sUC>zyKiN8$%GJF@Ff2-xxhVJ&rpSC-8m@sxo|>3NJPnfnK4Aao5CMg|O!Yai=){ rd8ERNc{{nV(T4SuR+UQY1giWC%Y{t1yceh}00000NkvXXu0mjf2WT_k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle_side.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle_side.png new file mode 100644 index 0000000000000000000000000000000000000000..286a70c397ea034b0d5fba4e25be1e282901121e GIT binary patch literal 596 zcmV-a0;~OrP)Px%4oO5oR5*=oQn5}{Q4qcR-dlIyVpvuz1a>j8&`vvz(NYtQi5q`Iu;l}6wE=|A z!rH=M`~fVqGgih0Vn{&4t|Y{L3;XWOoO3NMF~&I6%;e0ubMBnVy`@bv8b}CD0zn92 zq)|&Ec8per5NMK_@zU&BF^bYaQU1vzMVx_pLW;q5q6RVU>>h}*6#m%X6{Q*?df4BJ z=wi?#EI_kBRSUBh&JRzl^mZnn9FLAnPDrzI=$tDC+fd(V&BHt)8BNqs3df~xuH0E& zeNnAet68;HtJiCDdA;%A;r%Ojmk0?^s80wfg$LhvA;-(hD_N3eXb1OH z`|$o_fEN88At4|Mgcv8M+k~V^Qc05WA)Ry1xudTdoU0@$A^Fr?)R4f`jA}3`7oRMq zX*%)tRvfT5mw$b!+`N4q>LZ$vgb+0ZDk09fcTYb#=Qj4%Hulz>bFZGicFu)>0EKy| z&jK`1p&oMFZ9ndI7Myb%`|HlRZf7BupD~2_01ZS!2-Fw-9@NK8BKO}3A)~<-A%U6@ z7N`@`7op?G_fK>?3s9f8I#5rO%GF2D8m%@>ib0Pigq@lyAgYYbyg5VK=;uxb9mD)+ zu$51B;?s>*o3QAjqTh>jqr-1`bA~2KAObXR&c$2C|338`v~g}8>PgF+Gf{UI7_a#M iO#+oBq|qcmN&5{%qb2OFhI2>&0000Px%97#k$R5*=glD|$AaS+Fsy=A#w{vKEe92kuWT3J}yVq#-uVq+~&Kqw)+f|bOM zJJ1j#hC2-;-0yC8XXg7Iiv^=`s>$R#lljhkCZ6panbAN(XyODRgpo!q ziMnF6(%os2nDO4qj2J~}peX<3^@zF$S`jiF9LH)9d~9c{r&x- zD9W-disIn#Ac~?WiZ-6^5aLj16%$el&(BUFqut%zWM-7ijwWZvSxdLJw(16l4*Oj~ z+z~q=#<`_7At8jbFX8MY6h)b)Y5V@%+fNVQeSSnpwy;`zh+%3*HJFqkgb>1bJWkWJ z*=#nOStCx9IE7ZVnvj?fH8_=!(P)$}+Vb7$JkRrdy0}bUKls>)C*9#tSOu+OhdLEn zK}MZUXZUlXxSSkcB;$+5-rnBf$&*GrRjVE9L_!F(8uq)xs?r_+i4ibg#7>fVR7 z$1lU6mo2P1H73ld(@S@tMf6`J@znco&!JV;T7yBoXaTFjpqDMI5fTQyyw$!Q0U7qYd8Px%1xZ9fR5*=wQoBxDK@eT6i}79?Y-1PU87WP=H24cpBBh~7!LRTWX`H}UkUxNm z-h6-oMHESd9i&LU_u{)VbIzt%M3qc28ja4J-7|AmKAv2e(Lh3I5(z>GBaK=UsbjP{ z#z>RQjBmC(Vicu;qI{_nMVf&ILW=oqLk(iQyMGX4E&TQ4UX*G`=*8?Np^N#Hun5f} zRV{A68ZMr!4%YM=%kq!O6KPg2oO8we78>&YJ}eND(L@cka9Qis*Z1yU@%F>Fb`@1wL=2Myw_H3$%q%t*qcZ;<0_gw~E!a_N}@x8tDbl%@3 zEV-zdO%q-D_}zE6Xwry8g!=AIx@Fq;v*)1s<~}r#=DS--cNVF|Z2G^SL@G^4qe+C4 Z_7_I?EuQHmib((f002ovPDHLkV1gHI5D@?X literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock_casing/euv_safe_casing.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock_casing/euv_safe_casing.png new file mode 100644 index 0000000000000000000000000000000000000000..9f8af8c8288f27d0c22a516351cb22f56a196302 GIT binary patch literal 538 zcmWlUTS!v@9L7HrnVYTM&e_?{&hGck>1LaG*;ck4w=rj%N)TC!MVCpJ2ZOM}6-8x1 zC5VPmA$yC;ha&W)hmj-}VwZNXaaUA%$uQ*!7PQb3={#Y1bP8T35+7>_>hrs2te>5Erp~|D2$X0#JPe+ zUGYe`k(yZh$pv0dEWz@YibZ0lwq(GQtP?26B6$R%tc z)2&zQg^p2j^><)q|1y{kalbj`m?l{>(f)Mz3Gd#i@r7BF`fTEe_eFN__zn6TQS~c5 z;Bo7}1iX!l{JEvzu|tX3sRhl{?Al_T$il)yYt8cQ^a2Ui&BCH+S&inXj6` z=d#19;mhLNefb}!`|qdUjqQ2!X-zRn-MqJ4G}68}ul_3;%k`}Et_QE*eVpfAnWocS ROjC~gA2GH${Ag$Ah5vA)kP-j@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/susy/blockstates/euv_lithographer_component.json b/src/main/resources/assets/susy/blockstates/euv_lithographer_component.json new file mode 100644 index 000000000..887aa1694 --- /dev/null +++ b/src/main/resources/assets/susy/blockstates/euv_lithographer_component.json @@ -0,0 +1,43 @@ +{ + "forge_marker" : 1, + "defaults": { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/euv_component/carbon_dioxide_laser" + } + }, + "variants" : { + "variant=laser" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/euv_component/carbon_dioxide_laser" + } + }, + "variant=mirror" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/euv_component/euv_laser_mirror" + } + }, + "variant=reticle" : { + "model" : "minecraft:cube_bottom_top", + "textures" : { + "bottom": "gregtech:blocks/casings/euv_component/euv_laser_reticle", + "top": "gregtech:blocks/casings/solid/machine_casing_robust_tungstensteel", + "side": "gregtech:blocks/casings/euv_component/euv_laser_reticle_side" + } + }, + "variant=tray" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/euv_component/euv_wafer_stage" + } + }, + "variant=handler" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/casings/euv_component/euv_wafer_robot_arm" + } + } + } +} diff --git a/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json b/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json index faa759d8b..1994305fb 100644 --- a/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json +++ b/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json @@ -38,6 +38,12 @@ "textures" : { "all" : "gregtech:blocks/multiblock_casing/drone_pad" } + }, + "variant=euv_safe_casing" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/multiblock_casing/euv_safe_casing" + } } } } diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang index 025add091..4b3807c55 100644 --- a/src/main/resources/assets/susy/lang/en_us.lang +++ b/src/main/resources/assets/susy/lang/en_us.lang @@ -22,6 +22,7 @@ tile.susy_multiblock_casing.sieve_tray.name=Sieve Tray tile.susy_multiblock_casing.structural_packing.name=Structural Packing tile.susy_multiblock_casing.ulv_structural_casing.name=Basic Structural Casing tile.susy_multiblock_casing.drone_pad.name=Drone Pad +tile.susy_multiblock_casing.euv_safe_casing.name=Extreme-Ultraviolet-Safe Lithographer Casing tile.serpentine.basic.name=Copper Tubing Serpentine Block @@ -104,6 +105,12 @@ tile.conveyor_belt.lv.name=Conveyor Belt tile.drill_bit.steel.name=Steel Drill Bit Block +tile.euv_lithographer_component.laser.name=Carbon Dioxide Laser Generator +tile.euv_lithographer_component.mirror.name=Silicon-Molybdenum EUV Mirror +tile.euv_lithographer_component.reticle.name=Silicon-Molybdenum EUV Reticle +tile.euv_lithographer_component.tray.name=Wafer Chuck Component +tile.euv_lithographer_component.handler.name=Wafer Transfer End Effector + # Rocks tile.susy_stone_smooth.gabbro.name=Gabbro tile.susy_stone_smooth.gneiss.name=Gneiss @@ -315,6 +322,8 @@ gregtech.machine.milling.name=Precise Milling Machine gregtech.multiblock.pattern.error.milling.upper=§cOnly allowed on the upper part of the machine§r gregtech.multiblock.pattern.error.milling.lower=§cOnly allowed on the lower part of the machine§r +gregtech.machine.euv_lithographer.name=Extreme Ultraviolet Lithographer + gregtech.machine.drone_pad.name=Drone Pad gregtech.machine.primitive_smelter.name=Primitive Smelter From 87454bb86ab6fbf2b4fe38065c77138a0c3205a1 Mon Sep 17 00:00:00 2001 From: LittleCube Date: Mon, 17 Mar 2025 01:56:57 +0800 Subject: [PATCH 2/8] feature: sputter deposition and spin coater single block design --- .../supersymmetry/api/recipes/SuSyRecipeMaps.java | 9 +++++++++ .../client/renderer/textures/SusyTextures.java | 2 ++ .../metatileentities/SuSyMetaTileEntities.java | 8 +++++++- .../blocks/machines/spin_coater/overlay_front.png | Bin 0 -> 336 bytes .../machines/spin_coater/overlay_front_active.png | Bin 0 -> 628 bytes .../spin_coater/overlay_front_active.png.mcmeta | 5 +++++ .../spin_coater/overlay_front_active_emissive.png | Bin 0 -> 249 bytes .../overlay_front_active_emissive.png.mcmeta | 5 +++++ .../machines/sputter_deposition/overlay_front.png | Bin 0 -> 341 bytes .../sputter_deposition/overlay_front_active.png | Bin 0 -> 387 bytes .../overlay_front_active_emissive.png | Bin 0 -> 267 bytes .../machines/sputter_deposition/overlay_side.png | Bin 0 -> 179 bytes .../sputter_deposition/overlay_side_active.png | Bin 0 -> 196 bytes .../overlay_side_active_emissive.png | Bin 0 -> 130 bytes 14 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active_emissive.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active_emissive.png diff --git a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java index a4954f1d4..8879415cc 100644 --- a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java +++ b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java @@ -169,6 +169,12 @@ public class SuSyRecipeMaps { public static final RecipeMap CVD_RECIPES = new RecipeMap<>("cvd", 3, 1, 2, 2, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ARC); + public static final RecipeMap SPIN_COATING_RECIPE = new RecipeMap<>("spin_coating", 2, 1, 1, 0, new SimpleRecipeBuilder(), false) + .setSound(GTSoundEvents.CENTRIFUGE); + + public static final RecipeMap SPUTTER_DEPOSITION_RECIPES = new RecipeMap<>("sputter_deposition", 3, 1, 2, 2, new SimpleRecipeBuilder(), false) + .setSound(GTSoundEvents.ELECTROLYZER); + public static final RecipeMap ORE_SORTER_RECIPES = new RecipeMap<>("ore_sorter", 2, 20, 1, 1, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, ProgressWidget.MoveType.HORIZONTAL) .setSound(GTSoundEvents.MACERATOR); @@ -275,6 +281,9 @@ public class SuSyRecipeMaps { public static final RecipeMap EUV_LITHOGRAPHY = new RecipeMap<>("euv_lithography", 3, 3, 0, 0, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ELECTROLYZER); + public static final RecipeMap SPIN_COATER = new RecipeMap<>("spin_coater", 2, 1, 1, 0, new SimpleRecipeBuilder(), false) + .setSound(GTSoundEvents.BATH); + public static final RecipeMap ROTARY_KILN = new RecipeMap<>("rotary_kiln", 3, 2, 3, 2, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, ProgressWidget.MoveType.HORIZONTAL) .setSound(GTSoundEvents.MACERATOR); diff --git a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java index 8e04d2cc2..856c15d4f 100644 --- a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java +++ b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java @@ -41,6 +41,8 @@ public SusyTextures(){ public static final OrientedOverlayRenderer UV_LIGHT_BOX_OVERLAY = new OrientedOverlayRenderer("machines/uv_light_box"); public static final OrientedOverlayRenderer CVD_OVERLAY = new OrientedOverlayRenderer("machines/cvd"); public static final OrientedOverlayRenderer ION_IMPLANTER_OVERLAY = new OrientedOverlayRenderer("machines/ion_implanter"); + public static final OrientedOverlayRenderer SPIN_COATER_OVERLAY = new OrientedOverlayRenderer("machines/spin_coater"); + public static final OrientedOverlayRenderer SPUTTER_DEPOSITION_OVERLAY = new OrientedOverlayRenderer("machines/sputter_deposition"); public static final OrientedOverlayRenderer PHASE_SEPARATOR_OVERLAY = new OrientedOverlayRenderer("machines/phase_separator"); public static final OrientedOverlayRenderer BATH_CONDENSER_OVERLAY = new OrientedOverlayRenderer("machines/bath_condenser"); public static final OrientedOverlayRenderer CATALYTIC_REFORMER_OVERLAY = new OrientedOverlayRenderer("multiblock/catalytic_reformer"); diff --git a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java index 8c54cd24b..e377c1b64 100644 --- a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java +++ b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java @@ -111,6 +111,8 @@ public class SuSyMetaTileEntities { public static SimpleMachineMetaTileEntity[] ION_IMPLANTER; public static SimpleMachineMetaTileEntity[] CVD; + public static SimpleMachineMetaTileEntity[] SPIN_COATER; + public static SimpleMachineMetaTileEntity[] SPUTTER_DEPOSITION; // atomic layer depositor public static SimpleMachineMetaTileEntity[] WEAPONS_FACTORY; @@ -286,7 +288,9 @@ public static void init() { MILLING = registerMetaTileEntity(14514, new MetaTileEntityPreciseMillingMachine(susyId("milling"))); EUV_LITHOGRAPHER = registerMetaTileEntity(14741, new MetaTileEntityEUVLithographer(susyId("euv_lithographer"))); -// 14742, 14743, 14744 + registerSimpleMTE(SPIN_COATER, 12, 14742, "spin_coater", SuSyRecipeMaps.SPIN_COATING_RECIPE, SusyTextures.SPIN_COATER_OVERLAY, true, GTUtility.defaultTankSizeFunction); + registerSimpleMTE(SPUTTER_DEPOSITION, 12, 14755, "sputter_deposition", SuSyRecipeMaps.SPUTTER_DEPOSITION_RECIPES, SusyTextures.SPUTTER_DEPOSITION_OVERLAY, true, GTUtility.defaultTankSizeFunction); + ArrayList ids = new ArrayList<>(); for (int id = 14500; id < 15000; id++) { if (GregTechAPI.MTE_REGISTRY.getObjectById(id) == null) ids.add(id); @@ -455,6 +459,8 @@ private static void registerCatalystMTE(CatalystMachineMetaTileEntity[] machines UV_LIGHT_BOX = new SimpleMachineMetaTileEntity[GTValues.OpV]; CVD = new SimpleMachineMetaTileEntity[GTValues.OpV]; ION_IMPLANTER = new SimpleMachineMetaTileEntity[GTValues.OpV]; + SPIN_COATER = new SimpleMachineMetaTileEntity[GTValues.OpV]; + SPUTTER_DEPOSITION = new SimpleMachineMetaTileEntity[GTValues.OpV]; FLUID_COMPRESSOR = new SimpleMachineMetaTileEntity[GTValues.OpV]; FLUID_DECOMPRESSOR = new SimpleMachineMetaTileEntity[GTValues.OpV]; diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front.png new file mode 100644 index 0000000000000000000000000000000000000000..9e5f84f34a8b7fb6be9ea83fdb99cff20a80feca GIT binary patch literal 336 zcmV-W0k8gvP)Px$3Q0skR5*>*l1*yFFbsvCWjR0B2;>3-T_hAjx83zLA1q5y3pqDZqP=bzKvHQVQcZ!h0V@ zUDu_6EX(36N5C))N#n}0Oac48#|j?W=c^rme|t^N=-2}hxhV#K$EOznfH5WogbMC4 z=2-Xz5U8K$kDJ1f%d+eO3r-juYb{Qv>i}!*kGuFi2Tjv}nW41?GlQ8yL?9v*MS;4m iVT?hZ=XZVeZ|n>G`-=gR-~&DY0000Px%E=fc|R9J=Wn89ijK^(@vnfdP~@!};ABnKfhFHlfONJ(qas2ju=0XT?&LM;VV~Z|*&N&AWfiVUl1O|fv0{}8fj6o>{r4(kfnfcX6{Jhz0nh}@) zB0?C3ma*IILP`lKC6rQ-Qerq9+5u4%VLF{!0gN&9`+Y=FWK8XL+Ya!3-`pi0u<@XW zm=^$0DwXVj`Fw6h@TmFHTyS^d(db!KtvEifQUdu;GBbVj$*Nh zdc6+M^H3-hGCitOMmZk*4ITg|W*Pq*9vmKZteWG2)2bW~)|v;^$^_NQ#I*6JJUBkx zvTAW2m{yzz_wGN$Xk508jtBp(91k+^px5hJ6PJkxdI`UNevaeQEsVzH>^#usxT=*& zK0HX=A0)A0G%o)h4=%1&BSOc6wUy&RUOaf!d7L=o@86wUHH!ynW&n8ecCobc{eE!q zElf4)zFTon&iLoEk5(BCGmf_yFYJ8}bUuTptDnm{r-UW|>9%7R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta new file mode 100644 index 000000000..78df88c42 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front.png new file mode 100644 index 0000000000000000000000000000000000000000..2700e687ae377aa0507ed80436b555ec2802ba53 GIT binary patch literal 341 zcmV-b0jmCqP)Px$4@pEpR5*>zlD|zuK@7%!wvUR2f&#<pPT~l@%{#}{0ZRh{-GvFqXeiaXXn!<=43Ldc=q&2&bbvRrI5^6JkQt25wX^r zDem41xI3oW5MmS^KvgKEv;sM2%=8CQDm4OB6-)L@0#?N8EQkon3^gOAv{_)8z*5TC@^xDRqnpmE^X}e00AK!znIR(8 nY@@*S&24kKPx$JxN4CR5*>zlD$epK@f$%xm?KIfPzRQK8Jz^(uwf_tnwUU<4+|v`UW9Bf{$RY zg{`Hn!O|i-vk4iCo5X}9YNrDWy9|5w+cO9Lx@5A6F}j(ds-%=qRa6x-o37b&yWJLm zd?JuiqIR+g1$Y3eu=lVJz|+Aa^g$w^&}nw31o;dBQWvh)uNe-93xx)!6Og_F-Wgz zQNYX?ZH+G#ju#GD+4D6=R6qe0^yP~nnz=IXibZKL$zD3J*HX?tFBQ$~ZUr hjWWi`<}Uw_`UGK{#u-6}AAtY>002ovPDHLkV1gR^oG<_Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..80a72cc3cfbeebcb12b652feeca838c25ec663f2 GIT binary patch literal 267 zcmV+m0rdWfP)Px##Ysd#R5*>*l08lXF%X5n=iMcCBw7^CN0}o;qTn3id_)`oJA&+^@J5PJvRhE) zb>kVoAI-qsLzl(y(wPWOz#4wuP6Fs(JM#s~K!NY~ldiHo?0PRL{+;QY?#2xJ>S9cw zSZ7^CnAFLwMoaJvUIEFFV4Mh4z!}IwM{X00Pt&Jp91Wqq`_ZVVIw)=Yu#|ZTjf3zB ztON<1R9yfnsvF26%thb>lz=FlAjB!cnV3=qo-=0-7~lBu>eZ`)TAdSYe|~&yPQ1SCD$o4=b;&<|eYHOP zet*4WMC1%0j*y60@MX?X?ZB9ZqyyXY?@Q#w))w44bM)xZ4}X7`&tg5UA#sp_!P8ON VO5T>Lo9mV zPSE8$O;^Ec7-_cTm1Khm)0S)9#zw7BV^AV(DIVzIVoao-;bf zlv+NR7@y(s^msJ;+r9dls}>5+&wMOWSj&}q^U^n2n+5yAcSQHD>%08VCenbj!*Ek> t*$K|qyxQ-dZQXD-+tcf1dij|@hRkdo@)FHY_Jdr);OXk;vd$@?2>|&cP5A%- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active_emissive.png new file mode 100644 index 0000000000000000000000000000000000000000..c2039765b53952f3b8b222bb00824f60307d1e2f GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Y&=~YLo9le z6C_wgnB7Vkull_Ff8Vvv@Q={Hvma)E=Vu0i*Xd$x+qSRanUjA*BG13RYhk)bPg5g1 Z!^)4mOcy7byaAfS;OXk;vd$@?2>{EWD4PHP literal 0 HcmV?d00001 From 4ed30e31cfd7166335446e14f8788d3335b1dd33 Mon Sep 17 00:00:00 2001 From: LittleCube Date: Mon, 17 Mar 2025 02:02:01 +0800 Subject: [PATCH 3/8] fix: change EUV component material to metal honestly I don't know why it's glass in the first place --- .../common/blocks/BlockEUVLithographerComponent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java b/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java index 4662522c8..42a6f9b7d 100644 --- a/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java +++ b/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java @@ -16,11 +16,11 @@ public class BlockEUVLithographerComponent extends VariantBlock { public BlockEUVLithographerComponent() { - super(Material.GLASS); + super(Material.IRON); setTranslationKey("euv_lithographer_component"); setHardness(5.0f); setResistance(5.0f); - setSoundType(SoundType.GLASS); + setSoundType(SoundType.METAL); setHarvestLevel("wrench", 1); setDefaultState(getState(EUVComponentType.LASER)); } From 58f297b2a34cae21c59fbed4ee1e9d6249c7777a Mon Sep 17 00:00:00 2001 From: LittleCube Date: Mon, 17 Mar 2025 02:04:57 +0800 Subject: [PATCH 4/8] fix: remove a misleading comment --- .../common/metatileentities/SuSyMetaTileEntities.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java index e377c1b64..79f849b56 100644 --- a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java +++ b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java @@ -112,7 +112,7 @@ public class SuSyMetaTileEntities { public static SimpleMachineMetaTileEntity[] ION_IMPLANTER; public static SimpleMachineMetaTileEntity[] CVD; public static SimpleMachineMetaTileEntity[] SPIN_COATER; - public static SimpleMachineMetaTileEntity[] SPUTTER_DEPOSITION; // atomic layer depositor + public static SimpleMachineMetaTileEntity[] SPUTTER_DEPOSITION; public static SimpleMachineMetaTileEntity[] WEAPONS_FACTORY; From c090fe17cf962b6bb5618388540813b453e713b3 Mon Sep 17 00:00:00 2001 From: LittleCube Date: Mon, 17 Mar 2025 13:42:48 +0800 Subject: [PATCH 5/8] refactor: combine spin coater + polishing machine to wafer spinner --- .../api/recipes/SuSyRecipeMaps.java | 8 +---- .../renderer/textures/SusyTextures.java | 3 +- .../SuSyMetaTileEntities.java | 11 +++---- .../machines/spin_coater/overlay_front.png | Bin 336 -> 0 bytes .../spin_coater/overlay_front_active.png | Bin 628 -> 0 bytes .../overlay_front_active.png.mcmeta | 5 --- .../overlay_front_active_emissive.png | Bin 249 -> 0 bytes .../overlay_front_active_emissive.png.mcmeta | 5 --- .../overlay_front.png | Bin .../overlay_front_active.png | Bin .../overlay_front_active.png.mcmeta | 0 .../overlay_top.png | Bin .../overlay_top_active.png | Bin .../overlay_top_active.png.mcmeta | 0 .../resources/assets/susy/lang/en_us.lang | 30 +++++++++--------- .../resources/assets/susy/lang/ru_RU.lang | 30 +++++++++--------- .../resources/assets/susy/lang/zh_cn.lang | 30 +++++++++--------- 17 files changed, 51 insertions(+), 71 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta rename src/main/resources/assets/gregtech/textures/blocks/machines/{polishing_machine => wafer_spinner}/overlay_front.png (100%) rename src/main/resources/assets/gregtech/textures/blocks/machines/{polishing_machine => wafer_spinner}/overlay_front_active.png (100%) rename src/main/resources/assets/gregtech/textures/blocks/machines/{polishing_machine => wafer_spinner}/overlay_front_active.png.mcmeta (100%) rename src/main/resources/assets/gregtech/textures/blocks/machines/{polishing_machine => wafer_spinner}/overlay_top.png (100%) rename src/main/resources/assets/gregtech/textures/blocks/machines/{polishing_machine => wafer_spinner}/overlay_top_active.png (100%) rename src/main/resources/assets/gregtech/textures/blocks/machines/{polishing_machine => wafer_spinner}/overlay_top_active.png.mcmeta (100%) diff --git a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java index 8879415cc..b48e00bc8 100644 --- a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java +++ b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java @@ -117,7 +117,7 @@ public class SuSyRecipeMaps { .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, ProgressWidget.MoveType.HORIZONTAL) .setSound(GTSoundEvents.CENTRIFUGE); - public static final RecipeMap POLISHING_MACHINE = new RecipeMap<>("polishing_machine", 1, 1, 2, 1, new SimpleRecipeBuilder(), false) + public static final RecipeMap WAFER_SPINNER = new RecipeMap<>("wafer_spinner", 1, 1, 2, 1, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, ProgressWidget.MoveType.CIRCULAR) .setSound(GTSoundEvents.CENTRIFUGE); @@ -169,9 +169,6 @@ public class SuSyRecipeMaps { public static final RecipeMap CVD_RECIPES = new RecipeMap<>("cvd", 3, 1, 2, 2, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ARC); - public static final RecipeMap SPIN_COATING_RECIPE = new RecipeMap<>("spin_coating", 2, 1, 1, 0, new SimpleRecipeBuilder(), false) - .setSound(GTSoundEvents.CENTRIFUGE); - public static final RecipeMap SPUTTER_DEPOSITION_RECIPES = new RecipeMap<>("sputter_deposition", 3, 1, 2, 2, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ELECTROLYZER); @@ -281,9 +278,6 @@ public class SuSyRecipeMaps { public static final RecipeMap EUV_LITHOGRAPHY = new RecipeMap<>("euv_lithography", 3, 3, 0, 0, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ELECTROLYZER); - public static final RecipeMap SPIN_COATER = new RecipeMap<>("spin_coater", 2, 1, 1, 0, new SimpleRecipeBuilder(), false) - .setSound(GTSoundEvents.BATH); - public static final RecipeMap ROTARY_KILN = new RecipeMap<>("rotary_kiln", 3, 2, 3, 2, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, ProgressWidget.MoveType.HORIZONTAL) .setSound(GTSoundEvents.MACERATOR); diff --git a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java index 856c15d4f..8c73c2762 100644 --- a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java +++ b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java @@ -41,7 +41,6 @@ public SusyTextures(){ public static final OrientedOverlayRenderer UV_LIGHT_BOX_OVERLAY = new OrientedOverlayRenderer("machines/uv_light_box"); public static final OrientedOverlayRenderer CVD_OVERLAY = new OrientedOverlayRenderer("machines/cvd"); public static final OrientedOverlayRenderer ION_IMPLANTER_OVERLAY = new OrientedOverlayRenderer("machines/ion_implanter"); - public static final OrientedOverlayRenderer SPIN_COATER_OVERLAY = new OrientedOverlayRenderer("machines/spin_coater"); public static final OrientedOverlayRenderer SPUTTER_DEPOSITION_OVERLAY = new OrientedOverlayRenderer("machines/sputter_deposition"); public static final OrientedOverlayRenderer PHASE_SEPARATOR_OVERLAY = new OrientedOverlayRenderer("machines/phase_separator"); public static final OrientedOverlayRenderer BATH_CONDENSER_OVERLAY = new OrientedOverlayRenderer("machines/bath_condenser"); @@ -52,7 +51,7 @@ public SusyTextures(){ public static final OrientedOverlayRenderer FLUID_DECOMPRESSOR_OVERLAY = new OrientedOverlayRenderer("machines/fluid_decompressor"); public static final OrientedOverlayRenderer ELECTROSTATIC_SEPARATOR_OVERLAY = new OrientedOverlayRenderer("machines/electrostatic_separator"); public static final OrientedOverlayRenderer TEXTILE_SPINNER_OVERLAY = new OrientedOverlayRenderer("machines/textile_spinner"); - public static final OrientedOverlayRenderer POLISHING_MACHINE_OVERLAY = new OrientedOverlayRenderer("machines/polishing_machine"); + public static final OrientedOverlayRenderer WAFER_SPINNER_OVERLAY = new OrientedOverlayRenderer("machines/wafer_spinner"); public static final OrientedOverlayRenderer ARC_FURNACE_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/arc_furnace"); public static final OrientedOverlayRenderer CLARIFIER_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/clarifier"); public static final OrientedOverlayRenderer CONDENSER_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/condenser"); diff --git a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java index 79f849b56..2c8962bf1 100644 --- a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java +++ b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java @@ -111,7 +111,6 @@ public class SuSyMetaTileEntities { public static SimpleMachineMetaTileEntity[] ION_IMPLANTER; public static SimpleMachineMetaTileEntity[] CVD; - public static SimpleMachineMetaTileEntity[] SPIN_COATER; public static SimpleMachineMetaTileEntity[] SPUTTER_DEPOSITION; public static SimpleMachineMetaTileEntity[] WEAPONS_FACTORY; @@ -166,7 +165,7 @@ public class SuSyMetaTileEntities { public static SimpleMachineMetaTileEntity[] BATH_CONDENSER; public static SimpleMachineMetaTileEntity[] ELECTROSTATIC_SEPARATOR; public static SimpleMachineMetaTileEntity[] TEXTILE_SPINNER; - public static SimpleMachineMetaTileEntity[] POLISHING_MACHINE; + public static SimpleMachineMetaTileEntity[] WAFER_SPINNER; public static MetaTileEntityPrimitiveSmelter PRIMITIVE_SMELTER; public static MetaTileEntityPrimitiveItemBus PRIMITIVE_ITEM_IMPORT; @@ -288,8 +287,7 @@ public static void init() { MILLING = registerMetaTileEntity(14514, new MetaTileEntityPreciseMillingMachine(susyId("milling"))); EUV_LITHOGRAPHER = registerMetaTileEntity(14741, new MetaTileEntityEUVLithographer(susyId("euv_lithographer"))); - registerSimpleMTE(SPIN_COATER, 12, 14742, "spin_coater", SuSyRecipeMaps.SPIN_COATING_RECIPE, SusyTextures.SPIN_COATER_OVERLAY, true, GTUtility.defaultTankSizeFunction); - registerSimpleMTE(SPUTTER_DEPOSITION, 12, 14755, "sputter_deposition", SuSyRecipeMaps.SPUTTER_DEPOSITION_RECIPES, SusyTextures.SPUTTER_DEPOSITION_OVERLAY, true, GTUtility.defaultTankSizeFunction); + registerSimpleMTE(SPUTTER_DEPOSITION, 12, 14742, "sputter_deposition", SuSyRecipeMaps.SPUTTER_DEPOSITION_RECIPES, SusyTextures.SPUTTER_DEPOSITION_OVERLAY, true, GTUtility.defaultTankSizeFunction); ArrayList ids = new ArrayList<>(); for (int id = 14500; id < 15000; id++) { @@ -381,7 +379,7 @@ public static void init() { } registerSimpleMTE(ELECTROSTATIC_SEPARATOR, 12, 17035, "electrostatic_separator", SuSyRecipeMaps.ELECTROSTATIC_SEPARATOR, SusyTextures.ELECTROSTATIC_SEPARATOR_OVERLAY, true, GTUtility.defaultTankSizeFunction); - registerSimpleMTE(POLISHING_MACHINE, 12, 17048, "polishing_machine", SuSyRecipeMaps.POLISHING_MACHINE, SusyTextures.POLISHING_MACHINE_OVERLAY, true, GTUtility.defaultTankSizeFunction); + registerSimpleMTE(WAFER_SPINNER, 12, 17048, "wafer_spinner", SuSyRecipeMaps.WAFER_SPINNER, SusyTextures.WAFER_SPINNER_OVERLAY, true, GTUtility.defaultTankSizeFunction); registerSimpleMTE(TEXTILE_SPINNER, 12, 17061, "textile_spinner", SuSyRecipeMaps.SPINNING_RECIPES, SusyTextures.TEXTILE_SPINNER_OVERLAY, true); //STOCK_DETECTOR = registerMetaTileEntity(18000, new MetaTileEntityStockDetector(susyId("stock_detector"))); @@ -459,7 +457,6 @@ private static void registerCatalystMTE(CatalystMachineMetaTileEntity[] machines UV_LIGHT_BOX = new SimpleMachineMetaTileEntity[GTValues.OpV]; CVD = new SimpleMachineMetaTileEntity[GTValues.OpV]; ION_IMPLANTER = new SimpleMachineMetaTileEntity[GTValues.OpV]; - SPIN_COATER = new SimpleMachineMetaTileEntity[GTValues.OpV]; SPUTTER_DEPOSITION = new SimpleMachineMetaTileEntity[GTValues.OpV]; FLUID_COMPRESSOR = new SimpleMachineMetaTileEntity[GTValues.OpV]; @@ -468,7 +465,7 @@ private static void registerCatalystMTE(CatalystMachineMetaTileEntity[] machines ELECTROSTATIC_SEPARATOR = new SimpleMachineMetaTileEntity[GTValues.OpV]; TEXTILE_SPINNER = new SimpleMachineMetaTileEntity[GTValues.OpV]; - POLISHING_MACHINE = new SimpleMachineMetaTileEntity[GTValues.OpV]; + WAFER_SPINNER = new SimpleMachineMetaTileEntity[GTValues.OpV]; PHASE_SEPARATOR = new SimpleMachineMetaTileEntity[1]; BATH_CONDENSER = new SimpleMachineMetaTileEntity[1]; diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front.png deleted file mode 100644 index 9e5f84f34a8b7fb6be9ea83fdb99cff20a80feca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmV-W0k8gvP)Px$3Q0skR5*>*l1*yFFbsvCWjR0B2;>3-T_hAjx83zLA1q5y3pqDZqP=bzKvHQVQcZ!h0V@ zUDu_6EX(36N5C))N#n}0Oac48#|j?W=c^rme|t^N=-2}hxhV#K$EOznfH5WogbMC4 z=2-Xz5U8K$kDJ1f%d+eO3r-juYb{Qv>i}!*kGuFi2Tjv}nW41?GlQ8yL?9v*MS;4m iVT?hZ=XZVeZ|n>G`-=gR-~&DY0000Px%E=fc|R9J=Wn89ijK^(@vnfdP~@!};ABnKfhFHlfONJ(qas2ju=0XT?&LM;VV~Z|*&N&AWfiVUl1O|fv0{}8fj6o>{r4(kfnfcX6{Jhz0nh}@) zB0?C3ma*IILP`lKC6rQ-Qerq9+5u4%VLF{!0gN&9`+Y=FWK8XL+Ya!3-`pi0u<@XW zm=^$0DwXVj`Fw6h@TmFHTyS^d(db!KtvEifQUdu;GBbVj$*Nh zdc6+M^H3-hGCitOMmZk*4ITg|W*Pq*9vmKZteWG2)2bW~)|v;^$^_NQ#I*6JJUBkx zvTAW2m{yzz_wGN$Xk508jtBp(91k+^px5hJ6PJkxdI`UNevaeQEsVzH>^#usxT=*& zK0HX=A0)A0G%o)h4=%1&BSOc6wUy&RUOaf!d7L=o@86wUHH!ynW&n8ecCobc{eE!q zElf4)zFTon&iLoEk5(BCGmf_yFYJ8}bUuTptDnm{r-UW|>9%7R diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta deleted file mode 100644 index 78df88c42..000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/machines/spin_coater/overlay_front_active_emissive.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front.png rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png.mcmeta similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png.mcmeta rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top.png rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png.mcmeta similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png.mcmeta rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png.mcmeta diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang index 4b3807c55..7c2eb4edd 100644 --- a/src/main/resources/assets/susy/lang/en_us.lang +++ b/src/main/resources/assets/susy/lang/en_us.lang @@ -674,20 +674,20 @@ gregtech.machine.textile_spinner.uiv.name=Epic Textile Spinner III gregtech.machine.textile_spinner.uxv.name=Epic Textile Spinner IV gregtech.machine.textile_spinner.opv.name=Legendary Textile Spinner -# Polishing Machine -gregtech.machine.polishing_machine.lv.name=Basic Polishing Machine -gregtech.machine.polishing_machine.mv.name=Advanced Polishing Machine -gregtech.machine.polishing_machine.hv.name=Advanced Polishing Machine II -gregtech.machine.polishing_machine.ev.name=Advanced Polishing Machine III -gregtech.machine.polishing_machine.iv.name=Elite Polishing Machine -gregtech.machine.polishing_machine.luv.name=Elite Polishing Machine II -gregtech.machine.polishing_machine.zpm.name=Elite Polishing Machine III -gregtech.machine.polishing_machine.uv.name=Ultimate Polishing Machine -gregtech.machine.polishing_machine.uhv.name=Epic Polishing Machine -gregtech.machine.polishing_machine.uev.name=Epic Polishing Machine II -gregtech.machine.polishing_machine.uiv.name=Epic Polishing Machine III -gregtech.machine.polishing_machine.uxv.name=Epic Polishing Machine IV -gregtech.machine.polishing_machine.opv.name=Legendary Polishing Machine +# Wafer Spinner +gregtech.machine.wafer_spinner.lv.name=Basic Wafer Spinner +gregtech.machine.wafer_spinner.mv.name=Advanced Wafer Spinner +gregtech.machine.wafer_spinner.hv.name=Advanced Wafer Spinner II +gregtech.machine.wafer_spinner.ev.name=Advanced Wafer Spinner III +gregtech.machine.wafer_spinner.iv.name=Elite Wafer Spinner +gregtech.machine.wafer_spinner.luv.name=Elite Wafer Spinner II +gregtech.machine.wafer_spinner.zpm.name=Elite Wafer Spinner III +gregtech.machine.wafer_spinner.uv.name=Ultimate Wafer Spinner +gregtech.machine.wafer_spinner.uhv.name=Epic Wafer Spinner +gregtech.machine.wafer_spinner.uev.name=Epic Wafer Spinner II +gregtech.machine.wafer_spinner.uiv.name=Epic Wafer Spinner III +gregtech.machine.wafer_spinner.uxv.name=Epic Wafer Spinner IV +gregtech.machine.wafer_spinner.opv.name=Legendary Wafer Spinner gregtech.machine.bath_condenser.name=Bath Condenser gregtech.machine.bath_condenser.tooltip=Only works inside a Cryogenic Distillation Tower @@ -754,7 +754,7 @@ recipemap.blender.name=Blender recipemap.phase_separator.name=Phase Separation recipemap.bath_condenser.name=Bath Condenser recipemap.drone_pad.name=Drone Pad -recipemap.polishing_machine.name=Polishing +recipemap.wafer_spinner.name=Wafer Spinning recipemap.gravity_separator=Gravity Separation recipemap.spinning.name=Textile Spinning recipemap.large_steam_turbine.name=Large Steam Turbine diff --git a/src/main/resources/assets/susy/lang/ru_RU.lang b/src/main/resources/assets/susy/lang/ru_RU.lang index 7121067da..aa0fe0f7b 100644 --- a/src/main/resources/assets/susy/lang/ru_RU.lang +++ b/src/main/resources/assets/susy/lang/ru_RU.lang @@ -654,20 +654,20 @@ gregtech.machine.textile_spinner.uiv.name=Идеальный текстильн gregtech.machine.textile_spinner.uxv.name=Идеальный текстильный прядильщик IV gregtech.machine.textile_spinner.opv.name=Совершенный текстильный прядильщик -# Polishing Machine -gregtech.machine.polishing_machine.lv.name=Обычная полировальная машина -gregtech.machine.polishing_machine.mv.name=Улучшеная полировальная машина -gregtech.machine.polishing_machine.hv.name=Улучшеная полировальная машина II -gregtech.machine.polishing_machine.ev.name=Улучшеная полировальная машина III -gregtech.machine.polishing_machine.iv.name=Превосходная полировальная машина -gregtech.machine.polishing_machine.luv.name=Превосходная полировальная машина II -gregtech.machine.polishing_machine.zpm.name=Превосходная полировальная машина III -gregtech.machine.polishing_machine.uv.name=Безупречная полировальная машина -gregtech.machine.polishing_machine.uhv.name=Идеальная полировальная машина -gregtech.machine.polishing_machine.uev.name=Идеальная полировальная машина II -gregtech.machine.polishing_machine.uiv.name=Идеальная полировальная машина III -gregtech.machine.polishing_machine.uxv.name=Идеальная полировальная машина IV -gregtech.machine.polishing_machine.opv.name=Совершенная полировальная машина +# Wafer Spinner +gregtech.machine.wafer_spinner.lv.name=Обычная полировальная машина +gregtech.machine.wafer_spinner.mv.name=Улучшеная полировальная машина +gregtech.machine.wafer_spinner.hv.name=Улучшеная полировальная машина II +gregtech.machine.wafer_spinner.ev.name=Улучшеная полировальная машина III +gregtech.machine.wafer_spinner.iv.name=Превосходная полировальная машина +gregtech.machine.wafer_spinner.luv.name=Превосходная полировальная машина II +gregtech.machine.wafer_spinner.zpm.name=Превосходная полировальная машина III +gregtech.machine.wafer_spinner.uv.name=Безупречная полировальная машина +gregtech.machine.wafer_spinner.uhv.name=Идеальная полировальная машина +gregtech.machine.wafer_spinner.uev.name=Идеальная полировальная машина II +gregtech.machine.wafer_spinner.uiv.name=Идеальная полировальная машина III +gregtech.machine.wafer_spinner.uxv.name=Идеальная полировальная машина IV +gregtech.machine.wafer_spinner.opv.name=Совершенная полировальная машина gregtech.machine.bath_condenser.name=Конденсатор для ванны gregtech.machine.bath_condenser.tooltip=Работает только внутри криогенной дистилляционной башни. @@ -734,7 +734,7 @@ recipemap.blender.name=Блендер recipemap.phase_separator.name=Разделение фаз recipemap.bath_condenser.name=Конденсатор для ванны recipemap.drone_pad.name=Площадка для дронов -recipemap.polishing_machine.name=Полировка +recipemap.wafer_spinner.name=Полировка recipemap.gravity_separator=Гравитационное разделение recipemap.spinning.name=Текстильное прядение recipemap.large_steam_turbine.name=Большая паровая турбина diff --git a/src/main/resources/assets/susy/lang/zh_cn.lang b/src/main/resources/assets/susy/lang/zh_cn.lang index 46f8744bb..3f22071b6 100644 --- a/src/main/resources/assets/susy/lang/zh_cn.lang +++ b/src/main/resources/assets/susy/lang/zh_cn.lang @@ -600,20 +600,20 @@ gregtech.machine.textile_spinner.uiv.name=史诗纺线机 III gregtech.machine.textile_spinner.uxv.name=史诗纺线机 IV gregtech.machine.textile_spinner.opv.name=传说纺线机 -# Polishing Machine -gregtech.machine.polishing_machine.lv.name=基础 -gregtech.machine.polishing_machine.mv.name=进阶抛光机 -gregtech.machine.polishing_machine.hv.name=进阶抛光机 II -gregtech.machine.polishing_machine.ev.name=进阶抛光机 III -gregtech.machine.polishing_machine.iv.name=精英抛光机 -gregtech.machine.polishing_machine.luv.name=精英抛光机 II -gregtech.machine.polishing_machine.zpm.name=精英抛光机 III -gregtech.machine.polishing_machine.uv.name=终极抛光机 -gregtech.machine.polishing_machine.uhv.name=史诗抛光机 -gregtech.machine.polishing_machine.uev.name=史诗抛光机 II -gregtech.machine.polishing_machine.uiv.name=史诗抛光机 III -gregtech.machine.polishing_machine.uxv.name=史诗抛光机 IV -gregtech.machine.polishing_machine.opv.name=传说抛光机 +# Wafer Spinner +gregtech.machine.wafer_spinner.lv.name=基础晶圆旋涂机 +gregtech.machine.wafer_spinner.mv.name=进阶晶圆旋涂机 +gregtech.machine.wafer_spinner.hv.name=进阶晶圆旋涂机 II +gregtech.machine.wafer_spinner.ev.name=进阶晶圆旋涂机 III +gregtech.machine.wafer_spinner.iv.name=精英晶圆旋涂机 +gregtech.machine.wafer_spinner.luv.name=精英晶圆旋涂机 II +gregtech.machine.wafer_spinner.zpm.name=精英晶圆旋涂机 III +gregtech.machine.wafer_spinner.uv.name=终极晶圆旋涂机 +gregtech.machine.wafer_spinner.uhv.name=史诗晶圆旋涂机 +gregtech.machine.wafer_spinner.uev.name=史诗晶圆旋涂机 II +gregtech.machine.wafer_spinner.uiv.name=史诗晶圆旋涂机 III +gregtech.machine.wafer_spinner.uxv.name=史诗晶圆旋涂机 IV +gregtech.machine.wafer_spinner.opv.name=传说晶圆旋涂机 gregtech.machine.bath_condenser.name=浴式冷凝器 gregtech.machine.bath_condenser.tooltip=仅在低温蒸馏厂中工作 @@ -670,7 +670,7 @@ recipemap.blender.name=混合搅拌 recipemap.phase_separator.name=相分离 recipemap.bath_condenser.name=浴式冷凝 recipemap.drone_pad.name=无人机坪 -recipemap.polishing_machine.name=抛光 +recipemap.wafer_spinner.name=晶圆旋涂 recipemap.gravity_separator=重力分离 recipemap.spinning.name=纺线 recipemap.large_steam_turbine.name=大型蒸汽轮机 From 882dccd93a227de72f827e2a42e3a5214dbcf889 Mon Sep 17 00:00:00 2001 From: LittleCube Date: Mon, 17 Mar 2025 13:46:55 +0800 Subject: [PATCH 6/8] feature: sputtering lang files --- .../resources/assets/susy/lang/en_us.lang | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang index 7c2eb4edd..c57ef69a3 100644 --- a/src/main/resources/assets/susy/lang/en_us.lang +++ b/src/main/resources/assets/susy/lang/en_us.lang @@ -702,6 +702,21 @@ gregtech.machine.incinerator.tooltip.3=§8Don't worry about where the heavy meta gregtech.multiblock.incinerator.clogged=§4Clogged! (Is the top blocked?) gregtech.multiblock.incinerator.working=§2Clog-free +# Sputtering Machine +gregtech.machine.sputter_deposition.lv.name=Basic Sputtering Machine +gregtech.machine.sputter_deposition.mv.name=Advanced Sputtering Machine +gregtech.machine.sputter_deposition.hv.name=Advanced Sputtering Machine II +gregtech.machine.sputter_deposition.ev.name=Advanced Sputtering Machine III +gregtech.machine.sputter_deposition.iv.name=Elite Sputtering Machine +gregtech.machine.sputter_deposition.luv.name=Elite Sputtering Machine II +gregtech.machine.sputter_deposition.zpm.name=Elite Sputtering Machine III +gregtech.machine.sputter_deposition.uv.name=Ultimate Sputtering Machine +gregtech.machine.sputter_deposition.uhv.name=Epic Sputtering Machine +gregtech.machine.sputter_deposition.uev.name=Epic Sputtering Machine II +gregtech.machine.sputter_deposition.uiv.name=Epic Sputtering Machine III +gregtech.machine.sputter_deposition.uxv.name=Epic Sputtering Machine IV +gregtech.machine.sputter_deposition.opv.name=Legendary Sputtering Machine + # Recipemaps recipemap.coagulation_tank.name=Coagulation recipemap.latex_collector.name=Arboreal Collector @@ -762,8 +777,9 @@ recipemap.primitive_smelter.name=Primitive Smelting recipemap.large_fluid_pump.name=Large Fluid Pump recipemap.sieve_distillation.name=Fractional Distillation recipemap.jet_wingpack_fuels.name=Jet Wingpack Fuels -recipemap.curtain_coater.name=Curtain Coater -recipemap.milling.name=Precise Milling Machine +recipemap.curtain_coater.name=Curtain Coating +recipemap.milling.name=Precise Milling +recipemap.sputter_deposition=Sputter Deposition gregtech.multiblock.primitive_mud_pump.description=The Primitive Mud Pump is a Steam Era multiblock that collects mud once per second, but only if it is in a river biome, and when the controller is between Y = 64 and Y = 80 (Inclusive). It can use a Pump, ULV, or LV Output Hatch. From 94dbb33a18ab2e7532a3d3f47f7b3fc7e23bb09e Mon Sep 17 00:00:00 2001 From: littlecube8152 Date: Thu, 3 Jul 2025 21:10:58 +0800 Subject: [PATCH 7/8] fix: sputter deposition lang --- src/main/resources/assets/susy/lang/en_us.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang index 01a25a25d..f212c5c25 100644 --- a/src/main/resources/assets/susy/lang/en_us.lang +++ b/src/main/resources/assets/susy/lang/en_us.lang @@ -856,7 +856,7 @@ recipemap.gas_atomizer.name=Gas Atomizer recipemap.metallurgical_converter.name=Metallurgical Converter recipemap.low_pressure_advanced_steam_turbine.name=Low Pressure Advanced Steam Turbine recipemap.high_pressure_advanced_steam_turbine.name=High Pressure Advanced Steam Turbine -recipemap.sputter_deposition=Sputter Deposition +recipemap.sputter_deposition.name=Sputter Deposition gregtech.multiblock.primitive_mud_pump.description=The Primitive Mud Pump is a Steam Era multiblock that collects mud once per second, but only if it is in a river biome, and when the controller is between Y = 64 and Y = 80 (Inclusive). It can use a Pump, ULV, or LV Output Hatch. From 789b6ea03866d43d03a756042477738cab567bed Mon Sep 17 00:00:00 2001 From: littlecube8152 Date: Wed, 9 Jul 2025 09:32:58 +0800 Subject: [PATCH 8/8] feature: buff sputter deposition input slot --- src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java index 90104e29c..c54c5e0fd 100644 --- a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java +++ b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java @@ -168,7 +168,7 @@ public class SuSyRecipeMaps { public static final RecipeMap CVD_RECIPES = new RecipeMap<>("cvd", 3, 1, 2, 2, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ARC); - public static final RecipeMap SPUTTER_DEPOSITION_RECIPES = new RecipeMap<>("sputter_deposition", 3, 1, 2, 2, new SimpleRecipeBuilder(), false) + public static final RecipeMap SPUTTER_DEPOSITION_RECIPES = new RecipeMap<>("sputter_deposition", 6, 1, 2, 2, new SimpleRecipeBuilder(), false) .setSound(GTSoundEvents.ELECTROLYZER); public static final RecipeMap ORE_SORTER_RECIPES = new RecipeMap<>("ore_sorter", 2, 20, 1, 1, new SimpleRecipeBuilder(), false)