FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-15 00:14:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

1.17.1-rc2

Browse source
This commit is contained in:
modmuss50 2021-07-05 18:44:49 +01:00
parent a722d8c028
commit 6cefd57746
13 changed files with 21 additions and 21 deletions
build.gradle
fabric-command-api-v1
build.gradle
src/testmod/java/net/fabricmc/fabric/test/command
CommandTest.java
fabric-dimensions-v1
build.gradle
src/testmod/java/net/fabricmc/fabric/test/dimension
FabricDimensionTest.java
fabric-game-rule-api-v1
build.gradle
src/main/java/net/fabricmc/fabric/impl/gamerule
EnumRuleCommand.java
fabric-networking-api-v1
build.gradle
src/main/java/net/fabricmc/fabric/impl/networking/server
ServerLoginNetworkAddon.java
fabric-structure-api-v1
build.gradle
src/main/java/net/fabricmc/fabric
api/structure/v1
FabricStructureBuilder.java
mixin/structure
StructureFeatureAccessor.java
src/main/resources
fabric.mod.json

8
build.gradle
View file

@ -19,11 +19,11 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.36.0"
static def mcVersion = "1.17"
static def yarnVersion = "+build.6"
static def baseVersion = "0.36.1"
static def mcVersion = "1.17.1-rc2"
static def yarnVersion = "+build.1"
static def loaderVersion = "0.11.3"
static def preRelease = false
static def preRelease = true
}
version = Globals.baseVersion + "+" + (ENV.GITHUB_RUN_NUMBER ? "" : "local-") + getBranch()

