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

Moved more parts of ME over

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-01 01:04:53 +02:00
parent 529d03fa9e
commit 007c7ceb56
61 changed files with 322 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/helpers/BaseActionSource.java
-44
View File
@@ -1,44 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.me.helpers;
import java.util.Optional;
import net.minecraft.entity.player.PlayerEntity;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
public class BaseActionSource implements IActionSource {
@Override
public Optional<PlayerEntity> player() {
return Optional.empty();
}
@Override
public Optional<IActionHost> machine() {
return Optional.empty();
}
@Override
public <T> Optional<T> context(Class<T> key) {
return Optional.empty();
}
}
src/main/java/appeng/me/helpers/ChannelPowerSrc.java
-43
View File
@@ -1,43 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.me.helpers;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.networking.IGridNode;
import appeng.api.networking.energy.IEnergySource;
public class ChannelPowerSrc implements IEnergySource {
private final IGridNode node;
private final IEnergySource realSrc;
public ChannelPowerSrc(final IGridNode networkNode, final IEnergySource src) {
this.node = networkNode;
this.realSrc = src;
}
@Override
public double extractAEPower(final double amt, final Actionable mode, final PowerMultiplier usePowerMultiplier) {
if (this.node.isActive()) {
return this.realSrc.extractAEPower(amt, mode, usePowerMultiplier);
}
return 0.0;
}
}
src/main/java/appeng/me/helpers/GenericInterestManager.java
-102
View File
@@ -1,102 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.me.helpers;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.google.common.collect.Multimap;
import appeng.api.storage.data.IAEStack;
public class GenericInterestManager<T> {
private final Multimap<IAEStack, T> container;
private List<SavedTransactions> transactions = null;
private int transDepth = 0;
public GenericInterestManager(final Multimap<IAEStack, T> interests) {
this.container = interests;
}
public void enableTransactions() {
if (this.transDepth == 0) {
this.transactions = new ArrayList<>();
}
this.transDepth++;
}
public void disableTransactions() {
this.transDepth--;
if (this.transDepth == 0) {
final List<SavedTransactions> myActions = this.transactions;
this.transactions = null;
for (final SavedTransactions t : myActions) {
if (t.put) {
this.put(t.stack, t.iw);
} else {
this.remove(t.stack, t.iw);
}
}
}
}
public boolean put(final IAEStack stack, final T iw) {
if (this.transactions != null) {
this.transactions.add(new SavedTransactions(true, stack, iw));
return true;
} else {
return this.container.put(stack, iw);
}
}
public boolean remove(final IAEStack stack, final T iw) {
if (this.transactions != null) {
this.transactions.add(new SavedTransactions(false, stack, iw));
return true;
} else {
return this.container.remove(stack, iw);
}
}
public boolean containsKey(final IAEStack stack) {
return this.container.containsKey(stack);
}
public Collection<T> get(final IAEStack stack) {
return this.container.get(stack);
}
private class SavedTransactions {
private final boolean put;
private final IAEStack stack;
private final T iw;
public SavedTransactions(final boolean putOperation, final IAEStack myStack, final T watcher) {
this.put = putOperation;
this.stack = myStack;
this.iw = watcher;
}
}
}
src/main/java/appeng/me/helpers/MEMonitorHandler.java
-188
View File
@@ -1,188 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2013 AlgorithmX2
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package appeng.me.helpers;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
import com.google.common.collect.ImmutableList;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.networking.security.IActionSource;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
/**
* Common implementation of a simple class that monitors injection/extraction of
* a inventory to send events to a list of listeners.
*
* @param <T>
*
* TODO: Needs to be redesigned to solve performance issues.
*/
public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T> {
private final IMEInventoryHandler<T> internalHandler;
private final IItemList<T> cachedList;
private final HashMap<IMEMonitorHandlerReceiver<T>, Object> listeners = new HashMap<>();
protected boolean hasChanged = true;
public MEMonitorHandler(final IMEInventoryHandler<T> t) {
this.internalHandler = t;
this.cachedList = t.getChannel().createList();
}
public MEMonitorHandler(final IMEInventoryHandler<T> t, final IStorageChannel<T> chan) {
this.internalHandler = t;
this.cachedList = chan.createList();
}
@Override
public void addListener(final IMEMonitorHandlerReceiver<T> l, final Object verificationToken) {
this.listeners.put(l, verificationToken);
}
@Override
public void removeListener(final IMEMonitorHandlerReceiver<T> l) {
this.listeners.remove(l);
}
@Override
public T injectItems(final T input, final Actionable mode, final IActionSource src) {
if (mode == Actionable.SIMULATE) {
return this.getHandler().injectItems(input, mode, src);
}
return this.monitorDifference(input.copy(), this.getHandler().injectItems(input, mode, src), false, src);
}
protected IMEInventoryHandler<T> getHandler() {
return this.internalHandler;
}
private T monitorDifference(final T original, final T leftOvers, final boolean extraction,
final IActionSource src) {
final T diff = original.copy();
if (extraction) {
diff.setStackSize(leftOvers == null ? 0 : -leftOvers.getStackSize());
} else if (leftOvers != null) {
diff.decStackSize(leftOvers.getStackSize());
}
if (diff.getStackSize() != 0) {
this.postChangesToListeners(ImmutableList.of(diff), src);
}
return leftOvers;
}
protected void postChangesToListeners(final Iterable<T> changes, final IActionSource src) {
this.notifyListenersOfChange(changes, src);
}
protected void notifyListenersOfChange(final Iterable<T> diff, final IActionSource src) {
this.hasChanged = true;// need to update the cache.
final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
while (i.hasNext()) {
final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
if (receiver.isValid(o.getValue())) {
receiver.postChange(this, diff, src);
} else {
i.remove();
}
}
}
protected Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> getListeners() {
return this.listeners.entrySet().iterator();
}
@Override
public T extractItems(final T request, final Actionable mode, final IActionSource src) {
if (mode == Actionable.SIMULATE) {
return this.getHandler().extractItems(request, mode, src);
}
return this.monitorDifference(request.copy(), this.getHandler().extractItems(request, mode, src), true, src);
}
@Override
public IStorageChannel<T> getChannel() {
return this.getHandler().getChannel();
}
@Override
public AccessRestriction getAccess() {
return this.getHandler().getAccess();
}
@Override
public IItemList<T> getStorageList() {
if (this.hasChanged) {
this.hasChanged = false;
this.cachedList.resetStatus();
return this.getAvailableItems(this.cachedList);
}
return this.cachedList;
}
@Override
public boolean isPrioritized(final T input) {
return this.getHandler().isPrioritized(input);
}
@Override
public boolean canAccept(final T input) {
return this.getHandler().canAccept(input);
}
@Override
public IItemList<T> getAvailableItems(final IItemList<T> out) {
return this.getHandler().getAvailableItems(out);
}
@Override
public int getPriority() {
return this.getHandler().getPriority();
}
@Override
public int getSlot() {
return this.getHandler().getSlot();
}
@Override
public boolean validForPass(final int i) {
return this.getHandler().validForPass(i);
}
}
src/main/java/appeng/me/helpers/MachineSource.java
-51
View File
@@ -1,51 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.me.helpers;
import java.util.Optional;
import net.minecraft.entity.player.PlayerEntity;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
public class MachineSource implements IActionSource {
private final IActionHost via;
public MachineSource(final IActionHost v) {
this.via = v;
}
@Override
public Optional<PlayerEntity> player() {
return Optional.empty();
}
@Override
public Optional<IActionHost> machine() {
return Optional.of(this.via);
}
@Override
public <T> Optional<T> context(Class<T> key) {
return Optional.empty();
}
}
src/main/java/appeng/me/helpers/PlayerSource.java
-55
View File
@@ -1,55 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.me.helpers;
import java.util.Optional;
import com.google.common.base.Preconditions;
import net.minecraft.entity.player.PlayerEntity;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
public class PlayerSource implements IActionSource {
private final PlayerEntity player;
private final IActionHost via;
public PlayerSource(final PlayerEntity p, final IActionHost v) {
Preconditions.checkNotNull(p);
this.player = p;
this.via = v;
}
@Override
public Optional<PlayerEntity> player() {
return Optional.of(this.player);
}
@Override
public Optional<IActionHost> machine() {
return Optional.ofNullable(this.via);
}
@Override
public <T> Optional<T> context(Class<T> key) {
return Optional.empty();
}
}