update

Energy slots can be charged using redstone blocks Update the version --中文-- 能量插槽可以使用红石块来进行充能更新版本
GameModsBR · Mar 12, 2023 · 366b35f · 366b35f
1 parent 92ffe2b
commit 366b35f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ minecraft_version=1.12.2
 mappings_version=stable_39
 forge_version=14.23.5.2847
 mod_version=9.8.11
-homebaked=050-sddsd2332
+homebaked=120-sddsd2332
 
 mcmp_version=2.5.3
 jei_version=4.15.0.289

diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
@@ -2,15 +2,9 @@
 
 import com.mojang.authlib.GameProfile;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
+
 import mekanism.api.Coord4D;
 import mekanism.api.EnumColor;
 import mekanism.api.MekanismAPI;
@@ -62,7 +56,6 @@
 import mekanism.common.recipe.RecipeHandler;
 import mekanism.common.recipe.RecipeHandler.Recipe;
 import mekanism.common.recipe.inputs.ItemStackInput;
-import mekanism.common.recipe.inputs.MachineInput;
 import mekanism.common.recipe.machines.SmeltingRecipe;
 import mekanism.common.recipe.outputs.ItemStackOutput;
 import mekanism.common.security.SecurityFrequency;
@@ -73,7 +66,6 @@
 import mekanism.common.transmitters.grid.FluidNetwork.FluidTransferEvent;
 import mekanism.common.transmitters.grid.GasNetwork.GasTransferEvent;
 import mekanism.common.util.MekanismUtils;
-import mekanism.common.util.StackUtils;
 import mekanism.common.voice.VoiceServerManager;
 import mekanism.common.world.GenHandler;
 import net.minecraft.block.Block;
@@ -211,7 +203,6 @@ public class Mekanism {
     }
 
 
-
     @SubscribeEvent
     public static void registerBlocks(RegistryEvent.Register<Block> event) {
         // Register blocks and tile entities
@@ -297,7 +288,6 @@ public static void addRecipes() {
             RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismItems.Polyethene, 3, 0), new ItemStack(MekanismItems.Polyethene, 1, 2));
             RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.OreBlock, 1, 3), new ItemStack(MekanismItems.OtherDust, 6, 7));
             RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismItems.Ingot, 1, 8), new ItemStack(MekanismItems.YellowCakeUranium, 2));
-
             for (int i = 0; i < EnumColor.DYES.length; i++) {
                 RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i));
             }

diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyStorage.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyStorage.java
@@ -7,8 +7,10 @@
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public abstract class ContainerEnergyStorage<TILE extends TileEntityContainerBlock> extends ContainerMekanism<TILE> {
@@ -26,7 +28,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotID) {
             ItemStack slotStack = currentSlot.getStack();
             stack = slotStack.copy();
             if (ChargeUtils.canBeCharged(slotStack) || ChargeUtils.canBeDischarged(slotStack)) {
-                if (slotStack.getItem() == Items.REDSTONE) {
+                if (slotStack.getItem() == Items.REDSTONE || slotStack.getItem() == Item.getItemFromBlock(Blocks.REDSTONE_BLOCK)) {
                     if (slotID != 1) {
                         if (!mergeItemStack(slotStack, 1, 2, false)) {
                             return ItemStack.EMPTY;

diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java
@@ -15,8 +15,10 @@
 import mekanism.common.tile.prefab.TileEntityContainerBlock;
 import net.darkhax.tesla.api.ITeslaConsumer;
 import net.darkhax.tesla.api.ITeslaProducer;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
@@ -63,6 +65,9 @@ public static void discharge(int slotID, IStrictEnergyStorage storer) {
             } else if (stack.getItem() == Items.REDSTONE && storer.getEnergy() + MekanismConfig.current().general.ENERGY_PER_REDSTONE.val() <= storer.getMaxEnergy()) {
                 storer.setEnergy(storer.getEnergy() + MekanismConfig.current().general.ENERGY_PER_REDSTONE.val());
                 stack.shrink(1);
+            } else if (stack.getItem() == Item.getItemFromBlock(Blocks.REDSTONE_BLOCK) && storer.getEnergy() + MekanismConfig.current().general.ENERGY_PER_REDSTONE.val() * 9 <= storer.getMaxEnergy()) {
+                storer.setEnergy(storer.getEnergy() + MekanismConfig.current().general.ENERGY_PER_REDSTONE.val() * 9);
+                stack.shrink(1);
             }
         }
     }
@@ -150,7 +155,7 @@ public static boolean canBeDischarged(ItemStack itemstack) {
                 return true;
             }
         }
-        return itemstack.getItem() == Items.REDSTONE;
+        return itemstack.getItem() == Items.REDSTONE || itemstack.getItem() == Item.getItemFromBlock(Blocks.REDSTONE_BLOCK);
     }
 
     /**