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

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/jei/CondenserCategory.java
+2 -2
View File
@@ -47,7 +47,7 @@ import appeng.api.definitions.IMaterials;
import appeng.api.implementations.items.IStorageComponent;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.tile.misc.TileCondenser;
import appeng.tile.misc.CondenserTileEntity;
class CondenserCategory implements IRecipeCategory<CondenserOutput> {
@@ -177,7 +177,7 @@ class CondenserCategory implements IRecipeCategory<CondenserOutput> {
private void addViableComponent(CondenserOutput condenserOutput, List<ItemStack> viableComponents,
ItemStack itemStack) {
IStorageComponent comp = (IStorageComponent) itemStack.getItem();
int storage = comp.getBytes(itemStack) * TileCondenser.BYTE_MULTIPLIER;
int storage = comp.getBytes(itemStack) * CondenserTileEntity.BYTE_MULTIPLIER;
if (storage >= condenserOutput.requiredPower) {
viableComponents.add(itemStack);
}
src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java
+6 -6
View File
@@ -33,7 +33,7 @@ import mezz.jei.api.recipe.advanced.IRecipeManagerPlugin;
import mezz.jei.api.recipe.category.IRecipeCategory;
import appeng.core.AppEng;
import appeng.items.parts.ItemFacade;
import appeng.items.parts.FacadeItem;
/**
* This plugin will dynamically add facade recipes for any item that can be
@@ -41,11 +41,11 @@ import appeng.items.parts.ItemFacade;
*/
class FacadeRegistryPlugin implements IRecipeManagerPlugin {
private final ItemFacade itemFacade;
private final FacadeItem itemFacade;
private final ItemStack cableAnchor;
FacadeRegistryPlugin(ItemFacade itemFacade, ItemStack cableAnchor) {
FacadeRegistryPlugin(FacadeItem itemFacade, ItemStack cableAnchor) {
this.itemFacade = itemFacade;
this.cableAnchor = cableAnchor;
}
@@ -55,7 +55,7 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin {
if (focus.getMode() == IFocus.Mode.OUTPUT && focus.getValue() instanceof ItemStack) {
// Looking up how a certain facade is crafted
ItemStack itemStack = (ItemStack) focus.getValue();
if (itemStack.getItem() instanceof ItemFacade) {
if (itemStack.getItem() instanceof FacadeItem) {
return Collections.singletonList(VanillaRecipeCategoryUid.CRAFTING);
}
} else if (focus.getMode() == IFocus.Mode.INPUT && focus.getValue() instanceof ItemStack) {
@@ -80,8 +80,8 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin {
if (focus.getMode() == IFocus.Mode.OUTPUT && focus.getValue() instanceof ItemStack) {
// Looking up how a certain facade is crafted
ItemStack itemStack = (ItemStack) focus.getValue();
if (itemStack.getItem() instanceof ItemFacade) {
ItemFacade facadeItem = (ItemFacade) itemStack.getItem();
if (itemStack.getItem() instanceof FacadeItem) {
FacadeItem facadeItem = (FacadeItem) itemStack.getItem();
ItemStack textureItem = facadeItem.getTextureItem(itemStack);
return Collections.singletonList((T) make(textureItem, this.cableAnchor, itemStack));
}
src/main/java/appeng/integration/modules/jei/JEIPlugin.java
+6 -6
View File
@@ -41,13 +41,13 @@ import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IItemDefinition;
import appeng.api.definitions.IMaterials;
import appeng.api.features.AEFeature;
import appeng.container.implementations.ContainerCraftingTerm;
import appeng.container.implementations.ContainerPatternTerm;
import appeng.container.implementations.CraftingTermContainer;
import appeng.container.implementations.PatternTermContainer;
import appeng.core.AEConfig;
import appeng.core.AppEng;
import appeng.core.localization.GuiText;
import appeng.integration.abstraction.JEIFacade;
import appeng.items.parts.ItemFacade;
import appeng.items.parts.FacadeItem;
import appeng.recipes.handlers.GrinderRecipe;
import appeng.recipes.handlers.InscriberRecipe;
@@ -76,9 +76,9 @@ public class JEIPlugin implements IModPlugin {
@Override
public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) {
// Allow recipe transfer from JEI to crafting and pattern terminal
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(ContainerCraftingTerm.class),
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(CraftingTermContainer.class),
VanillaRecipeCategoryUid.CRAFTING);
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(ContainerPatternTerm.class),
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(PatternTermContainer.class),
VanillaRecipeCategoryUid.CRAFTING);
}
@@ -160,7 +160,7 @@ public class JEIPlugin implements IModPlugin {
IDefinitions definitions = AEApi.instance().definitions();
if (AEConfig.instance().isFeatureEnabled(AEFeature.ENABLE_FACADE_CRAFTING)) {
ItemFacade itemFacade = (ItemFacade) definitions.items().facade().item();
FacadeItem itemFacade = (FacadeItem) definitions.items().facade().item();
ItemStack cableAnchor = definitions.parts().cableAnchor().stack(1);
registration.addRecipeManagerPlugin(new FacadeRegistryPlugin(itemFacade, cableAnchor));
}
src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
+5 -5
View File
@@ -36,10 +36,10 @@ import mezz.jei.api.gui.ingredient.IGuiIngredient;
import mezz.jei.api.recipe.transfer.IRecipeTransferError;
import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
import appeng.container.slot.SlotCraftingMatrix;
import appeng.container.slot.SlotFakeCraftingMatrix;
import appeng.container.slot.CraftingMatrixSlot;
import appeng.container.slot.FakeCraftingMatrixSlot;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketJEIRecipe;
import appeng.core.sync.packets.JEIRecipePacket;
import appeng.util.Platform;
class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandler<T> {
@@ -76,7 +76,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
}
for (final Slot slot : container.inventorySlots) {
if (slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix) {
if (slot instanceof CraftingMatrixSlot || slot instanceof FakeCraftingMatrixSlot) {
if (slot.getSlotIndex() == slotIndex) {
final ListNBT tags = new ListNBT();
final List<ItemStack> list = new ArrayList<>();
@@ -111,7 +111,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
slotIndex++;
}
NetworkHandler.instance().sendToServer(new PacketJEIRecipe(recipe));
NetworkHandler.instance().sendToServer(new JEIRecipePacket(recipe));
return null;
}
src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java
+3 -3
View File
@@ -38,7 +38,7 @@ import appeng.integration.modules.theoneprobe.tile.CraftingMonitorInfoProvider;
import appeng.integration.modules.theoneprobe.tile.ITileProbInfoProvider;
import appeng.integration.modules.theoneprobe.tile.PowerStateInfoProvider;
import appeng.integration.modules.theoneprobe.tile.PowerStorageInfoProvider;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
public final class TileInfoProvider implements IProbeInfoProvider {
private final List<ITileProbInfoProvider> providers;
@@ -62,8 +62,8 @@ public final class TileInfoProvider implements IProbeInfoProvider {
BlockState blockState, IProbeHitData data) {
final TileEntity tile = world.getTileEntity(data.getPos());
if (tile instanceof AEBaseTile) {
final AEBaseTile aeBaseTile = (AEBaseTile) tile;
if (tile instanceof AEBaseTileEntity) {
final AEBaseTileEntity aeBaseTile = (AEBaseTileEntity) tile;
for (final ITileProbInfoProvider provider : this.providers) {
provider.addProbeInfo(aeBaseTile, mode, probeInfo, player, world, blockState, data);
src/main/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java
+2 -2
View File
@@ -28,7 +28,7 @@ import mcjty.theoneprobe.api.IProbeConfigProvider;
import mcjty.theoneprobe.api.IProbeHitData;
import mcjty.theoneprobe.api.IProbeHitEntityData;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
public class AEConfigProvider implements IProbeConfigProvider {
@@ -41,7 +41,7 @@ public class AEConfigProvider implements IProbeConfigProvider {
@Override
public void getProbeConfig(IProbeConfig config, PlayerEntity player, World world, BlockState blockState,
IProbeHitData data) {
if (world.getTileEntity(data.getPos()) instanceof AEBaseTile) {
if (world.getTileEntity(data.getPos()) instanceof AEBaseTileEntity) {
config.setRFMode(0);
}
}
src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java
+4 -4
View File
@@ -29,17 +29,17 @@ import mcjty.theoneprobe.api.ProbeMode;
import appeng.api.parts.IPart;
import appeng.integration.modules.theoneprobe.TheOneProbeText;
import appeng.parts.networking.PartCableSmart;
import appeng.parts.networking.PartDenseCableSmart;
import appeng.parts.networking.SmartCablePart;
import appeng.parts.networking.SmartDenseCablePart;
public class ChannelInfoProvider implements IPartProbInfoProvider {
@Override
public void addProbeInfo(IPart part, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (part instanceof PartDenseCableSmart || part instanceof PartCableSmart) {
if (part instanceof SmartDenseCablePart || part instanceof SmartCablePart) {
final int usedChannels;
final int maxChannels = (part instanceof PartDenseCableSmart) ? 32 : 8;
final int maxChannels = (part instanceof SmartDenseCablePart) ? 32 : 8;
if (part.getGridNode().isActive()) {
final CompoundNBT tmp = new CompoundNBT();
src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java
+5 -5
View File
@@ -31,7 +31,7 @@ import mcjty.theoneprobe.api.ProbeMode;
import appeng.api.parts.IPart;
import appeng.integration.modules.theoneprobe.TheOneProbeText;
import appeng.me.GridAccessException;
import appeng.parts.p2p.PartP2PTunnel;
import appeng.parts.p2p.P2PTunnelPart;
import appeng.util.Platform;
public class P2PStateInfoProvider implements IPartProbInfoProvider {
@@ -43,8 +43,8 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider {
@Override
public void addProbeInfo(IPart part, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (part instanceof PartP2PTunnel) {
final PartP2PTunnel tunnel = (PartP2PTunnel) part;
if (part instanceof P2PTunnelPart) {
final P2PTunnelPart tunnel = (P2PTunnelPart) part;
if (!tunnel.isPowered()) {
return;
@@ -61,7 +61,7 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider {
state = STATE_INPUT;
}
} else {
final PartP2PTunnel input = tunnel.getInput();
final P2PTunnelPart input = tunnel.getInput();
if (input != null) {
state = STATE_OUTPUT;
}
@@ -86,7 +86,7 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider {
}
}
private static int getOutputCount(PartP2PTunnel tunnel) {
private static int getOutputCount(P2PTunnelPart tunnel) {
try {
return Iterators.size(tunnel.getOutputs().iterator());
} catch (GridAccessException e) {
src/main/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java
+3 -3
View File
@@ -27,7 +27,7 @@ import mcjty.theoneprobe.api.IProbeHitData;
import mcjty.theoneprobe.api.IProbeInfo;
import mcjty.theoneprobe.api.ProbeMode;
import appeng.api.implementations.parts.IPartStorageMonitor;
import appeng.api.implementations.parts.IStorageMonitorPart;
import appeng.api.parts.IPart;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
@@ -39,8 +39,8 @@ public class StorageMonitorInfoProvider implements IPartProbInfoProvider {
@Override
public void addProbeInfo(IPart part, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (part instanceof IPartStorageMonitor) {
final IPartStorageMonitor monitor = (IPartStorageMonitor) part;
if (part instanceof IStorageMonitorPart) {
final IStorageMonitorPart monitor = (IStorageMonitorPart) part;
final IAEStack<?> displayed = monitor.getDisplayed();
final boolean isLocked = monitor.isLocked();
src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java
+6 -6
View File
@@ -29,16 +29,16 @@ import mcjty.theoneprobe.api.IProbeHitData;
import mcjty.theoneprobe.api.IProbeInfo;
import mcjty.theoneprobe.api.ProbeMode;
import appeng.tile.AEBaseTile;
import appeng.tile.misc.TileCharger;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.misc.ChargerTileEntity;
public class ChargerInfoProvider implements ITileProbInfoProvider {
@Override
public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (tile instanceof TileCharger) {
final TileCharger charger = (TileCharger) tile;
public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (tile instanceof ChargerTileEntity) {
final ChargerTileEntity charger = (ChargerTileEntity) tile;
final IItemHandler chargerInventory = charger.getInternalInventory();
final ItemStack chargingItem = chargerInventory.getStackInSlot(0);
src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java
+6 -6
View File
@@ -30,16 +30,16 @@ import mcjty.theoneprobe.api.ProbeMode;
import appeng.api.storage.data.IAEItemStack;
import appeng.integration.modules.theoneprobe.TheOneProbeText;
import appeng.tile.AEBaseTile;
import appeng.tile.crafting.TileCraftingMonitorTile;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.crafting.CraftingMonitorTileEntity;
public class CraftingMonitorInfoProvider implements ITileProbInfoProvider {
@Override
public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (tile instanceof TileCraftingMonitorTile) {
final TileCraftingMonitorTile monitor = (TileCraftingMonitorTile) tile;
public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (tile instanceof CraftingMonitorTileEntity) {
final CraftingMonitorTileEntity monitor = (CraftingMonitorTileEntity) tile;
final IAEItemStack displayStack = monitor.getJobProgress();
if (displayStack != null) {
src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java
+4 -4
View File
@@ -27,11 +27,11 @@ import mcjty.theoneprobe.api.IProbeInfo;
import mcjty.theoneprobe.api.IProbeInfoProvider;
import mcjty.theoneprobe.api.ProbeMode;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
/**
* Similar to {@link IProbeInfoProvider}, but already providing the
* {@link AEBaseTile} being looked at.
* {@link AEBaseTileEntity} being looked at.
*
*/
public interface ITileProbInfoProvider {
@@ -40,6 +40,6 @@ public interface ITileProbInfoProvider {
* @see IProbeInfoProvider#addProbeInfo(ProbeMode, IProbeInfo, EntityPlayer,
* World, IBlockState, IProbeHitData)
*/
void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data);
void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data);
}
src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java
+3 -3
View File
@@ -28,13 +28,13 @@ import mcjty.theoneprobe.api.ProbeMode;
import appeng.api.implementations.IPowerChannelState;
import appeng.integration.modules.theoneprobe.TheOneProbeText;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
public class PowerStateInfoProvider implements ITileProbInfoProvider {
@Override
public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (tile instanceof IPowerChannelState) {
final IPowerChannelState state = (IPowerChannelState) tile;
src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java
+3 -3
View File
@@ -28,14 +28,14 @@ import mcjty.theoneprobe.api.ProbeMode;
import appeng.api.networking.energy.IAEPowerStorage;
import appeng.integration.modules.theoneprobe.TheOneProbeText;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
import appeng.util.Platform;
public class PowerStorageInfoProvider implements ITileProbInfoProvider {
@Override
public void addProbeInfo(AEBaseTile tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
public void addProbeInfo(AEBaseTileEntity tile, ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world,
BlockState blockState, IProbeHitData data) {
if (tile instanceof IAEPowerStorage) {
final IAEPowerStorage storage = (IAEPowerStorage) tile;
final double maxPower = storage.getAEMaxPower();