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