prep work to update to arch loom 1.3

GregTech-Intergalactical · Sep 15, 2023 · 3fb6d01 · 3fb6d01
1 parent 5d86571
commit 3fb6d01
Show file tree

Hide file tree

Showing 319 changed files with 534 additions and 1,263 deletions.
diff --git a/TesseractAPI b/TesseractAPI
diff --git a/build.gradle b/build.gradle
@@ -91,17 +91,17 @@ subprojects{
 
         shadowJar {
             configurations = [project.configurations.shadowCommon]
-            classifier "dev-shadow"
+            archiveClassifier.set "dev-shadow"
         }
 
         remapJar {
             input.set shadowJar.archiveFile
             dependsOn shadowJar
-            classifier null
+            archiveClassifier.set null
         }
 
         jar {
-            classifier "dev"
+            archiveClassifier.set "dev"
         }
 
         components.java {

diff --git a/common/build.gradle b/common/build.gradle
@@ -38,7 +38,6 @@ dependencies{
     modImplementation("com.gtnewhorizon.structurelib:structurelib-common:${project.structurelib_version}-${project.minecraft_version}")
     modImplementation("net.minecraftforge:forgeconfigapiport-fabric:3.2.4")
     modCompileOnly("curse.maven:the-one-probe-fabric-581847:${project.top_fabric_file}")
-    modCompileOnly "lol.bai.megane:megane-reborn-energy:${project.megane_version}"
     modImplementation("earth.terrarium:botarium-common-1.18.2:${project.botarium_version}")
     modImplementation "com.teamresourceful.resourcefullib:resourcefullib-common-1.18.2:${project.resourcefullib_version}"
 

diff --git a/common/gradle.properties b/common/gradle.properties
@@ -1,4 +1,3 @@
 mod_version=0.2-rc46
 ct_fabric_fluid_support_hash=1.0.1
 top_fabric_file=3877300
-megane_version=7.7.2
diff --git a/common/src/main/java/muramasa/antimatter/AntimatterAPI.java b/common/src/main/java/muramasa/antimatter/AntimatterAPI.java
@@ -31,9 +31,9 @@
 import net.minecraft.world.level.block.state.BlockState;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.util.TriConsumer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -172,13 +172,13 @@ public static <T extends ISharedAntimatterObject> T get(Class<? extends T> c, St
         return getInternal(c, id);
     }
 
-    @Nonnull
+    @NotNull
     public static <T> T getOrDefault(Class<T> c, String id, String domain, NonNullSupplier<? extends T> supplier) {
         Object obj = get(c, id, domain);
         return obj != null ? c.cast(obj) : supplier.get();
     }
 
-    @Nonnull
+    @NotNull
     public static <T> T getOrThrow(Class<T> c, String id, String domain,
                                    Supplier<? extends RuntimeException> supplier) {
         Object obj = get(c, id, domain);
@@ -188,7 +188,7 @@ public static <T> T getOrThrow(Class<T> c, String id, String domain,
         throw supplier.get();
     }
 
-    @Nonnull
+    @NotNull
     public static <T extends ISharedAntimatterObject> T getOrThrow(Class<T> c, String id,
                                                                    Supplier<? extends RuntimeException> supplier) {
         Object obj = get(c, id);
@@ -274,7 +274,7 @@ private static <T> Stream<T> allInternal(Class<T> c) {
                 : new Object2ObjectArrayMap<>(map).values().stream().flatMap(t -> t.map(Stream::of, right -> right.values().stream())).map(c::cast);
     }
 
-    private static <T> Stream<T> allInternal(Class<T> c, @Nonnull String domain) {
+    private static <T> Stream<T> allInternal(Class<T> c, @NotNull String domain) {
         return allInternal(c)
                 .filter(o -> o instanceof IAntimatterObject && ((IAntimatterObject) o).getDomain().equals(domain)
                         || isRegistryEntry(o, domain));

diff --git a/common/src/main/java/muramasa/antimatter/AntimatterProperties.java b/common/src/main/java/muramasa/antimatter/AntimatterProperties.java
@@ -8,8 +8,8 @@
 import muramasa.antimatter.texture.Texture;
 import muramasa.antimatter.tile.TileEntityMachine.DynamicKey;
 import net.minecraft.core.Direction;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Function;
 
 public class AntimatterProperties {

diff --git a/common/src/main/java/muramasa/antimatter/Data.java b/common/src/main/java/muramasa/antimatter/Data.java
@@ -1,15 +1,7 @@
 package muramasa.antimatter;
 
 import muramasa.antimatter.capability.IGuiHandler;
-import muramasa.antimatter.cover.CoverDebug;
-import muramasa.antimatter.cover.CoverDynamo;
-import muramasa.antimatter.cover.CoverEnergy;
-import muramasa.antimatter.cover.CoverFactory;
-import muramasa.antimatter.cover.CoverHeat;
-import muramasa.antimatter.cover.CoverInput;
-import muramasa.antimatter.cover.CoverMuffler;
-import muramasa.antimatter.cover.CoverOutput;
-import muramasa.antimatter.cover.ICover;
+import muramasa.antimatter.cover.*;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.gui.ButtonOverlay;
 import muramasa.antimatter.gui.MenuHandlerCover;
@@ -38,15 +30,15 @@
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.material.PushReaction;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
-
-;
 import static muramasa.antimatter.gui.ButtonOverlay.APAD_RIGHT;
 import static muramasa.antimatter.machine.MachineFlag.ENERGY;
 import static muramasa.antimatter.machine.MachineFlag.GUI;
 import static muramasa.antimatter.machine.Tier.MAX;
 
+;
+
 public class Data {
 
     public static final Material WRENCH_MATERIAL = new Material(MaterialColor.METAL, false, true, true, true, false, false, PushReaction.NORMAL);

diff --git a/common/src/main/java/muramasa/antimatter/MaterialDataInit.java b/common/src/main/java/muramasa/antimatter/MaterialDataInit.java
@@ -5,16 +5,13 @@
 import muramasa.antimatter.data.AntimatterMaterials;
 import muramasa.antimatter.event.MaterialEvent;
 import muramasa.antimatter.material.MaterialTags;
-import net.minecraft.data.loot.BlockLoot;
 import net.minecraft.world.item.Tiers;
 import net.minecraft.world.item.enchantment.Enchantments;
 
 import static com.google.common.collect.ImmutableMap.of;
 import static muramasa.antimatter.material.MaterialTags.MOLTEN;
 import static muramasa.antimatter.material.MaterialTags.QUARTZ_LIKE_BLOCKS;
-import static net.minecraft.world.item.Tiers.GOLD;
-import static net.minecraft.world.item.Tiers.IRON;
-import static net.minecraft.world.item.Tiers.NETHERITE;
+import static net.minecraft.world.item.Tiers.*;
 
 public class MaterialDataInit {
     public static void onMaterialEvent(MaterialEvent event){

diff --git a/common/src/main/java/muramasa/antimatter/behaviour/IAddInformation.java b/common/src/main/java/muramasa/antimatter/behaviour/IAddInformation.java
@@ -1,10 +1,8 @@
 package muramasa.antimatter.behaviour;
 
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.context.UseOnContext;
 
 import java.util.List;
 

diff --git a/common/src/main/java/muramasa/antimatter/block/AntimatterItemBlock.java b/common/src/main/java/muramasa/antimatter/block/AntimatterItemBlock.java
@@ -5,21 +5,19 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
-
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 public class AntimatterItemBlock extends BlockItem {
 
     public AntimatterItemBlock(Block block) {
         super(block, new Properties().tab(block instanceof IItemBlockProvider ? ((IItemBlockProvider) block).getItemGroup() : Ref.TAB_BLOCKS));
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public Component getName(@Nonnull ItemStack stack) {
+    public Component getName(@NotNull ItemStack stack) {
         return getBlock() instanceof IItemBlockProvider ? ((IItemBlockProvider) getBlock()).getDisplayName(stack) : new TranslatableComponent(stack.getDescriptionId());
     }
 }
diff --git a/common/src/main/java/muramasa/antimatter/block/BlockMaterialType.java b/common/src/main/java/muramasa/antimatter/block/BlockMaterialType.java
@@ -9,8 +9,7 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class BlockMaterialType extends BlockBasic implements IColorHandler {
 

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockStone.java b/common/src/main/java/muramasa/antimatter/block/BlockStone.java
@@ -1,11 +1,9 @@
 package muramasa.antimatter.block;
 
-import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;
 import muramasa.antimatter.ore.CobbleStoneType;
 import muramasa.antimatter.ore.StoneType;
 import muramasa.antimatter.registration.ISharedAntimatterObject;
 import muramasa.antimatter.texture.Texture;
-import net.minecraft.world.level.block.Block;
 
 public class BlockStone extends BlockBasic implements ISharedAntimatterObject {
 

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockStoneSlab.java b/common/src/main/java/muramasa/antimatter/block/BlockStoneSlab.java
@@ -4,14 +4,14 @@
 import muramasa.antimatter.data.AntimatterStoneTypes;
 import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
 import muramasa.antimatter.datagen.builder.VariantBlockStateBuilder.VariantBuilder;
-import net.minecraft.resources.ResourceLocation;
 import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;
 import muramasa.antimatter.ore.CobbleStoneType;
 import muramasa.antimatter.ore.StoneType;
 import muramasa.antimatter.registration.IModelProvider;
 import muramasa.antimatter.registration.ISharedAntimatterObject;
 import muramasa.antimatter.registration.ITextureProvider;
 import muramasa.antimatter.texture.Texture;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.state.properties.SlabType;

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockStoneStair.java b/common/src/main/java/muramasa/antimatter/block/BlockStoneStair.java
@@ -17,10 +17,7 @@
 import net.minecraft.world.level.block.state.properties.Half;
 import net.minecraft.world.level.block.state.properties.StairsShape;
 
-import static net.minecraft.core.Direction.EAST;
-import static net.minecraft.core.Direction.NORTH;
-import static net.minecraft.core.Direction.SOUTH;
-import static net.minecraft.core.Direction.WEST;
+import static net.minecraft.core.Direction.*;
 import static net.minecraft.world.level.block.state.properties.StairsShape.STRAIGHT;
 
 public class BlockStoneStair extends StairBlock implements ISharedAntimatterObject, ITextureProvider, IModelProvider {

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockStorage.java b/common/src/main/java/muramasa/antimatter/block/BlockStorage.java
@@ -14,9 +14,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
@@ -26,9 +24,7 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-
-import javax.annotation.Nullable;
-import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 public class BlockStorage extends BlockMaterialType implements IItemBlockProvider, ISharedAntimatterObject {
 

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockSurfaceRock.java b/common/src/main/java/muramasa/antimatter/block/BlockSurfaceRock.java
@@ -1,7 +1,6 @@
 package muramasa.antimatter.block;
 
 import com.google.common.collect.ImmutableMap;
-import muramasa.antimatter.Data;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
@@ -18,7 +17,6 @@
 import muramasa.antimatter.util.Utils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.Containers;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;

diff --git a/common/src/main/java/muramasa/antimatter/capability/ComponentHandler.java b/common/src/main/java/muramasa/antimatter/capability/ComponentHandler.java
@@ -10,7 +10,6 @@
 import muramasa.antimatter.tile.multi.TileEntityMultiMachine;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.Set;
@@ -33,13 +32,13 @@ public ComponentHandler(String componentId, T componentTile) {
         this(componentId, componentId, componentTile);
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public String getId() {
         return componentId;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public T getTile() {
         return componentTile;
@@ -50,31 +49,31 @@ public T getTile() {
         return idForHandlers;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Optional<MachineItemHandler<?>> getItemHandler() {
         return componentTile instanceof TileEntityMachine<?> machine ? machine.itemHandler.map(h -> h) : Optional.empty();
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Optional<MachineFluidHandler<?>> getFluidHandler() {
         return componentTile instanceof TileEntityMachine<?> machine ?  machine.fluidHandler.map(f -> f) : Optional.empty();
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Optional<MachineEnergyHandler<?>> getEnergyHandler() {
         return componentTile instanceof TileEntityMachine<?> machine ? machine.energyHandler.map(e -> e) : Optional.empty();
     }
 
     @Override
-    public void onStructureFormed(@Nonnull TileEntityMultiMachine<?> controllerTile) {
+    public void onStructureFormed(@NotNull TileEntityMultiMachine<?> controllerTile) {
         this.controllers.add(controllerTile);
     }
 
     @Override
-    public void onStructureInvalidated(@Nonnull TileEntityMultiMachine<?> controllerTile) {
+    public void onStructureInvalidated(@NotNull TileEntityMultiMachine<?> controllerTile) {
         this.controllers.remove(controllerTile);
     }
 
@@ -83,7 +82,7 @@ public boolean hasLinkedController() {
         return StructureCache.has(getTile().getLevel(), getTile().getBlockPos());
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Collection<TileEntityMultiMachine<?>> getControllers() {
         return controllers;

diff --git a/common/src/main/java/muramasa/antimatter/capability/CoverHandler.java b/common/src/main/java/muramasa/antimatter/capability/CoverHandler.java
@@ -22,9 +22,9 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -53,7 +53,7 @@ public DynamicTexturer<ICover, ICover.DynamicKey> getTexturer(Direction dir) {
     }
 
     @Override
-    public boolean set(Direction side, @Nonnull ICover newCover, boolean sync) {
+    public boolean set(Direction side, @NotNull ICover newCover, boolean sync) {
         if (!validCovers.contains(newCover.getLoc())) return false;
         ICover old = covers.getOrDefault(side, ICover.empty);
         return set(side, old, newCover, sync);
@@ -195,7 +195,7 @@ public boolean hasCover(Class<? extends ICover> clazz) {
     }
 
     @Override
-    public boolean isValid(@Nonnull Direction side, @Nonnull ICover replacement) {
+    public boolean isValid(@NotNull Direction side, @NotNull ICover replacement) {
         return (get(side).isEmpty() || replacement.isEqual(ICover.empty)) && validCovers.contains(replacement.getId());
     }
 

diff --git a/common/src/main/java/muramasa/antimatter/capability/EnergyHandler.java b/common/src/main/java/muramasa/antimatter/capability/EnergyHandler.java
@@ -4,9 +4,7 @@
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import tesseract.api.gt.GTConsumer;
-import tesseract.api.gt.GTTransaction;
 import tesseract.api.gt.IEnergyHandler;
-import tesseract.api.gt.IGTNode;
 
 
 public class EnergyHandler implements IEnergyHandler {
+4 −4		build.gradle
+4 −4		common/src/main/java/tesseract/FluidPlatformUtils.java
+2 −2		common/src/main/java/tesseract/api/fluid/FluidController.java
+0 −1		common/src/main/java/tesseract/api/rf/IEnergyHandlerRF.java
+3 −5		common/src/main/java/tesseract/api/wrapper/ItemTileWrapper.java
+2 −2		common/src/main/java/tesseract/controller/Fluid.java
+5 −5		common/src/main/java/tesseract/util/ItemHandlerUtils.java
+2 −2		fabric/src/main/java/tesseract/api/fabric/wrapper/FluidTileWrapper.java
+3 −3		forge/src/main/java/tesseract/api/forge/wrapper/FluidTileWrapper.java
+2 −2		forge/src/test/java/tests/GraphTest.java
+1 −1		gradle/wrapper/gradle-wrapper.properties