2
fabric-command-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-command-api-v1"
version = getSubprojectVersion(project, "1.1.1")
version = getSubprojectVersion(project, "1.1.2")
dependencies {
testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')

10
fabric-command-api-v1/src/testmod/java/net/fabricmc/fabric/test/command/CommandTest.java
View file

@ -98,7 +98,7 @@ public final class CommandTest implements ModInitializer {
private int executeCommonCommand(CommandContext<ServerCommandSource> context) {
final ServerCommandSource source = context.getSource();
source.sendFeedback(new LiteralText("Common test command is working."), false);
source.sendFeedback(new LiteralText("Server Is Dedicated: " + source.getMinecraftServer().isDedicated()), false);
source.sendFeedback(new LiteralText("Server Is Dedicated: " + source.getServer().isDedicated()), false);
return 1;
}
@ -106,12 +106,12 @@ public final class CommandTest implements ModInitializer {
private int executeDedicatedCommand(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
final ServerCommandSource source = context.getSource();
if (!source.getMinecraftServer().isDedicated()) {
if (!source.getServer().isDedicated()) {
throw WRONG_SIDE_SHOULD_BE_DEDICATED.create();
}
source.sendFeedback(new LiteralText("Dedicated test command is working."), false);
source.sendFeedback(new LiteralText("Server Is Dedicated: " + source.getMinecraftServer().isDedicated()), false);
source.sendFeedback(new LiteralText("Server Is Dedicated: " + source.getServer().isDedicated()), false);
return 1;
}
@ -119,12 +119,12 @@ public final class CommandTest implements ModInitializer {
private int executeIntegratedCommand(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
final ServerCommandSource source = context.getSource();
if (source.getMinecraftServer().isDedicated()) {
if (source.getServer().isDedicated()) {
throw WRONG_SIDE_SHOULD_BE_INTEGRATED.create();
}
source.sendFeedback(new LiteralText("Integrated test command is working."), false);
source.sendFeedback(new LiteralText("Server Is Integrated: " + !source.getMinecraftServer().isDedicated()), false);
source.sendFeedback(new LiteralText("Server Is Integrated: " + !source.getServer().isDedicated()), false);
return 1;
}

2
fabric-dimensions-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-dimensions-v1"
version = getSubprojectVersion(project, "2.0.10")
version = getSubprojectVersion(project, "2.0.11")
dependencies {
testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')

2
fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/FabricDimensionTest.java
View file

@ -123,6 +123,6 @@ public class FabricDimensionTest implements ModInitializer {
}
private ServerWorld getWorld(CommandContext<ServerCommandSource> context, RegistryKey<World> dimensionRegistryKey) {
return context.getSource().getMinecraftServer().getWorld(dimensionRegistryKey);
return context.getSource().getServer().getWorld(dimensionRegistryKey);
}
}

2
fabric-game-rule-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-game-rule-api-v1"
version = getSubprojectVersion(project, "1.0.6")
version = getSubprojectVersion(project, "1.0.7")
minecraft {
accessWidener = file("src/main/resources/fabric-game-rule-api-v1.accesswidener")

4
fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/impl/gamerule/EnumRuleCommand.java
View file

@ -45,10 +45,10 @@ public final class EnumRuleCommand {
public static <E extends Enum<E>> int executeAndSetEnum(CommandContext<ServerCommandSource> context, E value, GameRules.Key<EnumRule<E>> key) throws CommandSyntaxException {
// Mostly copied from vanilla, but tweaked so we can use literals
ServerCommandSource serverCommandSource = context.getSource();
EnumRule<E> rule = serverCommandSource.getMinecraftServer().getGameRules().get(key);
EnumRule<E> rule = serverCommandSource.getServer().getGameRules().get(key);
try {
rule.set(value, serverCommandSource.getMinecraftServer());
rule.set(value, serverCommandSource.getServer());
} catch (IllegalArgumentException e) {
throw new SimpleCommandExceptionType(new LiteralText(e.getMessage())).create();
}

2
fabric-networking-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-networking-api-v1"
version = getSubprojectVersion(project, "1.0.11")
version = getSubprojectVersion(project, "1.0.12")
moduleDependencies(project, [
'fabric-api-base'

2
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerLoginNetworkAddon.java
View file

@ -114,7 +114,7 @@ public final class ServerLoginNetworkAddon extends AbstractNetworkAddon<ServerLo
// Compression is not needed for local transport
if (this.server.getNetworkCompressionThreshold() >= 0 && !this.connection.isLocal()) {
this.connection.send(new LoginCompressionS2CPacket(this.server.getNetworkCompressionThreshold()), (channelFuture) ->
this.connection.setCompressionThreshold(this.server.getNetworkCompressionThreshold())
this.connection.setCompressionThreshold(this.server.getNetworkCompressionThreshold(), true)
);
}
}

2
fabric-structure-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-structure-api-v1"
version = getSubprojectVersion(project, "1.1.11")
version = getSubprojectVersion(project, "1.1.12")
moduleDependencies(project, [
'fabric-lifecycle-events-v1',
'fabric-api-base'

2
fabric-structure-api-v1/src/main/java/net/fabricmc/fabric/api/structure/v1/FabricStructureBuilder.java
View file

@ -180,7 +180,7 @@ public final class FabricStructureBuilder<FC extends FeatureConfig, S extends St
if (adjustsSurface) {
StructureFeatureAccessor.setSurfaceAdjustingStructures(ImmutableList.<StructureFeature<?>>builder()
.addAll(StructureFeature.JIGSAW_STRUCTURES)
.addAll(StructureFeature.LAND_MODIFYING_STRUCTURES)
.add(structure)
.build());
}

2
fabric-structure-api-v1/src/main/java/net/fabricmc/fabric/mixin/structure/StructureFeatureAccessor.java
View file

@ -28,7 +28,7 @@ import net.minecraft.world.gen.feature.StructureFeature;
@Mixin(StructureFeature.class)
public interface StructureFeatureAccessor {
@Accessor("JIGSAW_STRUCTURES")
@Accessor("LAND_MODIFYING_STRUCTURES")
@Mutable
static void setSurfaceAdjustingStructures(List<StructureFeature<?>> surfaceAdjustingStructures) {
throw new AssertionError("Untransformed accessor");

2
src/main/resources/fabric.mod.json
View file

@ -18,7 +18,7 @@
"depends": {
"fabricloader": ">=0.11.3",
"java": ">=16",
"minecraft": "~1.17-alpha.21.19.a"
"minecraft": "~1.17.1-rc"
},
"description": "Core API module providing key hooks and intercompatibility features."
}