From e37de3951fd594240f8e3bb4879bb7f597775085 Mon Sep 17 00:00:00 2001 From: screret <68943070+screret@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:57:15 +0300 Subject: [PATCH 1/3] fix actions --- .github/workflows/auto_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto_build.yml b/.github/workflows/auto_build.yml index 61fdd9cc..594f57b9 100644 --- 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 build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcyr-forge-|.jar' '{print $2}') + MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcyr-|.jar' '{print $2}') echo version=$MESSAGE >> $GITHUB_OUTPUT - name: release From 395907607730961dfca67460f26cb2baa46de192 Mon Sep 17 00:00:00 2001 From: screret <68943070+screret@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:39:57 +0300 Subject: [PATCH 2/3] update to GT 1.4.1+patch.2 --- settings.gradle | 4 ++-- .../gcyr/common/data/GCYRDimensionMarkers.java | 4 ++++ .../multiblock/electric/DysonSystemControllerMachine.java | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/settings.gradle b/settings.gradle index 1c0da9de..f82caf70 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,8 +36,8 @@ dependencyResolutionManagement { def vineFlowerVersion = "1.+" def macheteVersion = "1.+" def configurationVersion = "2.2.0" - def gtCeuVersion = "1.4.0" - def ldLibVersion = "1.0.27" + def gtCeuVersion = "1.4.1+patch.2" + def ldLibVersion = "1.0.27.b" def mixinExtrasVersion = "0.2.0" def mixinVersion = "0.8.6-SNAPSHOT" diff --git a/src/main/java/argent_matter/gcyr/common/data/GCYRDimensionMarkers.java b/src/main/java/argent_matter/gcyr/common/data/GCYRDimensionMarkers.java index 62b10a97..47756761 100644 --- a/src/main/java/argent_matter/gcyr/common/data/GCYRDimensionMarkers.java +++ b/src/main/java/argent_matter/gcyr/common/data/GCYRDimensionMarkers.java @@ -13,6 +13,10 @@ @SuppressWarnings("unused") public class GCYRDimensionMarkers { + static { + GCYRRegistries.REGISTRATE.creativeModeTab(() -> null); + } + public static final BlockEntry LUNA_MARKER = createMarker("luna"); public static final BlockEntry MARS_MARKER = createMarker("mars"); public static final BlockEntry MERCURY_MARKER = createMarker("mercury"); diff --git a/src/main/java/argent_matter/gcyr/common/machine/multiblock/electric/DysonSystemControllerMachine.java b/src/main/java/argent_matter/gcyr/common/machine/multiblock/electric/DysonSystemControllerMachine.java index 0b9379e9..0784ca01 100644 --- a/src/main/java/argent_matter/gcyr/common/machine/multiblock/electric/DysonSystemControllerMachine.java +++ b/src/main/java/argent_matter/gcyr/common/machine/multiblock/electric/DysonSystemControllerMachine.java @@ -8,6 +8,8 @@ import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; import com.gregtechceu.gtceu.api.recipe.GTRecipe; +import com.gregtechceu.gtceu.api.recipe.logic.OCParams; +import com.gregtechceu.gtceu.api.recipe.logic.OCResult; import com.gregtechceu.gtceu.common.data.GTDamageTypes; import com.lowdragmc.lowdraglib.gui.util.ClickData; import net.minecraft.ChatFormatting; @@ -22,6 +24,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -59,13 +62,13 @@ public void onStructureFormed() { } @Override - protected @Nullable GTRecipe getRealRecipe(GTRecipe recipe) { + protected @Nullable GTRecipe getRealRecipe(GTRecipe recipe, @NotNull OCParams params, @NotNull OCResult result) { if (this.getLevel().dimensionType().hasCeiling()) return null; if (recipe.data.contains("gcyr:repair_dyson_sphere")) { IDysonSystem system = GCYRCapabilityHelper.getDysonSystem((ServerLevel) this.getLevel()); if (system != null && system.isDysonSphereActive() && (!system.activeDysonSphere().isNeedsMaintenance() || !this.getPos().equals(system.activeDysonSphere().getControllerPos()))) return null; } - return super.getRealRecipe(recipe); + return super.getRealRecipe(recipe, params, result); } @Override From 703853db4f643b516ad72631881bde0de9011184 Mon Sep 17 00:00:00 2001 From: screret <68943070+screret@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:41:44 +0300 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 7 +------ gradle.properties | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c704f31c..5d0e6a12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,9 @@ ### ADDITIONS: -- added a (currently unused) black hole skybox shader (does NOT work with optifine shaders) ### FIXES: -- fixed space having clouds & rain -- fixed rockets deleting all block entity data from placed BEs, they now store it instead ### CHANGES: -- made sky renderers independent of the dimension type, instead being based on the dimension ID itself -- made space station packagers save the ID chip's destination planet to the keycard instead of always sending the rocket to the planet the packager is on -- made rockets able to be sent to a specific location via button & slot in rocket scanner GUI +- updated to GT 1.4.1+patch.2 ## WIP Documentation!: diff --git a/gradle.properties b/gradle.properties index a686e5f4..7b06ce59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xss4M mod_id=gcyr mod_name=Gregicality Rocketry -mod_version=0.2.1 +mod_version=0.2.2 maven_group=argent_matter loom.platform=forge