From 626707df475c810ec798aedf44069c18a7084b6d Mon Sep 17 00:00:00 2001 From: screret <68943070+screret@users.noreply.github.com> Date: Mon, 26 Aug 2024 14:45:59 +0300 Subject: [PATCH] correct capitalization of "GCYR" --- .../gcyr/{GCyR.java => GCYR.java} | 58 +++--- .../gcyr/{GCyRClient.java => GCYRClient.java} | 4 +- .../{GCyRGTAddon.java => GCYRGTAddon.java} | 36 ++-- ...yHelper.java => GCYRCapabilityHelper.java} | 2 +- .../{GCyRTagUtil.java => GCYRTagUtil.java} | 8 +- .../gcyr/api/gui/factory/EntityUIFactory.java | 6 +- ...RGuiTextures.java => GCYRGuiTextures.java} | 2 +- ...CyRRegistries.java => GCYRRegistries.java} | 8 +- .../api/space/dyson/DysonSystemSavedData.java | 18 +- .../gcyr/api/space/satellite/Satellite.java | 12 +- .../api/space/satellite/SatelliteType.java | 4 +- .../capability/SatelliteWorldSavedData.java | 4 +- .../gcyr/api/space/station/SpaceStation.java | 4 +- .../space/station/StationWorldSavedData.java | 4 +- ...viders.java => GCYRParticleProviders.java} | 6 +- .../gcyr/client/dimension/ClientModSkies.java | 6 +- .../gcyr/client/gui/Category.java | 22 +- .../gui/screen/PlanetSelectionScreen.java | 40 ++-- .../renderer/entity/RocketEntityRenderer.java | 4 +- .../data/{GCyRBiomes.java => GCYRBiomes.java} | 20 +- .../data/{GCyRBlocks.java => GCYRBlocks.java} | 125 ++++++------ ...odeTabs.java => GCYRCreativeModeTabs.java} | 11 +- .../common/data/GCYRDimensionMarkers.java | 14 +- ...sionTypes.java => GCYRDimensionTypes.java} | 8 +- .../{GCyREntities.java => GCYREntities.java} | 4 +- ...rs.java => GCYREntityDataSerializers.java} | 4 +- .../data/{GCyRItems.java => GCYRItems.java} | 36 ++-- .../{GCyRMachines.java => GCYRMachines.java} | 25 +-- ...{GCyRMaterials.java => GCYRMaterials.java} | 56 +++--- .../data/{GCyRMenus.java => GCYRMenus.java} | 4 +- .../data/{GCyRModels.java => GCYRModels.java} | 12 +- ...CyRNetworking.java => GCYRNetworking.java} | 6 +- ...{GCyRParticles.java => GCYRParticles.java} | 6 +- ...ditions.java => GCYRRecipeConditions.java} | 2 +- ...RRecipeTypes.java => GCYRRecipeTypes.java} | 14 +- .../{GCyRRecipes.java => GCYRRecipes.java} | 2 +- ...CyRSatellites.java => GCYRSatellites.java} | 14 +- ...oundEntries.java => GCYRSoundEntries.java} | 7 +- ...Types.java => GCYRVanillaRecipeTypes.java} | 7 +- .../gcyr/common/entity/RocketEntity.java | 68 +++---- .../entity/data/EntityOxygenSystem.java | 16 +- .../entity/data/EntityTemperatureSystem.java | 16 +- .../gcyr/common/gui/EntityOxygenHUD.java | 10 +- .../gcyr/common/gui/PlanetSelectionMenu.java | 10 +- .../gcyr/common/item/KeyCardBehaviour.java | 8 +- .../common/item/PlanetIdChipBehaviour.java | 10 +- .../item/StationContainerBehaviour.java | 8 +- ...Materials.java => GCYRArmorMaterials.java} | 8 +- .../common/item/armor/SpaceSuitArmorItem.java | 6 +- ...mMaterials.java => GCYRTrimMaterials.java} | 10 +- ...rimPatterns.java => GCYRTrimPatterns.java} | 10 +- .../electric/SatelliteJammerMachine.java | 8 +- .../multiblock/PlatformMultiblockMachine.java | 6 +- .../multiblock/RocketScannerMachine.java | 14 +- .../SpaceStationPackagerMachine.java | 16 +- .../DysonSystemControllerMachine.java | 24 +-- .../c2s/PacketCreateSpaceStation.java | 8 +- .../c2s/PacketRequestPlanetData.java | 4 +- .../c2s/PacketSendSelectedDimension.java | 4 +- .../s2c/PacketReturnPlanetData.java | 4 +- .../s2c/PacketSyncDysonSphereStatus.java | 5 +- .../condition/DysonSphereCondition.java | 4 +- .../recipe/condition/OrbitCondition.java | 10 +- .../recipe/type/SmithingSpaceSuitRecipe.java | 19 +- .../gcyr/common/satellite/LaserSatellite.java | 6 +- ...CyROreRemoval.java => GCYROreRemoval.java} | 4 +- .../worldgen/{GCyROres.java => GCYROres.java} | 82 ++++---- ...GenLayers.java => GCYRWorldGenLayers.java} | 14 +- .../common/worldgen/SpaceLevelSource.java | 6 +- .../{GCyRConfig.java => GCYRConfig.java} | 10 +- .../{GCyRDatagen.java => GCYRDatagen.java} | 12 +- .../gcyr/data/forge/BiomeTagsLoader.java | 18 +- .../gcyr/data/forge/DataGenerators.java | 20 +- .../gcyr/data/lang/LangHandler.java | 19 +- .../gcyr/data/loader/PlanetData.java | 24 +-- .../gcyr/data/loader/PlanetResources.java | 30 +-- .../data/recipe/DysonSphereRecipeLoader.java | 54 ++--- .../recipe/{GCyRTags.java => GCYRTags.java} | 36 ++-- .../gcyr/data/recipe/MiscRecipes.java | 190 +++++++++--------- .../recipe/OxygenSpreaderRecipeLoader.java | 28 +-- .../gcyr/data/recipe/RecipeOverrides.java | 2 +- .../gcyr/data/recipe/RocketFuelRecipes.java | 14 +- .../SmithingSpaceSuitRecipeBuilder.java | 4 +- .../recipe/chemistry/ChemistryRecipes.java | 7 - .../data/recipe/chemistry/PolymerRecipes.java | 41 ++-- .../gcyr/data/tags/BlockTagLoader.java | 8 +- .../gcyr/data/tags/FluidTagLoader.java | 5 +- .../gcyr/data/tags/ItemTagLoader.java | 15 +- .../gcyr/forge/ForgeCommonEventListener.java | 27 ++- ...Events.java => GCYRForgeClientEvents.java} | 18 +- ...ubeJSPlugin.java => GCYRKubeJSPlugin.java} | 3 +- .../kjs/builders/FuelTankBlockBuilder.java | 4 +- .../kjs/builders/RocketMotorBlockBuilder.java | 4 +- .../gcyr/mixin/ClientLevelMixin.java | 4 +- .../argent_matter/gcyr/mixin/EntityMixin.java | 14 -- ...RMixinPlugin.java => GCYRMixinPlugin.java} | 2 +- .../gcyr/mixin/LevelRendererMixin.java | 2 +- .../gcyr/mixin/ServerLevelMixin.java | 4 +- .../gcyr/util/FloodFiller3D.java | 10 +- .../util/{GCyRValues.java => GCYRValues.java} | 2 +- .../argent_matter/gcyr/util/MixinHelpers.java | 4 +- src/main/resources/gcyr.mixins.json | 2 +- src/main/resources/kubejs.plugins.txt | 2 +- 103 files changed, 811 insertions(+), 871 deletions(-) rename src/main/java/argent_matter/gcyr/{GCyR.java => GCYR.java} (78%) rename src/main/java/argent_matter/gcyr/{GCyRClient.java => GCYRClient.java} (92%) rename src/main/java/argent_matter/gcyr/{GCyRGTAddon.java => GCYRGTAddon.java} (69%) rename src/main/java/argent_matter/gcyr/api/capability/{GCyRCapabilityHelper.java => GCYRCapabilityHelper.java} (95%) rename src/main/java/argent_matter/gcyr/api/data/tag/{GCyRTagUtil.java => GCYRTagUtil.java} (90%) rename src/main/java/argent_matter/gcyr/api/gui/widget/{GCyRGuiTextures.java => GCYRGuiTextures.java} (94%) rename src/main/java/argent_matter/gcyr/api/registries/{GCyRRegistries.java => GCYRRegistries.java} (73%) rename src/main/java/argent_matter/gcyr/client/data/{GCyRParticleProviders.java => GCYRParticleProviders.java} (77%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRBiomes.java => GCYRBiomes.java} (83%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRBlocks.java => GCYRBlocks.java} (83%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRCreativeModeTabs.java => GCYRCreativeModeTabs.java} (65%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRDimensionTypes.java => GCYRDimensionTypes.java} (84%) rename src/main/java/argent_matter/gcyr/common/data/{GCyREntities.java => GCYREntities.java} (87%) rename src/main/java/argent_matter/gcyr/common/data/{GCyREntityDataSerializers.java => GCYREntityDataSerializers.java} (97%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRItems.java => GCYRItems.java} (86%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRMachines.java => GCYRMachines.java} (98%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRMaterials.java => GCYRMaterials.java} (89%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRMenus.java => GCYRMenus.java} (85%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRModels.java => GCYRModels.java} (90%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRNetworking.java => GCYRNetworking.java} (90%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRParticles.java => GCYRParticles.java} (81%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRRecipeConditions.java => GCYRRecipeConditions.java} (93%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRRecipeTypes.java => GCYRRecipeTypes.java} (85%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRRecipes.java => GCYRRecipes.java} (96%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRSatellites.java => GCYRSatellites.java} (80%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRSoundEntries.java => GCYRSoundEntries.java} (74%) rename src/main/java/argent_matter/gcyr/common/data/{GCyRVanillaRecipeTypes.java => GCYRVanillaRecipeTypes.java} (86%) rename src/main/java/argent_matter/gcyr/common/item/armor/{GCyRArmorMaterials.java => GCYRArmorMaterials.java} (88%) rename src/main/java/argent_matter/gcyr/common/item/armor/trim/{GCyRTrimMaterials.java => GCYRTrimMaterials.java} (87%) rename src/main/java/argent_matter/gcyr/common/item/armor/trim/{GCyRTrimPatterns.java => GCYRTrimPatterns.java} (81%) rename src/main/java/argent_matter/gcyr/common/worldgen/{GCyROreRemoval.java => GCYROreRemoval.java} (96%) rename src/main/java/argent_matter/gcyr/common/worldgen/{GCyROres.java => GCYROres.java} (87%) rename src/main/java/argent_matter/gcyr/common/worldgen/{GCyRWorldGenLayers.java => GCYRWorldGenLayers.java} (54%) rename src/main/java/argent_matter/gcyr/config/{GCyRConfig.java => GCYRConfig.java} (95%) rename src/main/java/argent_matter/gcyr/data/{GCyRDatagen.java => GCYRDatagen.java} (57%) rename src/main/java/argent_matter/gcyr/data/recipe/{GCyRTags.java => GCYRTags.java} (57%) rename src/main/java/argent_matter/gcyr/forge/{GCyRForgeClientEvents.java => GCYRForgeClientEvents.java} (61%) rename src/main/java/argent_matter/gcyr/integration/kjs/{GCyRKubeJSPlugin.java => GCYRKubeJSPlugin.java} (81%) rename src/main/java/argent_matter/gcyr/mixin/{GCyRMixinPlugin.java => GCYRMixinPlugin.java} (95%) rename src/main/java/argent_matter/gcyr/util/{GCyRValues.java => GCYRValues.java} (87%) diff --git a/src/main/java/argent_matter/gcyr/GCyR.java b/src/main/java/argent_matter/gcyr/GCYR.java similarity index 78% rename from src/main/java/argent_matter/gcyr/GCyR.java rename to src/main/java/argent_matter/gcyr/GCYR.java index b2476fba..e38ebc8b 100644 --- a/src/main/java/argent_matter/gcyr/GCyR.java +++ b/src/main/java/argent_matter/gcyr/GCYR.java @@ -1,11 +1,11 @@ package argent_matter.gcyr; import argent_matter.gcyr.api.gui.factory.EntityUIFactory; -import argent_matter.gcyr.api.registries.GCyRRegistries; +import argent_matter.gcyr.api.registries.GCYRRegistries; import argent_matter.gcyr.common.data.*; import argent_matter.gcyr.common.gui.EntityOxygenHUD; -import argent_matter.gcyr.config.GCyRConfig; -import argent_matter.gcyr.data.GCyRDatagen; +import argent_matter.gcyr.config.GCYRConfig; +import argent_matter.gcyr.data.GCYRDatagen; import argent_matter.gcyr.data.loader.PlanetResources; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.data.DimensionMarker; @@ -28,16 +28,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Mod(GCyR.MOD_ID) -public class GCyR { +@Mod(GCYR.MOD_ID) +public class GCYR { public static final String MOD_ID = "gcyr", NAME = "Gregicality Rocketry"; public static final Logger LOGGER = LoggerFactory.getLogger(NAME); public static MaterialRegistry MATERIAL_REGISTRY; - public GCyR() { - GCyR.init(); + public GCYR() { + GCYR.init(); var bus = FMLJavaModLoadingContext.get().getModEventBus(); bus.register(this); @@ -45,31 +45,31 @@ public GCyR() { bus.addGenericListener(Class.class, this::registerRecipeConditions); bus.addGenericListener(MachineDefinition.class, this::registerMachines); bus.addGenericListener(DimensionMarker.class, this::registerDimensionMarkers); - GCyRDimensionTypes.register(bus); + GCYRDimensionTypes.register(bus); - GCyRVanillaRecipeTypes.RECIPE_TYPE_DEFERRED_REGISTER.register(bus); + GCYRVanillaRecipeTypes.RECIPE_TYPE_DEFERRED_REGISTER.register(bus); - DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> GCyRClient::init); + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> GCYRClient::init); } public static void init() { - GCyRConfig.init(); - GCyRNetworking.init(); + GCYRConfig.init(); + GCYRNetworking.init(); UIFactory.register(EntityUIFactory.INSTANCE); - GCyRSatellites.init(); - GCyREntityDataSerializers.init(); - GCyRCreativeModeTabs.init(); - GCyREntities.init(); - GCyRBlocks.init(); - GCyRItems.init(); - GCyRMenus.init(); + GCYRSatellites.init(); + GCYREntityDataSerializers.init(); + GCYRCreativeModeTabs.init(); + GCYREntities.init(); + GCYRBlocks.init(); + GCYRItems.init(); + GCYRMenus.init(); - GCyRDatagen.init(); + GCYRDatagen.init(); - GCyRRegistries.REGISTRATE.registerRegistrate(); - GCyRDimensionTypes.init(); - GCyRParticles.init(); + GCYRRegistries.REGISTRATE.registerRegistrate(); + GCYRDimensionTypes.init(); + GCYRParticles.init(); } public static ResourceLocation id(String path) { @@ -89,29 +89,29 @@ public void registerClientReloadListeners(RegisterClientReloadListenersEvent eve @SubscribeEvent public void registerMaterialRegistry(MaterialRegistryEvent event) { - MATERIAL_REGISTRY = GTCEuAPI.materialManager.createRegistry(GCyR.MOD_ID); + MATERIAL_REGISTRY = GTCEuAPI.materialManager.createRegistry(GCYR.MOD_ID); } @SubscribeEvent public void registerMaterials(MaterialEvent event) { - GCyRMaterials.init(); + GCYRMaterials.init(); } @SubscribeEvent public void modifyMaterials(PostMaterialEvent event) { - GCyRMaterials.modifyMaterials(); + GCYRMaterials.modifyMaterials(); } public void registerRecipeTypes(GTCEuAPI.RegisterEvent event) { - GCyRRecipeTypes.init(); + GCYRRecipeTypes.init(); } public void registerRecipeConditions(GTCEuAPI.RegisterEvent> event) { - GCyRRecipeConditions.init(); + GCYRRecipeConditions.init(); } public void registerMachines(GTCEuAPI.RegisterEvent event) { - GCyRMachines.init(); + GCYRMachines.init(); } public void registerDimensionMarkers(GTCEuAPI.RegisterEvent event) { diff --git a/src/main/java/argent_matter/gcyr/GCyRClient.java b/src/main/java/argent_matter/gcyr/GCYRClient.java similarity index 92% rename from src/main/java/argent_matter/gcyr/GCyRClient.java rename to src/main/java/argent_matter/gcyr/GCYRClient.java index 8e75756a..1bd45edc 100644 --- a/src/main/java/argent_matter/gcyr/GCyRClient.java +++ b/src/main/java/argent_matter/gcyr/GCYRClient.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; -public class GCyRClient { +public class GCYRClient { public static boolean isDysonSphereActive = false; @@ -19,6 +19,6 @@ public class GCyRClient { public static List galaxies = new ArrayList<>(); public static void init() { - //GCyRKeyMappings.init(); + //GCYRKeyMappings.init(); } } diff --git a/src/main/java/argent_matter/gcyr/GCyRGTAddon.java b/src/main/java/argent_matter/gcyr/GCYRGTAddon.java similarity index 69% rename from src/main/java/argent_matter/gcyr/GCyRGTAddon.java rename to src/main/java/argent_matter/gcyr/GCYRGTAddon.java index 3a150f4b..a0c12b04 100644 --- a/src/main/java/argent_matter/gcyr/GCyRGTAddon.java +++ b/src/main/java/argent_matter/gcyr/GCYRGTAddon.java @@ -1,12 +1,12 @@ package argent_matter.gcyr; -import argent_matter.gcyr.api.registries.GCyRRegistries; -import argent_matter.gcyr.common.data.GCyRBlocks; -import argent_matter.gcyr.common.data.GCyRMaterials; -import argent_matter.gcyr.common.data.GCyRRecipes; -import argent_matter.gcyr.common.data.GCyRSoundEntries; -import argent_matter.gcyr.common.worldgen.GCyROres; -import argent_matter.gcyr.common.worldgen.GCyRWorldGenLayers; +import argent_matter.gcyr.api.registries.GCYRRegistries; +import argent_matter.gcyr.common.data.GCYRBlocks; +import argent_matter.gcyr.common.data.GCYRMaterials; +import argent_matter.gcyr.common.data.GCYRRecipes; +import argent_matter.gcyr.common.data.GCYRSoundEntries; +import argent_matter.gcyr.common.worldgen.GCYROres; +import argent_matter.gcyr.common.worldgen.GCYRWorldGenLayers; import com.gregtechceu.gtceu.api.addon.GTAddon; import com.gregtechceu.gtceu.api.addon.IGTAddon; import com.gregtechceu.gtceu.api.addon.events.MaterialCasingCollectionEvent; @@ -21,10 +21,10 @@ import java.util.function.Consumer; @GTAddon -public class GCyRGTAddon implements IGTAddon { +public class GCYRGTAddon implements IGTAddon { @Override public GTRegistrate getRegistrate() { - return GCyRRegistries.REGISTRATE; + return GCYRRegistries.REGISTRATE; } @Override @@ -34,23 +34,23 @@ public void initializeAddon() { @Override public String addonModId() { - return GCyR.MOD_ID; + return GCYR.MOD_ID; } @Override public void registerTagPrefixes() { TagPrefix.oreTagPrefix("moon", BlockTags.MINEABLE_WITH_PICKAXE) .langValue("Moon %s Ore") - .registerOre(() -> GCyRBlocks.MOON_STONE.orElse(Blocks.STONE).defaultBlockState(), null, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCyR.id("block/moon_stone")); + .registerOre(() -> GCYRBlocks.MOON_STONE.orElse(Blocks.STONE).defaultBlockState(), null, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCYR.id("block/moon_stone")); TagPrefix.oreTagPrefix("mars", BlockTags.MINEABLE_WITH_PICKAXE) .langValue("Mars %s Ore") - .registerOre(() -> GCyRBlocks.MARTIAN_ROCK.orElse(Blocks.DEEPSLATE).defaultBlockState(), () -> GCyRMaterials.MartianRockDust, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCyR.id("block/martian_rock")); + .registerOre(() -> GCYRBlocks.MARTIAN_ROCK.orElse(Blocks.DEEPSLATE).defaultBlockState(), () -> GCYRMaterials.MartianRockDust, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCYR.id("block/martian_rock")); TagPrefix.oreTagPrefix("venus", BlockTags.MINEABLE_WITH_PICKAXE) .langValue("Venus %s Ore") - .registerOre(() -> GCyRBlocks.VENUS_ROCK.orElse(Blocks.DEEPSLATE).defaultBlockState(), null, BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCyR.id("block/venus_rock")); + .registerOre(() -> GCYRBlocks.VENUS_ROCK.orElse(Blocks.DEEPSLATE).defaultBlockState(), null, BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCYR.id("block/venus_rock")); TagPrefix.oreTagPrefix("mercury", BlockTags.MINEABLE_WITH_PICKAXE) .langValue("Mercury %s Ore") - .registerOre(() -> GCyRBlocks.MERCURY_ROCK.orElse(Blocks.STONE).defaultBlockState(), null, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCyR.id("block/moon_stone")); + .registerOre(() -> GCYRBlocks.MERCURY_ROCK.orElse(Blocks.STONE).defaultBlockState(), null, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(3.0F, 3.0F), GCYR.id("block/moon_stone")); } @Override @@ -60,7 +60,7 @@ public void registerElements() { @Override public void registerSounds() { - GCyRSoundEntries.init(); + GCYRSoundEntries.init(); } @Override @@ -70,7 +70,7 @@ public void registerCovers() { @Override public void registerWorldgenLayers() { - GCyRWorldGenLayers.init(); + GCYRWorldGenLayers.init(); } @Override @@ -85,7 +85,7 @@ public void registerVeinGenerators() { @Override public void registerOreVeins() { - GCyROres.init(); + GCYROres.init(); } @Override @@ -95,6 +95,6 @@ public void collectMaterialCasings(MaterialCasingCollectionEvent event) { @Override public void addRecipes(Consumer provider) { - GCyRRecipes.init(provider); + GCYRRecipes.init(provider); } } diff --git a/src/main/java/argent_matter/gcyr/api/capability/GCyRCapabilityHelper.java b/src/main/java/argent_matter/gcyr/api/capability/GCYRCapabilityHelper.java similarity index 95% rename from src/main/java/argent_matter/gcyr/api/capability/GCyRCapabilityHelper.java rename to src/main/java/argent_matter/gcyr/api/capability/GCYRCapabilityHelper.java index 6f324a08..aa103cd3 100644 --- a/src/main/java/argent_matter/gcyr/api/capability/GCyRCapabilityHelper.java +++ b/src/main/java/argent_matter/gcyr/api/capability/GCYRCapabilityHelper.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; -public class GCyRCapabilityHelper { +public class GCYRCapabilityHelper { @Nullable public static ISpaceStationHolder getSpaceStations(@Nullable ServerLevel level) { return StationWorldSavedData.getOrCreate(level); diff --git a/src/main/java/argent_matter/gcyr/api/data/tag/GCyRTagUtil.java b/src/main/java/argent_matter/gcyr/api/data/tag/GCYRTagUtil.java similarity index 90% rename from src/main/java/argent_matter/gcyr/api/data/tag/GCyRTagUtil.java rename to src/main/java/argent_matter/gcyr/api/data/tag/GCYRTagUtil.java index f11f1477..13d80274 100644 --- a/src/main/java/argent_matter/gcyr/api/data/tag/GCyRTagUtil.java +++ b/src/main/java/argent_matter/gcyr/api/data/tag/GCYRTagUtil.java @@ -1,9 +1,7 @@ package argent_matter.gcyr.api.data.tag; -import argent_matter.gcyr.GCyR; -import com.lowdragmc.lowdraglib.Platform; +import argent_matter.gcyr.GCYR; import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -12,7 +10,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.material.Fluid; -public class GCyRTagUtil { +public class GCYRTagUtil { public static TagKey optionalTag(ResourceKey> registry, ResourceLocation id) { return TagKey.create(registry, id); } @@ -23,7 +21,7 @@ public static TagKey createTag(ResourceKey> registr } public static TagKey createModTag(ResourceKey> registry, String path) { - return optionalTag(registry, GCyR.id(path)); + return optionalTag(registry, GCYR.id(path)); } public static TagKey createBlockTag(String path) { diff --git a/src/main/java/argent_matter/gcyr/api/gui/factory/EntityUIFactory.java b/src/main/java/argent_matter/gcyr/api/gui/factory/EntityUIFactory.java index 2c2002a0..6fc013d7 100644 --- a/src/main/java/argent_matter/gcyr/api/gui/factory/EntityUIFactory.java +++ b/src/main/java/argent_matter/gcyr/api/gui/factory/EntityUIFactory.java @@ -1,6 +1,6 @@ package argent_matter.gcyr.api.gui.factory; -import argent_matter.gcyr.GCyR; +import argent_matter.gcyr.GCYR; import com.lowdragmc.lowdraglib.gui.factory.UIFactory; import com.lowdragmc.lowdraglib.gui.modular.IUIHolder; import com.lowdragmc.lowdraglib.gui.modular.ModularUI; @@ -16,7 +16,7 @@ public class EntityUIFactory extends UIFactory { public static final EntityUIFactory INSTANCE = new EntityUIFactory(); private EntityUIFactory() { - super(GCyR.id("entity")); + super(GCYR.id("entity")); } @Override @@ -38,4 +38,4 @@ protected Entity readHolderFromSyncData(FriendlyByteBuf syncData) { protected void writeHolderToSyncData(FriendlyByteBuf syncData, Entity holder) { syncData.writeVarLong(holder.getId()); } -} \ No newline at end of file +} diff --git a/src/main/java/argent_matter/gcyr/api/gui/widget/GCyRGuiTextures.java b/src/main/java/argent_matter/gcyr/api/gui/widget/GCYRGuiTextures.java similarity index 94% rename from src/main/java/argent_matter/gcyr/api/gui/widget/GCyRGuiTextures.java rename to src/main/java/argent_matter/gcyr/api/gui/widget/GCYRGuiTextures.java index 6f9b18db..40837c11 100644 --- a/src/main/java/argent_matter/gcyr/api/gui/widget/GCyRGuiTextures.java +++ b/src/main/java/argent_matter/gcyr/api/gui/widget/GCYRGuiTextures.java @@ -2,7 +2,7 @@ import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; -public class GCyRGuiTextures { +public class GCYRGuiTextures { public static final ResourceTexture BUTTON_LAUNCH_ROCKET = new ResourceTexture("gcyr:textures/gui/widget/button_launch_rocket.png"); public static final ResourceTexture BUTTON_ENABLED = new ResourceTexture("gcyr:textures/gui/widget/button_enabled.png"); diff --git a/src/main/java/argent_matter/gcyr/api/registries/GCyRRegistries.java b/src/main/java/argent_matter/gcyr/api/registries/GCYRRegistries.java similarity index 73% rename from src/main/java/argent_matter/gcyr/api/registries/GCyRRegistries.java rename to src/main/java/argent_matter/gcyr/api/registries/GCYRRegistries.java index 93b49893..d233a4eb 100644 --- a/src/main/java/argent_matter/gcyr/api/registries/GCyRRegistries.java +++ b/src/main/java/argent_matter/gcyr/api/registries/GCYRRegistries.java @@ -1,12 +1,12 @@ package argent_matter.gcyr.api.registries; -import argent_matter.gcyr.GCyR; +import argent_matter.gcyr.GCYR; import argent_matter.gcyr.api.space.satellite.SatelliteType; import com.gregtechceu.gtceu.api.registry.GTRegistry; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; -public class GCyRRegistries { - public static final GTRegistrate REGISTRATE = GTRegistrate.create(GCyR.MOD_ID); +public class GCYRRegistries { + public static final GTRegistrate REGISTRATE = GTRegistrate.create(GCYR.MOD_ID); - public static final GTRegistry.RL> SATELLITES = new GTRegistry.RL<>(GCyR.id("satellite")); + public static final GTRegistry.RL> SATELLITES = new GTRegistry.RL<>(GCYR.id("satellite")); } diff --git a/src/main/java/argent_matter/gcyr/api/space/dyson/DysonSystemSavedData.java b/src/main/java/argent_matter/gcyr/api/space/dyson/DysonSystemSavedData.java index 3c951df6..2541ef78 100644 --- a/src/main/java/argent_matter/gcyr/api/space/dyson/DysonSystemSavedData.java +++ b/src/main/java/argent_matter/gcyr/api/space/dyson/DysonSystemSavedData.java @@ -1,10 +1,10 @@ package argent_matter.gcyr.api.space.dyson; -import argent_matter.gcyr.GCyR; +import argent_matter.gcyr.GCYR; import argent_matter.gcyr.api.capability.IDysonSystem; import argent_matter.gcyr.api.space.planet.Planet; -import argent_matter.gcyr.common.data.GCyRNetworking; -import argent_matter.gcyr.common.data.GCyRSatellites; +import argent_matter.gcyr.common.data.GCYRNetworking; +import argent_matter.gcyr.common.data.GCYRSatellites; import argent_matter.gcyr.common.networking.s2c.PacketSyncDysonSphereStatus; import argent_matter.gcyr.common.satellite.DysonSwarmSatellite; import argent_matter.gcyr.data.loader.PlanetData; @@ -44,7 +44,7 @@ public static DysonSystemSavedData getOrCreate(ServerLevel originLevel) { } private static DysonSystemSavedData internalGetOrCreate(ServerLevel serverLevel) { - return serverLevel.getDataStorage().computeIfAbsent(tag -> new DysonSystemSavedData(serverLevel, tag), () -> new DysonSystemSavedData(serverLevel), GCyR.MOD_ID + "_dyson_systems"); + return serverLevel.getDataStorage().computeIfAbsent(tag -> new DysonSystemSavedData(serverLevel, tag), () -> new DysonSystemSavedData(serverLevel), GCYR.MOD_ID + "_dyson_systems"); } @Nullable @@ -89,7 +89,7 @@ public void addDysonSphere(BlockPos controllerPos) { Planet thisPlanet = PlanetData.getPlanetFromLevel(this.level.dimension()).orElse(null); if (playerPlanet == null || thisPlanet == null) continue; if (playerPlanet.solarSystem().equals(thisPlanet.solarSystem())) { - GCyRNetworking.NETWORK.sendToPlayer(new PacketSyncDysonSphereStatus(false), player); + GCYRNetworking.NETWORK.sendToPlayer(new PacketSyncDysonSphereStatus(false), player); } } } @@ -105,7 +105,7 @@ public void disableDysonSphere(BlockPos controllerPos) { Planet thisPlanet = PlanetData.getPlanetFromLevel(this.level.dimension()).orElse(null); if (playerPlanet == null || thisPlanet == null) continue; if (playerPlanet.solarSystem().equals(thisPlanet.solarSystem())) { - GCyRNetworking.NETWORK.sendToPlayer(new PacketSyncDysonSphereStatus(false), player); + GCYRNetworking.NETWORK.sendToPlayer(new PacketSyncDysonSphereStatus(false), player); } } } @@ -139,7 +139,7 @@ public void load(CompoundTag arg) { if (arg.contains("dysonSphere", Tag.TAG_COMPOUND)) { this.currentActiveSunBlock = DysonSphere.load(arg.getCompound("dysonSphere"), this); for (ServerPlayer player : this.level.players()) { - GCyRNetworking.NETWORK.sendToPlayer(new PacketSyncDysonSphereStatus(true), player); + GCYRNetworking.NETWORK.sendToPlayer(new PacketSyncDysonSphereStatus(true), player); } } CompoundTag stationsTag = arg.getCompound("satellites"); @@ -147,7 +147,7 @@ public void load(CompoundTag arg) { ListTag tag = stationsTag.getList(name, Tag.TAG_COMPOUND); long pos = Long.parseLong(name); for (int i = 0; i < tag.size(); ++i) { - DysonSwarmSatellite satellite = GCyRSatellites.DYSON_SWARM.getCodec().parse(NbtOps.INSTANCE, tag.getCompound(i)).getOrThrow(false, GCyR.LOGGER::error); + DysonSwarmSatellite satellite = GCYRSatellites.DYSON_SWARM.getCodec().parse(NbtOps.INSTANCE, tag.getCompound(i)).getOrThrow(false, GCYR.LOGGER::error); swarmSatellites.computeIfAbsent(pos, $ -> new HashSet<>()).add(satellite); } } @@ -164,7 +164,7 @@ public CompoundTag save(CompoundTag compoundTag) { for (Long2ObjectMap.Entry> entry : swarmSatellites.long2ObjectEntrySet()) { ListTag pos = new ListTag(); for (DysonSwarmSatellite satellite : entry.getValue()) { - Tag station = GCyRSatellites.DYSON_SWARM.getCodec().encodeStart(NbtOps.INSTANCE, satellite).result().orElseThrow(); + Tag station = GCYRSatellites.DYSON_SWARM.getCodec().encodeStart(NbtOps.INSTANCE, satellite).result().orElseThrow(); pos.add(station); } tag.put(Long.toString(entry.getLongKey()), pos); diff --git a/src/main/java/argent_matter/gcyr/api/space/satellite/Satellite.java b/src/main/java/argent_matter/gcyr/api/space/satellite/Satellite.java index 4724d483..f7164891 100644 --- a/src/main/java/argent_matter/gcyr/api/space/satellite/Satellite.java +++ b/src/main/java/argent_matter/gcyr/api/space/satellite/Satellite.java @@ -1,8 +1,8 @@ package argent_matter.gcyr.api.space.satellite; -import argent_matter.gcyr.api.registries.GCyRRegistries; +import argent_matter.gcyr.api.registries.GCYRRegistries; import argent_matter.gcyr.api.space.satellite.data.SatelliteData; -import argent_matter.gcyr.common.data.GCyRSatellites; +import argent_matter.gcyr.common.data.GCYRSatellites; import argent_matter.gcyr.common.satellite.EmptySatellite; import com.mojang.datafixers.Products; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -46,7 +46,7 @@ public Satellite(SatelliteType type, SatelliteData data, ResourceKey l public static Products.P3, SatelliteType, SatelliteData, ResourceKey> baseCodec(RecordCodecBuilder.Instance instance) { return instance.group( - GCyRRegistries.SATELLITES.codec().fieldOf("type").forGetter(Satellite::getType), + GCYRRegistries.SATELLITES.codec().fieldOf("type").forGetter(Satellite::getType), SatelliteData.CODEC.fieldOf("data").forGetter(Satellite::getData), ResourceKey.codec(Registries.DIMENSION).fieldOf("level").forGetter(Satellite::getLevel) ); @@ -73,7 +73,7 @@ public boolean runSatellite(Level level) { public CompoundTag serializeNBT() { CompoundTag tag = new CompoundTag(); - tag.putString("id", GCyRRegistries.SATELLITES.getKey(type).toString()); + tag.putString("id", GCYRRegistries.SATELLITES.getKey(type).toString()); tag.put("data", this.data.serializeNBT()); @@ -87,11 +87,11 @@ public CompoundTag serializeNBT() { public abstract Tag serializeExtraData(); public static Satellite deserializeNBT(CompoundTag nbt, Level level) { - SatelliteType type = GCyRRegistries.SATELLITES.get(new ResourceLocation(nbt.getString("id"))); + SatelliteType type = GCYRRegistries.SATELLITES.get(new ResourceLocation(nbt.getString("id"))); SatelliteData data = SatelliteData.deserializeNBT(nbt.getCompound("data")); ResourceKey levelResourceKey = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(nbt.getString("level"))); if (type == null) { - return new EmptySatellite(GCyRSatellites.EMPTY, data, levelResourceKey); + return new EmptySatellite(GCYRSatellites.EMPTY, data, levelResourceKey); } SatelliteType.SatelliteFactory satellite = type.getFactory(); diff --git a/src/main/java/argent_matter/gcyr/api/space/satellite/SatelliteType.java b/src/main/java/argent_matter/gcyr/api/space/satellite/SatelliteType.java index 2f27ae10..5c3508ac 100644 --- a/src/main/java/argent_matter/gcyr/api/space/satellite/SatelliteType.java +++ b/src/main/java/argent_matter/gcyr/api/space/satellite/SatelliteType.java @@ -1,6 +1,6 @@ package argent_matter.gcyr.api.space.satellite; -import argent_matter.gcyr.api.registries.GCyRRegistries; +import argent_matter.gcyr.api.registries.GCYRRegistries; import argent_matter.gcyr.api.space.satellite.data.SatelliteData; import com.mojang.serialization.Codec; import lombok.Getter; @@ -30,7 +30,7 @@ public SatelliteType(SatelliteFactory factory, Codec codec) { } public String toLangString() { - ResourceLocation id = GCyRRegistries.SATELLITES.getKey(this); + ResourceLocation id = GCYRRegistries.SATELLITES.getKey(this); return id.getNamespace() + ".satellite." + id.getPath(); } diff --git a/src/main/java/argent_matter/gcyr/api/space/satellite/capability/SatelliteWorldSavedData.java b/src/main/java/argent_matter/gcyr/api/space/satellite/capability/SatelliteWorldSavedData.java index ffb34e9d..711feac2 100644 --- a/src/main/java/argent_matter/gcyr/api/space/satellite/capability/SatelliteWorldSavedData.java +++ b/src/main/java/argent_matter/gcyr/api/space/satellite/capability/SatelliteWorldSavedData.java @@ -1,6 +1,6 @@ package argent_matter.gcyr.api.space.satellite.capability; -import argent_matter.gcyr.GCyR; +import argent_matter.gcyr.GCYR; import argent_matter.gcyr.api.capability.ISatelliteHolder; import argent_matter.gcyr.api.space.satellite.Satellite; import argent_matter.gcyr.util.Vec2i; @@ -21,7 +21,7 @@ public class SatelliteWorldSavedData extends SavedData implements ISatelliteHold @Nullable public static SatelliteWorldSavedData getOrCreate(ServerLevel serverLevel) { if (serverLevel.dimensionType().hasCeiling()) return null; - return serverLevel.getDataStorage().computeIfAbsent(tag -> new SatelliteWorldSavedData(serverLevel, tag), () -> new SatelliteWorldSavedData(serverLevel), GCyR.MOD_ID + "_satellites"); + return serverLevel.getDataStorage().computeIfAbsent(tag -> new SatelliteWorldSavedData(serverLevel, tag), () -> new SatelliteWorldSavedData(serverLevel), GCYR.MOD_ID + "_satellites"); } @Getter diff --git a/src/main/java/argent_matter/gcyr/api/space/station/SpaceStation.java b/src/main/java/argent_matter/gcyr/api/space/station/SpaceStation.java index d84d4435..d7e93b05 100644 --- a/src/main/java/argent_matter/gcyr/api/space/station/SpaceStation.java +++ b/src/main/java/argent_matter/gcyr/api/space/station/SpaceStation.java @@ -1,7 +1,7 @@ package argent_matter.gcyr.api.space.station; import argent_matter.gcyr.api.space.planet.Planet; -import argent_matter.gcyr.config.GCyRConfig; +import argent_matter.gcyr.config.GCYRConfig; import argent_matter.gcyr.util.Vec2i; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -13,7 +13,7 @@ public class SpaceStation { public static final int ID_MAX = 31, ID_EMPTY = Integer.MIN_VALUE; - public static final int BLOCK_MULTIPLIER = GCyRConfig.INSTANCE.server.spaceStationMaxSize; + public static final int BLOCK_MULTIPLIER = GCYRConfig.INSTANCE.server.spaceStationMaxSize; public static final int SIZE_BLOCKS = BLOCK_MULTIPLIER * BLOCK_MULTIPLIER; public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( diff --git a/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java b/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java index 89dac890..7efc2ba8 100644 --- a/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java +++ b/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java @@ -1,6 +1,6 @@ package argent_matter.gcyr.api.space.station; -import argent_matter.gcyr.GCyR; +import argent_matter.gcyr.GCYR; import argent_matter.gcyr.api.capability.ISpaceStationHolder; import argent_matter.gcyr.api.space.planet.Planet; import argent_matter.gcyr.common.worldgen.SpaceLevelSource; @@ -35,7 +35,7 @@ public static StationWorldSavedData getOrCreate(@Nullable ServerLevel serverLeve ServerLevel orbit = serverLevel.getServer().getLevel(planet.orbitWorld()); return getOrCreate(orbit); } - return serverLevel.getDataStorage().computeIfAbsent(tag -> new StationWorldSavedData(serverLevel, tag), () -> new StationWorldSavedData(serverLevel), GCyR.MOD_ID + "_space_stations"); + return serverLevel.getDataStorage().computeIfAbsent(tag -> new StationWorldSavedData(serverLevel, tag), () -> new StationWorldSavedData(serverLevel), GCYR.MOD_ID + "_space_stations"); } private final Int2ObjectMap stations = new Int2ObjectLinkedOpenHashMap<>(1); diff --git a/src/main/java/argent_matter/gcyr/client/data/GCyRParticleProviders.java b/src/main/java/argent_matter/gcyr/client/data/GCYRParticleProviders.java similarity index 77% rename from src/main/java/argent_matter/gcyr/client/data/GCyRParticleProviders.java rename to src/main/java/argent_matter/gcyr/client/data/GCYRParticleProviders.java index 9bb86e22..751b721c 100644 --- a/src/main/java/argent_matter/gcyr/client/data/GCyRParticleProviders.java +++ b/src/main/java/argent_matter/gcyr/client/data/GCYRParticleProviders.java @@ -1,7 +1,7 @@ package argent_matter.gcyr.client.data; import argent_matter.gcyr.client.particle.DysonBeamParticle; -import argent_matter.gcyr.common.data.GCyRParticles; +import argent_matter.gcyr.common.data.GCYRParticles; import net.minecraft.client.particle.ParticleEngine; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; @@ -9,11 +9,11 @@ import java.util.HashMap; import java.util.Map; -public class GCyRParticleProviders { +public class GCYRParticleProviders { public static final Map, ParticleEngine.SpriteParticleRegistration> PARTICLES = new HashMap<>(); public static void init() { - PARTICLES.put(GCyRParticles.DYSON_BEAM, DysonBeamParticle.Provider::new); + PARTICLES.put(GCYRParticles.DYSON_BEAM, DysonBeamParticle.Provider::new); } } diff --git a/src/main/java/argent_matter/gcyr/client/dimension/ClientModSkies.java b/src/main/java/argent_matter/gcyr/client/dimension/ClientModSkies.java index 205fa1b8..5ca1f16e 100644 --- a/src/main/java/argent_matter/gcyr/client/dimension/ClientModSkies.java +++ b/src/main/java/argent_matter/gcyr/client/dimension/ClientModSkies.java @@ -1,6 +1,6 @@ package argent_matter.gcyr.client.dimension; -import argent_matter.gcyr.GCyRClient; +import argent_matter.gcyr.GCYRClient; import argent_matter.gcyr.api.space.planet.PlanetSkyRenderer; import argent_matter.gcyr.client.dimension.renderer.DimensionEffects; import net.minecraft.client.renderer.DimensionSpecialEffects; @@ -15,7 +15,7 @@ public class ClientModSkies { public static final Map DIMENSION_SPECIAL_EFFECTS = new HashMap<>(); public static void register() { - for (PlanetSkyRenderer skyRenderer : GCyRClient.skyRenderers) { + for (PlanetSkyRenderer skyRenderer : GCYRClient.skyRenderers) { registerDimensionEffects(skyRenderer.dimension(), new DimensionEffects(skyRenderer)); } } @@ -23,4 +23,4 @@ public static void register() { public static void registerDimensionEffects(ResourceKey id, DimensionEffects effects) { DIMENSION_SPECIAL_EFFECTS.put(id.location(), effects); } -} \ No newline at end of file +} diff --git a/src/main/java/argent_matter/gcyr/client/gui/Category.java b/src/main/java/argent_matter/gcyr/client/gui/Category.java index fef75e16..31f5e946 100644 --- a/src/main/java/argent_matter/gcyr/client/gui/Category.java +++ b/src/main/java/argent_matter/gcyr/client/gui/Category.java @@ -1,6 +1,6 @@ package argent_matter.gcyr.client.gui; -import argent_matter.gcyr.GCyR; +import argent_matter.gcyr.GCYR; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -8,14 +8,14 @@ @OnlyIn(Dist.CLIENT) public record Category(ResourceLocation id, Category parent) { - public static final Category BACK = new Category(GCyR.id("back"), null); + public static final Category BACK = new Category(GCYR.id("back"), null); - public static final Category GALAXY_CATEGORY = new Category(GCyR.id("galaxy"), null); - public static final Category MILKY_WAY_CATEGORY = new Category(GCyR.id("milky_way"), GALAXY_CATEGORY); - public static final Category SOLAR_SYSTEM_CATEGORY = new Category(GCyR.id("solar_system.json"), MILKY_WAY_CATEGORY); - public static final Category EARTH_CATEGORY = new Category(GCyR.id("earth"), SOLAR_SYSTEM_CATEGORY); - public static final Category MARS_CATEGORY = new Category(GCyR.id("mars"), SOLAR_SYSTEM_CATEGORY); - public static final Category VENUS_CATEGORY = new Category(GCyR.id("venus"), SOLAR_SYSTEM_CATEGORY); - public static final Category MERCURY_CATEGORY = new Category(GCyR.id("mercury"), SOLAR_SYSTEM_CATEGORY); - public static final Category PROXIMA_CENTAURI_CATEGORY = new Category(GCyR.id("proxima_centauri"), MILKY_WAY_CATEGORY); -} \ No newline at end of file + public static final Category GALAXY_CATEGORY = new Category(GCYR.id("galaxy"), null); + public static final Category MILKY_WAY_CATEGORY = new Category(GCYR.id("milky_way"), GALAXY_CATEGORY); + public static final Category SOLAR_SYSTEM_CATEGORY = new Category(GCYR.id("solar_system.json"), MILKY_WAY_CATEGORY); + public static final Category EARTH_CATEGORY = new Category(GCYR.id("earth"), SOLAR_SYSTEM_CATEGORY); + public static final Category MARS_CATEGORY = new Category(GCYR.id("mars"), SOLAR_SYSTEM_CATEGORY); + public static final Category VENUS_CATEGORY = new Category(GCYR.id("venus"), SOLAR_SYSTEM_CATEGORY); + public static final Category MERCURY_CATEGORY = new Category(GCYR.id("mercury"), SOLAR_SYSTEM_CATEGORY); + public static final Category PROXIMA_CENTAURI_CATEGORY = new Category(GCYR.id("proxima_centauri"), MILKY_WAY_CATEGORY); +} diff --git a/src/main/java/argent_matter/gcyr/client/gui/screen/PlanetSelectionScreen.java b/src/main/java/argent_matter/gcyr/client/gui/screen/PlanetSelectionScreen.java index ffc7d87b..176b5eb3 100644 --- a/src/main/java/argent_matter/gcyr/client/gui/screen/PlanetSelectionScreen.java +++ b/src/main/java/argent_matter/gcyr/client/gui/screen/PlanetSelectionScreen.java @@ -1,18 +1,18 @@ package argent_matter.gcyr.client.gui.screen; -import argent_matter.gcyr.GCyR; -import argent_matter.gcyr.GCyRClient; +import argent_matter.gcyr.GCYR; +import argent_matter.gcyr.GCYRClient; import argent_matter.gcyr.api.space.planet.Galaxy; import argent_matter.gcyr.api.space.planet.Planet; import argent_matter.gcyr.api.space.planet.PlanetRing; import argent_matter.gcyr.api.space.planet.SolarSystem; import argent_matter.gcyr.client.gui.Category; -import argent_matter.gcyr.common.data.GCyRNetworking; +import argent_matter.gcyr.common.data.GCYRNetworking; import argent_matter.gcyr.common.gui.PlanetSelectionMenu; import argent_matter.gcyr.common.networking.c2s.PacketCreateSpaceStation; import argent_matter.gcyr.common.networking.c2s.PacketSendSelectedDimension; import argent_matter.gcyr.data.loader.PlanetData; -import argent_matter.gcyr.util.GCyRValues; +import argent_matter.gcyr.util.GCYRValues; import com.gregtechceu.gtceu.GTCEu; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -27,12 +27,10 @@ import net.minecraft.client.gui.screens.inventory.MenuAccess; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -45,8 +43,8 @@ @ParametersAreNonnullByDefault public class PlanetSelectionScreen extends Screen implements MenuAccess { - public static final ResourceLocation SMALL_MENU_LIST = GCyR.id("textures/gui/selection_menu.png"); - public static final ResourceLocation LARGE_MENU_TEXTURE = GCyR.id("textures/gui/selection_menu_large.png"); + public static final ResourceLocation SMALL_MENU_LIST = GCYR.id("textures/gui/selection_menu.png"); + public static final ResourceLocation LARGE_MENU_TEXTURE = GCYR.id("textures/gui/selection_menu_large.png"); public static final ResourceLocation SCROLL_BAR = GTCEu.id("textures/gui/widget/slider.png"); private static final Component CATALOG_TEXT = Component.translatable("menu.gcyr.catalog"); private static final Component BACK_TEXT = Component.translatable("menu.gcyr.back"); @@ -84,7 +82,7 @@ public PlanetSelectionScreen(PlanetSelectionMenu handler, Inventory inventory, C super(title); this.menu = handler; - if (GCyRClient.galaxies.size() <= 1) { + if (GCYRClient.galaxies.size() <= 1) { currentCategory = Category.MILKY_WAY_CATEGORY; } @@ -124,21 +122,21 @@ private void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, f SolarSystem solarSystem = null; Set planetRings = new HashSet<>(); - for (SolarSystem system : GCyRClient.solarSystems) { + for (SolarSystem system : GCYRClient.solarSystems) { if (this.currentCategory.id().equals(system.solarSystem()) || this.currentCategory.parent() != null && this.currentCategory.parent().id().equals(system.solarSystem())) { solarSystem = system; break; } } - for (PlanetRing ring : GCyRClient.planetRings) { + for (PlanetRing ring : GCYRClient.planetRings) { if (this.currentCategory.id().equals(ring.solarSystem()) || this.currentCategory.parent() != null && this.currentCategory.parent().id().equals(ring.solarSystem())) { planetRings.add(ring); } } if (currentPage == 1) { - GCyRClient.galaxies.stream().filter(g -> g.galaxy().equals(this.currentCategory.id())) + GCYRClient.galaxies.stream().filter(g -> g.galaxy().equals(this.currentCategory.id())) .findFirst() .ifPresent(galaxy -> addRotatingTexture(this, guiGraphics, -125, -125, galaxy.scale(), galaxy.scale(), galaxy.texture(), 0.6f)); } @@ -174,7 +172,7 @@ private void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, f // Disable the back button when there is nothing to go back to. Button backButton = this.categoryButtons.get(Category.BACK).get(0); backButton.visible = this.currentCategory.parent() != null; - if (currentPage == 1 && GCyRClient.galaxies.size() <= 1) { + if (currentPage == 1 && GCYRClient.galaxies.size() <= 1) { backButton.visible = false; } if (this.categoryButtons.containsKey(this.currentCategory)) { @@ -258,13 +256,13 @@ public void onNavigationButtonClick(Category target) { public void createGalaxyButton(Category galaxyCategory) { Component label = Component.translatable(galaxyCategory.id().toLanguageKey()); - Galaxy galaxy = GCyRClient.galaxies.stream().filter(g -> g.galaxy().equals(galaxyCategory.id())).findFirst().orElse(null); + Galaxy galaxy = GCYRClient.galaxies.stream().filter(g -> g.galaxy().equals(galaxyCategory.id())).findFirst().orElse(null); createNavigationButton(label, Category.GALAXY_CATEGORY, (galaxy != null ? galaxy.buttonColor() : 0xFFAA00AA), 75, 20, TooltipType.GALAXY, null, galaxyCategory); } public void createSolarSystemButton(Category solarSystemCategory) { Component label = Component.translatable(solarSystemCategory.id().toLanguageKey()); - SolarSystem solarSystem = GCyRClient.solarSystems.stream().filter(g -> g.solarSystem().equals(solarSystemCategory.id())).findFirst().orElse(null); + SolarSystem solarSystem = GCYRClient.solarSystems.stream().filter(g -> g.solarSystem().equals(solarSystemCategory.id())).findFirst().orElse(null); createNavigationButton(label, solarSystemCategory.parent(), (solarSystem != null ? solarSystem.buttonColor() : 0xFF0000AA), 71, 20, TooltipType.SOLAR_SYSTEM, null, solarSystemCategory); } @@ -295,7 +293,7 @@ public void createSpaceStationTeleportButton(int row, Component label, Category createTeleportButton(row, label, category, colour, sizeX, sizeY, TooltipType.SPACE_STATION, planet, press -> { if (minecraft != null && minecraft.player != null) { selectPlanet(planet); - GCyRNetworking.NETWORK.sendToServer(new PacketCreateSpaceStation()); + GCYRNetworking.NETWORK.sendToServer(new PacketCreateSpaceStation()); } }); } @@ -303,7 +301,7 @@ public void createSpaceStationTeleportButton(int row, Component label, Category public void selectPlanet(Planet planet) { this.minecraft.player.closeContainer(); // Tell the server to teleport the player after the button has been pressed. - GCyRNetworking.NETWORK.sendToServer(new PacketSendSelectedDimension(planet.level().location())); + GCYRNetworking.NETWORK.sendToServer(new PacketSendSelectedDimension(planet.level().location())); } public Button createButton(Component label, Category category, int colour, int sizeX, int sizeY, TooltipType tooltip, Planet planetInfo, Consumer