first pass on 1.16.2 - no world gen

This commit is contained in:
modmuss50 2020-07-29 19:42:39 +01:00
parent ec1ae17134
commit 6e0fc6af61
49 changed files with 139 additions and 138 deletions

View file

@ -37,13 +37,13 @@ import reborncore.common.fluid.container.GenericFluidContainer;
import reborncore.common.fluid.container.ItemFluidInfo;
import reborncore.mixin.common.AccessorFluidBlock;
import javax.annotation.Nonnull;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.stream.Collectors;
public class FluidUtils {
@Nonnull
@NotNull
public static Fluid fluidFromBlock(Block block) {
if (block instanceof AccessorFluidBlock) {
return ((AccessorFluidBlock) block).getFluid();
@ -133,11 +133,11 @@ public class FluidUtils {
return true;
}
public static boolean fluidEquals(@Nonnull Fluid fluid, @Nonnull Fluid fluid1) {
public static boolean fluidEquals(@NotNull Fluid fluid, @NotNull Fluid fluid1) {
return fluid == fluid1;
}
public static FluidInstance getFluidStackInContainer(@Nonnull ItemStack invStack) {
public static FluidInstance getFluidStackInContainer(@NotNull ItemStack invStack) {
return null;
}

View file

@ -30,12 +30,12 @@ import net.minecraft.recipe.RecipeType;
import net.minecraft.world.World;
import techreborn.items.DynamicCellItem;
import javax.annotation.Nonnull;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.stream.Collectors;
public class RecipeUtils {
@Nonnull
@NotNull
public static ItemStack getEmptyCell(int stackSize) {
return DynamicCellItem.getEmptyCell(stackSize);
}

View file

@ -28,7 +28,8 @@ import net.minecraft.block.Block;
import net.minecraft.fluid.Fluid;
import net.minecraft.item.Item;
import net.minecraft.tag.Tag;
import net.minecraft.tag.TagContainer;
import net.minecraft.tag.TagGroup;
import net.minecraft.tag.TagGroupLoader;
import net.minecraft.world.World;
public class TagUtils {
@ -37,15 +38,15 @@ public class TagUtils {
return tag.contains(type);
}
public static TagContainer<Block> getAllBlockTags(World world) {
return world.getTagManager().blocks();
public static TagGroup<Block> getAllBlockTags(World world) {
return world.getTagManager().getBlocks();
}
public static TagContainer<Item> getAllItemTags(World world) {
return world.getTagManager().items();
public static TagGroup<Item> getAllItemTags(World world) {
return world.getTagManager().getItems();
}
public static TagContainer<Fluid> getAllFluidTags(World world) {
return world.getTagManager().fluids();
public static TagGroup<Fluid> getAllFluidTags(World world) {
return world.getTagManager().getFluids();
}
}

View file

@ -39,7 +39,7 @@ import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import team.reborn.energy.Energy;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Random;