diff options
| author | Alexdoru <57050655+Alexdoru@users.noreply.github.com> | 2024-09-02 20:48:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 20:48:15 +0200 |
| commit | 2beddd5c8db8fcf727607112d5287ab460d567bd (patch) | |
| tree | 3364864085c3a960f0f4722952d2170d278b7110 /src/main | |
| parent | eac418f191d9639c61a4cbd4cf3eea7c783cd3f7 (diff) | |
| download | GT5-Unofficial-2beddd5c8db8fcf727607112d5287ab460d567bd.tar.gz GT5-Unofficial-2beddd5c8db8fcf727607112d5287ab460d567bd.tar.bz2 GT5-Unofficial-2beddd5c8db8fcf727607112d5287ab460d567bd.zip | |
change loops on METATILEENTITIES to all start at 1 for consistency (#3017)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 25 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Machines.java | 7 |
2 files changed, 12 insertions, 20 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 85978e4c20..40fa1d1548 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -138,7 +138,6 @@ import gregtech.api.interfaces.IProjectileItem; import gregtech.api.interfaces.IToolStats; import gregtech.api.interfaces.internal.IGT_Mod; import gregtech.api.interfaces.internal.IThaumcraftCompat; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.GT_MetaGenerated_Item; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -1258,10 +1257,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { GT_Log.out.println("GT_Mod: Adding Configs specific for MetaTileEntities"); try { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { - for (; i < GregTech_API.METATILEENTITIES.length; i++) { - if (GregTech_API.METATILEENTITIES[i] != null) { - GregTech_API.METATILEENTITIES[i].onConfigLoad(); - } + if (GregTech_API.METATILEENTITIES[i] != null) { + GregTech_API.METATILEENTITIES[i].onConfigLoad(); } } } catch (Throwable e) { @@ -1354,10 +1351,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { } try { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { - for (; i < GregTech_API.METATILEENTITIES.length; i++) { - if (GregTech_API.METATILEENTITIES[i] != null) { - GregTech_API.METATILEENTITIES[i].onServerStart(); - } + if (GregTech_API.METATILEENTITIES[i] != null) { + GregTech_API.METATILEENTITIES[i].onServerStart(); } } } catch (Throwable e) { @@ -1399,10 +1394,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { if (tSaveDirectory != null) { try { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { - for (; i < GregTech_API.METATILEENTITIES.length; i++) { - if (GregTech_API.METATILEENTITIES[i] != null) { - GregTech_API.METATILEENTITIES[i].onWorldSave(tSaveDirectory); - } + if (GregTech_API.METATILEENTITIES[i] != null) { + GregTech_API.METATILEENTITIES[i].onWorldSave(tSaveDirectory); } } } catch (Throwable e) { @@ -2198,9 +2191,9 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { if (tSaveDiretory != null) { this.isFirstServerWorldTick = false; try { - for (IMetaTileEntity tMetaTileEntity : GregTech_API.METATILEENTITIES) { - if (tMetaTileEntity != null) { - tMetaTileEntity.onWorldLoad(tSaveDiretory); + for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { + if (GregTech_API.METATILEENTITIES[i] != null) { + GregTech_API.METATILEENTITIES[i].onWorldLoad(tSaveDiretory); } } } catch (Throwable e) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index dad96c9222..2f80929d94 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -37,7 +37,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IDebugableBlock; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IColoredTileEntity; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IDebugableTileEntity; @@ -315,9 +314,9 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo GT_Log.out.println("GT_Mod: Registering MetaTileEntity specific Textures"); try { - for (IMetaTileEntity tMetaTileEntity : GregTech_API.METATILEENTITIES) { - if (tMetaTileEntity != null) { - tMetaTileEntity.registerIcons(aIconRegister); + for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { + if (GregTech_API.METATILEENTITIES[i] != null) { + GregTech_API.METATILEENTITIES[i].registerIcons(aIconRegister); } } } catch (Exception e) { |