diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/xmod/gregtech/common/render | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/render')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java) | 26 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/FlaskRenderer.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java) | 8 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java) | 40 |
3 files changed, 37 insertions, 37 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java index a281a205d2..f9ec4b9433 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java @@ -21,18 +21,18 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import org.apache.commons.io.IOUtils; import org.lwjgl.opengl.GL11; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; import gtPlusPlus.core.proxy.ClientProxy; import gtPlusPlus.core.util.data.AES; import gtPlusPlus.core.util.data.FileUtils; import gtPlusPlus.core.util.math.MathUtils; -public class GTPP_CapeRenderer extends RenderPlayer { +public class CapeRenderer extends RenderPlayer { private static final ResourceLocation[] mCapes = { new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), @@ -42,7 +42,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { private final boolean mInit; - public GTPP_CapeRenderer() { + public CapeRenderer() { mInit = init(); } @@ -91,7 +91,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { // We have already checked if this player has a cape, but since they do not, we best not render. if (hasResourceChecked) { - if (!hasCape && !CORE.DEVENV) { + if (!hasCape && !GTPPCore.DEVENV) { return; } } @@ -113,7 +113,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } // Automatically allocate a Dev cape while in Dev mode. - if (tResource == null && CORE.DEVENV) { + if (tResource == null && GTPPCore.DEVENV) { tResource = mCapes[4]; hasCape = true; } @@ -184,13 +184,13 @@ public class GTPP_CapeRenderer extends RenderPlayer { private boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) { float aPartialTicks = aEvent.partialRenderTick; try { - if (tResource == null && CORE.DEVENV) { + if (tResource == null && GTPPCore.DEVENV) { tResource = mCapes[3]; } // If player is invisible, don't render. - if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() - || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) { + if (GTUtility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() + || GTUtility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) { aEvent.setCanceled(true); return false; } @@ -207,8 +207,8 @@ public class GTPP_CapeRenderer extends RenderPlayer { - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks); float f6 = aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks; - double d3 = MathHelper.sin(f6 * CORE.PI / 180.0F); - double d4 = -MathHelper.cos(f6 * CORE.PI / 180.0F); + double d3 = MathHelper.sin(f6 * GTPPCore.PI / 180.0F); + double d4 = -MathHelper.cos(f6 * GTPPCore.PI / 180.0F); float f7 = (float) d1 * 10.0F; float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F; float f9 = (float) (d0 * d4 - d2 * d3) * 100.0F; @@ -260,7 +260,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { private static boolean init() { CapeUtils.handleOldCapeCache(); - if (CORE.DEVENV) { + if (GTPPCore.DEVENV) { return true; } ForkJoinPool.commonPool() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/FlaskRenderer.java index 0c9e59e2f2..20d904ae80 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/FlaskRenderer.java @@ -13,14 +13,14 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.common.items.GT_VolumetricFlask; +import gregtech.common.items.ItemVolumetricFlask; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import ic2.core.util.DrawUtil; @SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) -public final class GTPP_FlaskRenderer implements net.minecraftforge.client.IItemRenderer { +public final class FlaskRenderer implements net.minecraftforge.client.IItemRenderer { - public GTPP_FlaskRenderer() { + public FlaskRenderer() { MinecraftForgeClient.registerItemRenderer(GregtechItemList.VOLUMETRIC_FLASK_8k.getItem(), this); MinecraftForgeClient.registerItemRenderer(GregtechItemList.VOLUMETRIC_FLASK_32k.getItem(), this); } @@ -37,7 +37,7 @@ public final class GTPP_FlaskRenderer implements net.minecraftforge.client.IItem @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GT_VolumetricFlask cell = (GT_VolumetricFlask) item.getItem(); + ItemVolumetricFlask cell = (ItemVolumetricFlask) item.getItem(); int aType = cell.getMaxCapacity() == 8000 ? 0 : 1; IIcon icon = item.getIconIndex(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java index bfd16b4cc5..7ce7002738 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java @@ -28,23 +28,23 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.RenderingRegistry; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; -import gregtech.common.blocks.GT_Block_Machines; -import gregtech.common.render.GT_Renderer_Block; -import gtPlusPlus.xmod.gregtech.common.helpers.GT_MethodHelper; +import gregtech.common.blocks.BlockMachines; +import gregtech.common.render.GTRendererBlock; +import gtPlusPlus.xmod.gregtech.common.helpers.GTMethodHelper; -public class GTPP_Render_MachineBlock extends GT_Renderer_Block { +public class MachineBlockRenderer extends GTRendererBlock { - public static GTPP_Render_MachineBlock INSTANCE; + public static MachineBlockRenderer INSTANCE; public final int mRenderID = RenderingRegistry.getNextAvailableRenderId(); - public GTPP_Render_MachineBlock() { + public MachineBlockRenderer() { INSTANCE = this; RenderingRegistry.registerBlockHandler(this); } @@ -62,8 +62,8 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, RenderBlocks aRenderer) { - if (aMeta > 0 && aMeta < GregTech_API.METATILEENTITIES.length) { - IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aMeta]; + if (aMeta > 0 && aMeta < GregTechAPI.METATILEENTITIES.length) { + IMetaTileEntity tMetaTileEntity = GregTechAPI.METATILEENTITIES[aMeta]; if (tMetaTileEntity != null) { aBlock.setBlockBoundsForItemRender(); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -240,12 +240,12 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { aZ, aBlock, aRenderer, - new ITexture[][] { GT_MethodHelper.getTexture(tTileEntity, aBlock, DOWN), - GT_MethodHelper.getTexture(tTileEntity, aBlock, UP), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) }) + new ITexture[][] { GTMethodHelper.getTexture(tTileEntity, aBlock, DOWN), + GTMethodHelper.getTexture(tTileEntity, aBlock, UP), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) }) : false; } @@ -294,7 +294,7 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { final EnumMap<ForgeDirection, ITexture[]> textureUncovered = new EnumMap<>(ForgeDirection.class); for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - texture.put(side, GT_MethodHelper.getTexture((TileEntity) aTileEntity, aBlock, side)); + texture.put(side, GTMethodHelper.getTexture((TileEntity) aTileEntity, aBlock, side)); textureUncovered.put(side, aTileEntity.getTextureUncovered(side)); } @@ -1204,10 +1204,10 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { @Override public void renderInventoryBlock(Block aBlock, int aMeta, int aModelID, RenderBlocks aRenderer) { aMeta += 30400; - if (aBlock instanceof GT_Block_Machines) { - if (aMeta > 0 && aMeta < GregTech_API.METATILEENTITIES.length - && GregTech_API.METATILEENTITIES[aMeta] != null - && !GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer)) { + if (aBlock instanceof BlockMachines) { + if (aMeta > 0 && aMeta < GregTechAPI.METATILEENTITIES.length + && GregTechAPI.METATILEENTITIES[aMeta] != null + && !GregTechAPI.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer)) { renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer); } } |
