Skip to content

Commit

Permalink
Sanity Check PR Diff
Browse files Browse the repository at this point in the history
  • Loading branch information
OroArmor committed Jan 25, 2024
1 parent 0535e25 commit 5b7b86b
Show file tree
Hide file tree
Showing 24 changed files with 75 additions and 346 deletions.
90 changes: 45 additions & 45 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,48 +48,48 @@ jobs:
name: Maven Local
path: /root/.m2/repository

client_test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: 'microsoft'
java-version: '17'
- name: Run Auto test Client
uses: modmuss50/xvfb-action@v1
with:
run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
- uses: actions/upload-artifact@v3
if: always()
with:
name: Test Screenshots
path: run/screenshots

server_test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: 'microsoft'
java-version: '17'
- run: mkdir run && echo "eula=true" >> run/eula.txt
- run: ./gradlew runProductionAutoTestServer --stacktrace --warning-mode=fail

check_resources:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: 'microsoft'
java-version: '17'
- run: ./gradlew generateResources --stacktrace --warning-mode=fail
- run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi
# client_test:
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - uses: actions/setup-java@v3
# with:
# distribution: 'microsoft'
# java-version: '17'
# - name: Run Auto test Client
# uses: modmuss50/xvfb-action@v1
# with:
# run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
# - uses: actions/upload-artifact@v3
# if: always()
# with:
# name: Test Screenshots
# path: run/screenshots
#
# server_test:
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - uses: actions/setup-java@v3
# with:
# distribution: 'microsoft'
# java-version: '17'
# - run: mkdir run && echo "eula=true" >> run/eula.txt
# - run: ./gradlew runProductionAutoTestServer --stacktrace --warning-mode=fail
#
# check_resources:
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - uses: actions/setup-java@v3
# with:
# distribution: 'microsoft'
# java-version: '17'
# - run: ./gradlew generateResources --stacktrace --warning-mode=fail
# - run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi
7 changes: 1 addition & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,6 @@ allprojects {
}
}

repositories {
maven {
url "https://maven.quiltmc.org/repository/snapshot"
}
}
dependencies {
minecraft "com.mojang:minecraft:$rootProject.minecraft_version"
mappings "net.fabricmc:yarn:${rootProject.minecraft_version}${project.yarn_version}:v2"
Expand Down Expand Up @@ -408,7 +403,7 @@ loom {
}
autoTestServer {
inherit testmodServer
name "Auto Test Server"
name "Auto Test Server"
vmArg "-Dfabric.autoTest"
}
autoTestClient {
Expand Down
2 changes: 1 addition & 1 deletion fabric-block-view-api-v2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ version = getSubprojectVersion(project)
upstream_version = getSubprojectUpstreamVersion(project)

loom {
accessWidenerPath = file("src/main/resources/fabric-block-view-api-v2.accesswidener")
accessWidenerPath = file("src/main/resources/quilted_fabric_block_view_api_v2.accesswidener")
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright 2022 The Quilt Project
* Copyright 2016, 2017, 2018, 2019 FabricMC
* Copyright 2023 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion fabric-block-view-api-v2/src/main/resources/quilt.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"quilted_fabric_block_view_api_v2.mixins.json",
"quilted_fabric_block_view_api_v2.client.mixins.json"
],
"access_widener": "fabric-block-view-api-v2.accesswidener",
"access_widener": "quilted_fabric_block_view_api_v2.accesswidener",
"fabric-api:module-lifecycle": "stable",
"modmenu": {
"badges": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"package": "net.fabricmc.fabric.mixin.event.interaction",
"compatibilityLevel": "JAVA_17",
"mixins": [
"BeehiveBlockMixin",
"PlayerAdvancementTrackerMixin",
"ServerPlayerEntityMixin",
"ServerPlayerInteractionManagerMixin",
Expand Down
4 changes: 0 additions & 4 deletions fabric-networking-api-v1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,3 @@ testDependencies(project, [
':fabric-lifecycle-events-v1',
':fabric-key-binding-api-v1'
])

loom {
accessWidenerPath = file('src/main/resources/fabric-networking-api-v1.accesswidener')
}
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public static boolean registerReceiver(Identifier channelName, PlayChannelHandle
* <p>For example, if you only register a receiver using this method when a {@linkplain ClientLoginNetworking#registerGlobalReceiver(Identifier, ClientLoginNetworking.LoginQueryRequestHandler)}
* login query has been received, you should use {@link ClientPlayConnectionEvents#INIT} to register the channel handler.
*
* @param type the packet type
* @param type the packet type
* @param handler the handler
* @return {@code false} if a handler is already registered for the type
* @throws IllegalStateException if the client is not connected to a server
Expand Down Expand Up @@ -288,7 +288,7 @@ public static boolean canSend(PacketType<?> type) {
* Creates a packet which may be sent to the connected server.
*
* @param channelName the channel name
* @param buf the packet byte buf which represents the payload of the packet
* @param buf the packet byte buf which represents the payload of the packet
* @return a new packet
*/
public static Packet<ServerCommonPacketListener> createC2SPacket(Identifier channelName, PacketByteBuf buf) {
Expand Down Expand Up @@ -319,7 +319,7 @@ public static PacketSender getSender() throws IllegalStateException {
* Sends a packet to the connected server.
*
* @param channelName the channel of the packet
* @param buf the payload of the packet
* @param buf the payload of the packet
* @throws IllegalStateException if the client is not connected to a server
*/
public static void send(Identifier channelName, PacketByteBuf buf) throws IllegalStateException {
Expand Down Expand Up @@ -428,8 +428,8 @@ public interface PlayPacketHandler<T extends FabricPacket> {
*
* <p>The network handler can be accessed via {@link ClientPlayerEntity#networkHandler}.
*
* @param packet the packet
* @param player the player that received the packet
* @param packet the packet
* @param player the player that received the packet
* @param responseSender the packet sender
* @see FabricPacket
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
/**
* Fabric-provided extensions for {@link ServerConfigurationNetworkHandler}.
* This interface is automatically implemented via Mixin and interface injection.
*
* @deprecated See {@link ServerConfigurationTaskManager}
*/
@Deprecated
public interface FabricServerConfigurationNetworkHandler extends ServerConfigurationTaskManager {
/**
* Enqueues a {@link ServerPlayerConfigurationTask} task to be processed.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
* Copyright 2022 The Quilt Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +36,9 @@
/**
* Represents something that supports sending packets to channels.
* @see PacketByteBufs
* @deprecated Use Quilt Networking's {@link org.quiltmc.qsl.networking.api.PacketSender} instead.
*/
@Deprecated
@ApiStatus.NonExtendable
public interface PacketSender {
/**
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 5b7b86b

Please sign in to comment.