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.17-pre1

Browse source
This commit is contained in:
modmuss50 2021-05-27 18:40:00 +01:00
parent 9e521e1377
commit b7ab612143
21 changed files with 47 additions and 47 deletions
build.gradle
fabric-crash-report-info-v1
build.gradle
src/main/java/net/fabricmc/fabric/mixin/crash/report/info
MixinCrashReport.java
fabric-item-groups-v0
build.gradle
src/main/java/net/fabricmc/fabric/mixin/item/group/client
MixinCreativePlayerInventoryGui.java
fabric-networking-api-v1
build.gradle
src/testmod/java/net/fabricmc/fabric/test/networking/channeltest
ChannelList.javaChannelScreen.java
fabric-object-builder-api-v1
build.gradle
src/main/java/net/fabricmc/fabric
api/object/builder/v1/client/model
FabricModelPredicateProviderRegistry.java
mixin/object/builder
ModelPredicateProviderRegistryAccessor.javaModelPredicateProviderRegistrySpecificAccessor.java
fabric-resource-loader-v0
build.gradle
src/main/java/net/fabricmc/fabric/mixin/resource/loader/client
CreateWorldScreenMixin.java
fabric-screen-api-v1
build.gradle
src
main/java/net/fabricmc/fabric
impl/client/screen
ButtonList.java
mixin/screen
ScreenMixin.java
testmod/java/net/fabricmc/fabric/test/screen
SoundButton.javaStopSoundButton.java
fabric-tool-attribute-api-v1
build.gradle
src/main/java/net/fabricmc/fabric/mixin/tool/attribute
LivingEntityMixin.java

8
build.gradle
View file

@ -9,7 +9,7 @@ plugins {
id "eclipse"
id "idea"
id "maven-publish"
id "fabric-loom" version "0.8.7" apply false
id "fabric-loom" version "0.8.12" apply false
id "org.cadixdev.licenser" version "0.5.0"
id "org.ajoberstar.grgit" version "3.1.0"
id "com.matthewprenger.cursegradle" version "1.4.0"
@ -19,9 +19,9 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.34.7"
static def mcVersion = "21w20a"
static def yarnVersion = "+build.2"
static def baseVersion = "0.34.8"
static def mcVersion = "1.17-pre1"
static def yarnVersion = "+build.1"
static def loaderVersion = "0.11.3"
static def preRelease = true
}

2
fabric-crash-report-info-v1/build.gradle
View file

@ -1,2 +1,2 @@
archivesBaseName = "fabric-crash-report-info-v1"
version = getSubprojectVersion(project, "0.1.3")
version = getSubprojectVersion(project, "0.1.4")

12
fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/MixinCrashReport.java
View file

