diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-12-03 15:39:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-03 16:39:59 +0100 |
| commit | 7a4a430a1fbef24a288c333b372b2188fe80e0b0 (patch) | |
| tree | 912f5662a40c72574bbbc17fa12b1b8723e9bb73 /src/main/java | |
| parent | 7e0704c2b1b923191dad4ba3f5c3c0ca093698ce (diff) | |
| download | GT5-Unofficial-7a4a430a1fbef24a288c333b372b2188fe80e0b0.tar.gz GT5-Unofficial-7a4a430a1fbef24a288c333b372b2188fe80e0b0.tar.bz2 GT5-Unofficial-7a4a430a1fbef24a288c333b372b2188fe80e0b0.zip | |
Optimise EOH Renderer and fix transparency bug (#258)
* Clean up EOH rendering and fix transparency bug
* Optimise the renderer somewhat
* Lower poly count of space shell
* spotlessApply
* fix wci
* update bs+deps
* Change EOH render hitbox
* Imports + spotless
* Fix bounding box and culling
* Update src/main/java/com/github/technus/tectech/rendering/EOH/EOH_RenderingUtils.java
Co-authored-by: Raven Szewczyk <git@eigenraven.me>
* Update src/main/java/com/github/technus/tectech/rendering/EOH/EOH_RenderingUtils.java
Co-authored-by: Raven Szewczyk <git@eigenraven.me>
* Update src/main/java/com/github/technus/tectech/rendering/EOH/EOH_RenderingUtils.java
Co-authored-by: Raven Szewczyk <git@eigenraven.me>
* Add constant
* blendfunc
* Hitbox change
* Spotless
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <unknown>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Connor Colenso <colen@CONNORSPC>
Co-authored-by: Raven Szewczyk <git@eigenraven.me>
Diffstat (limited to 'src/main/java')
20 files changed, 815 insertions, 338 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index d4e436157b..cacf236134 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -1,6 +1,9 @@ package com.github.technus.tectech.loader; -import static com.github.technus.tectech.TecTech.*; +import static com.github.technus.tectech.TecTech.LOGGER; +import static com.github.technus.tectech.TecTech.configTecTech; +import static com.github.technus.tectech.TecTech.creativeTabTecTech; +import static com.github.technus.tectech.TecTech.proxy; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.TwilightForest; diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 1dd36e0ed6..aa55361e7c 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -2,7 +2,28 @@ package com.github.technus.tectech.loader.recipe; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemContainer; import static com.google.common.math.LongMath.pow; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.AvaritiaAddons; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.DraconicEvolution; +import static gregtech.api.enums.Mods.EternalSingularity; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.GTNHIntergalactic; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GTPlusPlusEverglades; +import static gregtech.api.enums.Mods.GalaxySpace; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.GraviSuite; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.KekzTech; +import static gregtech.api.enums.Mods.KubaTech; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.SGCraft; +import static gregtech.api.enums.Mods.SuperSolarPanels; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TinkersGregworks; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 70765ecddc..e0a373e67a 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -1,6 +1,294 @@ package com.github.technus.tectech.loader.thing; -import static com.github.technus.tectech.thing.CustomItemList.*; +import static com.github.technus.tectech.thing.CustomItemList.DATApipe; +import static com.github.technus.tectech.thing.CustomItemList.DATApipeBlock; +import static com.github.technus.tectech.thing.CustomItemList.LASERpipe; +import static com.github.technus.tectech.thing.CustomItemList.LASERpipeBlock; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_LuV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UEV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UHV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UIV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UMV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_UXV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_BuckConverter_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.Machine_DebugGenny; +import static com.github.technus.tectech.thing.CustomItemList.Machine_DebugPollutor; +import static com.github.technus.tectech.thing.CustomItemList.Machine_DebugWriter; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Computer; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_DataBank; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Infuser; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Microwave; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Research; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Switch; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_TeslaCoil; +import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Transformer; +import static com.github.technus.tectech.thing.CustomItemList.Machine_OwnerDetector; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_1by1_MV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_2by2_MV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_3by3_MV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_EV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_HV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_IV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_LV; +import static com.github.technus.tectech.thing.CustomItemList.Machine_TeslaCoil_4by4_MV; +import static com.github.technus.tectech.thing.CustomItemList.ParametrizerTXT_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.ParametrizerX_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.Parametrizer_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.UncertaintyX_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.Uncertainty_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.UnusedStuff; +import static com.github.technus.tectech.thing.CustomItemList.capacitor_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataInAss_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataIn_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataOutAss_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.dataOut_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti16_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoMulti64_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel1_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel2_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel3_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel5_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel6_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel7_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_dynamoTunnel9001; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti16_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel1_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel2_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel3_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel5_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel6_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel7_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyTunnel9001; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_MAX; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti16_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_MAX; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti4_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_EV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_IV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_LuV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_MAX; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UEV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UHV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UIV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UMV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel1_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel2_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel3_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel5_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel6_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel7_UXV; +import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeData; +import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeMaintenance; +import static com.github.technus.tectech.thing.CustomItemList.holder_Hatch; +import static com.github.technus.tectech.thing.CustomItemList.rack_Hatch; import static com.github.technus.tectech.util.CommonValues.V; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java index 0baf9a3f24..68b3fb7a0f 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -15,11 +15,11 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.ForgeDirection; import com.github.technus.tectech.Reference; +import com.github.technus.tectech.rendering.EOH.EOH_ItemRenderer; +import com.github.technus.tectech.rendering.EOH.EOH_TESR; import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.block.QuantumGlassRender; -import com.github.technus.tectech.thing.block.RenderEyeOfHarmony; import com.github.technus.tectech.thing.block.TileEyeOfHarmony; -import com.github.technus.tectech.thing.item.RenderEyeOfHarmonyItem; import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; import cpw.mods.fml.client.FMLClientHandler; @@ -35,9 +35,9 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(QuantumGlassBlock.renderID, new QuantumGlassRender()); MinecraftForgeClient - .registerItemRenderer(Item.getItemFromBlock(eyeOfHarmonyRenderBlock), new RenderEyeOfHarmonyItem()); + .registerItemRenderer(Item.getItemFromBlock(eyeOfHarmonyRenderBlock), new EOH_ItemRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEyeOfHarmony.class, new RenderEyeOfHarmony()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEyeOfHarmony.class, new EOH_TESR()); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/RenderEyeOfHarmonyItem.java b/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_ItemRenderer.java index 191fcbc941..d8c4be71f1 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/RenderEyeOfHarmonyItem.java +++ b/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_ItemRenderer.java @@ -1,9 +1,9 @@ -package com.github.technus.tectech.thing.item; +package com.github.technus.tectech.rendering.EOH; -import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.STAR_LAYER_0; -import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.STAR_LAYER_1; -import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.STAR_LAYER_2; -import static com.github.technus.tectech.thing.block.RenderEyeOfHarmony.starModel; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.STAR_LAYER_0; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.STAR_LAYER_1; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.STAR_LAYER_2; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.starModel; import static java.lang.Math.pow; import net.minecraft.item.ItemStack; @@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; -public class RenderEyeOfHarmonyItem implements IItemRenderer { +public class EOH_ItemRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -74,15 +74,9 @@ public class RenderEyeOfHarmonyItem implements IItemRenderer { GL11.glScalef(scale, scale, scale); switch (layer) { - case 0: - GL11.glRotatef(130 + (System.currentTimeMillis() / 64) % 360, 0F, 1F, 1F); - break; - case 1: - GL11.glRotatef(-49 + (System.currentTimeMillis() / 64) % 360, 1F, 1F, 0F); - break; - case 2: - GL11.glRotatef(67 + (System.currentTimeMillis() / 64) % 360, 1F, 0F, 1F); - break; + case 0 -> GL11.glRotatef(130 + (System.currentTimeMillis() / 64) % 360, 0F, 1F, 1F); + case 1 -> GL11.glRotatef(-49 + (System.currentTimeMillis() / 64) % 360, 1F, 1F, 0F); + case 2 -> GL11.glRotatef(67 + (System.currentTimeMillis() / 64) % 360, 1F, 0F, 1F); } // Set colour and alpha (transparency) of the star layer. @@ -93,6 +87,7 @@ public class RenderEyeOfHarmonyItem implements IItemRenderer { GL11.glDepthMask(true); GL11.glEnable(GL11.GL_LIGHTING); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); // Finish animation. GL11.glPopMatrix(); } diff --git a/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_RenderingUtils.java b/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_RenderingUtils.java new file mode 100644 index 0000000000..74e8ecc9bf --- /dev/null +++ b/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_RenderingUtils.java @@ -0,0 +1,265 @@ +package com.github.technus.tectech.rendering.EOH; + +import static com.github.technus.tectech.Reference.MODID; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.STAR_LAYER_0; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.STAR_LAYER_1; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.STAR_LAYER_2; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.spaceModel; +import static com.github.technus.tectech.rendering.EOH.EOH_TESR.starModel; +import static java.lang.Math.pow; + +import java.awt.Color; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.FMLClientHandler; + +public abstract class EOH_RenderingUtils { + + public static void renderStar(IItemRenderer.ItemRenderType type, Color color) { + GL11.glPushMatrix(); + + if (type == IItemRenderer.ItemRenderType.INVENTORY) GL11.glRotated(180, 0, 1, 0); + else if (type == IItemRenderer.ItemRenderType.EQUIPPED + || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslated(0.5, 0.5, 0.5); + if (type == |
