Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.20.2 #135

Closed
wants to merge 50 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
f4b7e42
Update to loom 1.3 and use Mod Publish Plugin (#3158)
modmuss50 Aug 2, 2023
86b1264
23w31a
modmuss50 Aug 7, 2023
0b2eb40
[1.20.2] Support common registration packets. Add configuration task …
modmuss50 Aug 9, 2023
0ba8e9c
23w32a
modmuss50 Aug 9, 2023
a336222
Fix publishMods dryRun
modmuss50 Aug 9, 2023
09816d0
Fix createAndPopulateRegistryMap() always returning null, preventing …
modmuss50 Aug 11, 2023
96274c1
Fix #3255 (#3257)
modmuss50 Aug 13, 2023
db99c88
Make deprecated modules opt-out instead of opt-in (#3246)
modmuss50 Aug 13, 2023
b122995
Make DFU error-tolerant to mod custom generator types (#3213)
qouteall Aug 13, 2023
736900a
Improve Indigo and FRAPI Test Mod (#3208)
PepperCode1 Aug 13, 2023
11da534
Bump version
modmuss50 Aug 13, 2023
839aeb4
Misc networking API cleanup + fixes (#3265)
modmuss50 Aug 17, 2023
f091af9
23w33a
modmuss50 Aug 17, 2023
017b9d9
Networking API javadoc fixes and small refactors (#3285)
apple502j Aug 30, 2023
fce67b3
23w35a (#3292)
modmuss50 Aug 31, 2023
0287208
Update mod publish plugin.
modmuss50 Aug 31, 2023
ceabd76
Mark `SidedStorageBlockEntity`'s side as nullable (#3281)
deirn Sep 3, 2023
73761d2
BlockView API v2 (#3268)
PepperCode1 Sep 3, 2023
22fb02c
Bump version
modmuss50 Sep 3, 2023
b680c0d
Implement RenderAttachedBlockView on ChunkRendererRegion (#3300)
PepperCode1 Sep 3, 2023
462ea84
Bump version
modmuss50 Sep 3, 2023
4351121
1.20.2-pre1
modmuss50 Sep 5, 2023
34a3e0e
Include namespace in modded registry tag path (#3303)
apple502j Sep 7, 2023
3bafade
1.20.2-pre2
modmuss50 Sep 7, 2023
109a65e
1.20.2-pre4
modmuss50 Sep 13, 2023
daef22a
1.20.2-rc1
modmuss50 Sep 15, 2023
5c13385
1.20.2-rc2
modmuss50 Sep 18, 2023
bbae80f
Add a method to data generator entrypoints to register custom keys wi…
ErrorCraft Sep 18, 2023
bbfadae
Fix Random mismatch between vanilla and FRAPI baked models (weighted …
Technici4n Sep 18, 2023
2034447
FRAPI improvements: context getters, full removal of fallback consume…
Technici4n Sep 18, 2023
69e331e
Fix unhandled packets disconnecting the client. (#3324)
modmuss50 Sep 18, 2023
0708114
Bump version
modmuss50 Sep 18, 2023
219ee51
Support trade rebalance experiment (#3311)
apple502j Sep 21, 2023
b1b4f7b
Handle null being passed as the datafix type to PersistentState.Type …
modmuss50 Sep 21, 2023
8fe4516
1.20.2
modmuss50 Sep 21, 2023
b1913a6
Bump version
modmuss50 Sep 21, 2023
74a33ae
Fix ClientConfigurationNetworkAddon.handleReady() being called too la…
modmuss50 Sep 23, 2023
3ccb77f
Bump version
modmuss50 Sep 23, 2023
7468709
Update link to Minecraft Wiki (#3336)
lunaynx Oct 1, 2023
6f59c18
Update to loom 1.4 (#3341)
modmuss50 Oct 1, 2023
e982ae8
Fix Message API javadoc (#3342)
apple502j Oct 1, 2023
9650955
Document the getCodec method (#3343)
apple502j Oct 1, 2023
285022b
Content Registries: javadoc and small refactor (#3347)
apple502j Oct 1, 2023
d9a2869
Biome API: javadoc fixes (#3348)
apple502j Oct 1, 2023
b18afef
Fix incorrect internal method names in ServerNetworkingImpl (#3349)
modmuss50 Oct 1, 2023
d19c412
Fix bad interaction between `FabricDynamicRegistryProvider` and modde…
Technici4n Oct 1, 2023
670b2ea
Bump version
modmuss50 Oct 1, 2023
620de1f
Merge from Upstream part 1
Oct 7, 2023
c40e52b
Merge from Upstream + Port to 1.20.2 part 2
Oct 10, 2023
6886788
Update Copyrights from Fabric
Oct 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
java: [17, 20]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/cache@v3
Expand Down
35 changes: 28 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ plugins {
id "eclipse"
id "idea"
id "maven-publish"
id "org.quiltmc.loom" version "1.2.+" apply false
id "org.quiltmc.loom" version "1.4.+" apply false
id "org.quiltmc.gradle.licenser" version "2.0.+"
id "net.kyori.indra.git" version "3.1.1"
id "net.kyori.indra.git" version "3.1.3"
id "com.matthewprenger.cursegradle" version "1.4.0"
id "com.modrinth.minotaur" version "2.8.0"
id "com.modrinth.minotaur" version "2.8.4"
id "me.modmuss50.remotesign" version "0.4.0" apply false
id "io.github.p03w.machete" version "2.0.1"
}
Expand Down Expand Up @@ -200,6 +200,10 @@ allprojects {
}
}

loom.runs.configureEach {
vmArg("-enableassertions")
}

allprojects.each { p ->
if (project.name == "deprecated") {
return
Expand Down Expand Up @@ -228,6 +232,7 @@ allprojects {

testImplementation "org.quiltmc:quilt-loader-junit:$project.loader_version"
testImplementation sourceSets.testmodClient.output
testImplementation 'org.mockito:mockito-core:5.4.0'
}

test {
Expand Down Expand Up @@ -265,7 +270,7 @@ allprojects {

checkstyle {
configFile = rootProject.file("codeformat/checkstyle.xml")
toolVersion = "10.11.0"
toolVersion = "10.12.1"
}

tasks.withType(AbstractArchiveTask).configureEach {
Expand Down Expand Up @@ -409,7 +414,7 @@ loom {
}
autoTestServer {
inherit testmodServer
name "Auto Test Server"
name "Auto Test Server"
vmArg "-Dfabric.autoTest"
}
autoTestClient {
Expand Down Expand Up @@ -465,7 +470,8 @@ tasks.register('runProductionAutoTestClient', JavaExec) {

jvmArgs(
"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
"-Dfabric.autoTest"
"-Dfabric.autoTest",
"-enableassertions"
)
}
}
Expand Down Expand Up @@ -496,7 +502,8 @@ tasks.register('runProductionAutoTestServer', JavaExec) {

jvmArgs(
"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
"-Dfabric.autoTest"
"-Dfabric.autoTest",
"-enableassertions"
)

args("nogui")
Expand Down Expand Up @@ -551,6 +558,10 @@ subprojects {
return
}

base {
archivesName = project.name
}

dependencies {
testmodImplementation sourceSets.main.output

Expand Down Expand Up @@ -850,3 +861,13 @@ github.mustRunAfter checkVersion
project.tasks.modrinth.mustRunAfter checkVersion
publish.dependsOn checkVersion
project.tasks.curseforge.mustRunAfter checkVersion

// Temporary for snapshots
allprojects {
repositories {
maven {
name = "Quilt"
url = "https://maven.quiltmc.org/repository/snapshot"
}
}
}
2 changes: 1 addition & 1 deletion codeformat/FABRIC_MODIFIED_HEADER
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2016, 2017, 2018, 2019 FabricMC
Copyright (c) 2016, 2017, 2018, 2019 FabricMC
Copyright ${YEAR} The Quilt Project

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion codeformat/HEADER_FOR_GRADLE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 0 additions & 1 deletion deprecated/fabric-commands-v0/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
archivesBaseName = "fabric-commands-v0"
version = getSubprojectVersion(project)

moduleDependencies(project, [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -22,18 +22,18 @@
import java.util.function.Consumer;

import io.netty.buffer.Unpooled;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier;
import net.minecraft.network.PacketByteBuf;

import net.fabricmc.fabric.api.container.ContainerFactory;
import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.fabricmc.fabric.mixin.container.ServerPlayerEntityAccessor;

public class ContainerProviderImpl implements ContainerProviderRegistry {
Expand Down Expand Up @@ -88,7 +88,7 @@ public void openContainer(Identifier identifier, ServerPlayerEntity player, Cons
buf.writeByte(syncId);

writer.accept(buf);
player.networkHandler.sendPacket(new CustomPayloadS2CPacket(OPEN_CONTAINER, buf));
player.networkHandler.sendPacket(ServerPlayNetworking.createS2CPacket(OPEN_CONTAINER, buf));

PacketByteBuf clonedBuf = new PacketByteBuf(buf.duplicate());
clonedBuf.readIdentifier();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
11 changes: 0 additions & 11 deletions deprecated/fabric-loot-tables-v1/build.gradle

This file was deleted.

This file was deleted.

Loading