Skip to content

Commit

Permalink
23w42a
Browse files Browse the repository at this point in the history
  • Loading branch information
@modmuss50
modmuss50 committed Oct 18, 2023
1 parent 13986bf commit 2148f3b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions ...ic-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.File;
import java.nio.file.Path;

import com.mojang.serialization.Dynamic;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
Expand All @@ -29,13 +30,12 @@
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

import net.minecraft.util.ApiServices;
import net.minecraft.resource.ResourcePackManager;
import net.minecraft.server.Main;
import net.minecraft.server.dedicated.EulaReader;
import net.minecraft.server.dedicated.ServerPropertiesLoader;
import net.minecraft.util.ApiServices;
import net.minecraft.world.level.storage.LevelStorage;
import net.minecraft.world.level.storage.LevelSummary;

import net.fabricmc.fabric.impl.gametest.FabricGameTestHelper;

Expand All @@ -48,7 +48,7 @@ private static boolean isEulaAgreedTo(EulaReader reader) {

// Inject after resourcePackManager is stored
@Inject(method = "main", cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "INVOKE", shift = At.Shift.BY, by = 2, target = "Lnet/minecraft/resource/VanillaDataPackProvider;createManager(Lnet/minecraft/world/level/storage/LevelStorage$Session;)Lnet/minecraft/resource/ResourcePackManager;"))
private static void main(String[] args, CallbackInfo info, OptionParser optionParser, OptionSpec optionSpec, OptionSpec optionSpec2, OptionSpec optionSpec3, OptionSpec optionSpec4, OptionSpec optionSpec5, OptionSpec optionSpec6, OptionSpec optionSpec7, OptionSpec optionSpec8, OptionSpec optionSpec9, OptionSpec optionSpec10, OptionSpec optionSpec11, OptionSpec optionSpec12, OptionSpec optionSpec13, OptionSpec optionSpec14, OptionSpec optionSpec15, OptionSet optionSet, Path path2, ServerPropertiesLoader serverPropertiesLoader, Path path3, EulaReader eulaReader, File file, ApiServices apiServices, String string, LevelStorage levelStorage, LevelStorage.Session session, LevelSummary levelSummary, boolean bl, ResourcePackManager resourcePackManager) {
private static void main(String[] args, CallbackInfo info, OptionParser optionParser, OptionSpec optionSpec, OptionSpec optionSpec2, OptionSpec optionSpec3, OptionSpec optionSpec4, OptionSpec optionSpec5, OptionSpec optionSpec6, OptionSpec optionSpec7, OptionSpec optionSpec8, OptionSpec optionSpec9, OptionSpec optionSpec10, OptionSpec optionSpec11, OptionSpec optionSpec12, OptionSpec optionSpec13, OptionSpec optionSpec14, OptionSpec optionSpec15, OptionSet optionSet, Path path2, ServerPropertiesLoader serverPropertiesLoader, Path path3, EulaReader eulaReader, File file, ApiServices apiServices, String string, LevelStorage levelStorage, LevelStorage.Session session, Dynamic dynamic, Dynamic dynamic2, boolean bl, ResourcePackManager resourcePackManager) {
if (FabricGameTestHelper.ENABLED) {
FabricGameTestHelper.runHeadlessServer(session, resourcePackManager);
info.cancel(); // Do not progress in starting the normal dedicated server
Expand Down
3 changes: 2 additions & 1 deletion ...v0/src/client/java/net/fabricmc/fabric/mixin/resource/loader/client/GameOptionsMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import net.minecraft.nbt.NbtIo;
import net.minecraft.nbt.NbtList;
import net.minecraft.nbt.NbtString;
import net.minecraft.nbt.NbtTagSizeTracker;
import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourcePackProfile;

Expand Down Expand Up @@ -74,7 +75,7 @@ private void onLoad(CallbackInfo ci) {

if (trackerFile.exists()) {
try {
NbtCompound data = NbtIo.readCompressed(trackerFile);
NbtCompound data = NbtIo.readCompressed(trackerFile, NbtTagSizeTracker.ofUnlimitedBytes());
NbtList values = data.getList("values", NbtElement.STRING_TYPE);

for (int i = 0; i < values.size(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion ...-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/block/BoxBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public BoxBlockEntity(BlockPos blockPos, BlockState blockState) {
}

@Override
protected DefaultedList<ItemStack> getInvStackList() {
protected DefaultedList<ItemStack> method_11282() {
return items;
}

Expand Down
1 change: 0 additions & 1 deletion ...-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ transitive-accessible field net/minecraft/client/render/RenderPhase CUTOUT_MIPPE
transitive-accessible field net/minecraft/client/render/RenderPhase CUTOUT_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
transitive-accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
transitive-accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_MOVING_BLOCK_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
transitive-accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_NO_CRUMBLING_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
transitive-accessible field net/minecraft/client/render/RenderPhase ARMOR_CUTOUT_NO_CULL_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
transitive-accessible field net/minecraft/client/render/RenderPhase ENTITY_SOLID_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
transitive-accessible field net/minecraft/client/render/RenderPhase ENTITY_CUTOUT_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
Expand Down
24 changes: 12 additions & 12 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true

version=0.90.1
minecraft_version=23w41a
version=0.90.2
minecraft_version=23w42a
yarn_version=+build.1
loader_version=0.14.23
installer_version=0.11.1
Expand All @@ -22,27 +22,27 @@ fabric-command-api-v1-version=1.2.37
fabric-command-api-v2-version=2.2.16
fabric-commands-v0-version=0.2.54
fabric-containers-v0-version=0.1.73
fabric-content-registries-v0-version=5.0.5
fabric-content-registries-v0-version=5.0.6
fabric-crash-report-info-v1-version=0.2.20
fabric-data-generation-api-v1-version=13.1.4
fabric-data-generation-api-v1-version=13.1.5
fabric-dimensions-v1-version=2.1.56
fabric-entity-events-v1-version=1.5.25
fabric-events-interaction-v0-version=0.6.12
fabric-events-lifecycle-v0-version=0.2.69
fabric-game-rule-api-v1-version=1.0.40
fabric-gametest-api-v1-version=1.2.15
fabric-gametest-api-v1-version=1.2.16
fabric-item-api-v1-version=2.1.32
fabric-item-group-api-v1-version=4.0.14
fabric-item-group-api-v1-version=4.0.15
fabric-key-binding-api-v1-version=1.0.38
fabric-keybindings-v0-version=0.2.36
fabric-lifecycle-events-v1-version=2.2.27
fabric-loot-api-v2-version=2.1.0
fabric-loot-api-v2-version=2.1.1
fabric-message-api-v1-version=6.0.2
fabric-mining-level-api-v1-version=2.1.55
fabric-mining-level-api-v1-version=2.1.56
fabric-model-loading-api-v1-version=1.0.5
fabric-models-v0-version=0.4.4
fabric-networking-api-v1-version=3.0.9
fabric-object-builder-api-v1-version=13.0.1
fabric-object-builder-api-v1-version=13.0.2
fabric-particles-v1-version=1.1.4
fabric-recipe-api-v1-version=2.0.6
fabric-registry-sync-v0-version=4.0.5
Expand All @@ -54,11 +54,11 @@ fabric-rendering-fluids-v1-version=3.0.30
fabric-rendering-v0-version=1.1.51
fabric-rendering-v1-version=3.0.10
fabric-resource-conditions-api-v1-version=2.3.10
fabric-resource-loader-v0-version=0.11.11
fabric-resource-loader-v0-version=0.11.12
fabric-screen-api-v1-version=2.0.11
fabric-screen-handler-api-v1-version=1.3.41
fabric-screen-handler-api-v1-version=1.3.42
fabric-sound-api-v1-version=1.0.14
fabric-transfer-api-v1-version=4.0.1
fabric-transitive-access-wideners-v1-version=5.0.5
fabric-transitive-access-wideners-v1-version=5.0.6
fabric-convention-tags-v1-version=1.5.7
fabric-client-tags-api-v1-version=1.1.4

0 comments on commit 2148f3b

Please sign in to comment.