Skip to content
This repository has been archived by the owner on May 26, 2024. It is now read-only.

Fixed the controller texture for the turbines.PlayerCache is not called anywhere? #878

Merged
merged 2 commits into from
May 10, 2024
Merged

Fixed the controller texture for the turbines.PlayerCache is not called anywhere? #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beaf0cf
Fixed the controller texture for the turbines.
Pilad May 7, 2024
d3a93bf
The file is not called anywhere?
Pilad May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/gtPlusPlus/core/common/CommonProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.player.PlayerCache;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
Expand Down Expand Up @@ -101,8 +100,6 @@ public void init(final FMLInitializationEvent e) {
}

public void postInit(final FMLPostInitializationEvent e) {
Logger.INFO("Cleaning up, doing postInit.");
PlayerCache.initCache();

// Make Burnables burnable
if (!CORE.burnables.isEmpty()) {
Expand Down
66 changes: 0 additions & 66 deletions src/main/java/gtPlusPlus/core/util/player/PlayerCache.java
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the future try to put separate changes in a separate PR

This file was deleted.

5 changes: 3 additions & 2 deletions ...gtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import gregtech.api.recipe.maps.FuelBackend;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;

@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbineBase {
Expand Down Expand Up @@ -194,11 +195,11 @@ protected String getCasingName() {

@Override
protected ITexture getTextureFrontFace() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
}

@Override
protected ITexture getTextureFrontFaceActive() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
}
}
5 changes: 3 additions & 2 deletions ...ch/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;

@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTurbineBase {
Expand Down Expand Up @@ -301,11 +302,11 @@ protected String getCasingName() {

@Override
protected ITexture getTextureFrontFace() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
}

@Override
protected ITexture getTextureFrontFaceActive() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
}
}
5 changes: 3 additions & 2 deletions ...h/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;

public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTurbineBase {

Expand Down Expand Up @@ -115,11 +116,11 @@ protected String getCasingName() {

@Override
protected ITexture getTextureFrontFace() {
return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5);
return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
}

@Override
protected ITexture getTextureFrontFaceActive() {
return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5);
return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
}
}
5 changes: 3 additions & 2 deletions ...h/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;

@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTurbineBase {
Expand Down Expand Up @@ -188,11 +189,11 @@ protected String getCasingName() {

@Override
protected ITexture getTextureFrontFace() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
}

@Override
protected ITexture getTextureFrontFaceActive() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
}
}
5 changes: 3 additions & 2 deletions ...ech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;

@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurbineBase {
Expand Down Expand Up @@ -199,11 +200,11 @@ protected String getCasingName() {

@Override
protected ITexture getTextureFrontFace() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
}

@Override
protected ITexture getTextureFrontFaceActive() {
return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5);
return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
}
}