@ -18,6 +18,7 @@ package net.fabricmc.fabric.mixin.crash.report.info;
import java.util.Map;
import java.util.TreeMap;
import java.util.function.Supplier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@ -25,20 +26,19 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.util.crash.CrashReport;
import net.minecraft.util.crash.CrashReportSection;
import net.minecraft.class_6396;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.ModContainer;
@Mixin(CrashReport.class)
@Mixin(class_6396.class)
public abstract class MixinCrashReport {
@Shadow
public abstract CrashReportSection getSystemDetailsSection();
public abstract void method_37123(String string, Supplier<String> supplier);
@Inject(at = @At("RETURN"), method = "fillSystemDetails")
@Inject(at = @At("RETURN"), method = "<init>")
private void fillSystemDetails(CallbackInfo info) {
getSystemDetailsSection().add("Fabric Mods", () -> {
method_37123("Fabric Mods", () -> {
Map<String, String> mods = new TreeMap<>();
for (ModContainer container : FabricLoader.getInstance().getAllMods()) {

2
fabric-item-groups-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-item-groups-v0"
version = getSubprojectVersion(project, "0.2.9")
version = getSubprojectVersion(project, "0.2.10")
moduleDependencies(project, [
'fabric-api-base',

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

@ -123,8 +123,8 @@ public abstract class MixinCreativePlayerInventoryGui extends AbstractInventoryS
int xpos = x + 116;
int ypos = y - 10;
method_37063(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos + 11, ypos, FabricCreativeGuiComponents.Type.NEXT, this));
method_37063(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos, ypos, FabricCreativeGuiComponents.Type.PREVIOUS, this));
addDrawableChild(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos + 11, ypos, FabricCreativeGuiComponents.Type.NEXT, this));
addDrawableChild(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos, ypos, FabricCreativeGuiComponents.Type.PREVIOUS, this));
}
@Inject(method = "setSelectedTab", at = @At("HEAD"), cancellable = true)

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

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

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

@ -16,8 +16,8 @@
package net.fabricmc.fabric.test.networking.channeltest;
import net.minecraft.class_6382;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
import net.minecraft.client.gui.widget.EntryListWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.LiteralText;
@ -39,7 +39,7 @@ final class ChannelList extends EntryListWidget<ChannelList.Entry> {
}
@Override
public void method_37020(class_6382 arg) {
public void appendNarrations(NarrationMessageBuilder arg) {
// TODO seems to be possibly accessibility related
}

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

@ -40,14 +40,14 @@ final class ChannelScreen extends Screen {
@Override
protected void init() {
this.s2cButton = this.method_37063(new ButtonWidget(this.width / 2 - 55, 5, 50, 20, new LiteralText("S2C"), this::toS2C, (button, matrices, mouseX, mouseY) -> {
this.s2cButton = this.addDrawableChild(new ButtonWidget(this.width / 2 - 55, 5, 50, 20, new LiteralText("S2C"), this::toS2C, (button, matrices, mouseX, mouseY) -> {
this.renderTooltip(matrices, new LiteralText("Packets this client can receive"), mouseX, mouseY);
}));
this.c2sButton = this.method_37063(new ButtonWidget(this.width / 2 + 5, 5, 50, 20, new LiteralText("C2S"), this::toC2S, (button, matrices, mouseX, mouseY) -> {
this.c2sButton = this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, 5, 50, 20, new LiteralText("C2S"), this::toC2S, (button, matrices, mouseX, mouseY) -> {
this.renderTooltip(matrices, new LiteralText("Packets the server can receive"), mouseX, mouseY);
}));
this.closeButton = this.method_37063(new ButtonWidget(this.width / 2 - 60, this.height - 25, 120, 20, new LiteralText("Close"), button -> this.onClose()));
this.channelList = this.addChild(new ChannelList(this.client, this.width, this.height - 60, 30, this.height - 30, this.textRenderer.fontHeight + 2));
this.closeButton = this.addDrawableChild(new ButtonWidget(this.width / 2 - 60, this.height - 25, 120, 20, new LiteralText("Close"), button -> this.onClose()));
this.channelList = this.addDrawable(new ChannelList(this.client, this.width, this.height - 60, 30, this.height - 30, this.textRenderer.fontHeight + 2));
}
@Override

2
fabric-object-builder-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-object-builder-api-v1"
version = getSubprojectVersion(project, "1.10.8")
version = getSubprojectVersion(project, "1.10.9")
dependencies {
testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')

6
fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/client/model/FabricModelPredicateProviderRegistry.java
View file

@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.object.builder.v1.client.model;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
import net.minecraft.class_6395;
import net.minecraft.client.item.UnclampedModelPredicateProvider;
import net.fabricmc.fabric.mixin.object.builder.ModelPredicateProviderRegistryAccessor;
import net.fabricmc.fabric.mixin.object.builder.ModelPredicateProviderRegistrySpecificAccessor;
@ -38,7 +38,7 @@ public final class FabricModelPredicateProviderRegistry {
* @param id the identifier of the provider
* @param provider the provider
*/
public static void register(Identifier id, class_6395 provider) {
public static void register(Identifier id, UnclampedModelPredicateProvider provider) {
ModelPredicateProviderRegistryAccessor.callRegister(id, provider);
}
@ -49,7 +49,7 @@ public final class FabricModelPredicateProviderRegistry {
* @param id the identifier of the provider
* @param provider the provider
*/
public static void register(Item item, Identifier id, class_6395 provider) {
public static void register(Item item, Identifier id, UnclampedModelPredicateProvider provider) {
ModelPredicateProviderRegistrySpecificAccessor.callRegister(item, id, provider);
}
}

4
fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/ModelPredicateProviderRegistryAccessor.java
View file

@ -19,14 +19,14 @@ package net.fabricmc.fabric.mixin.object.builder;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
import net.minecraft.class_6395;
import net.minecraft.client.item.UnclampedModelPredicateProvider;
import net.minecraft.client.item.ModelPredicateProviderRegistry;
import net.minecraft.util.Identifier;
@Mixin(ModelPredicateProviderRegistry.class)
public interface ModelPredicateProviderRegistryAccessor {
@Invoker
static class_6395 callRegister(Identifier id, class_6395 provider) {
static UnclampedModelPredicateProvider callRegister(Identifier id, UnclampedModelPredicateProvider provider) {
throw new AssertionError("mixin dummy");
}
}

4
fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/ModelPredicateProviderRegistrySpecificAccessor.java
View file

@ -19,7 +19,7 @@ package net.fabricmc.fabric.mixin.object.builder;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
import net.minecraft.class_6395;
import net.minecraft.client.item.UnclampedModelPredicateProvider;
import net.minecraft.client.item.ModelPredicateProviderRegistry;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
@ -28,7 +28,7 @@ import net.minecraft.util.Identifier;
@Mixin(ModelPredicateProviderRegistry.class)
public interface ModelPredicateProviderRegistrySpecificAccessor {
@Invoker
static void callRegister(Item item, Identifier id, class_6395 provider) {
static void callRegister(Item item, Identifier id, UnclampedModelPredicateProvider provider) {
throw new AssertionError("mixin dummy");
}
}

2
fabric-resource-loader-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-resource-loader-v0"
version = getSubprojectVersion(project, "0.4.6")
version = getSubprojectVersion(project, "0.4.7")
dependencies {
testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')

2
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/client/CreateWorldScreenMixin.java
View file

@ -44,7 +44,7 @@ public class CreateWorldScreenMixin {
@Shadow
private ResourcePackManager packManager;
@Inject(method = "method_30296", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ResourcePackManager;scanPacks()V", shift = At.Shift.BEFORE))
@Inject(method = "getScannedPack", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ResourcePackManager;scanPacks()V", shift = At.Shift.BEFORE))
private void onScanPacks(CallbackInfoReturnable<Pair<File, ResourcePackManager>> cir) {
// Allow to display built-in data packs in the data pack selection screen at world creation.
((ResourcePackManagerAccessor) this.packManager).getProviders().add(new ModResourcePackCreator(ResourceType.SERVER_DATA));

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

@ -1,5 +1,5 @@
archivesBaseName = "fabric-screen-api-v1"
version = getSubprojectVersion(project, "1.0.2")
version = getSubprojectVersion(project, "1.0.3")
moduleDependencies(project, [
'fabric-api-base'

8
fabric-screen-api-v1/src/main/java/net/fabricmc/fabric/impl/client/screen/ButtonList.java
View file

@ -21,7 +21,7 @@ import java.util.List;
import org.jetbrains.annotations.ApiStatus;
import net.minecraft.class_6379;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.widget.ClickableWidget;
@ -32,10 +32,10 @@ import net.fabricmc.api.Environment;
@ApiStatus.Internal
@Environment(EnvType.CLIENT)
public final class ButtonList extends AbstractList<ClickableWidget> {
private final List<class_6379> listeners;
private final List<Selectable> listeners;
private final List<Element> children;
public ButtonList(List<class_6379> listeners, List<Element> children) {
public ButtonList(List<Selectable> listeners, List<Element> children) {
this.listeners = listeners;
this.children = children;
}
@ -91,7 +91,7 @@ public final class ButtonList extends AbstractList<ClickableWidget> {
public int size() {
int ret = 0;
for (class_6379 listener : listeners) {
for (Selectable listener : listeners) {
if (listener instanceof ClickableWidget) {
ret++;
}

4
fabric-screen-api-v1/src/main/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java
View file

@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.class_6379;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.screen.Screen;
@ -44,7 +44,7 @@ import net.fabricmc.fabric.impl.client.screen.ScreenExtensions;
abstract class ScreenMixin implements ScreenExtensions {
@Shadow
@Final
protected List<class_6379> field_33815;
protected List<Selectable> field_33815;
@Shadow
@Final
protected List<Element> children;

4
fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/SoundButton.java
View file

@ -21,7 +21,7 @@ import java.util.Random;
import org.jetbrains.annotations.Nullable;
import net.minecraft.client.MinecraftClient;
import net.minecraft.class_6382;
import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
import net.minecraft.client.gui.widget.PressableWidget;
import net.minecraft.client.sound.PositionedSoundInstance;
import net.minecraft.sound.SoundEvent;
@ -47,6 +47,6 @@ class SoundButton extends PressableWidget {
}
@Override
public void method_37020(class_6382 arg) {
public void appendNarrations(NarrationMessageBuilder arg) {
}
}

4
fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/StopSoundButton.java
View file

@ -18,11 +18,11 @@ package net.fabricmc.fabric.test.screen;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.class_6382;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.hud.InGameHud;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
import net.minecraft.client.gui.widget.PressableWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.LiteralText;
@ -53,6 +53,6 @@ class StopSoundButton extends PressableWidget {
}
@Override
public void method_37020(class_6382 arg) {
public void appendNarrations(NarrationMessageBuilder arg) {
}
}

2
fabric-tool-attribute-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-tool-attribute-api-v1"
version = getSubprojectVersion(project, "1.2.11")
version = getSubprojectVersion(project, "1.2.12")
dependencies {
testmodImplementation project(path: ':fabric-object-builder-api-v1', configuration: 'dev')

8
fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/mixin/tool/attribute/LivingEntityMixin.java
View file

@ -44,13 +44,13 @@ public class LivingEntityMixin {
@Nullable
@Unique private EquipmentSlot slotContext = null;
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "method_30129", locals = LocalCapture.CAPTURE_FAILHARD)
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment", locals = LocalCapture.CAPTURE_FAILHARD)
private void storeRemoveStackContext(CallbackInfoReturnable<Map> cir, Map map, EquipmentSlot[] var2, int var3, int var4, EquipmentSlot equipmentSlot, ItemStack oldStack, ItemStack newStack) {
stackContext = oldStack;
slotContext = equipmentSlot;
}
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "method_30129")
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment")
private void setupRemoveModifierContext(AttributeContainer attributeContainer, Multimap<EntityAttribute, EntityAttributeModifier> oldModifiers) {
((ItemStackContext) (Object) stackContext).fabricToolAttributes_setContext((LivingEntity) (Object) this);
Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers = stackContext.getAttributeModifiers(slotContext);
@ -58,13 +58,13 @@ public class LivingEntityMixin {
attributeContainer.removeModifiers(attributeModifiers);
}
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "method_30129", locals = LocalCapture.CAPTURE_FAILHARD)
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment", locals = LocalCapture.CAPTURE_FAILHARD)
private void storeAddStackContext(CallbackInfoReturnable<Map> cir, Map map, EquipmentSlot[] var2, int var3, int var4, EquipmentSlot equipmentSlot, ItemStack oldStack, ItemStack newStack) {
stackContext = newStack;
slotContext = equipmentSlot;
}
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "method_30129")
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V"), method = "getEquipment")
private void setupAddModifierContext(AttributeContainer attributeContainer, Multimap<EntityAttribute, EntityAttributeModifier> oldModifiers) {
((ItemStackContext) (Object) stackContext).fabricToolAttributes_setContext((LivingEntity) (Object) this);
Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers = stackContext.getAttributeModifiers(slotContext);