fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix terminals not being usable on servers

Browse Source
This commit is contained in:
PrototypeTrousers
2023-01-12 12:55:10 -03:00
parent 4f36ccf64d
commit 04f006695e
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -4,7 +4,7 @@ aebuild=7
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2
extended=extended_life extended=extended_life
extendedversion=v0.54.18 extendedversion=v0.54.19
######################################################### #########################################################
# Versions # # Versions #
######################################################### #########################################################
src/main/java/appeng/container/slot/SlotCraftingTerm.java
+16 -11
View File
@@ -40,7 +40,6 @@ import appeng.util.inv.AdaptorItemHandler;
import appeng.util.inv.WrapperCursorItemHandler; import appeng.util.inv.WrapperCursorItemHandler;
import appeng.util.inv.WrapperInvItemHandler; import appeng.util.inv.WrapperInvItemHandler;
import appeng.util.item.AEItemStack; import appeng.util.item.AEItemStack;
import com.blamejared.recipestages.RecipeStages;
import com.blamejared.recipestages.recipes.RecipeStage; import com.blamejared.recipestages.recipes.RecipeStage;
import net.darkhax.gamestages.GameStageHelper; import net.darkhax.gamestages.GameStageHelper;
import net.darkhax.itemstages.ItemStages; import net.darkhax.itemstages.ItemStages;
@@ -55,9 +54,10 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -101,16 +101,21 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
@Override @Override
public ItemStack getStack() { public ItemStack getStack() {
if (Platform.isClient() && Loader.isModLoaded("itemstages")) { if (Platform.isClient() && Loader.isModLoaded("itemstages")) {
final ItemStack item = super.getStack(); return itemstageStack();
final String itemsStage = ItemStages.getStage(item);
final String enchantStage = ItemStages.getEnchantStage(item);
final EntityPlayer player = Minecraft.getMinecraft().player;
if ((itemsStage != null && !GameStageHelper.hasStage(player, itemsStage))
|| (enchantStage != null && !GameStageHelper.hasStage(player, enchantStage)))
return ItemStack.EMPTY;
} }
return super.getStack();
}
@SideOnly(Side.CLIENT)
ItemStack itemstageStack() {
final ItemStack item = super.getStack();
final String itemsStage = ItemStages.getStage(item);
final String enchantStage = ItemStages.getEnchantStage(item);
final EntityPlayer player = Minecraft.getMinecraft().player;
if ((itemsStage != null && !GameStageHelper.hasStage(player, itemsStage))
|| (enchantStage != null && !GameStageHelper.hasStage(player, enchantStage)))
return ItemStack.EMPTY;
return super.getStack(); return super.getStack();
} }
@@ -196,7 +201,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
final String enchantStage = ItemStages.getEnchantStage(recipe.getRecipeOutput()); final String enchantStage = ItemStages.getEnchantStage(recipe.getRecipeOutput());
if ((itemsStage != null && !GameStageHelper.hasStage(player, itemsStage)) if ((itemsStage != null && !GameStageHelper.hasStage(player, itemsStage))
|| (enchantStage != null && !GameStageHelper.hasStage(player, enchantStage))) || (enchantStage != null && !GameStageHelper.hasStage(player, enchantStage)))
return null; return null;
} }