infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

update to 1.14.2pre2

Browse source
This commit is contained in:
Adrian Siekierka 2019-05-17 16:20:37 +02:00
parent 57f0d19cc0
commit 945f265fc3
9 changed files with 27 additions and 26 deletions
build.gradle
fabric-containers-v0/src/main/java/net/fabricmc/fabric
api/client/screen
ContainerScreenFactory.javaScreenProviderRegistry.java
impl/client/gui
ScreenProviderRegistryImpl.java
fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/eventsinteraction
MixinMinecraftClient.java
fabric-item-groups-v0/src/main/java/net/fabricmc/fabric
impl/itemgroup
FabricCreativeGuiComponents.java
mixin/itemgroup/client
MixinCreativePlayerInventoryGui.java
fabric-networking-v0/src/main/java/net/fabricmc/fabric/mixin/network
MixinMinecraftClient.java
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/client
MixinMinecraftClient.java

6
build.gradle
View file

@ -12,7 +12,7 @@ plugins {
def ENV = System.getenv() def ENV = System.getenv()
def baseVersion = "0.3.0-pre" def baseVersion = "0.3.0-pre"
def mcVersion = "1.14.1 Pre-Release 2" def mcVersion = "1.14.2 Pre-Release 2"
def yarnVersion = "+build.2" def yarnVersion = "+build.2"
def getSubprojectVersion(project, version) { def getSubprojectVersion(project, version) {
@ -140,7 +140,7 @@ publishing {
def depNode = depsNode.appendNode("dependency") def depNode = depsNode.appendNode("dependency")
depNode.appendNode("groupId", it.group) depNode.appendNode("groupId", it.group)
depNode.appendNode("artifactId", it.name) depNode.appendNode("artifactId", it.name)
depNode.appendNode("version", it.version) depNode.appendNode("version", it.version)
depNode.appendNode("scope", "compile") depNode.appendNode("scope", "compile")
} }
} }
@ -173,7 +173,7 @@ dependencies {
} }
// workaround linux segfault // workaround linux segfault
compile "org.lwjgl:lwjgl-jemalloc:3.2.1" // compile "org.lwjgl:lwjgl-jemalloc:3.2.1"
} }
version = baseVersion + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local") version = baseVersion + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local")

4
fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ContainerScreenFactory.java
View file

@ -16,12 +16,12 @@
package net.fabricmc.fabric.api.client.screen; package net.fabricmc.fabric.api.client.screen;
import net.minecraft.client.gui.ContainerScreen; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
import net.minecraft.container.Container; import net.minecraft.container.Container;
@FunctionalInterface @FunctionalInterface
public interface ContainerScreenFactory<C extends Container> { public interface ContainerScreenFactory<C extends Container> {
ContainerScreen create(C container); AbstractContainerScreen create(C container);
} }

6
fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ScreenProviderRegistry.java
View file

@ -19,7 +19,7 @@ package net.fabricmc.fabric.api.client.screen;
import net.fabricmc.fabric.api.container.ContainerFactory; import net.fabricmc.fabric.api.container.ContainerFactory;
import net.fabricmc.fabric.api.container.ContainerProviderRegistry; import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
import net.fabricmc.fabric.impl.client.gui.ScreenProviderRegistryImpl; import net.fabricmc.fabric.impl.client.gui.ScreenProviderRegistryImpl;
import net.minecraft.client.gui.ContainerScreen; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
import net.minecraft.container.Container; import net.minecraft.container.Container;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -40,8 +40,8 @@ public interface ScreenProviderRegistry {
* to override the default behaviour of re-using the existing "packet -> Container" logic. * to override the default behaviour of re-using the existing "packet -> Container" logic.
* *
* @param identifier a shared identifier, this identifier should also be used to register a container using {@link ContainerProviderRegistry} * @param identifier a shared identifier, this identifier should also be used to register a container using {@link ContainerProviderRegistry}
* @param factory the gui factory, this should return a new {@link ContainerScreen} * @param factory the gui factory, this should return a new {@link AbstractContainerScreen}
*/ */
void registerFactory(Identifier identifier, ContainerFactory<ContainerScreen> factory); void registerFactory(Identifier identifier, ContainerFactory<AbstractContainerScreen> factory);
} }

