mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
This commit is contained in:
commit
84336ec4d1
571 files changed
+10295
-4773
No files matched your search
@@ -28,17 +28,21 @@ public class FrequencyManager
|
||||
|
||||
private String owner;
|
||||
|
||||
private String name;
|
||||
|
||||
private Class<? extends Frequency> frequencyClass;
|
||||
|
||||
public FrequencyManager(Class c)
|
||||
public FrequencyManager(Class c, String n)
|
||||
{
|
||||
frequencyClass = c;
|
||||
name = n;
|
||||
|
||||
managers.add(this);
|
||||
}
|
||||
|
||||
public FrequencyManager(Class c, String s)
|
||||
public FrequencyManager(Class c, String n, String s)
|
||||
{
|
||||
this(c);
|
||||
this(c, n);
|
||||
|
||||
owner = s;
|
||||
}
|
||||
@@ -173,9 +177,9 @@ public class FrequencyManager
|
||||
}
|
||||
}
|
||||
|
||||
public static FrequencyManager loadOnly(World world, String owner, Class<? extends Frequency> freqClass)
|
||||
public static FrequencyManager loadOnly(World world, String owner, Class<? extends Frequency> freqClass, String n)
|
||||
{
|
||||
FrequencyManager manager = new FrequencyManager(freqClass);
|
||||
FrequencyManager manager = new FrequencyManager(freqClass, n);
|
||||
String name = manager.getName();
|
||||
|
||||
FrequencyDataHandler handler = (FrequencyDataHandler)world.getPerWorldStorage().loadData(FrequencyDataHandler.class, name);
|
||||
@@ -282,7 +286,7 @@ public class FrequencyManager
|
||||
try {
|
||||
for(int i = 0; i < size; i++)
|
||||
{
|
||||
Frequency freq = frequencyClass.newInstance();
|
||||
Frequency freq = frequencyClass.getConstructor(new Class[] {ByteBuf.class}).newInstance(dataStream);
|
||||
freq.read(dataStream);
|
||||
ret.add(freq);
|
||||
}
|
||||
@@ -295,7 +299,7 @@ public class FrequencyManager
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return owner != null ? owner + "FrequencyHandler" : "FrequencyHandler";
|
||||
return owner != null ? (owner + "_" + name + "FrequencyHandler") : (name + "FrequencyHandler");
|
||||
}
|
||||
|
||||
public static void reset()
|
||||
|
||||
Reference in new issue
Block a user