Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-25 18:19:14 +00:00
Code Issues Releases Activity

Obfuscation fixes

Browse Source
This commit is contained in:
Daniel Mills
2020-08-30 16:09:22 -04:00
parent 9880248e49
commit 0b583bcf80
16 changed files with 14408 additions and 14054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/volmit/iris/IrisBoardManager.java
View File

@@ -17,20 +17,24 @@ import com.volmit.iris.util.BoardProvider;
import com.volmit.iris.util.BoardSettings;
import com.volmit.iris.util.C;
import com.volmit.iris.util.ChronoLatch;
import com.volmit.iris.util.DontObfuscate;
import com.volmit.iris.util.Form;
import com.volmit.iris.util.IrisStructureResult;
import com.volmit.iris.util.J;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.RollingSequence;
import com.volmit.iris.util.ScoreDirection;
public class IrisBoardManager implements BoardProvider, Listener
{
@DontObfuscate
private BoardManager manager;
private String mem = "...";
public RollingSequence hits = new RollingSequence(20);
public RollingSequence tp = new RollingSequence(100);
private ChronoLatch cl = new ChronoLatch(1000);
@DontObfuscate
public IrisBoardManager()
{
Iris.instance.registerListener(this);
@@ -42,18 +46,29 @@ public class IrisBoardManager implements BoardProvider, Listener
//@done
}
@EventHandler
public void on(PlayerChangedWorldEvent e)
{
J.s(() -> updatePlayer(e.getPlayer()));
}
@DontObfuscate
private boolean isIrisWorld(World w)
{
return (w.getGenerator() instanceof IrisChunkGenerator) && ((IrisChunkGenerator) w.getGenerator()).isDev();
}
@EventHandler
public void on(PlayerChangedWorldEvent e)
public void updatePlayer(Player p)
{
if(isIrisWorld(e.getPlayer().getWorld()))
if(isIrisWorld(p.getWorld()))
{
manager.remove(e.getPlayer());
manager.setup(e.getPlayer());
manager.remove(p);
manager.setup(p);
}
else
{
manager.remove(p);
}
}
@@ -63,6 +78,7 @@ public class IrisBoardManager implements BoardProvider, Listener
return C.GREEN + "Iris";
}
@DontObfuscate
@Override
public List<String> getLines(Player player)
{
@@ -114,6 +130,7 @@ public class IrisBoardManager implements BoardProvider, Listener
return v;
}
@DontObfuscate
public void disable()
{
manager.onDisable();

1
src/main/java/com/volmit/iris/IrisDataManager.java
View File

@@ -169,6 +169,7 @@ public class IrisDataManager
dimensionLoader.preferFolder(name);
generatorLoader.preferFolder(name);
structureLoader.preferFolder(name);
Iris.info("Preferred Folder: " + name);
}
public void clearLists()

1
src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java
View File

@@ -93,6 +93,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
@Override
public void onHotload()
{
getData().preferFolder(getDimension().getLoadFile().getParentFile().getParentFile().getName());
super.onHotload();
cacheID = RNG.r.simax();
}

12
src/main/java/com/volmit/iris/object/IrisBiome.java
View File

@@ -179,7 +179,17 @@ public class IrisBiome extends IrisRegistrant implements IRare
return null;
}
return Color.getColor(getDebugColor().substring(1));
try
{
return Color.decode(getDebugColor());
}
catch(Throwable e)
{
}
return null;
});
}

16
src/main/java/com/volmit/iris/util/BoardManager.java
View File

