diff --git a/src/main/java/com/volmit/iris/util/format/Form.java b/src/main/java/com/volmit/iris/util/format/Form.java index 67f2532b3..5b5d27c64 100644 --- a/src/main/java/com/volmit/iris/util/format/Form.java +++ b/src/main/java/com/volmit/iris/util/format/Form.java @@ -330,6 +330,7 @@ public class Form { suffix = "Month"; div = 12; + //noinspection IfStatementWithIdenticalBranches if(phantom > div) { phantom /= div; suffix = "Year"; diff --git a/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java b/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java index 38072b042..16e7993b5 100644 --- a/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java +++ b/src/main/java/com/volmit/iris/util/format/MemoryMonitor.java @@ -75,6 +75,7 @@ public class MemoryMonitor { return usedMemory / (double) getMaxBytes(); } + @SuppressWarnings("IfStatementWithIdenticalBranches") private void sample() { long used = getVMUse(); if(usedMemory == -1) { diff --git a/src/main/java/com/volmit/iris/util/hunk/bits/TecTest.java b/src/main/java/com/volmit/iris/util/hunk/bits/TecTest.java deleted file mode 100644 index c34993766..000000000 --- a/src/main/java/com/volmit/iris/util/hunk/bits/TecTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2022 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.volmit.iris.util.hunk.bits; - -import com.volmit.iris.Iris; -import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KSet; -import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.slices.BlockMatter; -import org.bukkit.Material; -import org.bukkit.block.data.BlockData; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.util.Arrays; -import java.util.Set; - -public class TecTest { - public static Set randomBlocks(int max) { - KSet d = new KSet<>(); - - while(d.size() < max) { - Material m = Material.values()[RNG.r.i(Material.values().length - 1)]; - if(m.isBlock()) { - d.add(m.createBlockData()); - } - } - - return d; - } - - public static void go() { - - } - - public static boolean test(int size, int pal) { - try { - Iris.info("Test? " + size + " " + pal); - KList blocks = new KList<>(randomBlocks(pal)); - Iris.info("Fill " + pal + " -> " + size + " Entries"); - Writable writer = new BlockMatter(); - DataContainer dc = new DataContainer<>(writer, size); - - for(int i = 0; i < dc.size(); i++) { - dc.set(i, blocks.getRandom()); - } - - Iris.info(dc.toString()); - byte[] dat = dc.write(); - DataContainer dx = new DataContainer<>(new DataInputStream(new ByteArrayInputStream(dat)), writer); - Iris.info(dx.toString()); - byte[] dat2 = dx.write(); - Iris.info("Size: " + Form.memSize(dat.length, 2) + " -> " + Form.memSize(dat2.length, 2)); - - if(Arrays.equals(dat, dat2)) { - Iris.info("MATCH"); - return true; - } else { - for(int i = 0; i < dc.size(); i++) { - if(!dx.get(i).equals(dc.get(i))) { - Iris.info("FAIL Expected " + dc.get(i).getAsString(true) + " but got " + dx.get(i).getAsString(true)); - return false; - } - } - Iris.info("MATCH but different output?"); - - return true; - } - } catch(Throwable e) { - e.printStackTrace(); - return false; - } - } -} diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index 36318a05d..25c6b363b 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -234,6 +234,7 @@ public class VolmitSender implements CommandSender { } public void sendProgress(double percent, String thing) { + //noinspection IfStatementWithIdenticalBranches if(percent < 0) { int l = 44; int g = (int) (1D * l);