From 92d11c17fdeddac9ada8d846b580f34a81a4d63f Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 11 Jan 2025 01:08:26 -0600 Subject: [PATCH 1/4] RTG generator --- .../java/gregtech/api/enums/Textures.java | 7 +++ .../generators/MTERTGenerator.java | 54 +++++++++--------- .../blocks/iconsets/OVERLAY_SIDE_RTG.png | Bin 0 -> 387 bytes .../iconsets/OVERLAY_SIDE_RTG_ACTIVE.png | Bin 0 -> 410 bytes .../iconsets/OVERLAY_SIDE_RTG_ACTIVE_GLOW.png | Bin 0 -> 496 bytes .../blocks/iconsets/OVERLAY_TOP_RTG.png | Bin 0 -> 400 bytes .../iconsets/OVERLAY_TOP_RTG_ACTIVE.png | Bin 0 -> 409 bytes .../iconsets/OVERLAY_TOP_RTG_ACTIVE_GLOW.png | Bin 0 -> 431 bytes 8 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_RTG.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_RTG_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_RTG_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_RTG.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_RTG_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_RTG_ACTIVE_GLOW.png diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 39979445e51..f37eb4be6f6 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -890,6 +890,13 @@ public enum BlockIcons implements IIconContainer, Runnable { OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE, OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW, + OVERLAY_TOP_RTG_ACTIVE, + OVERLAY_TOP_RTG_ACTIVE_GLOW, + OVERLAY_TOP_RTG, + OVERLAY_SIDE_RTG_ACTIVE, + OVERLAY_SIDE_RTG_ACTIVE_GLOW, + OVERLAY_SIDE_RTG, + OVERLAY_ADV_PUMP, OVERLAY_TELEPORTER, OVERLAY_TELEPORTER_GLOW, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java index ddad318ccf3..ca3e0a38ce6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java @@ -14,8 +14,8 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTEBasicGenerator; -import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; +import gregtech.api.render.TextureFactory; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.common.pollution.Pollution; @@ -218,68 +218,68 @@ public int getEfficiency() { @Override public ITexture[] getFront(byte aColor) { - return new ITexture[] { super.getFront(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), - new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG) }; } @Override public ITexture[] getBack(byte aColor) { - return new ITexture[] { super.getBack(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG) }; } @Override public ITexture[] getBottom(byte aColor) { - return new ITexture[] { super.getBottom(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG) }; } @Override public ITexture[] getTop(byte aColor) { - return new ITexture[] { super.getTop(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG) }; } @Override public ITexture[] getSides(byte aColor) { - return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG), gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] }; } @Override public ITexture[] getFrontActive(byte aColor) { - return new ITexture[] { super.getFrontActive(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBackActive(byte aColor) { - return new ITexture[] { super.getBackActive(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomActive(byte aColor) { - return new ITexture[] { super.getBottomActive(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopActive(byte aColor) { - return new ITexture[] { super.getTopActive(aColor)[0], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSidesActive(byte aColor) { - return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)], - new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] }; + return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE_GLOW) + .glow() + .build(), gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] }; } @Override @@ -297,11 +297,9 @@ public int getFuelValue(ItemStack aStack) { this.mCurrentRecipe = tFuel; int voltage = tFuel.mEUt; this.mVoltage = voltage; - // this.mDaysRemaining = tFuel.mSpecialValue*365; // Do some voodoo. byte mTier2; - // mTier2 = ReflectionUtils.getField(this.getClass(), "mTier"); try { if (ItemStack.areItemStacksEqual(tFuel.mInputs[0], GregtechItemList.Pellet_RTG_AM241.get(1))) { mTier2 = 1; diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_RTG.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_RTG.png new file mode 100644 index 0000000000000000000000000000000000000000..74e719b8277dcf43bcd1b9a330cf2c74e68ecd48 GIT binary patch literal 387 zcmV-}0et?6P)Nklm}0_AqPI-DatVnai68lT^UMhb1E9ocV2) zx&T;fnWhPVX_~Os@|u5T_WL~|@+|<+bsbezaXOti91hy4?|Z7MT6Hf>(=~=IOmj+ zqQ2d30dUT-*=#Vzs9@7HIOo*OIF8E5rx6)r)MDTF)OD@-=QRw&k3a}P=N>}%IQ#SY zylMh`3pnSrQ0_XNZXR81H&R=qBy;YCLl^*~A002ovPDHLkV1jxlSkup^R2m{ID$XjTov1eziu#(Bg zPg0aSVC9a92svjyvKkkFd7gPXy#VlZdSRYtZvD5+@pwc;iU7c13|-gp=hqLud_A>F z2V4AGtBkc4vDOyQ*&Q?t!@IT**6hBGF-XptX_^4&`<`i$wW6YCGqg@!mH^s`}^Y0RZnk4+n>Ht_fOe@!s<|jjhYd$h{RgYZ=F}bmJ_> znC9QwIF46=MYZjHQN6qSzy7={0u%x7eGAlCV~hZt!$L}_`76Ju5@SRzmrF@lv<2g$ zgb-S#+F8^KTRwz<=v%wzC9$q+J8vu1O@-w;W@Xw#0dY81l zgPrd!xmrpIsci=>!Q=Bce*gUbVbZ#;jmbIF{qOJm3Jg)c>I!7BQ2+n{07*qoM6N<$ Ef{OLN(f|Me literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_RTG_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_RTG_ACTIVE_GLOW.png new file mode 100644 index 0000000000000000000000000000000000000000..20d22dc06307bdacf4b7bb216bea2c84c91ac0e4 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|+7J^vKbpmej~blZq*_qYO=n7ojT3cr*RuY@9?k`EWIS^_Dqk|4j} z|1iL?>5R^KpeSd7M`SSr1K(i~W;~w1A_XWYQQ{g=5}cn_Ql40p$`Fv4nOCCc=Nh75 zs%NNY^m`BUHlUhqsS%!Oo}O9^96$~$gA^kx10#^-1;o-&Hpn*`jLcwhCLr68kqPX( zC?GqtodqnO1!RLj0uY1r!)P>18Gzw2ft`T`sKUU=*nn{X#8i+D)&&rgrU2O>zyvgh z39K^6(gMhW>M}Gi0Li|*`px3ht(+<#Gv3q1F+?LcwV#vkfC2~0+lABq*Y7yYv@P>w zT5~gp*>9EwJJ+)0UYciFCgQ+)VJ7DSZ^m8CiDs-HW-82(S|;ZPr}+!F@N-N@ tB2MKj-Z*DV&>Hp?vdYKn=2y4hiT~RK3}3n9XJgA?Uge?>*P+6#*1$Eip!nF*xV& z-t&`$5YSrFw(YHi7$eK&65v;7=N#wrnf-o0G*gmNVmh5xx<85co~CI?DIujq=A2PV zJ(c~wCrYWuG2R=0V{q>y0ou0xGlRjWG6*3&&0v_qLjbMyQxmwy1Gj$wAcO#5wOTQs z&p95CpESUByL|}yB7}I=T4Rjia5&KSJpkkJxSspICxn2MlCJ9*@G(Y4rQDYBa=BD` uyWNhI5=yE1;|9v5l#0nYznAdeb$$coNw2t~S}L;u0000aE&(mO%2KlmDFmKLQB+5K>CK_xu*|T>=Gz^zHYEQA#12Ektmh=agl+an5El079tK1Q2?~7*|fnvMd4r z3TrJoKjr@BsxDxR;jmxOex9=}y4@}hZ*89LZdfjtNGT=GIoi*2@;u*KpsFf5FLRu8 z^$@-HXsrRZQjZJ(wAP<8>ijefZWjh$bCL>8ss3V6RTb0ev^G>UiM4iT2G-hSwj?8f zUM+U|-L;MYK4k0*QLs2_Xc=7>>^_2q9ptW&YmzHn2$BwT_7Rlk-cI zQmAOj*Y!G0_wn``=Nww=b$b#xJG%x_kzP$R);?%92Dj+k?)5S5w!asR|)P>LfKl^ Date: Sat, 11 Jan 2025 01:14:18 -0600 Subject: [PATCH 2/4] Charcoal Pile Igniter --- .../java/gregtech/api/enums/Textures.java | 4 +++ .../machines/multi/MTECharcoalPit.java | 23 +++++------------- .../blocks/iconsets/OVERLAY_CHARCOAL_PIT.png | Bin 0 -> 638 bytes .../iconsets/OVERLAY_CHARCOAL_PIT_ACTIVE.png | Bin 0 -> 717 bytes .../OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW.png | Bin 0 -> 631 bytes 5 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_CHARCOAL_PIT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_CHARCOAL_PIT_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW.png diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index f37eb4be6f6..c8b3fb4306d 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -897,6 +897,10 @@ public enum BlockIcons implements IIconContainer, Runnable { OVERLAY_SIDE_RTG_ACTIVE_GLOW, OVERLAY_SIDE_RTG, + OVERLAY_CHARCOAL_PIT, + OVERLAY_CHARCOAL_PIT_ACTIVE, + OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW, + OVERLAY_ADV_PUMP, OVERLAY_TELEPORTER, OVERLAY_TELEPORTER_GLOW, diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java index f39ea70422d..e9967f0c7a8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java @@ -1,9 +1,8 @@ package gregtech.common.tileentities.machines.multi; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_CHARCOAL_PIT; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_CHARCOAL_PIT_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; @@ -29,7 +28,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.MTETooltipMultiBlockBase; -import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; @@ -232,11 +230,6 @@ public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } - @Override - public RecipeMap getRecipeMap() { - return null; - } - @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new MTECharcoalPit(mName); @@ -266,15 +259,11 @@ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirec int colorIndex, boolean aActive, boolean redstoneLevel) { if (side == ForgeDirection.UP) { if (aActive) return new ITexture[] { casingTexturePages[0][10], - TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), TextureFactory.builder() - .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW) + TextureFactory.of(OVERLAY_CHARCOAL_PIT_ACTIVE), TextureFactory.builder() + .addIcon(OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW) .glow() .build() }; - return new ITexture[] { casingTexturePages[0][10], TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW) - .glow() - .build(), }; + return new ITexture[] { casingTexturePages[0][10], TextureFactory.of(OVERLAY_CHARCOAL_PIT) }; } return new ITexture[] { casingTexturePages[0][10] }; } diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_CHARCOAL_PIT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_CHARCOAL_PIT.png new file mode 100644 index 0000000000000000000000000000000000000000..9f712f1769d8c2e65478bffce594586182f8a60d GIT binary patch literal 638 zcmV-^0)hRBP)4Tx04R}tkvmAkP!xv$rb?w&9PA+CkfA!+!3W}4s#pXIrLEAagUL-_(4-+r zad8w}3l2UOs}3&Cx;nTDg5U$h*}+NCMM^w3DYS_3z~z4Y_xwNio(l-gDpSp#7@%sF zkxsMqK&y!-yF0i|Fvz$X&Nm~L3a8^p7l zmd<&fILykDLVQj$Qp0G~-j zK~y-)#gfqt!ypVqU!;DL0pc-WfNaAYnS(X52V=kh=D+;{rAmk@RT1}dwhZT!bub!J zEtX|@1Bl4&hm;ZkIp+!BbsTQn)@oI~6i`({2(51db#n*-Yb`OxOP=Q$5h3Ty$-&WL zkJokmdVdlS5v;WUUA`4~+(9X&FQBS}9sF_w=UhLD-g{J)QVPbH)3%Cz-&+#@j`DbX Y0PGNScb0S7-T(jq07*qoM6N<$g7};m@c;k- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_CHARCOAL_PIT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_CHARCOAL_PIT_ACTIVE.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4da72f02477f0e233932b2e10e981c21b378ed GIT binary patch literal 717 zcmV;;0y6!HP)4Tx04R}tkvmAkP!xv$rb?w&9PA+CkfA!+!3W}4s#pXIrLEAagUL-_(4-+r zad8w}3l2UOs}3&Cx;nTDg5U$h*}+NCMM^w3DYS_3z~z4Y_xwNio(l-gDpSp#7@%sF zkxsMqK&y!-yF0i|Fvz$X&Nm~L3a8^p7l zmd<&fILykDLVQj$Qp0Paad zK~y-)#gZXX1VIc%-%^X~m2B1YArOHxa0C>31P4H%Mj}prUI8;BrBwSW z;La%}L%3h*#=de5KRQGz624e`SD|kh;aM4 zMnnz^yxeR?j&JwxBcg)>*U#&bn8qtm5(34G76W2{tzZh00000NkvXXu0mjfO4Tx04R}tkvmAkP!xv$rb?w&9PA+CkfA!+!3W}4s#pXIrLEAagUL-_(4-+r zad8w}3l2UOs}3&Cx;nTDg5U$h*}+NCMM^w3DYS_3z~z4Y_xwNio(l-gDpSp#7@%sF zkxsMqK&y!-yF0i|Fvz$X&Nm~L3a8^p7l zmd<&fILykDLVQj$Qp0GLTc zK~y-)V_+BsjOYT!#>W4RjEor0ojb>Xjh;PwHX~jW-&!#KH#Ro@52IHm>i;)3HvWIo zL-xP1vGIR&^-SmjZoiEfjEs!nbk`*o1|uUQhOF0O3`Ryqg#C24Ulzs2|7#ggTtv_X zVN1kNY&2;zMsX2A0P{1Y9t$uRji!7|001flVnELn R-f{o{002ovPDHLkV1i!c5-9)x literal 0 HcmV?d00001 From 3ff75b33d9859f3ae8ac9ad34c3e558068fa78d0 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 11 Jan 2025 01:30:35 -0600 Subject: [PATCH 3/4] Seismic Prospector --- .../java/gregtech/api/enums/Textures.java | 4 + .../basic/MTEAdvSeismicProspector.java | 78 ++++-------------- .../OVERLAY_FRONT_SEISMIC_PROSPECTOR.png | Bin 0 -> 714 bytes ...VERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE.png | Bin 0 -> 887 bytes ...FRONT_SEISMIC_PROSPECTOR_ACTIVE.png.mcmeta | 5 ++ ...Y_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW.png | Bin 0 -> 525 bytes 6 files changed, 27 insertions(+), 60 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_SEISMIC_PROSPECTOR.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW.png diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index c8b3fb4306d..3e86e40fd2f 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -901,6 +901,10 @@ public enum BlockIcons implements IIconContainer, Runnable { OVERLAY_CHARCOAL_PIT_ACTIVE, OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW, + OVERLAY_FRONT_SEISMIC_PROSPECTOR, + OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE, + OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW, + OVERLAY_ADV_PUMP, OVERLAY_TELEPORTER, OVERLAY_TELEPORTER_GLOW, diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java index fc4aefcf144..4bd904e21b8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java @@ -1,21 +1,9 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SEISMIC_PROSPECTOR; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.VOID; import static gregtech.common.UndergroundOil.undergroundOilReadInformation; import java.util.ArrayList; @@ -66,54 +54,19 @@ public MTEAdvSeismicProspector(int aID, String aName, String aNameRegional, int "", 1, // input slot count 1, // output slot count + TextureFactory.of(VOID), + TextureFactory.of(VOID), TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), + TextureFactory.of(OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE), TextureFactory.builder() - .addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW) + .addIcon(OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW) .glow() .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW) - .glow() - .build())); + TextureFactory.of(OVERLAY_FRONT_SEISMIC_PROSPECTOR), + TextureFactory.of(VOID), + TextureFactory.of(VOID), + TextureFactory.of(VOID), + TextureFactory.of(VOID)); radius = aRadius; step = aStep; } @@ -145,6 +98,11 @@ public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { this.step); } + @Override + public ITexture[][][] getTextureSet(ITexture[] aTextures) { + return super.getTextureSet(aTextures); + } + @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if (aBaseMetaTileEntity.isServerSide()) { diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_SEISMIC_PROSPECTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_SEISMIC_PROSPECTOR.png new file mode 100644 index 0000000000000000000000000000000000000000..a0a6f9d7491953114f07fadba30ab6a0cab7de8f GIT binary patch literal 714 zcmV;*0yX`KP)EX>4Tx04R}tkvmAkP!xv$rb?w&9PA+CkfA!+!3W}4s#pXIrLEAagUL-_(4-+r zad8w}3l2UOs}3&Cx;nTDg5U$h*}+NCMM^w3DYS_3z~z4Y_xwNio(l-gDpSp#7@%sF zkxsMqK&y!-yF0i|Fvz$X&Nm~L3a8^p7l zmd<&fILykDLVQj$Qp0P9Ia zK~y-)#gegc!!Qg*pK_|=2`~pz>2j*#PAS!94X>cgqSEY~N~cq0tRYU|v`k|vlo`kF z{40DEkHiPy(JEr0ssTVm0Px-eU}nXCfHF0zx&oNl%^xfP5ut5cs;UBDnkMFXz8{dP zuIsGVG);)Lb8Z>y=^DA~Iz$9j4XPTv_v}9$`&YN*l>y$iTb?(Y70ApA5#iVxFP};p zbO!i39QZz+7=~d5i5ofYY~`IP)EX>4Tx04R}tkvmAkP!xv$rb?w&9PA+CkfA!+!3W}4s#pXIrLEAagUL-_(4-+r zad8w}3l2UOs}3&Cx;nTDg5U$h*}+NCMM^w3DYS_3z~z4Y_xwNio(l-gDpSp#7@%sF zkxsMqK&y!-yF0i|Fvz$X&Nm~L3a8^p7l zmd<&fILykDLVQj$Qp0hmcd zK~z}7?U*rcgFp~PKb9+Vg1rOXxI&JrxFaQPuHh@#=P@00wy2oSbxL!BrQK9Z*0982 zM{y#}mk=z)Xm^--`UCK61@?i63;-yl004De0|1yg_%6WQT@cY#0A{|qgEoLt3Tc`m zj$;5oS(dn5F5?5ZTCdl=cS({M`~;y5`&Xnf8}64 zwqV@Extfg)5G9ep5hh9^GgyhfLTW4V2!j=X6Mz@^kHE~mQf_y!k8sAhy^H=l4}9%B zq*3i`d0?-bK&hBfIE`d^P;D9b0G2fwn;S0=y6rrf2VDsdga_gep5YG`VfdIoXtaLJ z9{>=4AUqHr{1gv-8sfp+*Um0bY;H#RgCfs+K$*k?%Yv$tyvaOhv4Tx04R}tkvmAkP!xv$rb?w&9PA+CkfA!+!3W}4s#pXIrLEAagUL-_(4-+r zad8w}3l2UOs}3&Cx;nTDg5U$h*}+NCMM^w3DYS_3z~z4Y_xwNio(l-gDpSp#7@%sF zkxsMqK&y!-yF0i|Fvz$X&Nm~L3a8^p7l zmd<&fILykDLVQj$Qp04_;H zK~y-)?aomR05A-MPz0Tnx~?$hVM()(^$8%rT7OAJ8dLGE(1=Lmqk}02_Tmqd^o&Tt P00000NkvXXu0mjf_R!@n literal 0 HcmV?d00001 From f6ca946c413768c6b3cb93c86261b75218a6fa21 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 11 Jan 2025 02:25:50 -0600 Subject: [PATCH 4/4] remove unnecessary addition --- .../tileentities/machines/basic/MTEAdvSeismicProspector.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java index 4bd904e21b8..c43a34ce6f1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java @@ -98,11 +98,6 @@ public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { this.step); } - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - return super.getTextureSet(aTextures); - } - @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if (aBaseMetaTileEntity.isServerSide()) {