10
fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/client/gui/ScreenProviderRegistryImpl.java
View file

@ -23,7 +23,7 @@ import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
import net.fabricmc.fabric.impl.container.ContainerProviderImpl; import net.fabricmc.fabric.impl.container.ContainerProviderImpl;
import net.fabricmc.fabric.impl.network.PacketTypes; import net.fabricmc.fabric.impl.network.PacketTypes;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.ContainerScreen; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
import net.minecraft.container.Container; import net.minecraft.container.Container;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@ -41,9 +41,9 @@ public class ScreenProviderRegistryImpl implements ScreenProviderRegistry {
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private static final Map<Identifier, ContainerFactory<ContainerScreen>> FACTORIES = new HashMap<>(); private static final Map<Identifier, ContainerFactory<AbstractContainerScreen>> FACTORIES = new HashMap<>();
public void registerFactory(Identifier identifier, ContainerFactory<ContainerScreen> factory) { public void registerFactory(Identifier identifier, ContainerFactory<AbstractContainerScreen> factory) {
if (FACTORIES.containsKey(identifier)) { if (FACTORIES.containsKey(identifier)) {
throw new RuntimeException("A factory has already been registered as " + identifier + "!"); throw new RuntimeException("A factory has already been registered as " + identifier + "!");
} }
@ -67,12 +67,12 @@ public class ScreenProviderRegistryImpl implements ScreenProviderRegistry {
Identifier identifier = packetByteBuf.readIdentifier(); Identifier identifier = packetByteBuf.readIdentifier();
int syncId = packetByteBuf.readUnsignedByte(); int syncId = packetByteBuf.readUnsignedByte();
MinecraftClient.getInstance().execute(() -> { MinecraftClient.getInstance().execute(() -> {
ContainerFactory<ContainerScreen> factory = FACTORIES.get(identifier); ContainerFactory<AbstractContainerScreen> factory = FACTORIES.get(identifier);
if (factory == null) { if (factory == null) {
LOGGER.error("No GUI factory found for {}!", identifier.toString()); LOGGER.error("No GUI factory found for {}!", identifier.toString());
return; return;
} }
ContainerScreen gui = factory.create(syncId, identifier, packetContext.getPlayer(), packetByteBuf); AbstractContainerScreen gui = factory.create(syncId, identifier, packetContext.getPlayer(), packetByteBuf);
packetContext.getPlayer().container = gui.getContainer(); packetContext.getPlayer().container = gui.getContainer();
MinecraftClient.getInstance().openScreen(gui); MinecraftClient.getInstance().openScreen(gui);
}); });

2
fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/eventsinteraction/MixinMinecraftClient.java
View file

@ -21,7 +21,7 @@ import net.fabricmc.fabric.api.event.client.player.ClientPickBlockCallback;
import net.fabricmc.fabric.api.event.client.player.ClientPickBlockGatherCallback; import net.fabricmc.fabric.api.event.client.player.ClientPickBlockGatherCallback;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;

7
fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/itemgroup/FabricCreativeGuiComponents.java
View file

@ -18,7 +18,8 @@ package net.fabricmc.fabric.impl.itemgroup;
import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.ingame.CreativePlayerInventoryScreen;
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.resource.language.I18n; import net.minecraft.client.resource.language.I18n;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
@ -42,14 +43,14 @@ public class FabricCreativeGuiComponents {
public static class ItemGroupButtonWidget extends ButtonWidget { public static class ItemGroupButtonWidget extends ButtonWidget {
CreativeGuiExtensions extensions; CreativeGuiExtensions extensions;
CreativePlayerInventoryScreen gui; CreativeInventoryScreen gui;
Type type; Type type;
public ItemGroupButtonWidget(int x, int y, Type type, CreativeGuiExtensions extensions) { public ItemGroupButtonWidget(int x, int y, Type type, CreativeGuiExtensions extensions) {
super(x, y, 10, 11, type.text, (bw) -> type.clickConsumer.accept(extensions)); super(x, y, 10, 11, type.text, (bw) -> type.clickConsumer.accept(extensions));
this.extensions = extensions; this.extensions = extensions;
this.type = type; this.type = type;
this.gui = (CreativePlayerInventoryScreen) extensions; this.gui = (CreativeInventoryScreen) extensions;
} }
@Override @Override

8
fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/itemgroup/client/MixinCreativePlayerInventoryGui.java
View file

@ -18,8 +18,8 @@ package net.fabricmc.fabric.mixin.itemgroup.client;
import net.fabricmc.fabric.impl.itemgroup.CreativeGuiExtensions; import net.fabricmc.fabric.impl.itemgroup.CreativeGuiExtensions;
import net.fabricmc.fabric.impl.itemgroup.FabricCreativeGuiComponents; import net.fabricmc.fabric.impl.itemgroup.FabricCreativeGuiComponents;
import net.minecraft.client.gui.ingame.AbstractPlayerInventoryScreen; import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen;
import net.minecraft.client.gui.ingame.CreativePlayerInventoryScreen; import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
import net.minecraft.container.Container; import net.minecraft.container.Container;
import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
@ -31,8 +31,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(CreativePlayerInventoryScreen.class) @Mixin(CreativeInventoryScreen.class)
public abstract class MixinCreativePlayerInventoryGui extends AbstractPlayerInventoryScreen implements CreativeGuiExtensions { public abstract class MixinCreativePlayerInventoryGui extends AbstractInventoryScreen implements CreativeGuiExtensions {
public MixinCreativePlayerInventoryGui(Container container_1, PlayerInventory playerInventory_1, Component textComponent_1) { public MixinCreativePlayerInventoryGui(Container container_1, PlayerInventory playerInventory_1, Component textComponent_1) {
super(container_1, playerInventory_1, textComponent_1); super(container_1, playerInventory_1, textComponent_1);

4
fabric-networking-v0/src/main/java/net/fabricmc/fabric/mixin/network/MixinMinecraftClient.java
View file

@ -18,7 +18,7 @@ package net.fabricmc.fabric.mixin.network;
import net.fabricmc.fabric.impl.network.ClientSidePacketRegistryImpl; import net.fabricmc.fabric.impl.network.ClientSidePacketRegistryImpl;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.Screen; import net.minecraft.client.gui.screen.Screen;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(MinecraftClient.class) @Mixin(MinecraftClient.class)
public class MixinMinecraftClient { public class MixinMinecraftClient {
@Inject(at = @At("RETURN"), method = "disconnect(Lnet/minecraft/client/gui/Screen;)V") @Inject(at = @At("RETURN"), method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V")
public void disconnectAfter(Screen screen_1, CallbackInfo info) { public void disconnectAfter(Screen screen_1, CallbackInfo info) {
ClientSidePacketRegistryImpl.invalidateRegisteredIdList(); ClientSidePacketRegistryImpl.invalidateRegisteredIdList();
} }

6
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/client/MixinMinecraftClient.java
View file

@ -20,7 +20,7 @@ import net.fabricmc.fabric.impl.network.ClientSidePacketRegistryImpl;
import net.fabricmc.fabric.impl.registry.RegistrySyncManager; import net.fabricmc.fabric.impl.registry.RegistrySyncManager;
import net.fabricmc.fabric.impl.registry.RemapException; import net.fabricmc.fabric.impl.registry.RemapException;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.Screen; import net.minecraft.client.gui.screen.Screen;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -34,7 +34,7 @@ public class MixinMinecraftClient {
private static Logger LOGGER; private static Logger LOGGER;
// Unmap the registry before loading a new SP/MP setup. // Unmap the registry before loading a new SP/MP setup.
@Inject(at = @At("RETURN"), method = "disconnect(Lnet/minecraft/client/gui/Screen;)V") @Inject(at = @At("RETURN"), method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V")
public void disconnectAfter(Screen screen_1, CallbackInfo info) { public void disconnectAfter(Screen screen_1, CallbackInfo info) {
ClientSidePacketRegistryImpl.invalidateRegisteredIdList(); ClientSidePacketRegistryImpl.invalidateRegisteredIdList();
@ -44,4 +44,4 @@ public class MixinMinecraftClient {
LOGGER.warn("Failed to unmap Fabric registries!", e); LOGGER.warn("Failed to unmap Fabric registries!", e);
} }
} }
} }