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

Renamed MAC -> Molecular Assembler

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-16 23:17:29 +02:00
parent ef85c284c6
commit e9e06fa7ee
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/crafting/BlockMolecularAssembler.java
+2 -3
View File
@@ -32,8 +32,7 @@ import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerInscriber;
import appeng.container.implementations.ContainerMAC;
import appeng.container.implementations.ContainerMolecularAssembler;
import appeng.tile.crafting.TileMolecularAssembler;
public class BlockMolecularAssembler extends AEBaseTileBlock<TileMolecularAssembler> {
@@ -62,7 +61,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock<TileMolecularAssemb
final TileMolecularAssembler tg = this.getTileEntity(w, pos);
if (tg != null && !p.isCrouching()) {
if (!tg.isRemote()) {
ContainerOpener.openContainer(ContainerMAC.TYPE, p,
ContainerOpener.openContainer(ContainerMolecularAssembler.TYPE, p,
ContainerLocator.forTileEntitySide(tg, hit.getFace()));
}
return ActionResultType.SUCCESS;
src/main/java/appeng/client/gui/implementations/GuiMAC.java → src/main/java/appeng/client/gui/implementations/GuiMolecularAssembler.java
+7 -5
View File
@@ -26,14 +26,15 @@ import appeng.api.config.Settings;
import appeng.client.gui.widgets.GuiProgressBar;
import appeng.client.gui.widgets.GuiProgressBar.Direction;
import appeng.client.gui.widgets.GuiServerSettingToggleButton;
import appeng.container.implementations.ContainerMAC;
import appeng.container.implementations.ContainerMolecularAssembler;
import appeng.core.localization.GuiText;
public class GuiMAC extends GuiUpgradeable<ContainerMAC> {
public class GuiMolecularAssembler extends GuiUpgradeable<ContainerMolecularAssembler> {
private GuiProgressBar pb;
public GuiMAC(ContainerMAC container, PlayerInventory playerInventory, ITextComponent title) {
public GuiMolecularAssembler(ContainerMolecularAssembler container, PlayerInventory playerInventory,
ITextComponent title) {
super(container, playerInventory, title);
this.ySize = 197;
}
@@ -42,7 +43,8 @@ public class GuiMAC extends GuiUpgradeable<ContainerMAC> {
public void init() {
super.init();
this.pb = new GuiProgressBar(this.container, "guis/mac.png", 139, 36, 148, 201, 6, 18, Direction.VERTICAL);
this.pb = new GuiProgressBar(this.container, "guis/molecular_assembler.png", 139, 36, 148, 201, 6, 18,
Direction.VERTICAL);
this.addButton(this.pb);
}
@@ -68,7 +70,7 @@ public class GuiMAC extends GuiUpgradeable<ContainerMAC> {
@Override
protected String getBackground() {
return "guis/mac.png";
return "guis/molecular_assembler.png";
}
@Override
src/main/java/appeng/container/implementations/ContainerMAC.java → src/main/java/appeng/container/implementations/ContainerMolecularAssembler.java
+11 -11
View File
@@ -32,23 +32,22 @@ import appeng.api.config.Settings;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.container.ContainerLocator;
import appeng.container.guisync.GuiSync;
import appeng.container.implementations.ContainerHelper;
import appeng.container.interfaces.IProgressProvider;
import appeng.container.slot.SlotMACPattern;
import appeng.container.slot.SlotMolecularAssemblerPattern;
import appeng.container.slot.SlotOutput;
import appeng.container.slot.SlotRestrictedInput;
import appeng.items.misc.ItemEncodedPattern;
import appeng.tile.crafting.TileMolecularAssembler;
import appeng.util.Platform;
public class ContainerMAC extends ContainerUpgradeable implements IProgressProvider {
public class ContainerMolecularAssembler extends ContainerUpgradeable implements IProgressProvider {
public static ContainerType<ContainerMAC> TYPE;
public static ContainerType<ContainerMolecularAssembler> TYPE;
private static final ContainerHelper<ContainerMAC, TileMolecularAssembler> helper = new ContainerHelper<>(
ContainerMAC::new, TileMolecularAssembler.class);
private static final ContainerHelper<ContainerMolecularAssembler, TileMolecularAssembler> helper = new ContainerHelper<>(
ContainerMolecularAssembler::new, TileMolecularAssembler.class);
public static ContainerMAC fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) {
public static ContainerMolecularAssembler fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) {
return helper.fromNetwork(windowId, inv, buf);
}
@@ -61,13 +60,13 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi
@GuiSync(4)
public int craftProgress = 0;
public ContainerMAC(int id, final PlayerInventory ip, final TileMolecularAssembler te) {
public ContainerMolecularAssembler(int id, final PlayerInventory ip, final TileMolecularAssembler te) {
super(TYPE, id, ip, te);
this.tma = te;
}
public boolean isValidItemForSlot(final int slotIndex, final ItemStack i) {
final IItemHandler mac = this.getUpgradeable().getInventoryByName("mac");
final IItemHandler mac = this.getUpgradeable().getInventoryByName(TileMolecularAssembler.INVENTORY_MAIN);
final ItemStack is = mac.getStackInSlot(10);
if (is.isEmpty()) {
@@ -96,11 +95,12 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi
int offX = 29;
int offY = 30;
final IItemHandler mac = this.getUpgradeable().getInventoryByName("mac");
final IItemHandler mac = this.getUpgradeable().getInventoryByName(TileMolecularAssembler.INVENTORY_MAIN);
for (int y = 0; y < 3; y++) {
for (int x = 0; x < 3; x++) {
final SlotMACPattern s = new SlotMACPattern(this, mac, x + y * 3, offX + x * 18, offY + y * 18);
final SlotMolecularAssemblerPattern s = new SlotMolecularAssemblerPattern(this, mac, x + y * 3,
offX + x * 18, offY + y * 18);
this.addSlot(s);
}
}
src/main/java/appeng/container/slot/SlotMACPattern.java → src/main/java/appeng/container/slot/SlotMolecularAssemblerPattern.java
+5 -4
View File
@@ -21,13 +21,14 @@ package appeng.container.slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import appeng.container.implementations.ContainerMAC;
import appeng.container.implementations.ContainerMolecularAssembler;
public class SlotMACPattern extends AppEngSlot {
public class SlotMolecularAssemblerPattern extends AppEngSlot {
private final ContainerMAC mac;
private final ContainerMolecularAssembler mac;
public SlotMACPattern(final ContainerMAC mac, final IItemHandler i, final int slotIdx, final int x, final int y) {
public SlotMolecularAssemblerPattern(final ContainerMolecularAssembler mac, final IItemHandler i, final int slotIdx,
final int x, final int y) {
super(i, slotIdx, x, y);
this.mac = mac;
}
src/main/java/appeng/core/Registration.java
+3 -5
View File
@@ -18,8 +18,6 @@
package appeng.core;
import java.util.Objects;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
@@ -39,7 +37,6 @@ import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.IFeatureConfig;
import net.minecraft.world.gen.feature.NoFeatureConfig;
import net.minecraft.world.gen.placement.Placement;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.*;
@@ -241,7 +238,8 @@ final class Registration {
ContainerIOPort::open);
ContainerLevelEmitter.TYPE = registerContainer(registry, "levelemitter", ContainerLevelEmitter::fromNetwork,
ContainerLevelEmitter::open);
ContainerMAC.TYPE = registerContainer(registry, "mac", ContainerMAC::fromNetwork, ContainerMAC::open);
ContainerMolecularAssembler.TYPE = registerContainer(registry, "molecular_assembler",
ContainerMolecularAssembler::fromNetwork, ContainerMolecularAssembler::open);
ContainerMEMonitorable.TYPE = registerContainer(registry, "memonitorable", ContainerMEMonitorable::fromNetwork,
ContainerMEMonitorable::open);
ContainerMEPortableCell.TYPE = registerContainer(registry, "meportablecell",
@@ -325,7 +323,7 @@ final class Registration {
ScreenManager.registerFactory(ContainerSpatialIOPort.TYPE, GuiSpatialIOPort::new);
ScreenManager.registerFactory(ContainerInscriber.TYPE, GuiInscriber::new);
ScreenManager.registerFactory(ContainerCellWorkbench.TYPE, GuiCellWorkbench::new);
ScreenManager.registerFactory(ContainerMAC.TYPE, GuiMAC::new);
ScreenManager.registerFactory(ContainerMolecularAssembler.TYPE, GuiMolecularAssembler::new);
ScreenManager.registerFactory(ContainerCraftAmount.TYPE, GuiCraftAmount::new);
ScreenManager.registerFactory(ContainerCraftConfirm.TYPE, GuiCraftConfirm::new);
ScreenManager.registerFactory(ContainerInterfaceTerminal.TYPE, GuiInterfaceTerminal::new);
src/main/java/appeng/core/sync/GuiBridge.java
+2 -5
View File
@@ -27,10 +27,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
import appeng.api.exceptions.AppEngException;
import appeng.api.features.IWirelessTermHandler;
import appeng.api.implementations.IUpgradeableHost;
import appeng.api.implementations.guiobjects.IGuiItem;
import appeng.api.implementations.guiobjects.INetworkTool;
@@ -47,7 +45,6 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.client.gui.AEBaseGui;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerLocator;
import appeng.container.ContainerNull;
import appeng.container.implementations.ContainerCellWorkbench;
import appeng.container.implementations.ContainerChest;
@@ -65,9 +62,9 @@ import appeng.container.implementations.ContainerInscriber;
import appeng.container.implementations.ContainerInterface;
import appeng.container.implementations.ContainerInterfaceTerminal;
import appeng.container.implementations.ContainerLevelEmitter;
import appeng.container.implementations.ContainerMAC;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.container.implementations.ContainerMEPortableCell;
import appeng.container.implementations.ContainerMolecularAssembler;
import appeng.container.implementations.ContainerNetworkStatus;
import appeng.container.implementations.ContainerNetworkTool;
import appeng.container.implementations.ContainerPatternTerm;
@@ -202,7 +199,7 @@ public enum GuiBridge {
GUI_CELL_WORKBENCH(ContainerCellWorkbench.class, TileCellWorkbench.class, GuiHostType.WORLD, null),
GUI_MAC(ContainerMAC.class, TileMolecularAssembler.class, GuiHostType.WORLD, null),
GUI_MAC(ContainerMolecularAssembler.class, TileMolecularAssembler.class, GuiHostType.WORLD, null),
GUI_CRAFTING_AMOUNT(ContainerCraftAmount.class, ITerminalHost.class, GuiHostType.ITEM_OR_WORLD,
SecurityPermissions.CRAFT),
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+4 -1
View File
@@ -79,6 +79,9 @@ import appeng.util.item.AEItemStack;
public class TileMolecularAssembler extends AENetworkInvTile
implements IUpgradeableHost, IConfigManagerHost, IGridTickable, ICraftingMachine, IPowerChannelState {
public static final String INVENTORY_MAIN = "molecular_assembler";
private final CraftingInventory craftingInv;
private final AppEngInternalInventory gridInv = new AppEngInternalInventory(this, 9 + 1, 1);
private final AppEngInternalInventory patternInv = new AppEngInternalInventory(this, 1, 1);
@@ -284,7 +287,7 @@ public class TileMolecularAssembler extends AENetworkInvTile
return this.upgrades;
}
if (name.equals("mac")) {
if (name.equals("molecular_assembler")) {
return this.internalInv;
}