@@ -11,13 +11,22 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitTask;
@DontObfuscate
public class BoardManager
{
@DontObfuscate
private final JavaPlugin plugin;
@DontObfuscate
private BoardSettings boardSettings;
@DontObfuscate
private Map<UUID, Board> scoreboards;
@DontObfuscate
private BukkitTask updateTask;
@DontObfuscate
public BoardManager(JavaPlugin plugin, BoardSettings boardSettings)
{
this.plugin = plugin;
@@ -27,22 +36,26 @@ public class BoardManager
plugin.getServer().getOnlinePlayers().forEach(this::setup);
}
@DontObfuscate
public void setBoardSettings(BoardSettings boardSettings)
{
this.boardSettings = boardSettings;
scoreboards.values().forEach(board -> board.setBoardSettings(boardSettings));
}
@DontObfuscate
public boolean hasBoard(Player player)
{
return scoreboards.containsKey(player.getUniqueId());
}
@DontObfuscate
public Optional<Board> getBoard(Player player)
{
return Optional.ofNullable(scoreboards.get(player.getUniqueId()));
}
@DontObfuscate
public void setup(Player player)
{
Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::resetScoreboard);
@@ -53,16 +66,19 @@ public class BoardManager
scoreboards.put(player.getUniqueId(), new Board(player, boardSettings));
}
@DontObfuscate
public void remove(Player player)
{
Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::remove);
}
@DontObfuscate
public Map<UUID, Board> getScoreboards()
{
return Collections.unmodifiableMap(scoreboards);
}
@DontObfuscate
public void onDisable()
{
updateTask.cancel();

3
src/main/java/com/volmit/iris/util/BoardProvider.java
View File

@@ -4,9 +4,12 @@ import java.util.List;
import org.bukkit.entity.Player;
@DontObfuscate
public interface BoardProvider
{
@DontObfuscate
String getTitle(Player player);
@DontObfuscate
List<String> getLines(Player player);
}

5
src/main/java/com/volmit/iris/util/BoardSettings.java
View File

@@ -3,11 +3,14 @@ package com.volmit.iris.util;
import lombok.Builder;
import lombok.Getter;
@DontObfuscate
@Getter
@Builder
public class BoardSettings
{
@DontObfuscate
private BoardProvider boardProvider;
@DontObfuscate
private ScoreDirection scoreDirection;
}

2
src/main/java/com/volmit/iris/util/DontObfuscate.java
View File

@@ -7,7 +7,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@Retention(RUNTIME)
@Target({FIELD, TYPE, CONSTRUCTOR})
@Target({FIELD, TYPE, CONSTRUCTOR, METHOD})
public @interface DontObfuscate
{

9
src/main/java/com/volmit/iris/util/ResourceLoader.java
View File

@@ -160,14 +160,16 @@ public class ResourceLoader<T extends IrisRegistrant>
{
for(File i : folderCache.copy())
{
if(i.getParentFile().getName().equals(preferredFolder))
if(i.getParentFile().getName().equals(preferredFolder) || i.getParentFile().getParentFile().getName().equals(preferredFolder))
{
folderCache.remove(i);
folderCache.add(0, i);
Iris.verbose("Prefering " + i.getPath() + " in the folder cache because we prefer " + preferredFolder);
}
}
}
}
lock.unlock();
return folderCache;
@@ -193,9 +195,11 @@ public class ResourceLoader<T extends IrisRegistrant>
public void clearCache()
{
lock.lock();
possibleKeys = null;
loadCache.clear();
folderCache = null;
lock.unlock();
}
public File fileFor(T b)
@@ -228,12 +232,15 @@ public class ResourceLoader<T extends IrisRegistrant>
public void preferFolder(String name)
{
clearList();
preferredFolder = name;
}
public void clearList()
{
lock.lock();
folderCache = null;
possibleKeys = null;
lock.unlock();
}
}

11
src/main/java/com/volmit/iris/util/ScoreDirection.java
View File

@@ -4,7 +4,12 @@ package com.volmit.iris.util;
* @author Missionary (missionarymc@gmail.com)
* @since 5/31/2018
*/
public enum ScoreDirection {
UP,
DOWN
@DontObfuscate
public enum ScoreDirection
{
@DontObfuscate
UP,
@DontObfuscate
DOWN
}