mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-22 17:37:38 +00:00
Code Issues Releases Wiki Activity

Bump dependency versions

Browse Source 
Mostly in prep for 1.19.4.

 - Update to Loom 1.1.

   - Simplifies our handling of remapped configurations a little.
   - Removes the need for a fake fabric.mod.json in the API jar.

   For reasons I don't quite understand, this required us to bump the
   Fabric API version. Otherwise interfaces are not injected.

 - Update to Rollup 3.0.

 - Do NOT update NullAway: It now correctly checks @Nullable fields in
   inherited classes. This is good, but also a pain as Minecraft is a
   little over-eager in where it puts @Nullable.
This commit is contained in:
Jonathan Coates
2023-03-14 18:41:31 +00:00
parent 04fed62dad
commit a74089d8ae
21 changed files with 638 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/common/src/main/java/dan200/computercraft/shared/command/builder/CommandBuilder.java
View File

@@ -70,7 +70,7 @@ public class CommandBuilder<S> implements CommandNodeBuilder<S, Command<S>> {
return argMany(name, RepeatArgumentType.someFlat(type, ARGUMENT_EXPECTED), empty);
}
private <T, U> CommandNodeBuilder<S, ArgCommand<S, List<T>>> argMany(String name, RepeatArgumentType<T, ?> type, Supplier<List<T>> empty) {
private <T> CommandNodeBuilder<S, ArgCommand<S, List<T>>> argMany(String name, RepeatArgumentType<T, ?> type, Supplier<List<T>> empty) {
if (args.isEmpty()) throw new IllegalStateException("Cannot have empty arg chain builder");
return command -> {

7
projects/common/src/main/java/dan200/computercraft/shared/util/Holiday.java
View File

@@ -7,6 +7,7 @@ package dan200.computercraft.shared.util;
import java.time.LocalDateTime;
import java.time.Month;
import java.time.ZoneId;
public enum Holiday {
NONE,
@@ -24,9 +25,9 @@ public enum Holiday {
CHRISTMAS;
public static Holiday getCurrent() {
var calendar = LocalDateTime.now();
var month = calendar.getMonth();
var day = calendar.getDayOfMonth();
var now = LocalDateTime.now(ZoneId.systemDefault());
var month = now.getMonth();
var day = now.getDayOfMonth();
if (month == Month.FEBRUARY && day == 14) return VALENTINES;
if (month == Month.DECEMBER && day >= 24 && day <= 26) return CHRISTMAS;
return NONE;

1
projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/SharedConstantsMixin.java
View File

@@ -9,6 +9,7 @@ import net.minecraft.SharedConstants;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
// TODO(1.19.4): Remove this
@Mixin(SharedConstants.class)
class SharedConstantsMixin {
/**