FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-03 10:39:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

1.20-pre2

Browse source
This commit is contained in:
modmuss50 2023-05-16 15:36:50 +01:00
parent 6b6af38432
commit b04edc7ab9
15 changed files with 72 additions and 72 deletions
fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base
FabricApiBaseTestInit.java
fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command
CommandTest.javaCustomArgumentTest.java
fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension
FabricDimensionTest.java
fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/impl/gamerule
EnumRuleCommand.java
fabric-loot-api-v2/src/main/java/net/fabricmc/fabric
api/loot/v2
FabricLootTableBuilder.java
mixin/loot
LootTableAccessor.java
fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest
NetworkingChannelTest.java
fabric-recipe-api-v1/src
main/java/net/fabricmc/fabric
impl/recipe/ingredient/builtin
CombinedIngredient.javaDifferenceIngredient.javaNbtIngredient.java
mixin/recipe/ingredient
IngredientMixin.javaShapelessRecipeMixin.java
testmod/java/net/fabricmc/fabric/test/recipe/ingredient
SerializationTests.java
gradle.properties

4
fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseTestInit.java
View file

@ -31,7 +31,7 @@ public class FabricApiBaseTestInit implements ModInitializer {
// Command to call audit the mixin environment
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal("audit_mixins").executes(context -> {
context.getSource().sendFeedback(Text.literal("Auditing mixin environment"), false);
context.getSource().sendFeedback(() -> Text.literal("Auditing mixin environment"), false);
try {
MixinEnvironment.getCurrentEnvironment().audit();
@ -40,7 +40,7 @@ public class FabricApiBaseTestInit implements ModInitializer {
throw new AssertionError("Failed to audit mixin environment", e);
}
context.getSource().sendFeedback(Text.literal("Successfully audited mixin environment"), false);
context.getSource().sendFeedback(() -> Text.literal("Successfully audited mixin environment"), false);
return 1;
}));

12
fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/CommandTest.java
View file

@ -115,8 +115,8 @@ public final class CommandTest implements ModInitializer {
private int executeCommonCommand(CommandContext<ServerCommandSource> context) {
final ServerCommandSource source = context.getSource();
source.sendFeedback(Text.literal("Common test command is working."), false);
source.sendFeedback(Text.literal("Server Is Dedicated: " + source.getServer().isDedicated()), false);
source.sendFeedback(() -> Text.literal("Common test command is working."), false);
source.sendFeedback(() -> Text.literal("Server Is Dedicated: " + source.getServer().isDedicated()), false);
return 1;
}
@ -128,8 +128,8 @@ public final class CommandTest implements ModInitializer {
throw WRONG_SIDE_SHOULD_BE_DEDICATED.create();
}
source.sendFeedback(Text.literal("Dedicated test command is working."), false);
source.sendFeedback(Text.literal("Server Is Dedicated: " + source.getServer().isDedicated()), false);
source.sendFeedback(() -> Text.literal("Dedicated test command is working."), false);
source.sendFeedback(() -> Text.literal("Server Is Dedicated: " + source.getServer().isDedicated()), false);
return 1;
}
@ -141,8 +141,8 @@ public final class CommandTest implements ModInitializer {
throw WRONG_SIDE_SHOULD_BE_INTEGRATED.create();
}
source.sendFeedback(Text.literal("Integrated test command is working."), false);
source.sendFeedback(Text.literal("Server Is Integrated: " + !source.getServer().isDedicated()), false);
source.sendFeedback(() -> Text.literal("Integrated test command is working."), false);
source.sendFeedback(() -> Text.literal("Server Is Integrated: " + !source.getServer().isDedicated()), false);
return 1;
}

2
fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/CustomArgumentTest.java
View file

@ -53,7 +53,7 @@ public class CustomArgumentTest implements ModInitializer {
case SAD -> "Oh no, here is a heart: <3";
case HAPPY -> "Nice to see that you are having a good day :)";
};
context.getSource().sendFeedback(Text.literal(feedback), false);
context.getSource().sendFeedback(() -> Text.literal(feedback), false);
return 1;
}

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

@ -115,7 +115,7 @@ public class FabricDimensionTest implements ModInitializer {
ServerPlayerEntity player = context.getSource().getPlayer();
if (player == null) {
context.getSource().sendFeedback(Text.literal("You must be a player to execute this command."), false);
context.getSource().sendFeedback(() -> Text.literal("You must be a player to execute this command."), false);
return 1;
}
@ -145,7 +145,7 @@ public class FabricDimensionTest implements ModInitializer {
ServerPlayerEntity player = context.getSource().getPlayer();
if (player == null) {
context.getSource().sendFeedback(Text.literal("You must be a player to execute this command."), false);
context.getSource().sendFeedback(() -> Text.literal("You must be a player to execute this command."), false);
return 1;
}
@ -159,7 +159,7 @@ public class FabricDimensionTest implements ModInitializer {
ServerPlayerEntity player = context.getSource().getPlayer();
if (player == null) {
context.getSource().sendFeedback(Text.literal("You must be a player to execute this command."), false);
context.getSource().sendFeedback(() -> Text.literal("You must be a player to execute this command."), false);
return 1;
}
@ -170,7 +170,7 @@ public class FabricDimensionTest implements ModInitializer {
.orElse(null);
if (entity == null) {
context.getSource().sendFeedback(Text.literal("No entities found."), false);
context.getSource().sendFeedback(() -> Text.literal("No entities found."), false);
return 1;
}

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

@ -52,7 +52,7 @@ public final class EnumRuleCommand {
throw new SimpleCommandExceptionType(Text.literal(e.getMessage())).create();
}
serverCommandSource.sendFeedback(Text.translatable("commands.gamerule.set", key.getName(), rule.toString()), true);
serverCommandSource.sendFeedback(() -> Text.translatable("commands.gamerule.set", key.getName(), rule.toString()), true);
return rule.getCommandResult();
}
}

2
fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/api/loot/v2/FabricLootTableBuilder.java
View file

@ -106,7 +106,7 @@ public interface FabricLootTableBuilder {
builder.type(table.getType());
builder.pools(List.of(accessor.fabric_getPools()));
builder.apply(List.of(accessor.fabric_getFunctions()));
builder.method_51883(accessor.fabric_getRandomSequenceId());
builder.randomSequenceId(accessor.fabric_getRandomSequenceId());
return builder;
}

2
fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/mixin/loot/LootTableAccessor.java
View file

@ -36,6 +36,6 @@ public interface LootTableAccessor {
@Accessor("functions")
LootFunction[] fabric_getFunctions();
@Accessor("field_44892")
@Accessor("randomSequenceId")
Identifier fabric_getRandomSequenceId();
}

4
fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/NetworkingChannelTest.java
View file

@ -105,7 +105,7 @@ public final class NetworkingChannelTest implements ModInitializer {
System.out.printf("Received packet on channel %s%n", channel);
});
context.getSource().sendFeedback(Text.literal(String.format("Registered channel %s for %s", channel, executor.getEntityName())), false);
context.getSource().sendFeedback(() -> Text.literal(String.format("Registered channel %s for %s", channel, executor.getEntityName())), false);
return 1;
}
@ -118,7 +118,7 @@ public final class NetworkingChannelTest implements ModInitializer {
}
ServerPlayNetworking.unregisterReceiver(player.networkHandler, channel);
context.getSource().sendFeedback(Text.literal(String.format("Unregistered channel %s for %s", getIdentifier(context, "channel"), player.getEntityName())), false);
context.getSource().sendFeedback(() -> Text.literal(String.format("Unregistered channel %s for %s", getIdentifier(context, "channel"), player.getEntityName())), false);
return 1;
}

2
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient.java
View file

