change modid because tech told me to :waaGONE:, deprecate 1.19

Argent-Matter · Oct 25, 2023 · 8809930 · 8809930
1 parent 853c34f
commit 8809930
Show file tree

Hide file tree

Showing 455 changed files with 2,080 additions and 2,092 deletions.
diff --git a/.github/workflows/auto_build.yml b/.github/workflows/auto_build.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Get Version
         id: var
         run: |
-          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcys-forge-|.jar' '{print $2}')
+          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcyr-forge-|.jar' '{print $2}')
           echo version=$MESSAGE >> $GITHUB_OUTPUT
 
       - name: release

diff --git a/.github/workflows/auto_publish.yml b/.github/workflows/auto_publish.yml
@@ -60,9 +60,9 @@ jobs:
         name: Get Version
         id: var
         run: |
-          MESSAGE=$(ls fabric/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcys-fabric-|.jar' '{print $2}')
+          MESSAGE=$(ls fabric/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcyr-fabric-|.jar' '{print $2}')
           echo fabric_version=$MESSAGE >> $GITHUB_OUTPUT
-          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcys-forge-|.jar' '{print $2}')
+          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcyr-forge-|.jar' '{print $2}')
           echo forge_version=$MESSAGE >> $GITHUB_OUTPUT
 
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
@@ -83,7 +83,7 @@ jobs:
             fabric/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
             fabric/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
 
-          name: GCyS ${{ steps.var.outputs.fabric_version }}-fabric
+          name: GCyR ${{ steps.var.outputs.fabric_version }}-fabric
           version: mc${{ steps.var.outputs.fabric_version }}-fabric
           version-type: ${{ inputs.releaseType }}
           changelog-file: CHANGELOG.*
@@ -119,7 +119,7 @@ jobs:
             forge/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
             forge/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
 
-          name: GCyS ${{ steps.var.outputs.forge_version }}-forge
+          name: GCyR ${{ steps.var.outputs.forge_version }}-forge
           version: mc${{ steps.var.outputs.forge_version }}-forge
           version-type: ${{ inputs.releaseType }}
           changelog-file: CHANGELOG.*

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
 - make space stations use different dimensions per planet orbit
 - remove "orbit" button from planet selection screen, it did nothing
-- 
+- change modid because I was told to (sorry)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# gcys
-Gregicality Space
+# gcyr
+Gregicality Rocketry
 
 Adds Space content to GregTech in an advanced rocketry-like manner.
diff --git a/...rc/main/java/argent_matter/gcys/GCyS.java → ...rc/main/java/argent_matter/gcyr/GCyR.java b/...rc/main/java/argent_matter/gcys/GCyS.java → ...rc/main/java/argent_matter/gcyr/GCyR.java
@@ -1,13 +1,12 @@
-package argent_matter.gcys;
+package argent_matter.gcyr;
 
-import argent_matter.gcys.api.capability.GcysCapabilityHelper;
-import argent_matter.gcys.api.capability.IDysonSystem;
-import argent_matter.gcys.api.gui.factory.EntityUIFactory;
-import argent_matter.gcys.api.registries.GcysRegistries;
-import argent_matter.gcys.api.space.dyson.DysonSystemSavedData;
-import argent_matter.gcys.common.data.*;
-import argent_matter.gcys.config.GcysConfig;
-import argent_matter.gcys.data.GCySDatagen;
+import argent_matter.gcyr.api.capability.GCyRCapabilityHelper;
+import argent_matter.gcyr.api.capability.IDysonSystem;
+import argent_matter.gcyr.api.gui.factory.EntityUIFactory;
+import argent_matter.gcyr.api.registries.GCyRRegistries;
+import argent_matter.gcyr.common.data.*;
+import argent_matter.gcyr.config.GCyRConfig;
+import argent_matter.gcyr.data.GCyRDatagen;
 import com.gregtechceu.gtceu.config.ConfigHolder;
 import com.lowdragmc.lowdraglib.gui.factory.UIFactory;
 import net.minecraft.resources.ResourceLocation;
@@ -19,34 +18,34 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class GCyS {
+public class GCyR {
 	public static final String
-			MOD_ID = "gcys",
-			NAME = "Gregicality Space";
+			MOD_ID = "gcyr",
+			NAME = "Gregicality Rocketry";
 	public static final Logger LOGGER = LoggerFactory.getLogger(NAME);
 
 	public static void init() {
 		ConfigHolder.init(); // Forcefully init GT config because fabric doesn't allow dependents to load after dependencies
-		GcysConfig.init();
-		GCySNetworking.init();
+		GCyRConfig.init();
+		GCyRNetworking.init();
 		UIFactory.register(EntityUIFactory.INSTANCE);
 
-		GCySRecipeConditions.init();
-		GCySSatellites.init();
-		GCySEntityDataSerializers.init();
-		GCySCreativeModeTabs.init();
-		GCySEntities.init();
-		GCySBlocks.init();
-		GCySRecipeTypes.init();
-		GCySMachines.init();
-		GCySItems.init();
-		GCySMenus.init();
+		GCyRRecipeConditions.init();
+		GCyRSatellites.init();
+		GCyREntityDataSerializers.init();
+		GCyRCreativeModeTabs.init();
+		GCyREntities.init();
+		GCyRBlocks.init();
+		GCyRRecipeTypes.init();
+		GCyRMachines.init();
+		GCyRItems.init();
+		GCyRMenus.init();
 
-		GCySDatagen.init();
+		GCyRDatagen.init();
 
-		GcysRegistries.REGISTRATE.registerRegistrate();
-		GCySDimensionTypes.init();
-		GCySParticles.init();
+		GCyRRegistries.REGISTRATE.registerRegistrate();
+		GCyRDimensionTypes.init();
+		GCyRParticles.init();
 	}
 
 	public static ResourceLocation id(String path) {
@@ -55,8 +54,8 @@ public static ResourceLocation id(String path) {
 
 	public static void onKeyPressed(int key, int action, int modifiers) {
 		/* use GUI instead, this was just another annoying useless keybind
-		if (GCySKeyMappings.START_ROCKET.isDown()) {
-			GCySNetworking.NETWORK.sendToServer(new PacketLaunchRocket());
+		if (GCyRKeyMappings.START_ROCKET.isDown()) {
+			GCyRNetworking.NETWORK.sendToServer(new PacketLaunchRocket());
 		}
 		 */
 	}
@@ -68,11 +67,11 @@ public static void onLevelTick(Level ticked, boolean isStart) {
 
 		if (isStart) {
 			if (!level.dimensionType().hasCeiling()) {
-				var sat = GcysCapabilityHelper.getSatellites(level);
+				var sat = GCyRCapabilityHelper.getSatellites(level);
 				if (sat != null) sat.tickSatellites();
 			}
 
-			IDysonSystem system = GcysCapabilityHelper.getDysonSystem(level);
+			IDysonSystem system = GCyRCapabilityHelper.getDysonSystem(level);
 			if (system == null || TICKED_SYSTEMS.get().contains(system)) return;
 			system.tick();
 		} else {

diff --git a/...n/java/argent_matter/gcys/GCySClient.java → ...n/java/argent_matter/gcyr/GCyRClient.java b/...n/java/argent_matter/gcys/GCySClient.java → ...n/java/argent_matter/gcyr/GCyRClient.java
@@ -1,15 +1,15 @@
-package argent_matter.gcys;
+package argent_matter.gcyr;
 
-import argent_matter.gcys.api.space.planet.Galaxy;
-import argent_matter.gcys.api.space.planet.PlanetRing;
-import argent_matter.gcys.api.space.planet.PlanetSkyRenderer;
-import argent_matter.gcys.api.space.planet.SolarSystem;
-import argent_matter.gcys.common.data.GCySKeyMappings;
+import argent_matter.gcyr.api.space.planet.Galaxy;
+import argent_matter.gcyr.api.space.planet.PlanetRing;
+import argent_matter.gcyr.api.space.planet.PlanetSkyRenderer;
+import argent_matter.gcyr.api.space.planet.SolarSystem;
+import argent_matter.gcyr.common.data.GCyRKeyMappings;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class GCySClient {
+public class GCyRClient {
 
     public static boolean isDysonSphereActive = false;
 
@@ -20,6 +20,6 @@ public class GCySClient {
     public static List<Galaxy> galaxies = new ArrayList<>();
 
     public static void init() {
-        //GCySKeyMappings.init();
+        //GCyRKeyMappings.init();
     }
 }
diff --git a/.../java/argent_matter/gcys/GCySGTAddon.java → .../java/argent_matter/gcyr/GCyRGTAddon.java b/.../java/argent_matter/gcys/GCySGTAddon.java → .../java/argent_matter/gcyr/GCyRGTAddon.java
@@ -1,6 +1,6 @@
-package argent_matter.gcys;
+package argent_matter.gcyr;
 
-import argent_matter.gcys.common.data.*;
+import argent_matter.gcyr.common.data.*;
 import com.gregtechceu.gtceu.api.addon.GTAddon;
 import com.gregtechceu.gtceu.api.addon.IGTAddon;
 import com.gregtechceu.gtceu.api.addon.events.MaterialCasingCollectionEvent;
@@ -9,15 +9,15 @@
 import java.util.function.Consumer;
 
 @GTAddon
-public class GCySGTAddon implements IGTAddon {
+public class GCyRGTAddon implements IGTAddon {
     @Override
     public void initializeAddon() {
 
     }
 
     @Override
     public String addonModId() {
-        return GCyS.MOD_ID;
+        return GCyR.MOD_ID;
     }
 
     @Override
@@ -32,12 +32,12 @@ public void registerElements() {
 
     @Override
     public void registerMaterials() {
-        GCySMaterials.init();
+        GCyRMaterials.init();
     }
 
     @Override
     public void registerSounds() {
-        GCySSoundEntries.init();
+        GCyRSoundEntries.init();
     }
 
     @Override
@@ -62,6 +62,6 @@ public void collectMaterialCasings(MaterialCasingCollectionEvent event) {
 
     @Override
     public void addRecipes(Consumer<FinishedRecipe> provider) {
-        GCySRecipes.init(provider);
+        GCyRRecipes.init(provider);
     }
 }
diff --git a/.../api/capability/GcysCapabilityHelper.java → .../api/capability/GCyRCapabilityHelper.java b/.../api/capability/GcysCapabilityHelper.java → .../api/capability/GCyRCapabilityHelper.java
@@ -1,13 +1,13 @@
-package argent_matter.gcys.api.capability;
+package argent_matter.gcyr.api.capability;
 
-import argent_matter.gcys.api.space.dyson.DysonSystemSavedData;
-import argent_matter.gcys.api.space.satellite.capability.SatelliteWorldSavedData;
-import argent_matter.gcys.api.space.station.StationWorldSavedData;
+import argent_matter.gcyr.api.space.dyson.DysonSystemSavedData;
+import argent_matter.gcyr.api.space.satellite.capability.SatelliteWorldSavedData;
+import argent_matter.gcyr.api.space.station.StationWorldSavedData;
 import net.minecraft.server.level.ServerLevel;
 
 import javax.annotation.Nullable;
 
-public class GcysCapabilityHelper {
+public class GCyRCapabilityHelper {
     @Nullable
     public static ISpaceStationHolder getSpaceStations(@Nullable ServerLevel level) {
         return StationWorldSavedData.getOrCreate(level);

diff --git a/...ter/gcys/api/capability/IDysonSystem.java → ...ter/gcyr/api/capability/IDysonSystem.java b/...ter/gcys/api/capability/IDysonSystem.java → ...ter/gcyr/api/capability/IDysonSystem.java
@@ -1,8 +1,8 @@
-package argent_matter.gcys.api.capability;
+package argent_matter.gcyr.api.capability;
 
 
-import argent_matter.gcys.api.space.dyson.DysonSphere;
-import argent_matter.gcys.common.satellite.DysonSwarmSatellite;
+import argent_matter.gcyr.api.space.dyson.DysonSphere;
+import argent_matter.gcyr.common.satellite.DysonSwarmSatellite;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 

diff --git a/...tter/gcys/api/capability/IGpsTracked.java → ...tter/gcyr/api/capability/IGpsTracked.java b/...tter/gcys/api/capability/IGpsTracked.java → ...tter/gcyr/api/capability/IGpsTracked.java
@@ -1,4 +1,4 @@
-package argent_matter.gcys.api.capability;
+package argent_matter.gcyr.api.capability;
 
 public interface IGpsTracked {
 

diff --git a/...gcys/api/capability/ISatelliteHolder.java → ...gcyr/api/capability/ISatelliteHolder.java b/...gcys/api/capability/ISatelliteHolder.java → ...gcyr/api/capability/ISatelliteHolder.java
@@ -1,8 +1,8 @@
-package argent_matter.gcys.api.capability;
+package argent_matter.gcyr.api.capability;
 
-import argent_matter.gcys.api.space.satellite.Satellite;
-import argent_matter.gcys.api.space.satellite.SatelliteType;
-import argent_matter.gcys.util.Vec2i;
+import argent_matter.gcyr.api.space.satellite.Satellite;
+import argent_matter.gcyr.api.space.satellite.SatelliteType;
+import argent_matter.gcyr.util.Vec2i;
 import net.minecraft.world.phys.Vec2;
 
 import javax.annotation.Nullable;

diff --git a/...s/api/capability/ISpaceStationHolder.java → ...r/api/capability/ISpaceStationHolder.java b/...s/api/capability/ISpaceStationHolder.java → ...r/api/capability/ISpaceStationHolder.java
@@ -1,8 +1,8 @@
-package argent_matter.gcys.api.capability;
+package argent_matter.gcyr.api.capability;
 
-import argent_matter.gcys.api.space.planet.Planet;
-import argent_matter.gcys.api.space.station.SpaceStation;
-import argent_matter.gcys.util.Vec2i;
+import argent_matter.gcyr.api.space.planet.Planet;
+import argent_matter.gcyr.api.space.station.SpaceStation;
+import argent_matter.gcyr.util.Vec2i;
 import com.mojang.datafixers.util.Pair;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.MethodsReturnNonnullByDefault;

diff --git a/...matter/gcys/api/data/tag/GcysTagUtil.java → ...matter/gcyr/api/data/tag/GCyRTagUtil.java b/...matter/gcys/api/data/tag/GcysTagUtil.java → ...matter/gcyr/api/data/tag/GCyRTagUtil.java
@@ -1,6 +1,6 @@
-package argent_matter.gcys.api.data.tag;
+package argent_matter.gcyr.api.data.tag;
 
-import argent_matter.gcys.GCyS;
+import argent_matter.gcyr.GCyR;
 import com.lowdragmc.lowdraglib.Platform;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -10,7 +10,7 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Fluid;
 
-public class GcysTagUtil {
+public class GCyRTagUtil {
     public static <T> TagKey<T> optionalTag(Registry<T> registry, ResourceLocation id) {
         return TagKey.create(registry.key(), id);
     }
@@ -21,7 +21,7 @@ public static <T> TagKey<T> createTag(Registry<T> registry, String path, boolean
     }
 
     public static <T> TagKey<T> createPlatformTag(Registry<T> registry, String forgePath, String fabricPath, boolean modTag) {
-        if (modTag) return optionalTag(registry, Platform.isForge() ? GCyS.id(forgePath) : GCyS.id(fabricPath));
+        if (modTag) return optionalTag(registry, Platform.isForge() ? GCyR.id(forgePath) : GCyR.id(fabricPath));
         return optionalTag(registry, Platform.isForge() ? new ResourceLocation("forge", forgePath) : new ResourceLocation("c", fabricPath));
     }
 
@@ -30,7 +30,7 @@ public static <T> TagKey<T> createPlatformUnprefixedTag(Registry<T> registry, St
     }
 
     public static <T> TagKey<T> createModTag(Registry<T> registry, String path) {
-        return optionalTag(registry, GCyS.id(path));
+        return optionalTag(registry, GCyR.id(path));
     }
 
     public static TagKey<Block> createBlockTag(String path) {

diff --git a/...gcys/api/gui/factory/EntityUIFactory.java → ...gcyr/api/gui/factory/EntityUIFactory.java b/...gcys/api/gui/factory/EntityUIFactory.java → ...gcyr/api/gui/factory/EntityUIFactory.java
@@ -1,6 +1,6 @@
-package argent_matter.gcys.api.gui.factory;
+package argent_matter.gcyr.api.gui.factory;
 
-import argent_matter.gcys.GCyS;
+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<Entity> {
     public static final EntityUIFactory INSTANCE = new EntityUIFactory();
 
     private EntityUIFactory() {
-        super(GCyS.id("entity"));
+        super(GCyR.id("entity"));
     }
 
     @Override

diff --git a/.../gcys/api/gui/widget/GcysGuiTextures.java → .../gcyr/api/gui/widget/GCyRGuiTextures.java b/.../gcys/api/gui/widget/GcysGuiTextures.java → .../gcyr/api/gui/widget/GCyRGuiTextures.java
@@ -1,12 +1,12 @@
-package argent_matter.gcys.api.gui.widget;
+package argent_matter.gcyr.api.gui.widget;
 
 import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
 
-public class GcysGuiTextures {
+public class GCyRGuiTextures {
 
-    public static final ResourceTexture BUTTON_LAUNCH_ROCKET = new ResourceTexture("gcys:textures/gui/widget/button_launch_rocket.png");
-    public static final ResourceTexture BUTTON_ENABLED = new ResourceTexture("gcys:textures/gui/widget/button_enabled.png");
+    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");
 
 
-    public static final ResourceTexture PROGRESS_BAR_ROCKET = new ResourceTexture("gcys:textures/gui/progress_bar/progress_bar_rocket.png");
+    public static final ResourceTexture PROGRESS_BAR_ROCKET = new ResourceTexture("gcyr:textures/gui/progress_bar/progress_bar_rocket.png");
 }
diff --git a/...r/gcys/api/registries/GcysRegistries.java → ...r/gcyr/api/registries/GCyRRegistries.java b/...r/gcys/api/registries/GcysRegistries.java → ...r/gcyr/api/registries/GCyRRegistries.java
@@ -1,12 +1,12 @@
-package argent_matter.gcys.api.registries;
+package argent_matter.gcyr.api.registries;
 
-import argent_matter.gcys.GCyS;
-import argent_matter.gcys.api.space.satellite.SatelliteType;
+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 GcysRegistries {
-    public static final GTRegistrate REGISTRATE = GTRegistrate.create(GCyS.MOD_ID);
+public class GCyRRegistries {
+    public static final GTRegistrate REGISTRATE = GTRegistrate.create(GCyR.MOD_ID);
 
-    public static final GTRegistry.RL<SatelliteType<?>> SATELLITES = new GTRegistry.RL<>(GCyS.id("satellite"));
+    public static final GTRegistry.RL<SatelliteType<?>> SATELLITES = new GTRegistry.RL<>(GCyR.id("satellite"));
 }
diff --git a/...ter/gcys/api/space/dyson/DysonSphere.java → ...ter/gcyr/api/space/dyson/DysonSphere.java b/...ter/gcys/api/space/dyson/DysonSphere.java → ...ter/gcyr/api/space/dyson/DysonSphere.java
@@ -1,6 +1,6 @@
-package argent_matter.gcys.api.space.dyson;
+package argent_matter.gcyr.api.space.dyson;
 
-import argent_matter.gcys.api.capability.IDysonSystem;
+import argent_matter.gcyr.api.capability.IDysonSystem;
 import com.gregtechceu.gtceu.api.GTValues;
 import lombok.Getter;
 import lombok.Setter;