diff --git a/common/src/main/java/trinsdar/gt4r/GT4RConfig.java b/common/src/main/java/trinsdar/gt4r/GT4RConfig.java index df79a53c..aa7c647c 100644 --- a/common/src/main/java/trinsdar/gt4r/GT4RConfig.java +++ b/common/src/main/java/trinsdar/gt4r/GT4RConfig.java @@ -5,9 +5,6 @@ import carbonconfiglib.config.ConfigHandler; import carbonconfiglib.config.ConfigSection; import muramasa.antimatter.util.AntimatterPlatformUtils; -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.fml.config.ModConfig; -import org.apache.commons.lang3.tuple.Pair; public class GT4RConfig { static ConfigHandler CONFIG; diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalTank.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalTank.java index e6f3425d..8ccedd7f 100644 --- a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalTank.java +++ b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalTank.java @@ -16,11 +16,10 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.data.GT4RData; import trinsdar.gt4r.data.SlotTypes; -import javax.annotation.Nullable; - public class BlockEntityDigitalTank extends BlockEntityTank { public BlockEntityDigitalTank(Machine type, BlockPos pos, BlockState state) { super(type, pos, state); diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityHeatExchanger.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityHeatExchanger.java index 4f78cfb6..d45fac03 100644 --- a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityHeatExchanger.java +++ b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityHeatExchanger.java @@ -21,11 +21,11 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluids; +import org.jetbrains.annotations.NotNull; import tesseract.FluidPlatformUtils; import tesseract.TesseractCapUtils; import tesseract.TesseractGraphWrappers; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -245,7 +245,7 @@ public long fillInternal(FluidHolder resource, boolean simulate) { return fluidHandler.insertFluid(resource, simulate); } - @Nonnull + @NotNull @Override public FluidHolder extractFluid(FluidHolder resource, boolean simulate) { if (side == DOWN) return ((HeatExchangerFluidHandler)fluidHandler).tanks.get(FluidDirection.OUTPUT).getTank(1).extractFluid(resource, simulate); diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityInfiniteFluid.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityInfiniteFluid.java index 8c5f9e36..4698437b 100644 --- a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityInfiniteFluid.java +++ b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityInfiniteFluid.java @@ -13,8 +13,8 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.util.List; import static trinsdar.gt4r.data.Materials.Steam; @@ -79,7 +79,7 @@ public boolean canInput(Direction direction) { return false; } - @Nonnull + @NotNull @Override public FluidHolder extractFluid(FluidHolder stack, boolean action) { return stack.copyHolder(); diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityItemFilter.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityItemFilter.java index fa155a59..633ce502 100644 --- a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityItemFilter.java +++ b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityItemFilter.java @@ -26,11 +26,11 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.LevelChunk; +import org.jetbrains.annotations.Nullable; import tesseract.TesseractCapUtils; import tesseract.api.item.ExtendedItemContainer; import trinsdar.gt4r.gui.ButtonOverlays; -import javax.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityQuantumTank.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityQuantumTank.java index 5a1fbdbc..c3e0a00d 100644 --- a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityQuantumTank.java +++ b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityQuantumTank.java @@ -7,8 +7,7 @@ import muramasa.antimatter.machine.types.Machine; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; - -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public class BlockEntityQuantumTank extends BlockEntityTank { diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityTeleporter.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityTeleporter.java index c30d6244..87d2a55c 100644 --- a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityTeleporter.java +++ b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityTeleporter.java @@ -21,8 +21,8 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.util.List; public class BlockEntityTeleporter extends BlockEntityMachine { diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverBasicTransport.java b/common/src/main/java/trinsdar/gt4r/cover/CoverBasicTransport.java index c5322300..759c7fa9 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverBasicTransport.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverBasicTransport.java @@ -11,10 +11,9 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.player.Player; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; -import javax.annotation.Nullable; - import static trinsdar.gt4r.cover.ImportExportMode.EXPORT; import static trinsdar.gt4r.cover.ImportExportMode.IMPORT; diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverConveyor.java b/common/src/main/java/trinsdar/gt4r/cover/CoverConveyor.java index eafb0594..e4d2de0d 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverConveyor.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverConveyor.java @@ -15,11 +15,11 @@ import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; import tesseract.TesseractCapUtils; import tesseract.api.item.ExtendedItemContainer; import trinsdar.gt4r.cover.redstone.CoverRedstoneMachineController; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverCrafting.java b/common/src/main/java/trinsdar/gt4r/cover/CoverCrafting.java index eb429b1a..ff380baa 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverCrafting.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverCrafting.java @@ -12,10 +12,9 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; -import javax.annotation.Nullable; - public class CoverCrafting extends BaseCover { diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverDrain.java b/common/src/main/java/trinsdar/gt4r/cover/CoverDrain.java index fa67bba4..213543e9 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverDrain.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverDrain.java @@ -26,12 +26,11 @@ import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; +import org.jetbrains.annotations.Nullable; import tesseract.FluidPlatformUtils; import tesseract.TesseractGraphWrappers; import trinsdar.gt4r.GT4RRef; -import javax.annotation.Nullable; - import java.util.Optional; public class CoverDrain extends BaseCover { diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverDynamoOld.java b/common/src/main/java/trinsdar/gt4r/cover/CoverDynamoOld.java index 99c0c9ab..fe0082fb 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverDynamoOld.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverDynamoOld.java @@ -6,10 +6,9 @@ import muramasa.antimatter.machine.Tier; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; -import javax.annotation.Nullable; - public class CoverDynamoOld extends CoverDynamo { public CoverDynamoOld(ICoverHandler source, @Nullable Tier tier, Direction side, CoverFactory factory) { diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverFusionInput.java b/common/src/main/java/trinsdar/gt4r/cover/CoverFusionInput.java index 6841386f..fd66a643 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverFusionInput.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverFusionInput.java @@ -6,10 +6,9 @@ import muramasa.antimatter.machine.Tier; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; -import javax.annotation.Nullable; - public class CoverFusionInput extends CoverInput { public CoverFusionInput(ICoverHandler source, @Nullable Tier tier, Direction side, CoverFactory factory) { super(source, tier, side, factory); diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverFusionOutput.java b/common/src/main/java/trinsdar/gt4r/cover/CoverFusionOutput.java index 2eb00ec2..1e2815b4 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverFusionOutput.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverFusionOutput.java @@ -6,10 +6,9 @@ import muramasa.antimatter.machine.Tier; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; -import javax.annotation.Nullable; - public class CoverFusionOutput extends CoverOutput { public CoverFusionOutput(ICoverHandler source, @Nullable Tier tier, Direction side, CoverFactory factory) { super(source, tier, side, factory); diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverItemtransportValve.java b/common/src/main/java/trinsdar/gt4r/cover/CoverItemtransportValve.java index 27006e0b..a331b993 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverItemtransportValve.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverItemtransportValve.java @@ -5,8 +5,7 @@ import muramasa.antimatter.machine.Tier; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; - -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public class CoverItemtransportValve extends CoverBasicTransport{ public static String ID = "item_transport_valve"; diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverPump.java b/common/src/main/java/trinsdar/gt4r/cover/CoverPump.java index 5ef864dd..56fa0110 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverPump.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverPump.java @@ -9,10 +9,10 @@ import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.entity.BlockEntity; +import org.jetbrains.annotations.Nullable; import tesseract.TesseractCapUtils; import trinsdar.gt4r.cover.redstone.CoverRedstoneMachineController; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/trinsdar/gt4r/cover/CoverSteamVent.java b/common/src/main/java/trinsdar/gt4r/cover/CoverSteamVent.java index d55d8994..77f93654 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/CoverSteamVent.java +++ b/common/src/main/java/trinsdar/gt4r/cover/CoverSteamVent.java @@ -7,10 +7,9 @@ import muramasa.antimatter.blockentity.BlockEntityMachine; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.blockentity.single.BlockEntitySteamMachine; -import javax.annotation.Nullable; - public class CoverSteamVent extends BaseCover { diff --git a/common/src/main/java/trinsdar/gt4r/cover/redstone/CoverRedstoneMachineController.java b/common/src/main/java/trinsdar/gt4r/cover/redstone/CoverRedstoneMachineController.java index 1ce09c6c..dc0d0ac1 100644 --- a/common/src/main/java/trinsdar/gt4r/cover/redstone/CoverRedstoneMachineController.java +++ b/common/src/main/java/trinsdar/gt4r/cover/redstone/CoverRedstoneMachineController.java @@ -15,11 +15,10 @@ import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.cover.RedstoneMode; -import javax.annotation.Nullable; - public class CoverRedstoneMachineController extends BaseCover { protected boolean inverted; diff --git a/common/src/main/java/trinsdar/gt4r/data/ToolTypes.java b/common/src/main/java/trinsdar/gt4r/data/ToolTypes.java index 289a9f2f..098d22d6 100644 --- a/common/src/main/java/trinsdar/gt4r/data/ToolTypes.java +++ b/common/src/main/java/trinsdar/gt4r/data/ToolTypes.java @@ -18,6 +18,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; +import org.jetbrains.annotations.NotNull; import tesseract.TesseractCapUtils; import tesseract.api.gt.IEnergyHandlerItem; import tesseract.api.gt.IGTNode; @@ -25,10 +26,7 @@ import trinsdar.gt4r.items.IElectricTool; import trinsdar.gt4r.items.MaterialRockCutter; -import javax.annotation.Nonnull; -import java.util.List; import java.util.Map; -import java.util.function.Supplier; import static muramasa.antimatter.material.Material.NULL; import static net.minecraft.world.level.material.Material.*; @@ -46,7 +44,7 @@ public ItemStack build(CraftingContainer inv, MaterialRecipe.Result mats) { } @Override - public Map getFromResult(@Nonnull ItemStack stack) { + public Map getFromResult(@NotNull ItemStack stack) { CompoundTag nbt = stack.getTag().getCompound(muramasa.antimatter.Ref.TAG_TOOL_DATA); Material primary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_PRIMARY_MATERIAL)); Material secondary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_SECONDARY_MATERIAL)); @@ -64,7 +62,7 @@ public ItemStack build(CraftingContainer inv, MaterialRecipe.Result mats) { } @Override - public Map getFromResult(@Nonnull ItemStack stack) { + public Map getFromResult(@NotNull ItemStack stack) { return ImmutableMap.of("energy", getEnergy(stack).getA(), "maxEnergy", getEnergy(stack).getB()); } }); @@ -80,7 +78,7 @@ public ItemStack build(CraftingContainer inv, MaterialRecipe.Result mats) { } @Override - public Map getFromResult(@Nonnull ItemStack stack) { + public Map getFromResult(@NotNull ItemStack stack) { CompoundTag nbt = stack.getTag().getCompound(muramasa.antimatter.Ref.TAG_TOOL_DATA); Material primary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_PRIMARY_MATERIAL)); Material secondary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_SECONDARY_MATERIAL)); diff --git a/common/src/main/java/trinsdar/gt4r/gui/slots/SlotCoil.java b/common/src/main/java/trinsdar/gt4r/gui/slots/SlotCoil.java index fb2f83b1..8a7977d2 100644 --- a/common/src/main/java/trinsdar/gt4r/gui/slots/SlotCoil.java +++ b/common/src/main/java/trinsdar/gt4r/gui/slots/SlotCoil.java @@ -7,6 +7,7 @@ import muramasa.antimatter.blockentity.BlockEntityMachine; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import tesseract.api.item.ExtendedItemContainer; import trinsdar.gt4r.data.GT4RData; import trinsdar.gt4r.data.Machines; @@ -14,15 +15,13 @@ import trinsdar.gt4r.blockentity.multi.BlockEntityIndustrialBlastFurnace; import trinsdar.gt4r.blockentity.single.BlockEntitySmelter; -import javax.annotation.Nonnull; - public class SlotCoil extends AbstractSlot { public SlotCoil(SlotType type, IGuiHandler tile, ExtendedItemContainer stackHandler, int index, int xPosition, int yPosition) { super(type, tile, stackHandler, index, xPosition, yPosition); } @Override - public boolean mayPlace(@Nonnull ItemStack stack) { + public boolean mayPlace(@NotNull ItemStack stack) { if (holder instanceof BlockEntitySmelter){ return RecipeMaps.SMELTER_COILS.acceptsItem(stack); } @@ -44,7 +43,7 @@ public int getMaxStackSize() { } @Override - public int getMaxStackSize(@Nonnull ItemStack stack) { + public int getMaxStackSize(@NotNull ItemStack stack) { if (holder instanceof BlockEntitySmelter){ return 6; } diff --git a/common/src/main/java/trinsdar/gt4r/gui/slots/SlotData.java b/common/src/main/java/trinsdar/gt4r/gui/slots/SlotData.java index 8a879a80..df02ac32 100644 --- a/common/src/main/java/trinsdar/gt4r/gui/slots/SlotData.java +++ b/common/src/main/java/trinsdar/gt4r/gui/slots/SlotData.java @@ -4,17 +4,16 @@ import muramasa.antimatter.gui.SlotType; import muramasa.antimatter.gui.slot.AbstractSlot; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import tesseract.api.item.ExtendedItemContainer; -import javax.annotation.Nonnull; - public class SlotData extends AbstractSlot { public SlotData(SlotType type, IGuiHandler tile, ExtendedItemContainer stackHandler, int index, int x, int y) { super(type, tile, stackHandler, index, x, y); } @Override - public int getMaxStackSize(@Nonnull ItemStack stack) { + public int getMaxStackSize(@NotNull ItemStack stack) { return 1; } diff --git a/common/src/main/java/trinsdar/gt4r/gui/slots/SlotQuantum.java b/common/src/main/java/trinsdar/gt4r/gui/slots/SlotQuantum.java index d33e7829..292b7ee3 100644 --- a/common/src/main/java/trinsdar/gt4r/gui/slots/SlotQuantum.java +++ b/common/src/main/java/trinsdar/gt4r/gui/slots/SlotQuantum.java @@ -10,10 +10,9 @@ import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; import tesseract.api.item.ExtendedItemContainer; -import javax.annotation.Nonnull; - public class SlotQuantum extends AbstractSlot implements IClickableSlot { public SlotQuantum(SlotType type, IGuiHandler tile, ExtendedItemContainer stackHandler, int index, int x, int y) { super(type, tile, stackHandler, index, x, y); @@ -229,7 +228,7 @@ public int getMaxStackSize() { } @Override - public int getMaxStackSize(@Nonnull ItemStack stack) { + public int getMaxStackSize(@NotNull ItemStack stack) { if (stack.getMaxStackSize() == 1) return 1; return Integer.MAX_VALUE; } diff --git a/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerFuelWidget.java b/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerFuelWidget.java index c0b6374c..e64c487f 100644 --- a/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerFuelWidget.java +++ b/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerFuelWidget.java @@ -13,14 +13,13 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.TextComponent; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.blockentity.single.BlockEntityCoalBoiler; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class CoalBoilerFuelWidget extends Widget { private int fuel = 0, maxFuel = 0; - protected CoalBoilerFuelWidget(@Nonnull GuiInstance gui, @Nullable IGuiElement parent) { + protected CoalBoilerFuelWidget(@NotNull GuiInstance gui, @Nullable IGuiElement parent) { super(gui, parent); } diff --git a/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerWidget.java b/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerWidget.java index f8998890..c6671bda 100644 --- a/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerWidget.java +++ b/common/src/main/java/trinsdar/gt4r/gui/widgets/CoalBoilerWidget.java @@ -11,16 +11,15 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.TextComponent; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.blockentity.single.BlockEntityCoalBoiler; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class CoalBoilerWidget extends Widget { private int heat = 0, maxHeat = 0; long water = 0, steam = 0; - protected CoalBoilerWidget(@Nonnull GuiInstance gui, @Nullable IGuiElement parent) { + protected CoalBoilerWidget(@NotNull GuiInstance gui, @Nullable IGuiElement parent) { super(gui, parent); } diff --git a/common/src/main/java/trinsdar/gt4r/gui/widgets/FusionButtonWidget.java b/common/src/main/java/trinsdar/gt4r/gui/widgets/FusionButtonWidget.java index 94309e58..64533fda 100644 --- a/common/src/main/java/trinsdar/gt4r/gui/widgets/FusionButtonWidget.java +++ b/common/src/main/java/trinsdar/gt4r/gui/widgets/FusionButtonWidget.java @@ -9,17 +9,16 @@ import muramasa.antimatter.machine.MachineFlag; import net.minecraft.network.chat.TextComponent; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.blockentity.multi.BlockEntityFusionReactor; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class FusionButtonWidget extends Widget { ResourceLocation middle = new ResourceLocation(GT4RRef.ID, "textures/gui/machine/fusion_computer_middle_overlay.png"); ResourceLocation top_bottom = new ResourceLocation(GT4RRef.ID, "textures/gui/machine/fusion_computer_top_bottom_overlay.png"); - protected FusionButtonWidget(@Nonnull GuiInstance gui, @Nullable IGuiElement parent) { + protected FusionButtonWidget(@NotNull GuiInstance gui, @Nullable IGuiElement parent) { super(gui, parent); setW(18); setH(18); diff --git a/common/src/main/java/trinsdar/gt4r/gui/widgets/TooltipWidget.java b/common/src/main/java/trinsdar/gt4r/gui/widgets/TooltipWidget.java index 16e320a4..ca776741 100644 --- a/common/src/main/java/trinsdar/gt4r/gui/widgets/TooltipWidget.java +++ b/common/src/main/java/trinsdar/gt4r/gui/widgets/TooltipWidget.java @@ -6,13 +6,12 @@ import muramasa.antimatter.gui.Widget; import muramasa.antimatter.gui.widget.WidgetSupplier; import net.minecraft.network.chat.TranslatableComponent; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class TooltipWidget extends Widget { final String tooltipKey; - protected TooltipWidget(@Nonnull GuiInstance gui, @Nullable IGuiElement parent, String tooltipKey) { + protected TooltipWidget(@NotNull GuiInstance gui, @Nullable IGuiElement parent, String tooltipKey) { super(gui, parent); this.tooltipKey = tooltipKey; } diff --git a/common/src/main/java/trinsdar/gt4r/items/ItemCraftingModule.java b/common/src/main/java/trinsdar/gt4r/items/ItemCraftingModule.java index 1b39226c..95f0d53a 100644 --- a/common/src/main/java/trinsdar/gt4r/items/ItemCraftingModule.java +++ b/common/src/main/java/trinsdar/gt4r/items/ItemCraftingModule.java @@ -14,11 +14,10 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.data.MenuHandlers; -import javax.annotation.Nullable; - public class ItemCraftingModule extends ItemCover implements MenuProvider { public ItemCraftingModule() { super(GT4RRef.ID, "crafting_module"); diff --git a/common/src/main/java/trinsdar/gt4r/items/ItemMixedMetal.java b/common/src/main/java/trinsdar/gt4r/items/ItemMixedMetal.java index d6b5bb79..359eccdb 100644 --- a/common/src/main/java/trinsdar/gt4r/items/ItemMixedMetal.java +++ b/common/src/main/java/trinsdar/gt4r/items/ItemMixedMetal.java @@ -13,10 +13,10 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; +import org.jetbrains.annotations.Nullable; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.data.Materials; -import javax.annotation.Nullable; import java.util.List; import static muramasa.antimatter.material.Material.NULL; diff --git a/common/src/main/java/trinsdar/gt4r/items/MaterialRockCutter.java b/common/src/main/java/trinsdar/gt4r/items/MaterialRockCutter.java index eb99a280..ab4a6c17 100644 --- a/common/src/main/java/trinsdar/gt4r/items/MaterialRockCutter.java +++ b/common/src/main/java/trinsdar/gt4r/items/MaterialRockCutter.java @@ -17,11 +17,11 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; import tesseract.TesseractCapUtils; import tesseract.api.gt.IEnergyHandler; import tesseract.api.gt.IEnergyHandlerItem; -import javax.annotation.Nullable; import java.util.List; import java.util.Map; diff --git a/forge/build.gradle b/forge/build.gradle index 80b9d1b1..944ea65e 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -33,19 +33,21 @@ dependencies { common(project(path: ":antimatter-common", configuration: "namedElements")){ transitive = false; } + modImplementation("earth.terrarium:botarium-forge-1.18.2:${project.botarium_version}") + modImplementation("io.github.reforgedmods.terraform-api:terraform-utils-v1:3.1.5") + modImplementation("com.teamresourceful.resourcefullib:resourcefullib-forge-1.18.2:${project.resourcefullib_version}") //JEI //modRuntimeOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge:${rootProject.jei_version}") //modImplementation "me.shedaniel:RoughlyEnoughItems-forge:${rootProject.rei_version}" modRuntimeOnly("mezz.jei:jei-1.18.2:9.7.2.1001") - modImplementation("com.github.Reforged-Mods:ARRP-forge:0.6.7-1.18.2") - modImplementation("earth.terrarium:botarium-forge-1.18.2:${project.botarium_version}") - modImplementation("com.github.Reforged-Mods.Terraform-Reforged:terraform-utils-v1:${project.terraform_version}") - modImplementation("io.github.llamalad7:mixinextras-forge:0.2.0-beta.11") + modImplementation("io.github.trinsdar:arrp-forge:0.6.7") + modImplementation("io.github.llamalad7:mixinextras-forge:0.3.5") + minecraftRuntimeLibraries(group: 'com.github.Speiger', name: 'Primitive-Collections', version: '[0.8,0.9)') implementation("io.github.gregtechintergalactical:gtcore-forge:${rootProject.gt_core_version}-${rootProject.minecraft_version}:dev"){ transitive = false } include("io.github.gregtechintergalactical:gtcore-forge:${rootProject.gt_core_version}-${rootProject.minecraft_version}") - modRuntimeOnly(include("com.github.Reforged-Mods.Terraform-Reforged:terraform-wood-api-v1:3.1.5")) + modRuntimeOnly(include("io.github.reforgedmods.terraform-api:terraform-wood-api-v1:3.1.5")) modRuntimeOnly("com.gtnewhorizon.structurelib:structurelib-forge:${project.structurelib_version}-${project.minecraft_version}") modRuntimeOnly "com.teamresourceful.resourcefullib:resourcefullib-forge-1.18.2:${project.resourcefullib_version}" modRuntimeOnly("dev.latvian.mods:kubejs-forge:${rootProject.kubejs_version}")