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

22w18a

Browse source
This commit is contained in:
Player 2022-05-04 21:51:06 +02:00
parent 3847c74085
commit 729842f055
7 changed files with 22 additions and 28 deletions
fabric-command-api-v1/src/main/java/net/fabricmc/fabric/mixin/command/client
ClientCommandSourceMixin.java
fabric-data-generation-api-v1/src/main
java/net/fabricmc/fabric/api/datagen/v1/provider
FabricAdvancementProvider.javaFabricLootTableProvider.java
resources
fabric-data-generation-api-v1.accesswidener
fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra
ClientPlayerEntityMixin.java
gradle.properties
src/main/resources
fabric.mod.json

7
fabric-command-api-v1/src/main/java/net/fabricmc/fabric/mixin/command/client/ClientCommandSourceMixin.java
View file

@ -20,15 +20,16 @@ import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.class_7436;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientCommandSource;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.network.ChatMessageSender;
import net.minecraft.network.MessageType;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Util;
import net.minecraft.util.registry.Registry;
import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
@ -40,12 +41,12 @@ abstract class ClientCommandSourceMixin implements FabricClientCommandSource {
@Override
public void sendFeedback(Text message) {
client.inGameHud.method_43592(MessageType.SYSTEM, message, new class_7436(Util.NIL_UUID, message));
client.inGameHud.onChatMessage(Registry.field_39206.get(MessageType.SYSTEM), message, new ChatMessageSender(Util.NIL_UUID, message));
}
@Override
public void sendError(Text message) {
client.inGameHud.method_43592(MessageType.SYSTEM, Text.literal("").append(message).formatted(Formatting.RED), new class_7436(Util.NIL_UUID, message));
client.inGameHud.onChatMessage(Registry.field_39206.get(MessageType.SYSTEM), Text.literal("").append(message).formatted(Formatting.RED), new ChatMessageSender(Util.NIL_UUID, message));
}
@Override

6
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java
View file

@ -23,8 +23,6 @@ import java.util.function.Consumer;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import net.minecraft.advancement.Advancement;
@ -42,8 +40,6 @@ import net.fabricmc.fabric.impl.datagen.FabricDataGenHelper;
* <p>Register an instance of the class with {@link FabricDataGenerator#addProvider} in a {@link net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint}
*/
public abstract class FabricAdvancementProvider implements DataProvider {
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
protected final FabricDataGenerator dataGenerator;
protected FabricAdvancementProvider(FabricDataGenerator dataGenerator) {
@ -83,7 +79,7 @@ public abstract class FabricAdvancementProvider implements DataProvider {
JsonObject advancementJson = advancement.createTask().toJson();
ConditionJsonProvider.write(advancementJson, FabricDataGenHelper.consumeConditions(advancement));
DataProvider.writeToPath(GSON, writer, advancementJson, getOutputPath(advancement));
DataProvider.writeToPath(writer, advancementJson, getOutputPath(advancement));
}
}

6
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLootTableProvider.java
View file

@ -25,8 +25,6 @@ import java.util.function.Consumer;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import org.jetbrains.annotations.ApiStatus;
@ -50,8 +48,6 @@ import net.fabricmc.fabric.impl.datagen.FabricDataGenHelper;
*/
@ApiStatus.NonExtendable
public interface FabricLootTableProvider extends Consumer<BiConsumer<Identifier, LootTable.Builder>>, DataProvider {
Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
LootContextType getLootContextType();
FabricDataGenerator getFabricDataGenerator();
@ -86,7 +82,7 @@ public interface FabricLootTableProvider extends Consumer<BiConsumer<Identifier,
JsonObject tableJson = (JsonObject) LootManager.toJson(entry.getValue());
ConditionJsonProvider.write(tableJson, conditionMap.remove(entry.getKey()));
DataProvider.writeToPath(GSON, writer, tableJson, getOutputPath(entry.getKey()));
DataProvider.writeToPath(writer, tableJson, getOutputPath(entry.getKey()));
}
}

6
fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener
View file

@ -196,8 +196,8 @@ transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRoots (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator addJigsawOrientationToVariant (Lnet/minecraft/block/enums/JigsawOrientation;Lnet/minecraft/data/client/BlockStateVariant;)Lnet/minecraft/data/client/BlockStateVariant;
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCandle (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator applyExplosionDecay (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/function/LootFunctionConsumingBuilder;)Ljava/lang/Object;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator addSurvivesExplosionCondition (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/condition/LootConditionConsumingBuilder;)Ljava/lang/Object;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator applyExplosionDecay (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/function/LootFunctionConsumingBuilder;)Lnet/minecraft/loot/function/LootFunctionConsumingBuilder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator addSurvivesExplosionCondition (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/condition/LootConditionConsumingBuilder;)Lnet/minecraft/loot/condition/LootConditionConsumingBuilder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator drops (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator drops (Lnet/minecraft/block/Block;Lnet/minecraft/loot/condition/LootCondition$Builder;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator dropsWithSilkTouch (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder;
@ -225,7 +225,7 @@ transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator g
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator cropStemDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator attachedCropStemDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator dropsWithShears (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator glowLichenDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator glowLichenDrops (Lnet/minecraft/block/Block;Lnet/minecraft/loot/condition/LootCondition$Builder;)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator leavesDrop (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator oakLeavesDrop (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder;
transitive-accessible method net/minecraft/data/server/BlockLootTableGenerator mangroveLeavesDrop (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;

7
fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/ClientPlayerEntityMixin.java
View file

@ -26,17 +26,18 @@ import org.spongepowered.asm.mixin.injection.Slice;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.item.Items;
import net.minecraft.network.encryption.PlayerPublicKey;
import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
@SuppressWarnings("unused")
@Mixin(ClientPlayerEntity.class)
abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
super(world, profile);
ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, PlayerPublicKey playerPublicKey) {
super(world, profile, playerPublicKey);
throw new AssertionError();
}

16
gradle.properties
View file

@ -1,9 +1,9 @@
org.gradle.jvmargs=-Xmx2560M
version=0.52.0
minecraft_version=22w17a
yarn_version=+build.1
loader_version=0.14.3
version=0.52.1
minecraft_version=22w18a
yarn_version=+build.3
loader_version=0.14.4
prerelease=true
@ -12,14 +12,14 @@ fabric-api-base-version=0.4.6
fabric-api-lookup-api-v1-version=1.6.2
fabric-biome-api-v1-version=9.0.6
fabric-blockrenderlayer-v1-version=1.1.14
fabric-command-api-v1-version=1.1.14
fabric-commands-v0-version=0.2.13
fabric-command-api-v1-version=1.1.15
fabric-commands-v0-version=0.2.14
fabric-containers-v0-version=0.1.23
fabric-content-registries-v0-version=3.0.10
fabric-crash-report-info-v1-version=0.1.12
fabric-data-generation-api-v1-version=3.0.4
fabric-data-generation-api-v1-version=3.0.5
fabric-dimensions-v1-version=2.1.21
fabric-entity-events-v1-version=1.4.12
fabric-entity-events-v1-version=1.4.13
fabric-events-interaction-v0-version=0.4.23
fabric-events-lifecycle-v0-version=0.2.18
fabric-game-rule-api-v1-version=1.0.15

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

@ -18,7 +18,7 @@
"depends": {
"fabricloader": ">=0.14.3",
"java": ">=17",
"minecraft": "~1.19-alpha.22.11.a"
"minecraft": "~1.19-alpha.22.18.a"
},
"description": "Core API module providing key hooks and intercompatibility features."
}