@ -74,7 +74,7 @@ abstract class CombinedIngredient implements CustomIngredient {
Ingredient[] ingredients = new Ingredient[values.size()];
for (int i = 0; i < values.size(); i++) {
ingredients[i] = Ingredient.fromJson(values.get(i));
ingredients[i] = Ingredient.method_52177(values.get(i));
}
return factory.apply(ingredients);

4
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java
View file

@ -72,8 +72,8 @@ public class DifferenceIngredient implements CustomIngredient {
@Override
public DifferenceIngredient read(JsonObject json) {
Ingredient base = Ingredient.fromJson(json.get("base"));
Ingredient subtracted = Ingredient.fromJson(json.get("subtracted"));
Ingredient base = Ingredient.method_52177(json.get("base"));
Ingredient subtracted = Ingredient.method_52177(json.get("subtracted"));
return new DifferenceIngredient(base, subtracted);
}

2
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/NbtIngredient.java
View file

@ -109,7 +109,7 @@ public class NbtIngredient implements CustomIngredient {
@Override
public NbtIngredient read(JsonObject json) {
Ingredient base = Ingredient.fromJson(json.get("base"));
Ingredient base = Ingredient.method_52177(json.get("base"));
NbtCompound nbt = readNbt(json.get("nbt"));
boolean strict = JsonHelper.getBoolean(json, "strict", false);
return new NbtIngredient(base, nbt, strict);

6
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java
View file

@ -41,13 +41,13 @@ public class IngredientMixin implements FabricIngredient {
@Inject(
at = @At(
value = "INVOKE",
target = "net/minecraft/recipe/Ingredient.entryFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/recipe/Ingredient$Entry;",
target = "net/minecraft/recipe/Ingredient.entryFromJson (Lcom/google/gson/JsonObject;Z)Lnet/minecraft/recipe/Ingredient$Entry;",
ordinal = 0
),
method = "fromJson",
cancellable = true
)
private static void injectFromJson(JsonElement json, CallbackInfoReturnable<Ingredient> cir) {
private static void injectFromJson(JsonElement json, boolean requireNotEmpty, CallbackInfoReturnable<Ingredient> cir) {
JsonObject obj = json.getAsJsonObject();
if (obj.has(CustomIngredientImpl.TYPE_KEY)) {
@ -67,7 +67,7 @@ public class IngredientMixin implements FabricIngredient {
* The {@link AnyIngredient} should be used instead.
*/
@Inject(at = @At("HEAD"), method = "entryFromJson")
private static void injectEntryFromJson(JsonObject obj, CallbackInfoReturnable<?> cir) {
private static void injectEntryFromJson(JsonObject obj, boolean returnNullOnEmpty, CallbackInfoReturnable<?> cir) {
if (obj.has(CustomIngredientImpl.TYPE_KEY)) {
throw new IllegalArgumentException("Custom ingredient cannot be used inside an array ingredient. You can replace the array by a fabric:any ingredient.");
}

4
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/ShapelessRecipeMixin.java
View file

@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.class_8566;
import net.minecraft.inventory.RecipeInputInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.ShapelessRecipe;
@ -58,7 +58,7 @@ public class ShapelessRecipeMixin {
}
@Inject(at = @At("HEAD"), method = "matches", cancellable = true)
public void customIngredientMatch(class_8566 craftingInventory, World world, CallbackInfoReturnable<Boolean> cir) {
public void customIngredientMatch(RecipeInputInventory craftingInventory, World world, CallbackInfoReturnable<Boolean> cir) {
if (fabric_requiresTesting) {
List<ItemStack> nonEmptyStacks = new ArrayList<>(craftingInventory.size());

2
fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java
View file

@ -49,7 +49,7 @@ public class SerializationTests {
JsonElement json = JsonParser.parseString(ingredientJson);
try {
Ingredient.fromJson(json);
Ingredient.method_52177(json);
throw new GameTestException("Using a custom ingredient inside an array ingredient should have failed.");
} catch (IllegalArgumentException e) {
context.complete();

88
gradle.properties
View file

@ -2,62 +2,62 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true
version=0.81.1
minecraft_version=1.20-pre1
yarn_version=+build.5
version=0.81.2
minecraft_version=1.20-pre2
yarn_version=+build.1
loader_version=0.14.19
installer_version=0.11.1
prerelease=true
# Do not manually update, use the bumpversions task:
fabric-api-base-version=0.4.27
fabric-api-lookup-api-v1-version=1.6.32
fabric-api-base-version=0.4.28
fabric-api-lookup-api-v1-version=1.6.33
fabric-biome-api-v1-version=13.0.9
fabric-block-api-v1-version=1.0.8
fabric-blockrenderlayer-v1-version=1.1.37
fabric-command-api-v1-version=1.2.30
fabric-command-api-v2-version=2.2.9
fabric-commands-v0-version=0.2.47
fabric-containers-v0-version=0.1.59
fabric-content-registries-v0-version=4.0.5
fabric-blockrenderlayer-v1-version=1.1.38
fabric-command-api-v1-version=1.2.31
fabric-command-api-v2-version=2.2.10
fabric-commands-v0-version=0.2.48
fabric-containers-v0-version=0.1.60
fabric-content-registries-v0-version=4.0.6
fabric-crash-report-info-v1-version=0.2.17
fabric-data-generation-api-v1-version=12.1.6
fabric-dimensions-v1-version=2.1.49
fabric-entity-events-v1-version=1.5.19
fabric-events-interaction-v0-version=0.5.1
fabric-events-lifecycle-v0-version=0.2.59
fabric-game-rule-api-v1-version=1.0.36
fabric-gametest-api-v1-version=1.2.8
fabric-item-api-v1-version=2.1.24
fabric-item-group-api-v1-version=4.0.5
fabric-data-generation-api-v1-version=12.1.7
fabric-dimensions-v1-version=2.1.50
fabric-entity-events-v1-version=1.5.20
fabric-events-interaction-v0-version=0.5.2
fabric-events-lifecycle-v0-version=0.2.60
fabric-game-rule-api-v1-version=1.0.37
fabric-gametest-api-v1-version=1.2.9
fabric-item-api-v1-version=2.1.25
fabric-item-group-api-v1-version=4.0.6
fabric-key-binding-api-v1-version=1.0.35
fabric-keybindings-v0-version=0.2.33
fabric-lifecycle-events-v1-version=2.2.18
fabric-loot-api-v2-version=1.1.35
fabric-loot-tables-v1-version=1.1.39
fabric-message-api-v1-version=5.1.4
fabric-mining-level-api-v1-version=2.1.45
fabric-models-v0-version=0.3.33
fabric-networking-api-v1-version=1.3.6
fabric-networking-v0-version=0.3.46
fabric-object-builder-api-v1-version=11.0.4
fabric-particles-v1-version=1.0.26
fabric-recipe-api-v1-version=1.0.14
fabric-registry-sync-v0-version=2.2.4
fabric-renderer-api-v1-version=2.2.10
fabric-renderer-indigo-version=1.2.0
fabric-renderer-registries-v1-version=3.2.42
fabric-rendering-data-attachment-v1-version=0.3.31
fabric-rendering-fluids-v1-version=3.0.24
fabric-rendering-v0-version=1.1.45
fabric-rendering-v1-version=3.0.4
fabric-lifecycle-events-v1-version=2.2.19
fabric-loot-api-v2-version=1.1.36
fabric-loot-tables-v1-version=1.1.40
fabric-message-api-v1-version=5.1.5
fabric-mining-level-api-v1-version=2.1.46
fabric-models-v0-version=0.3.34
fabric-networking-api-v1-version=1.3.7
fabric-networking-v0-version=0.3.47
fabric-object-builder-api-v1-version=11.0.5
fabric-particles-v1-version=1.0.27
fabric-recipe-api-v1-version=1.0.15
fabric-registry-sync-v0-version=2.2.5
fabric-renderer-api-v1-version=2.2.11
fabric-renderer-indigo-version=1.2.1
fabric-renderer-registries-v1-version=3.2.43
fabric-rendering-data-attachment-v1-version=0.3.32
fabric-rendering-fluids-v1-version=3.0.25
fabric-rendering-v0-version=1.1.46
fabric-rendering-v1-version=3.0.5
fabric-resource-conditions-api-v1-version=2.3.3
fabric-resource-loader-v0-version=0.11.6
fabric-screen-api-v1-version=2.0.4
fabric-screen-handler-api-v1-version=1.3.25
fabric-screen-api-v1-version=2.0.5
fabric-screen-handler-api-v1-version=1.3.26
fabric-sound-api-v1-version=1.0.11
fabric-transfer-api-v1-version=3.2.0
fabric-transfer-api-v1-version=3.2.1
fabric-transitive-access-wideners-v1-version=4.1.1
fabric-convention-tags-v1-version=1.5.1
fabric-client-tags-api-v1-version=1.0.18
fabric-convention-tags-v1-version=1.5.2
fabric-client-tags-api-v1-version=1.0.19