imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-27 19:47:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'architectury/1.19' into 1.19.2

Browse Source
This commit is contained in:
shedaniel
2022-11-23 01:46:01 +08:00
parent b0f0a04c50 e8177b3075
commit 709ca7535c
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/dev/architectury/registry/ReloadListenerRegistry.java
View File

@@ -23,8 +23,8 @@ import dev.architectury.injectables.annotations.ExpectPlatform;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.resources.PreparableReloadListener;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;

2
fabric/src/main/java/dev/architectury/registry/fabric/ReloadListenerRegistryImpl.java
View File

@@ -28,8 +28,8 @@ import net.minecraft.server.packs.resources.PreparableReloadListener;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.profiling.ProfilerFiller;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.security.SecureRandom;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;

2
forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java
View File

@@ -25,8 +25,8 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.material.Fluid;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.function.Supplier;
public class ArchitecturyBucketItem extends BucketItem {

10
forge/src/main/java/dev/architectury/platform/forge/PlatformImpl.java
View File

@@ -31,9 +31,9 @@ import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nonnull;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -100,25 +100,25 @@ public class PlatformImpl {
}
@Override
@Nonnull
@NotNull
public String getModId() {
return info.getModId();
}
@Override
@Nonnull
@NotNull
public String getVersion() {
return info.getVersion().toString();
}
@Override
@Nonnull
@NotNull
public String getName() {
return info.getDisplayName();
}
@Override
@Nonnull
@NotNull
public String getDescription() {
return info.getDescription();
}

4
forge/src/main/java/dev/architectury/registry/forge/CreativeTabRegistryImpl.java
View File

@@ -22,15 +22,15 @@ package dev.architectury.registry.forge;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.util.function.Supplier;
public class CreativeTabRegistryImpl {
public static CreativeModeTab create(ResourceLocation resourceLocation, Supplier<ItemStack> supplier) {
return new CreativeModeTab(String.format("%s.%s", resourceLocation.getNamespace(), resourceLocation.getPath())) {
@Override
@Nonnull
@NotNull
public ItemStack makeIcon() {
return supplier.get();
}

2
forge/src/main/java/dev/architectury/registry/forge/ReloadListenerRegistryImpl.java
View File

@@ -31,8 +31,8 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.event.AddReloadListenerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;

12
testmod-forge/build.gradle
View File

@@ -6,14 +6,14 @@ plugins {
loom {
accessWidenerPath = project(":common").loom.accessWidenerPath
mods {
forge {
sourceSet project(":forge").sourceSets.main
}
}
forge {
mixinConfig "architectury.mixins.json"
localMods {
forge {
it.add(project(":forge").sourceSets.main)
}
}
}
}