Robotics!

CalenXwX · Apr 11, 2024 · Apr 12, 2024 · Apr 13, 2024 · Apr 13, 2024 · Apr 20, 2024
commit db7e646f680266aebdcd266d75347fe567d65269
diff --git a/api/buildcraft/api/boards/RedstoneBoardNBT.java b/api/buildcraft/api/boards/RedstoneBoardNBT.java
@@ -6,29 +6,40 @@
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Random;
 
 public abstract class RedstoneBoardNBT<T> {
 
     private static Random rand = new Random();
 
-    public abstract String getID();
+    public abstract ResourceLocation getID();
 
-    public abstract void addInformation(ItemStack stack, Player player, List<String> list, boolean advanced);
+    // public abstract void addInformation(ItemStack stack, Player player, List<String> list, boolean advanced);
+    public abstract void addInformation(ItemStack stack, @Nullable Level world, List<Component> list, TooltipFlag flag);
 
-    public abstract String getDisplayName();
+    // public abstract String getDisplayName();
+    public final String getDisplayName() {
+        return getDisplayNameComponent().getString();
+    }
+
+    public abstract Component getDisplayNameComponent();
 
     public abstract IRedstoneBoard<T> create(CompoundTag nbt, T object);
 
-    public abstract String getItemModelLocation();
+    // public abstract String getItemModelLocation();
+    public abstract String getBoardTexture();
 
-    public void createBoard(CompoundTag nbt) {
-        nbt.putString("id", getID());
-    }
+//    public void createBoard(CompoundTag nbt) {
+//        nbt.putString("id", getID().toString());
+//    }
 
     public int getParameterNumber(CompoundTag nbt) {
         if (!nbt.contains("parameters")) {

diff --git a/api/buildcraft/api/boards/RedstoneBoardRegistry.java b/api/buildcraft/api/boards/RedstoneBoardRegistry.java
@@ -5,8 +5,12 @@
 package buildcraft.api.boards;
 
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraftforge.registries.RegistryObject;
 
-import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 public abstract class RedstoneBoardRegistry {
 
@@ -24,9 +28,13 @@ public abstract class RedstoneBoardRegistry {
 
     public abstract RedstoneBoardNBT<?> getRedstoneBoard(CompoundTag nbt);
 
-    public abstract RedstoneBoardNBT<?> getRedstoneBoard(String id);
+    // public abstract RedstoneBoardNBT<?> getRedstoneBoard(String id);
+    public abstract RedstoneBoardNBT<?> getRedstoneBoard(ResourceLocation id);
 
-    public abstract Collection<RedstoneBoardNBT<?>> getAllBoardNBTs();
+    // public abstract Collection<RedstoneBoardNBT<?>> getAllBoardNBTs();
+    public abstract List<RedstoneBoardNBT<?>> getAllBoardNBTs();
+
+    public abstract Map<RedstoneBoardNBT<?>, RegistryObject<? extends Item>> getBoardNBTItemMap();
 
     public abstract long getPowerCost(RedstoneBoardNBT<?> board);
 }
diff --git a/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java b/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java
@@ -18,5 +18,8 @@ public RedstoneBoardRobot create(CompoundTag nbt, EntityRobotBase robot) {
     public abstract RedstoneBoardRobot create(EntityRobotBase robot);
 
     public abstract ResourceLocation getRobotTexture();
+    // Calen 1.18.2
+    public abstract ResourceLocation getRobotTextureFullLocation();
 
+    public abstract ResourceLocation getRobotId();
 }
diff --git a/api/buildcraft/api/core/BuildCraftAPI.java b/api/buildcraft/api/core/BuildCraftAPI.java
@@ -4,24 +4,16 @@
  * should be located as "LICENSE.API" in the BuildCraft source code distribution. */
 package buildcraft.api.core;
 
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 
-import java.util.HashMap;
-import java.util.Set;
-
 public final class BuildCraftAPI {
     public static IFakePlayerProvider fakePlayerProvider;
 
-    public static final Set<Block> softBlocks = Sets.newHashSet();
-    public static final HashMap<String, IWorldProperty> worldProperties = Maps.newHashMap();
+    // public static final Set<Block> softBlocks = Sets.newHashSet();
+    // public static final HashMap<String, IWorldProperty> worldProperties = Maps.newHashMap();
 
     /** Deactivate constructor */
     private BuildCraftAPI() {
@@ -35,20 +27,20 @@ public static String getVersion() {
         return "UNKNOWN VERSION";
     }
 
-    public static IWorldProperty getWorldProperty(String name) {
-        return worldProperties.get(name);
-    }
+//    public static IWorldProperty getWorldProperty(String name) {
+//        return worldProperties.get(name);
+//    }
 
-    public static void registerWorldProperty(String name, IWorldProperty property) {
-        if (worldProperties.containsKey(name)) {
-            BCLog.logger.warn("The WorldProperty key '" + name + "' is being overridden with " + property.getClass().getSimpleName() + "!");
-        }
-        worldProperties.put(name, property);
-    }
+//    public static void registerWorldProperty(String name, IWorldProperty property) {
+//        if (worldProperties.containsKey(name)) {
+//            BCLog.logger.warn("The WorldProperty key '" + name + "' is being overridden with " + property.getClass().getSimpleName() + "!");
+//        }
+//        worldProperties.put(name, property);
+//    }
 
-    public static boolean isSoftBlock(Level world, BlockPos pos) {
-        return worldProperties.get("soft").get(world, pos);
-    }
+//    public static boolean isSoftBlock(Level world, BlockPos pos) {
+//        return worldProperties.get("soft").get(world, pos);
+//    }
 
     public static ResourceLocation nameToResourceLocation(String name) {
         if (name.indexOf(':') > 0) return new ResourceLocation(name);

diff --git a/api/buildcraft/api/core/IBlockFilter.java b/api/buildcraft/api/core/IBlockFilter.java
@@ -0,0 +1,13 @@
+/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com
+ * <p/>
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. Please check the contents
+ * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */
+package buildcraft.api.core;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+
+// Calen 1.18.2 from 1.8.9
+public interface IBlockFilter {
+    boolean matches(Level world, BlockPos pos);
+}
diff --git a/api/buildcraft/api/core/IEntityFilter.java b/api/buildcraft/api/core/IEntityFilter.java
@@ -0,0 +1,13 @@
+/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com
+ * <p/>
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. Please check the contents
+ * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */
+package buildcraft.api.core;
+
+import net.minecraft.world.entity.Entity;
+
+public interface IEntityFilter {
+
+    boolean matches(Entity entity);
+
+}
diff --git a/api/buildcraft/api/core/IInvSlot.java b/api/buildcraft/api/core/IInvSlot.java
@@ -6,6 +6,8 @@
 
 import net.minecraft.world.item.ItemStack;
 
+import javax.annotation.Nonnull;
+
 public interface IInvSlot {
     /** Returns the slot number of the underlying Inventory.
      *
@@ -18,9 +20,11 @@ public interface IInvSlot {
 
     boolean isItemValidForSlot(ItemStack stack);
 
+    @Nonnull
     ItemStack decreaseStackInSlot(int amount);
 
+    @Nonnull
     ItemStack getStackInSlot();
 
-    void setStackInSlot(ItemStack stack);
+    void setStackInSlot(@Nonnull ItemStack stack);
 }
diff --git a/api/buildcraft/api/crops/CropManager.java b/api/buildcraft/api/crops/CropManager.java
@@ -12,6 +12,12 @@
 import java.util.List;
 
 public final class CropManager {
+    public enum HarvestResult {
+        SUCCESS,
+        FAIL,
+        PROGRESS;
+    }
+
     private static List<ICropHandler> handlers = new ArrayList<>();
     private static ICropHandler defaultHandler;
 
@@ -73,13 +79,15 @@ public static boolean isMature(LevelAccessor blockAccess, BlockState state, Bloc
         return defaultHandler.isMature(blockAccess, state, pos);
     }
 
-    public static boolean harvestCrop(Level world, BlockPos pos, NonNullList<ItemStack> drops) {
+    // public static boolean harvestCrop(Level world, BlockPos pos, NonNullList<ItemStack> drops)
+    public static HarvestResult harvestCrop(Level world, BlockPos pos, ItemStack tool, NonNullList<ItemStack> drops) {
         BlockState state = world.getBlockState(pos);
         for (ICropHandler cropHandler : handlers) {
             if (cropHandler.isMature(world, state, pos)) {
-                return cropHandler.harvestCrop(world, pos, drops);
+                return cropHandler.harvestCrop(world, pos, tool, drops);
             }
         }
-        return defaultHandler.isMature(world, state, pos) && defaultHandler.harvestCrop(world, pos, drops);
+        // return defaultHandler.isMature(world, state, pos) && defaultHandler.harvestCrop(world, pos, drops);
+        return defaultHandler.isMature(world, state, pos) ? defaultHandler.harvestCrop(world, pos, tool, drops) : HarvestResult.FAIL;
     }
 }
diff --git a/api/buildcraft/api/crops/ICropHandler.java b/api/buildcraft/api/crops/ICropHandler.java
@@ -8,6 +8,8 @@
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.state.BlockState;
 
+import javax.annotation.Nonnull;
+
 public interface ICropHandler {
 
     /** Check if an item is a seed.
@@ -46,8 +48,10 @@ public interface ICropHandler {
      *
      * @param world
      * @param pos
+     * @param tool
      * @param drops a list to return the harvest's drops.
      * @return true if the block was successfully harvested. */
-    boolean harvestCrop(Level world, BlockPos pos, NonNullList<ItemStack> drops);
+    // boolean harvestCrop(Level world, BlockPos pos, NonNullList<ItemStack> drops);
+    CropManager.HarvestResult harvestCrop(Level world, BlockPos pos, @Nonnull ItemStack tool, NonNullList<ItemStack> drops);
 
 }
diff --git a/api/buildcraft/api/gates/IGateProvider.java b/api/buildcraft/api/gates/IGateProvider.java
@@ -0,0 +1,6 @@
+package buildcraft.api.gates;
+
+// Calen 1.18.2
+public interface IGateProvider {
+    IGate getGate();
+}
diff --git a/api/buildcraft/api/mj/IMjContainerItem.java b/api/buildcraft/api/mj/IMjContainerItem.java
@@ -0,0 +1,13 @@
+package buildcraft.api.mj;
+
+import net.minecraft.world.item.ItemStack;
+
+public interface IMjContainerItem {
+    long receivePower(ItemStack container, long maxReceive, boolean simulate);
+
+    long extractPower(ItemStack container, long maxExtract, boolean simulate);
+
+    long getPowerStored(ItemStack container);
+
+    long getMaxPowerStored(ItemStack container);
+}
diff --git a/api/buildcraft/api/mj/MjBattery.java b/api/buildcraft/api/mj/MjBattery.java
@@ -10,6 +10,8 @@
 /** Provides a basic implementation of a simple battery. Note that you should call {@link #tick(Level, BlockPos)} or
  * {@link #tick(Level, Vec3)} every tick to allow for losing excess power. */
 public class MjBattery implements INBTSerializable<CompoundTag> {
+    public static final String NBT_STORED = "stored";
+
     private final long capacity;
     private long microJoules = 0;
 
@@ -20,13 +22,13 @@ public MjBattery(long capacity) {
     @Override
     public CompoundTag serializeNBT() {
         CompoundTag nbt = new CompoundTag();
-        nbt.putLong("stored", microJoules);
+        nbt.putLong(NBT_STORED, microJoules);
         return nbt;
     }
 
     @Override
     public void deserializeNBT(CompoundTag nbt) {
-        microJoules = nbt.getLong("stored");
+        microJoules = nbt.getLong(NBT_STORED);
     }
 
     public void writeToBuffer(ByteBuf buffer) {

diff --git a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java
@@ -8,6 +8,7 @@ public final class BuildcraftRecipeRegistry {
 
     public static IIntegrationRecipeRegistry integrationRecipes;
     public static IRefineryRecipeManager refineryRecipes;
+    public static IProgrammingRecipeManager programmingRecipes;
 
     private BuildcraftRecipeRegistry() {
     }

diff --git a/api/buildcraft/api/recipes/IIntegrationRecipeProvider.java b/api/buildcraft/api/recipes/IIntegrationRecipeProvider.java
@@ -3,6 +3,7 @@
 import net.minecraft.core.NonNullList;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -17,10 +18,12 @@ public interface IIntegrationRecipeProvider {
      * @param toIntegrate A list of stacks to try to integrate to the
      * @return */
     @Nullable
-    IntegrationRecipe getRecipeFor(@Nonnull ItemStack target, @Nonnull NonNullList<ItemStack> toIntegrate);
+    // IntegrationRecipe getRecipeFor(@Nonnull ItemStack target, @Nonnull NonNullList<ItemStack> toIntegrate);
+    IntegrationRecipe getRecipeFor(@Nonnull ItemStack target, @Nonnull NonNullList<ItemStack> toIntegrate, Level world);
 
     /**
      * Returns recipe by it's name
      */
-    IntegrationRecipe getRecipe(@Nonnull ResourceLocation name);
+    // IntegrationRecipe getRecipe(@Nonnull ResourceLocation name);
+    IntegrationRecipe getRecipe(@Nonnull ResourceLocation name, Level world);
 }
diff --git a/api/buildcraft/api/recipes/IIntegrationRecipeRegistry.java b/api/buildcraft/api/recipes/IIntegrationRecipeRegistry.java
@@ -1,5 +1,7 @@
 package buildcraft.api.recipes;
 
+import net.minecraft.world.level.Level;
+
 import java.util.Iterator;
 
 public interface IIntegrationRecipeRegistry extends IIntegrationRecipeProvider {
@@ -9,6 +11,7 @@ public interface IIntegrationRecipeRegistry extends IIntegrationRecipeProvider {
      * Gets all of the simple recipes that are registered. Note that you *can* use the returned iterator's
      * {@link Iterator#remove()} method to remove recipes from this registry.
      */
-    Iterable<IntegrationRecipe> getAllRecipes();
+    // Iterable<IntegrationRecipe> getAllRecipes();
+    Iterable<IntegrationRecipe> getAllRecipes(Level world);
 
 }