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

Started P2P rework (#2966)

Browse Source 
* First iteration of P2P rework

Changed frequency to short instead of long.
Added a per grid RNG to request a new frequency, hopefully without many collisons.
Added a helper to convert between a frequency and 4 colours
This commit is contained in:
yueh
2017-07-28 22:06:19 +02:00
committed by GitHub
parent 52d28fabe3
commit bcc4a732ed
6 changed files with 190 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cache/P2PCache.java
Vendored
+38 -15
View File
@@ -20,6 +20,7 @@ package appeng.me.cache;
import java.util.HashMap;
import java.util.Random;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
@@ -34,6 +35,7 @@ import appeng.api.networking.events.MENetworkBootingStatusChange;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.ticking.ITickManager;
import appeng.core.AELog;
import appeng.me.cache.helpers.TunnelCollection;
import appeng.parts.p2p.PartP2PTunnel;
import appeng.parts.p2p.PartP2PTunnelME;
@@ -41,15 +43,17 @@ import appeng.parts.p2p.PartP2PTunnelME;
public class P2PCache implements IGridCache
{
private static final TunnelCollection<PartP2PTunnel> NULL_COLLECTION = new TunnelCollection<PartP2PTunnel>( null, null );
private final IGrid myGrid;
private final HashMap<Long, PartP2PTunnel> inputs = new HashMap<>();
private final Multimap<Long, PartP2PTunnel> outputs = LinkedHashMultimap.create();
private final TunnelCollection NullColl = new TunnelCollection<>( null, null );
private final HashMap<Short, PartP2PTunnel> inputs = new HashMap<>();
private final Multimap<Short, PartP2PTunnel> outputs = LinkedHashMultimap.create();
private final Random frequencyGenerator;
public P2PCache( final IGrid g )
{
this.myGrid = g;
this.frequencyGenerator = new Random( g.hashCode() );
}
@MENetworkEventSubscribe
@@ -98,8 +102,7 @@ public class P2PCache implements IGridCache
}
final PartP2PTunnel t = (PartP2PTunnel) machine;
// AELog.info( "rmv-" + (t.output ? "output: " : "input: ") + t.freq
// );
// AELog.info( "rmv-" + (t.output ? "output: " : "input: ") + t.freq );
if( t.isOutput() )
{
@@ -128,8 +131,7 @@ public class P2PCache implements IGridCache
}
final PartP2PTunnel t = (PartP2PTunnel) machine;
// AELog.info( "add-" + (t.output ? "output: " : "input: ") + t.freq
// );
// AELog.info( "add-" + (t.output ? "output: " : "input: ") + t.freq );
if( t.isOutput() )
{
@@ -162,7 +164,7 @@ public class P2PCache implements IGridCache
}
private void updateTunnel( final long freq, final boolean updateOutputs, final boolean configChange )
private void updateTunnel( final short freq, final boolean updateOutputs, final boolean configChange )
{
for( final PartP2PTunnel p : this.outputs.get( freq ) )
{
@@ -184,7 +186,7 @@ public class P2PCache implements IGridCache
}
}
public void updateFreq( final PartP2PTunnel t, final long newFrequency )
public void updateFreq( final PartP2PTunnel t, final short newFrequency )
{
if( this.outputs.containsValue( t ) )
{
@@ -207,30 +209,51 @@ public class P2PCache implements IGridCache
this.inputs.put( t.getFrequency(), t );
}
// AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq
// );
// AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq );
this.updateTunnel( t.getFrequency(), t.isOutput(), true );
this.updateTunnel( t.getFrequency(), !t.isOutput(), true );
}
public TunnelCollection<PartP2PTunnel> getOutputs( final long freq, final Class<? extends PartP2PTunnel> c )
public short newFrequency()
{
short newFrequency;
int cycles = 0;
do
{
newFrequency = (short) this.frequencyGenerator.nextInt( 1 << 16 );
cycles++;
}
while( newFrequency == 0 || this.inputs.containsKey( newFrequency ) );
if( cycles > 25 )
{
AELog.debug( "Generating a new P2P frequency '%1$d' took %2$d cycles", newFrequency, cycles );
}
return newFrequency;
}
public TunnelCollection<PartP2PTunnel> getOutputs( final short freq, final Class<? extends PartP2PTunnel> c )
{
final PartP2PTunnel in = this.inputs.get( freq );
if( in == null )
{
return this.NullColl;
return NULL_COLLECTION;
}
final TunnelCollection<PartP2PTunnel> out = this.inputs.get( freq ).getCollection( this.outputs.get( freq ), c );
if( out == null )
{
return this.NullColl;
return NULL_COLLECTION;
}
return out;
}
public PartP2PTunnel getInput( final long freq )
public PartP2PTunnel getInput( final short freq )
{
return this.inputs.get( freq );
}
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+14 -14
View File
@@ -55,7 +55,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
{
private final TunnelCollection type = new TunnelCollection<T>( null, this.getClass() );
private boolean output;
private long freq;
private short freq;
public PartP2PTunnel( final ItemStack is )
{
@@ -134,7 +134,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
{
super.readFromNBT( data );
this.setOutput( data.getBoolean( "output" ) );
this.setFrequency( data.getLong( "freq" ) );
this.setFrequency( data.getShort( "freq" ) );
}
@Override
@@ -142,7 +142,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
{
super.writeToNBT( data );
data.setBoolean( "output", this.isOutput() );
data.setLong( "freq", this.getFrequency() );
data.setShort( "freq", this.getFrequency() );
}
@Override
@@ -172,7 +172,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
final NBTTagCompound data = mc.getData( is );
final ItemStack newType = new ItemStack( data );
final long freq = data.getLong( "freq" );
final short freq = data.getShort( "freq" );
if( !newType.isEmpty() )
{
@@ -267,7 +267,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
if( !newType.isEmpty() && !Platform.itemComparisons().isEqualItem( newType, this.getItemStack() ) )
{
final boolean oldOutput = this.isOutput();
final long myFreq = this.getFrequency();
final short myFreq = this.getFrequency();
this.getHost().removePart( this.getSide(), false );
final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );
@@ -307,17 +307,17 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
final IMemoryCard mc = (IMemoryCard) is.getItem();
final NBTTagCompound data = new NBTTagCompound();
long newFreq = this.getFrequency();
short newFreq = this.getFrequency();
final boolean wasOutput = this.isOutput();
this.setOutput( false );
if( wasOutput || this.getFrequency() == 0 )
{
newFreq = System.currentTimeMillis();
}
try
{
if( wasOutput || this.getFrequency() == 0 )
{
newFreq = this.getProxy().getP2P().newFrequency();
}
this.getProxy().getP2P().updateFreq( this, newFreq );
}
catch( final GridAccessException e )
@@ -331,7 +331,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
final String type = p2pItem.getUnlocalizedName();
p2pItem.writeToNBT( data );
data.setLong( "freq", this.getFrequency() );
data.setShort( "freq", this.getFrequency() );
mc.setMemoryCardContents( is, type + ".name", data );
mc.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
@@ -363,12 +363,12 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
}
public long getFrequency()
public short getFrequency()
{
return this.freq;
}
public void setFrequency( final long freq )
public void setFrequency( final short freq )
{
this.freq = freq;
}
src/main/java/appeng/spatial/StorageHelper.java
+2
View File
@@ -139,6 +139,8 @@ public class StorageHelper
passanger.startRiding( entity, true );
}
}
entity.world.updateEntity( entity );
return entity;
}
src/main/java/appeng/util/Platform.java
+7
View File
@@ -129,6 +129,7 @@ import appeng.me.GridAccessException;
import appeng.me.GridNode;
import appeng.me.helpers.AENetworkProxy;
import appeng.util.helpers.ItemComparisonHelper;
import appeng.util.helpers.P2PHelper;
import appeng.util.item.AEItemStack;
import appeng.util.item.AESharedNBT;
import appeng.util.prioritylist.IPartitionList;
@@ -157,12 +158,18 @@ public class Platform
// private static Method getEntry;
private static final ItemComparisonHelper ITEM_COMPARISON_HELPER = new ItemComparisonHelper();
private static final P2PHelper P2P_HELPER = new P2PHelper();
public static ItemComparisonHelper itemComparisons()
{
return ITEM_COMPARISON_HELPER;
}
public static P2PHelper p2p()
{
return P2P_HELPER;
}
public static Random getRandom()
{
return RANDOM_GENERATOR;
src/main/java/appeng/util/helpers/P2PHelper.java
+60
View File
@@ -0,0 +1,60 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2015, 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.util.helpers;
import com.google.common.base.Preconditions;
import appeng.api.util.AEColor;
public class P2PHelper
{
public AEColor[] toColors( short frequency )
{
final AEColor[] colors = new AEColor[4];
for( int i = 0; i < 4; i++ )
{
int nibble = ( frequency >> 4 * ( 3 - i ) ) & 0xF;
colors[i] = AEColor.values()[nibble];
}
return colors;
}
public short fromColors( AEColor[] colors )
{
Preconditions.checkArgument( colors.length == 4 );
int t = 0;
for( int i = 0; i < 4; i++ )
{
int code = colors[3 - i].ordinal() << 4 * i;
t |= code;
}
return (short) ( t & 0xFFFF );
}
}