From eb25cb901172dfa4d68f44de8f61d52958f53cfa Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 5 Sep 2024 01:11:15 +0200 Subject: Delete/modify some reflection + more renaming (#3037) --- src/main/java/gregtech/common/GTWorldgenerator.java | 2 +- .../java/gregtech/common/render/GTCopiedBlockTextureRender.java | 3 ++- src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java | 2 +- src/main/java/gregtech/common/render/GTRenderedTexture.java | 2 +- src/main/java/gregtech/common/render/GTSidedTextureRender.java | 2 +- .../common/tileentities/machines/basic/MTEWorldAccelerator.java | 6 +++--- .../common/tileentities/machines/multi/MTEWormholeGenerator.java | 4 ++-- 7 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/GTWorldgenerator.java b/src/main/java/gregtech/common/GTWorldgenerator.java index 6762fb868c..a853472089 100644 --- a/src/main/java/gregtech/common/GTWorldgenerator.java +++ b/src/main/java/gregtech/common/GTWorldgenerator.java @@ -71,7 +71,7 @@ public class GTWorldgenerator implements IWorldGenerator { mEndAsteroidProbability = ConfigEndAsteroids.EndAsteroidProbability; GameRegistry.registerWorldGenerator(this, 1073741823); if (debugWorldGen) { - GTLog.out.println("GT_Worldgenerator created"); + GTLog.out.println("GTWorldgenerator created"); } } diff --git a/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java index ab4282c7ba..3ce8823663 100644 --- a/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java +++ b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java @@ -15,7 +15,8 @@ public class GTCopiedBlockTextureRender extends GTTextureBase implements ITextur private final byte mSide, mMeta; protected GTCopiedBlockTextureRender(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedBlockTexture"); + if (aRGBa.length != 4) + throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTCopiedBlockTextureRender"); mBlock = aBlock; mSide = (byte) ordinalSide; mMeta = (byte) aMeta; diff --git a/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java index d3f6292435..a33ead9ec5 100644 --- a/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java +++ b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java @@ -17,7 +17,7 @@ class GTCopiedCTMBlockTexture extends GTTextureBase implements ITexture, IBlockC GTCopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { if (aRGBa.length != 4) - throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedCTMBlockTexture"); + throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTCopiedCTMBlockTexture"); mBlock = aBlock; mSide = (byte) ordinalSide; mMeta = (byte) aMeta; diff --git a/src/main/java/gregtech/common/render/GTRenderedTexture.java b/src/main/java/gregtech/common/render/GTRenderedTexture.java index 3bd4e6d864..b6bffc9553 100644 --- a/src/main/java/gregtech/common/render/GTRenderedTexture.java +++ b/src/main/java/gregtech/common/render/GTRenderedTexture.java @@ -36,7 +36,7 @@ public class GTRenderedTexture extends GTTextureBase implements ITexture, IColor protected GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow, boolean stdOrient, boolean extFacing) { - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); + if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTRenderedTexture"); mIconContainer = aIcon; mRGBa = aRGBa; this.glow = glow; diff --git a/src/main/java/gregtech/common/render/GTSidedTextureRender.java b/src/main/java/gregtech/common/render/GTSidedTextureRender.java index 15885f10ce..f2f40bff97 100644 --- a/src/main/java/gregtech/common/render/GTSidedTextureRender.java +++ b/src/main/java/gregtech/common/render/GTSidedTextureRender.java @@ -20,7 +20,7 @@ public class GTSidedTextureRender extends GTTextureBase implements ITexture, ICo protected GTSidedTextureRender(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) { - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); + if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTSidedTextureRender"); mTextures = new ITexture[] { TextureFactory.of(aIcon0, aRGBa, aAllowAlpha), TextureFactory.of(aIcon1, aRGBa, aAllowAlpha), TextureFactory.of(aIcon2, aRGBa, aAllowAlpha), TextureFactory.of(aIcon3, aRGBa, aAllowAlpha), TextureFactory.of(aIcon4, aRGBa, aAllowAlpha), diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java index a89064ba35..bb086dc654 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java @@ -342,7 +342,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { } } } catch (Exception e) { - GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash\n" + e.getMessage()); + GTLog.err.println("MTEWorldAccelerator.onPostTick.crash\n" + e.getMessage()); } } @@ -367,7 +367,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { } } } catch (Exception e) { - GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage()); + GTLog.err.println("MTEWorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage()); } } @@ -464,7 +464,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { } } } catch (Exception e) { - GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash\n" + e.getMessage()); + GTLog.err.println("MTEWorldAccelerator.tryTickBlock.crash\n" + e.getMessage()); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java index 12153fc10e..74f7d4c655 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java @@ -694,7 +694,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase