mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-03 22:34:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Morning fixes

Browse source 
- Fix upload task not uploading the reobf'd jar
- Fix debug info not translating the graphics mode text
- Fix crash with factory gauges
- Mark getQueuedPromises as @Nullable
This commit is contained in:
IThundxr 2025-03-01 07:54:34 -05:00
parent e431324f98
commit a89b582ae3
Failed to generate hash of commit
6 changed files with 57 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View file

@ -10,10 +10,7 @@ jobs:
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
- name: NeoGradle Cache
uses: actions/cache@v4
@ -35,4 +32,5 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: Artifacts
path: build/libs/

5
.github/workflows/release.yml vendored
View file

@ -10,10 +10,7 @@ jobs:
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

14
build.gradle
View file

@ -334,18 +334,18 @@ project.publishing {
}
publishMods {
file = jar.archiveFile
file = reobfJar.archiveFile
changelog = ChangelogText.getChangelogText(project).toString()
type = STABLE
displayName = "$mod_name $minecraft_version $mod_version"
displayName = "$mod_name $mod_version for mc$minecraft_version"
modLoaders.add("forge")
modLoaders.add("neoforge")
// curseforge {
// accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
// projectId = "328085"
// minecraftVersions.add(minecraft_version)
// }
curseforge {
accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
projectId = "328085"
minecraftVersions.add(minecraft_version)
}
modrinth {
accessToken = providers.environmentVariable("MODRINTH_TOKEN")

15
src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
View file

@ -47,6 +47,11 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatt
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
import com.simibubi.create.foundation.utility.CreateLang;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.network.NetworkHooks;
import net.createmod.catnip.animation.LerpedFloat;
import net.createmod.catnip.animation.LerpedFloat.Chaser;
import net.createmod.catnip.gui.ScreenOpener;
@ -73,11 +78,6 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.network.NetworkHooks;
public class FactoryPanelBehaviour extends FilteringBehaviour implements MenuProvider {
public static final BehaviourType<FactoryPanelBehaviour> TOP_LEFT = new BehaviourType<>();
@ -730,13 +730,16 @@ public class FactoryPanelBehaviour extends FilteringBehaviour implements MenuPro
}
RequestPromiseQueue promises = Create.LOGISTICS.getQueuedPromises(network);
if (promises == null)
return 0;
if (forceClearPromises) {
promises.forceClear(item);
resetTimerSlightly();
}
forceClearPromises = false;
return promises == null ? 0 : promises.getTotalPromisedAndRemoveExpired(item, getPromiseExpiryTimeInTicks());
return promises.getTotalPromisedAndRemoveExpired(item, getPromiseExpiryTimeInTicks());
}
public void resetTimer() {

7
src/main/java/com/simibubi/create/content/logistics/packagerLink/GlobalLogisticsManager.java
View file

@ -4,6 +4,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.jetbrains.annotations.Nullable;
import net.minecraft.core.GlobalPos;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.player.Player;
@ -38,12 +40,12 @@ public class GlobalLogisticsManager {
LogisticsNetwork network = logisticsNetworks.get(networkId);
return network == null || network.owner == null || network.owner.equals(player.getUUID());
}
public boolean isLockable(UUID networkId) {
LogisticsNetwork network = logisticsNetworks.get(networkId);
return network != null;
}
public boolean isLocked(UUID networkId) {
LogisticsNetwork network = logisticsNetworks.get(networkId);
return network != null && network.locked;
@ -86,6 +88,7 @@ public class GlobalLogisticsManager {
return logisticsNetwork.totalLinks.size() - logisticsNetwork.loadedLinks.size();
}
@Nullable
public RequestPromiseQueue getQueuedPromises(UUID networkId) {
return !logisticsNetworks.containsKey(networkId) ? null : logisticsNetworks.get(networkId).panelPromises;
}

64
src/main/java/com/simibubi/create/infrastructure/debugInfo/DebugInformation.java
View file

@ -17,6 +17,11 @@ import com.simibubi.create.infrastructure.debugInfo.element.DebugInfoSection;
import com.simibubi.create.infrastructure.debugInfo.element.InfoElement;
import com.simibubi.create.infrastructure.debugInfo.element.InfoEntry;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.forgespi.language.IModInfo;
import dev.engine_room.flywheel.api.Flywheel;
import dev.engine_room.flywheel.api.backend.Backend;
import dev.engine_room.flywheel.api.backend.BackendManager;
@ -24,10 +29,7 @@ import net.minecraft.SharedConstants;
import net.minecraft.SystemReport;
import net.minecraft.Util;
import net.minecraft.client.Minecraft;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraft.client.resources.language.I18n;
import oshi.SystemInfo;
/**
@ -69,45 +71,45 @@ public class DebugInformation {
static {
DebugInfoSection.builder(Create.NAME)
.put("Mod Version", CreateBuildInfo.VERSION)
.put("Forge Version", getVersionOfMod("forge"))
.put("Minecraft Version", SharedConstants.getCurrentVersion().getName())
.buildTo(DebugInformation::registerBothInfo);
.put("Mod Version", CreateBuildInfo.VERSION)
.put("Forge Version", getVersionOfMod("forge"))
.put("Minecraft Version", SharedConstants.getCurrentVersion().getName())
.buildTo(DebugInformation::registerBothInfo);
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
DebugInfoSection.builder("Graphics")
.put("Flywheel Version", ModList.get()
.getModContainerById(Flywheel.ID)
.map(c -> c.getModInfo()
.getVersion()
.toString())
.orElse("None"))
.put("Flywheel Backend", () -> Backend.REGISTRY.getIdOrThrow(BackendManager.currentBackend()).toString())
.put("OpenGL Renderer", GlUtil::getRenderer)
.put("OpenGL Version", GlUtil::getOpenGLVersion)
.put("Graphics Mode", () -> Minecraft.getInstance().options.graphicsMode().get().getKey())
.buildTo(DebugInformation::registerClientInfo);
.put("Flywheel Version", ModList.get()
.getModContainerById(Flywheel.ID)
.map(c -> c.getModInfo()
.getVersion()
.toString())
.orElse("None"))
.put("Flywheel Backend", () -> Backend.REGISTRY.getIdOrThrow(BackendManager.currentBackend()).toString())
.put("OpenGL Renderer", GlUtil::getRenderer)
.put("OpenGL Version", GlUtil::getOpenGLVersion)
.put("Graphics Mode", () -> I18n.get(Minecraft.getInstance().options.graphicsMode().get().getKey()))
.buildTo(DebugInformation::registerClientInfo);
});
DebugInfoSection.builder("System Information")
.put("Operating System", SystemReportAccessor.getOPERATING_SYSTEM())
.put("Java Version", SystemReportAccessor.getJAVA_VERSION())
.put("JVM Flags", getMcSystemInfo("JVM Flags"))
.put("Memory", () -> getMcSystemInfo("Memory"))
.put("Total Memory", getTotalRam())
.put("CPU", getCpuInfo())
.putAll(listAllGraphicsCards())
.buildTo(DebugInformation::registerBothInfo);
.put("Operating System", SystemReportAccessor.getOPERATING_SYSTEM())
.put("Java Version", SystemReportAccessor.getJAVA_VERSION())
.put("JVM Flags", getMcSystemInfo("JVM Flags"))
.put("Memory", () -> getMcSystemInfo("Memory"))
.put("Total Memory", getTotalRam())
.put("CPU", getCpuInfo())
.putAll(listAllGraphicsCards())
.buildTo(DebugInformation::registerBothInfo);
DebugInfoSection.builder("Other Mods")
.putAll(listAllOtherMods())
.buildTo(DebugInformation::registerBothInfo);
.putAll(listAllOtherMods())
.buildTo(DebugInformation::registerBothInfo);
}
public static String getVersionOfMod(String id) {
return ModList.get().getModContainerById(id)
.map(mod -> mod.getModInfo().getVersion().toString())
.orElse("None");
.map(mod -> mod.getModInfo().getVersion().toString())
.orElse("None");
}
public static Collection<InfoElement> listAllOtherMods() {