first pass on 1.16.2 - no world gen
This commit is contained in:
parent
ec1ae17134
commit
6e0fc6af61
49 changed files with 139 additions and 138 deletions
|
@ -48,7 +48,7 @@ import reborncore.common.util.serialization.SerializationUtil;
|
|||
import techreborn.blockentity.machine.GenericMachineBlockEntity;
|
||||
import techreborn.init.ModRecipes;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
|
|
@ -45,7 +45,7 @@ import techreborn.api.generator.FluidGeneratorRecipeList;
|
|||
import techreborn.api.generator.GeneratorRecipeHelper;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider {
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ import techreborn.config.TechRebornConfig;
|
|||
import techreborn.init.TRBlockEntities;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import java.util.Map;
|
||||
|
||||
public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
|
||||
|
@ -63,7 +63,7 @@ public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity impl
|
|||
super(TRBlockEntities.SOLID_FUEL_GENEREATOR);
|
||||
}
|
||||
|
||||
public static int getItemBurnTime(@Nonnull ItemStack stack) {
|
||||
public static int getItemBurnTime(@NotNull ItemStack stack) {
|
||||
if (stack.isEmpty()) {
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ import reborncore.common.fluid.container.FluidInstance;
|
|||
import reborncore.common.util.Tank;
|
||||
import techreborn.init.TRBlockEntities;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class DrainBlockEntity extends MachineBaseBlockEntity {
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ import techreborn.init.TRBlockEntities;
|
|||
import techreborn.init.TRContent;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* @author drcrazy
|
||||
|
|
|
@ -45,7 +45,7 @@ import techreborn.init.TRBlockEntities;
|
|||
import techreborn.init.TRContent;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ import techreborn.init.TRBlockEntities;
|
|||
import techreborn.init.TRContent;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ import techreborn.init.ModSounds;
|
|||
import techreborn.init.TRBlockEntities;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
|
|
@ -49,7 +49,7 @@ import techreborn.init.ModRecipes;
|
|||
import techreborn.init.TRBlockEntities;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
@ -66,7 +66,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity
|
|||
public RebornInventory<RollingMachineBlockEntity> inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this);
|
||||
public boolean isRunning;
|
||||
public int tickTime;
|
||||
@Nonnull
|
||||
@NotNull
|
||||
public ItemStack currentRecipeOutput;
|
||||
public RollingMachineRecipe currentRecipe;
|
||||
private final int outputSlot;
|
||||
|
|
|
@ -46,7 +46,7 @@ import techreborn.config.TechRebornConfig;
|
|||
import techreborn.init.TRBlockEntities;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.world.PersistentState;
|
|||
import net.minecraft.world.World;
|
||||
import reborncore.common.util.NBTSerializable;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class IDSUManager extends PersistentState {
|
||||
|
@ -41,7 +41,7 @@ public class IDSUManager extends PersistentState {
|
|||
super(KEY);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@NotNull
|
||||
public static IDSUPlayer getPlayer(World world, String uuid) {
|
||||
return get(world).getPlayer(uuid);
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ public class IDSUManager extends PersistentState {
|
|||
|
||||
private final HashMap<String, IDSUPlayer> playerHashMap = new HashMap<>();
|
||||
|
||||
@Nonnull
|
||||
@NotNull
|
||||
public IDSUPlayer getPlayer(String uuid) {
|
||||
return playerHashMap.computeIfAbsent(uuid, s -> new IDSUPlayer());
|
||||
}
|
||||
|
@ -82,7 +82,7 @@ public class IDSUManager extends PersistentState {
|
|||
read(compoundTag);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@NotNull
|
||||
@Override
|
||||
public CompoundTag write() {
|
||||
CompoundTag tag = new CompoundTag();
|
||||
|
@ -91,7 +91,7 @@ public class IDSUManager extends PersistentState {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void read(@Nonnull CompoundTag tag) {
|
||||
public void read(@NotNull CompoundTag tag) {
|
||||
energy = tag.getDouble("energy");
|
||||
}
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ import techreborn.init.TRBlockEntities;
|
|||
import techreborn.init.TRContent;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider {
|
||||
|
@ -164,7 +164,7 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I
|
|||
.sync(tank).addInventory().create(this, syncID);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@NotNull
|
||||
@Override
|
||||
public Tank getTank() {
|
||||
return tank;
|
||||
|
|
|
@ -48,7 +48,7 @@ import reborncore.common.util.WorldUtils;
|
|||
import techreborn.init.TRBlockEntities;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue