upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-15 01:25:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
GlodBlock committed 2023-02-01 21:15:44 +08:00
1 parent 8081eb2c2c
commit dadf2784a8
16 files changed
+151 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/FluidCraft.java
+1 -1
View File
@@ -28,7 +28,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
modid = FluidCraft.MODID,
version = FluidCraft.VERSION,
name = FluidCraft.MODNAME,
dependencies = "required-after:appliedenergistics2;required-after:BuildCraft|Factory;required-after:CoFHCore;after:waila")
dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;after:waila")
public class FluidCraft {
public static final String MODID = "GRADLETOKEN_MODID";
src/main/java/com/glodblock/github/common/block/BlockFluidAutoFiller.java
+23
View File
@@ -1,8 +1,14 @@
package com.glodblock.github.common.block;
import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;
import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@@ -16,8 +22,12 @@ import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.util.BlockPos;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.RenderUtil;
import com.glodblock.github.util.Util;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockFluidAutoFiller extends FCBaseBlock {
@@ -61,4 +71,17 @@ public class BlockFluidAutoFiller extends FCBaseBlock {
}
return false;
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip,
final boolean advancedToolTips) {
if (isShiftKeyDown()) {
toolTip.addAll(
RenderUtil.listFormattedStringToWidth(
StatCollector.translateToLocal(NameConst.TT_FLUID_AUTO_FILLER)));
} else {
toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
}
}
}
src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.glodblock.github.common.item;
import static com.glodblock.github.loader.recipe.WirelessTerminal.getInfinityBoosterCard;
import static com.glodblock.github.loader.recipe.WirelessTerminalRecipe.getInfinityBoosterCard;
import static com.glodblock.github.util.Util.hasInfinityBoosterCard;
import java.util.List;
src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java
+4
View File
@@ -1,11 +1,14 @@
package com.glodblock.github.common.item;
import java.util.EnumSet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.networking.IGridNode;
import appeng.core.features.AEFeature;
import appeng.core.localization.PlayerMessages;
import appeng.util.Platform;
@@ -24,6 +27,7 @@ public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal
public ItemWirelessFluidTerminal() {
super(GuiType.WIRELESS_FLUID_TERMINAL);
AEApi.instance().registries().wireless().registerWirelessHandler(this);
this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools));
setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_TERMINAL);
setTextureName(FluidCraft.resource(NameConst.ITEM_WIRELESS_FLUID_TERMINAL).toString());
}
src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java
+4
View File
@@ -1,11 +1,14 @@
package com.glodblock.github.common.item;
import java.util.EnumSet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.networking.IGridNode;
import appeng.core.features.AEFeature;
import appeng.core.localization.PlayerMessages;
import appeng.util.Platform;
@@ -24,6 +27,7 @@ public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal
public ItemWirelessPatternTerminal() {
super(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL);
AEApi.instance().registries().wireless().registerWirelessHandler(this);
this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools));
setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_PATTERN_TERMINAL);
setTextureName(FluidCraft.resource(NameConst.ITEM_WIRELESS_FLUID_PATTERN_TERMINAL).toString());
}
src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java
+6 -3
View File
@@ -98,7 +98,7 @@ public class TileFluidAutoFiller extends AENetworkInvTile
public void updatePattern() {
ItemStack is = inventory.getStackInSlot(0);
if (is == null || this.getContainerItem().isItemEqual(is)) return;
if (is == null) return;
this.setContainerItem(is);
postEvent();
}
@@ -106,6 +106,10 @@ public class TileFluidAutoFiller extends AENetworkInvTile
@TileEvent(TileEventType.WORLD_NBT_READ)
public void readFromNBTEvent(NBTTagCompound data) {
inventory.readFromNBT(data, "Inv");
if (inventory.getStackInSlot(0) == null) {
inventory.setInventorySlotContents(0, BUCKET);
}
updatePattern();
}
@TileEvent(TileEventType.WORLD_NBT_WRITE)
@@ -210,8 +214,7 @@ public class TileFluidAutoFiller extends AENetworkInvTile
BaseActionSource source) {
if (this.getProxy().isActive() && this.getStorageGrid() != null) {
boolean hasChanged = false;
IItemList<IAEFluidStack> stored = this.getStorageGrid().getFluidInventory()
.getAvailableItems(AEApi.instance().storage().createFluidList());
IItemList<IAEFluidStack> stored = this.getStorageGrid().getFluidInventory().getStorageList();
for (IAEFluidStack tmp : change) {
if (stored.findPrecise(tmp) == null || this.fluids.findPrecise(tmp) == null) {
hasChanged = true;
src/main/java/com/glodblock/github/inventory/gui/GuiType.java
+1 -1
View File
@@ -170,7 +170,7 @@ public enum GuiType {
}
}),
CRAFTING_STATUS(new PartItemGuiFactory<ITerminalHost>(ITerminalHost.class) {
CRAFTING_STATUS(new PartOrItemGuiFactory<ITerminalHost>(ITerminalHost.class) {
@Override
protected Object createServerGui(EntityPlayer player, ITerminalHost inv) {
src/main/java/com/glodblock/github/inventory/gui/PartItemGuiFactory.java → src/main/java/com/glodblock/github/inventory/gui/PartOrItemGuiFactory.java
+2 -2
View File
@@ -15,9 +15,9 @@ import appeng.container.ContainerOpenContext;
import com.glodblock.github.inventory.item.IItemInventory;
import com.glodblock.github.util.Util;
public abstract class PartItemGuiFactory<T> extends PartGuiFactory<T> {
public abstract class PartOrItemGuiFactory<T> extends PartGuiFactory<T> {
PartItemGuiFactory(Class<T> invClass) {
PartOrItemGuiFactory(Class<T> invClass) {
super(invClass);
}
src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminal.java
-2
View File
@@ -32,7 +32,6 @@ public class WirelessFluidTerminal extends MEMonitorHandler<IAEFluidStack> imple
private final ItemStack target;
private final IAEItemPowerStorage ips;
private final EntityPlayer p;
private final int inventorySlot;
private final AppEngInternalInventory viewCell;
private final StorageChannel channel;
@@ -46,7 +45,6 @@ public class WirelessFluidTerminal extends MEMonitorHandler<IAEFluidStack> imple
this.ips = (ToolWirelessTerminal) is.getItem();
this.grid = gridNode;
this.target = is;
this.p = player;
this.inventorySlot = slot;
this.viewCell = new WirelessTerminalViewCells(is);
this.channel = StorageChannel.FLUIDS;
src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminal.java
-1
View File
@@ -127,7 +127,6 @@ public class WirelessPatternTerminal extends MEMonitorHandler<IAEItemStack> impl
final ConfigManager out = new ConfigManager((manager, settingName, newValue) -> {
final NBTTagCompound data = Platform.openNbtData(this.target);
manager.writeToNBT(data);
});
out.registerSetting(Settings.SORT_BY, SortOrder.NAME);
out.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
src/main/java/com/glodblock/github/loader/RecipeLoader.java
+3 -3
View File
@@ -14,7 +14,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import com.glodblock.github.common.Config;
import com.glodblock.github.common.item.ItemBasicFluidStorageCell;
import com.glodblock.github.common.storage.CellType;
import com.glodblock.github.loader.recipe.WirelessTerminal;
import com.glodblock.github.loader.recipe.WirelessTerminalRecipe;
import com.glodblock.github.util.ModAndClassUtil;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -134,8 +134,8 @@ public class RecipeLoader implements Runnable {
GameRegistry.addShapelessRecipe(WIRELESS_FLUID_TERM.stack(), AE2_WIRELESS_TERMINAL, BUCKET);
GameRegistry.addShapelessRecipe(WIRELESS_PATTERN_TERM.stack(), WIRELESS_FLUID_TERM, FLUID_TERMINAL);
if (ModAndClassUtil.WCT) {
GameRegistry.addRecipe(new WirelessTerminal(WIRELESS_PATTERN_TERM.stack()));
GameRegistry.addRecipe(new WirelessTerminal(WIRELESS_FLUID_TERM.stack()));
GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_PATTERN_TERM.stack()));
GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_FLUID_TERM.stack()));
}
GameRegistry
.addRecipe(new ShapedOreRecipe(CERTUS_QUARTZ_TANK.stack(), "GGG", "G G", "GGG", 'G', AE2_QUARTZ_GLASS));
src/main/java/com/glodblock/github/loader/recipe/WirelessTerminal.java → src/main/java/com/glodblock/github/loader/recipe/WirelessTerminalRecipe.java
+2 -2
View File
@@ -16,12 +16,12 @@ import appeng.util.Platform;
import com.glodblock.github.common.item.ItemBaseWirelessTerminal;
public class WirelessTerminal extends ShapelessRecipes {
public class WirelessTerminalRecipe extends ShapelessRecipes {
private static final ItemStack infinityBoosterCard = ItemEnum.BOOSTER_CARD.getStack();
private final ItemStack installedTerm;
public WirelessTerminal(ItemStack term) {
public WirelessTerminalRecipe(ItemStack term) {
super(term, Arrays.asList(term, infinityBoosterCard));
this.installedTerm = installInfinityBoosterCard(term);
}
src/main/java/com/glodblock/github/util/NameConst.java
+1
View File
@@ -76,6 +76,7 @@ public class NameConst {
public static final String TT_CELL_PORTABLE = TT_KEY + "cell_portable";
public static final String TT_WIRELESS = TT_KEY + "wireless.";
public static final String TT_WIRELESS_INSTALLED = TT_WIRELESS + "installed";
public static final String TT_FLUID_AUTO_FILLER = TT_KEY + "fluid_auto_filler";
public static final String WAILA_KEY = FluidCraft.MODID + ".waila.";
public static final String WAILA_ENABLE = WAILA_KEY + "enable";