]> git.lizzy.rs Git - BoundingBoxOutlineReloaded.git/commitdiff
Tidy up
authorIrtimaled <irtimaled@gmail.com>
Thu, 21 May 2020 22:36:22 +0000 (15:36 -0700)
committerIrtimaled <irtimaled@gmail.com>
Sun, 24 May 2020 23:50:31 +0000 (16:50 -0700)
24 files changed:
gradle/wrapper/gradle-wrapper.properties
src/main/java/com/irtimaled/bbor/client/commands/HexColorArgument.java
src/main/java/com/irtimaled/bbor/client/commands/SpawningSphereCommand.java
src/main/java/com/irtimaled/bbor/client/config/ColorHelper.java
src/main/java/com/irtimaled/bbor/client/config/Setting.java
src/main/java/com/irtimaled/bbor/client/interop/NBTStructureLoader.java
src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java
src/main/java/com/irtimaled/bbor/client/providers/CustomBeaconProvider.java
src/main/java/com/irtimaled/bbor/client/providers/CustomBoxProvider.java
src/main/java/com/irtimaled/bbor/client/providers/CustomLineProvider.java
src/main/java/com/irtimaled/bbor/client/providers/CustomSphereProvider.java
src/main/java/com/irtimaled/bbor/client/providers/IBoundingBoxProvider.java
src/main/java/com/irtimaled/bbor/client/providers/SlimeChunkProvider.java
src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java
src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java
src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java
src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
src/main/java/com/irtimaled/bbor/common/messages/BoundingBoxSerializer.java
src/main/java/com/irtimaled/bbor/common/models/Coords.java
src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java
src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerPlayClient.java
src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSPacketChat.java
src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSPacketCommandList.java
src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSPacketCustomPayload.java

index 949819d28a0b73ca5f2b07127f8bfc6c9efc2eb4..f2fe5ed4f45c18bc391a23e32c2ae28f8e8fc483 100644 (file)
@@ -1,5 +1,6 @@
+#Sun May 24 16:37:33 PDT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
index 80dfc997d365181a0c8c3712cb6ee9b71e8cee04..024558025f4fc0e953d8e873050e02e678afe296 100644 (file)
@@ -29,7 +29,7 @@ public class HexColorArgument implements ArgumentType<HexColor> {
         }
 
         HexColor color = HexColor.from(value);
-        if(color != null) {
+        if (color != null) {
             reader.setCursor(reader.getCursor() + 7);
             return color;
         }
index 1acb2ebe6a99b737fafb31a9f864219118d9eda7..ac823beed2331294659250fd5edc8264e4a522f0 100644 (file)
@@ -33,7 +33,7 @@ public class SpawningSphereCommand {
                         }))
                 .then(Commands.literal(CALCULATE_SPAWNABLE)
                         .executes(context -> {
-                            if(!SpawningSphereProvider.hasSpawningSphereInDimension(Player.getDimensionId())) {
+                            if (!SpawningSphereProvider.hasSpawningSphereInDimension(Player.getDimensionId())) {
                                 CommandHelper.feedback(context, "bbor.commands.spawningSphere.notSet");
                                 return 0;
                             }
@@ -42,7 +42,7 @@ public class SpawningSphereCommand {
                             World world = Minecraft.getInstance().world;
                             SpawningSphereProvider.calculateSpawnableSpacesCount(pos -> {
                                 counts.spawnable++;
-                                if(world.getLightFor(LightType.SKY, pos) > 7)
+                                if (world.getLightFor(LightType.SKY, pos) > 7)
                                     counts.nightSpawnable++;
                             });
                             SpawningSphereProvider.setSpawnableSpacesCount(counts.spawnable);
index b1e0cd932921d0e20b90195c4b05eee207e2a6ae..82a7728b23a68dffcad9df5b43ba7a9baf6b7384 100644 (file)
@@ -14,17 +14,14 @@ public class ColorHelper {
     private static Color decodeColor(HexColor hexColor) {
         try {
             int color = Integer.decode(hexColor.getValue());
-
-            int alpha = (color >> 24) & 0xFF;
             return new Color(color, hexColor.hasAlpha());
-        }
-        catch (Exception ignored) {
+        } catch (Exception ignored) {
             return null;
         }
     }
 
     public static Color getColor(Setting<HexColor> value) {
-        if(value == null) return Color.WHITE;
+        if (value == null) return Color.WHITE;
 
         Color color = getColor(value.get());
         return color != null ? color : getColor(value.defaultValue);
index 1c3a2234fc551b0517fbb26e834a788fc72832e5..0b76635a6452831007afbc0c3bd2cdf46ea44cc9 100644 (file)
@@ -29,5 +29,7 @@ public class Setting<T> {
         return type;
     }
 
-    public String getName() { return name; }
+    public String getName() {
+        return name;
+    }
 }
index 2affcc538889e99bd9f2b95299f50636e18a8381..b8455d2d44cbe9de8f0b6e8ded3cf0fe6d19806d 100644 (file)
@@ -41,7 +41,7 @@ class NBTStructureLoader {
         this.chunkSaveLocation = null;
         this.loadedChunks.clear();
 
-        if(this.chunkLoader == null) return;
+        if (this.chunkLoader == null) return;
         try {
             this.chunkLoader.close();
         } catch (IOException ignored) {
index 8fa64df3a6ab50f20941e838e60fed1d2b8dfddd..51ec94c63197c572227213f1b5e4f02c7f946120 100644 (file)
@@ -29,7 +29,7 @@ public class BiomeBorderProvider implements IBoundingBoxProvider<BoundingBoxBiom
         Coords playerCoords = Player.getCoords();
         Integer renderDistance = ConfigManager.biomeBordersRenderDistance.get();
         Boolean renderAllTransitions = !ConfigManager.renderOnlyCurrentBiome.get();
-        Integer maxY = (int)Player.getMaxY(ConfigManager.biomeBordersMaxY.get());
+        Integer maxY = (int) Player.getMaxY(ConfigManager.biomeBordersMaxY.get());
         if (!playerCoords.equals(lastPlayerCoords) ||
                 !renderDistance.equals(lastRenderDistance) ||
                 renderAllTransitions != lastRenderAllTransitions ||
index 43cec2c66155fcd67173177947558b988d190659..6033ac7943ec937206d8b9e4c563876eb0a96bf0 100644 (file)
@@ -31,6 +31,7 @@ public class CustomBeaconProvider implements IBoundingBoxProvider<BoundingBoxBea
         dimensionsCache.values().forEach(Map::clear);
     }
 
+    @Override
     public Iterable<BoundingBoxBeacon> get(int dimensionId) {
         return getCache(dimensionId).values();
     }
index b44e77a17a436a78d1aaa348847359e85fa599ac..43dbe512afab25280312d965a10070210f7f9fe6 100644 (file)
@@ -37,6 +37,7 @@ public class CustomBoxProvider implements IBoundingBoxProvider<BoundingBoxCuboid
         dimensionCache.values().forEach(Map::clear);
     }
 
+    @Override
     public Iterable<BoundingBoxCuboid> get(int dimensionId) {
         return getCache(dimensionId).values();
     }
index b35470f08e90634c20e950cc196c8fb7a629ba04..d7c96c04e6c5cb35d0d614193d2b40e2feb993ac 100644 (file)
@@ -37,6 +37,7 @@ public class CustomLineProvider implements IBoundingBoxProvider<BoundingBoxLine>
         dimensionCache.values().forEach(Map::clear);
     }
 
+    @Override
     public Iterable<BoundingBoxLine> get(int dimensionId) {
         return getCache(dimensionId).values();
     }
index 61e604d4c486b0ba96348b713770ba501200eb4e..92a5b152e7500ba325d3baafcaa30f239a5f8215 100644 (file)
@@ -33,6 +33,7 @@ public class CustomSphereProvider implements IBoundingBoxProvider<BoundingBoxSph
         dimensionCache.values().forEach(Map::clear);
     }
 
+    @Override
     public Iterable<BoundingBoxSphere> get(int dimensionId) {
         return getCache(dimensionId).values();
     }
index e4e81819253afd6606dbc4d33a75ac5e9a739549..ea2a0e2fe850cfb984fbe9b9d234998b50d4f201 100644 (file)
@@ -4,5 +4,8 @@ import com.irtimaled.bbor.common.models.AbstractBoundingBox;
 
 public interface IBoundingBoxProvider<T extends AbstractBoundingBox> {
     Iterable<T> get(int dimensionId);
-    default boolean canProvide(int dimensionId) { return true; }
+
+    default boolean canProvide(int dimensionId) {
+        return true;
+    }
 }
index 60630377de468fac2872f3f4f896cbfb642a6853..cd941ac48cca879f782347aa8a94544c34099232 100644 (file)
@@ -40,6 +40,7 @@ public class SlimeChunkProvider implements IBoundingBoxProvider<BoundingBoxSlime
         return dimensionId == Dimensions.OVERWORLD && seed != null && BoundingBoxTypeHelper.shouldRender(BoundingBoxType.SlimeChunks);
     }
 
+    @Override
     public Iterable<BoundingBoxSlimeChunk> get(int dimensionId) {
         Set<BoundingBoxSlimeChunk> slimeChunks = new HashSet<>();
         int renderDistanceChunks = ClientInterop.getRenderDistanceChunks();
index 92084b49f8b8d9597f1082d142a2a53ea80a32bf..f2123ac00aeab20ca1bdb17f93d23b5206e72be9 100644 (file)
@@ -38,7 +38,7 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
         double maxY = max.getY();
         double maxZ = max.getZ();
 
-        if(ConfigManager.invertBoxColorPlayerInside.get() &&
+        if (ConfigManager.invertBoxColorPlayerInside.get() &&
                 playerInsideBoundingBox(minX, minY, minZ, maxX, maxY, maxZ)) {
             color = new Color(255 - color.getRed(), 255 - color.getGreen(), 255 - color.getBlue());
         }
@@ -47,7 +47,7 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
                 .setColor(color)
                 .setAlpha(alpha);
 
-        if(minX != maxX && minZ != maxZ) {
+        if (minX != maxX && minZ != maxZ) {
             renderer.addPoint(minX, minY, minZ)
                     .addPoint(maxX, minY, minZ)
                     .addPoint(maxX, minY, maxZ)
@@ -61,26 +61,26 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
             }
         }
 
-        if(minX != maxX && minY != maxY) {
+        if (minX != maxX && minY != maxY) {
             renderer.addPoint(minX, minY, maxZ)
                     .addPoint(minX, maxY, maxZ)
                     .addPoint(maxX, maxY, maxZ)
                     .addPoint(maxX, minY, maxZ);
 
-            if(minZ != maxZ) {
+            if (minZ != maxZ) {
                 renderer.addPoint(minX, minY, minZ)
                         .addPoint(minX, maxY, minZ)
                         .addPoint(maxX, maxY, minZ)
                         .addPoint(maxX, minY, minZ);
             }
         }
-        if(minY != maxY && minZ != maxZ) {
+        if (minY != maxY && minZ != maxZ) {
             renderer.addPoint(minX, minY, minZ)
                     .addPoint(minX, minY, maxZ)
                     .addPoint(minX, maxY, maxZ)
                     .addPoint(minX, maxY, minZ);
 
-            if(minX != maxX) {
+            if (minX != maxX) {
                 renderer.addPoint(maxX, minY, minZ)
                         .addPoint(maxX, minY, maxZ)
                         .addPoint(maxX, maxY, maxZ)
index da19a4688e1b62528a3f76174f10e997f0c632c4..93a894c978f627878b3a259d05d0d778a2fe993c 100644 (file)
@@ -22,7 +22,7 @@ public class BiomeBorderRenderer extends AbstractRenderer<BoundingBoxBiomeBorder
         if (boundingBox.renderWest()) {
             render(northWest, southWest, color);
         }
-        if(ConfigManager.renderOnlyCurrentBiome.get()) {
+        if (ConfigManager.renderOnlyCurrentBiome.get()) {
             OffsetPoint southEast = southWest.offset(1, 0, 0);
             if (boundingBox.renderSouth()) {
                 render(southWest, southEast, color);
@@ -36,12 +36,9 @@ public class BiomeBorderRenderer extends AbstractRenderer<BoundingBoxBiomeBorder
     private void render(OffsetPoint topCorner1, OffsetPoint topCorner2, Color color) {
         double xOffset = 0d;
         double zOffset = 0d;
-        if(topCorner1.getX() == topCorner2.getX())
-        {
+        if (topCorner1.getX() == topCorner2.getX()) {
             xOffset = getOffset(topCorner1.getX());
-        }
-        else
-        {
+        } else {
             zOffset = getOffset(topCorner1.getZ());
         }
 
index 42aa39e2257f7a87f9bdfc3273d6b55d8228cdc7..d152c87defd80d41b611f1617d887f68027794b3 100644 (file)
@@ -21,7 +21,7 @@ public class LineRenderer extends AbstractRenderer<BoundingBoxLine> {
         }
 
         OffsetPoint[] cornerPoints = Arrays.stream(boundingBox.getCorners()).
-                map(point -> new OffsetPoint(point).offset(0,0.001f, 0)).
+                map(point -> new OffsetPoint(point).offset(0, 0.001f, 0)).
                 toArray(OffsetPoint[]::new);
 
         GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
@@ -30,7 +30,7 @@ public class LineRenderer extends AbstractRenderer<BoundingBoxLine> {
                 .addPoints(cornerPoints)
                 .render();
 
-        if(!ConfigManager.fill.get()) return;
+        if (!ConfigManager.fill.get()) return;
 
         GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
         GL11.glEnable(GL11.GL_BLEND);
index 1d343e9d3c3fbba26a46b7d3a2e7e3d2f6a3b7ea..8367c69889334cc1266cbe1fa017730388df14a2 100644 (file)
@@ -17,7 +17,7 @@ public class CommonInterop {
     public static void chunkLoaded(Chunk chunk) {
         int dimensionId = chunk.getWorld().getDimension().getType().getId();
         Map<String, StructureStart> structures = chunk.getStructureStarts();
-        if(structures.size() > 0) EventBus.publish(new StructuresLoaded(structures, dimensionId));
+        if (structures.size() > 0) EventBus.publish(new StructuresLoaded(structures, dimensionId));
     }
 
     public static void loadWorlds(Collection<ServerWorld> worlds) {
index f8498381f10765fa0ca1a6cc75c5638ef6c91abe..ec58b6229b2595932486c9d90e4c278d8dc6acdb 100644 (file)
@@ -11,7 +11,7 @@ class BoundingBoxSerializer {
     private static final Map<Class, BiConsumer<AbstractBoundingBox, PayloadBuilder>> serializers = new HashMap<>();
 
     static {
-        serializers.put(BoundingBoxCuboid.class, (bb, pb) -> serializeStructure((BoundingBoxCuboid)bb, pb));
+        serializers.put(BoundingBoxCuboid.class, (bb, pb) -> serializeStructure((BoundingBoxCuboid) bb, pb));
     }
 
     static boolean canSerialize(AbstractBoundingBox key) {
index df3c36e679f7e76fc5d4588ee3461aafcb17d71f..08140d933da95c712930335dc65159eb60892cdc 100644 (file)
@@ -26,7 +26,9 @@ public class Coords {
         this(pos.getX(), pos.getY(), pos.getZ());
     }
 
-    public Coords(Vec3d pos) { this(pos.x, pos.y, pos.z); }
+    public Coords(Vec3d pos) {
+        this(pos.x, pos.y, pos.z);
+    }
 
     public int getX() {
         return x;
index 68e23bdc8e7718ab21e4abc7bb480ddd5d460ef0..da293f88dda301c63a4e8e3845faec12ed83eb81 100644 (file)
@@ -15,7 +15,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Minecraft.class)
 public class MixinMinecraft {
-    @Shadow @Final private ResourcePackList<ClientResourcePackInfo> resourcePackRepository;
+    @Shadow
+    @Final
+    private ResourcePackList<ClientResourcePackInfo> resourcePackRepository;
     private ClientProxy clientProxy;
 
     @Inject(method = "<init>", at = @At("RETURN"))
index 094bc76231c8365a93eea0b743013985eff37432..d76ee62edb58aa888ee146cae0c021da092c18d6 100644 (file)
@@ -15,7 +15,7 @@ public class MixinNetHandlerPlayClient {
         ClientInterop.disconnectedFromRemoteServer();
     }
 
-    @Inject(method="handleChunkData", at = @At("RETURN"))
+    @Inject(method = "handleChunkData", at = @At("RETURN"))
     private void onChunkData(SChunkDataPacket packet, CallbackInfo ci) {
         ClientInterop.receivedChunk(packet.getChunkX(), packet.getChunkZ());
     }
index 6307170e22643bbb4805efd642a6c633137f477e..06198c287e9a63d42e3df375dafcf8876b2e1f57 100644 (file)
@@ -11,9 +11,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(SChatPacket.class)
 public class MixinSPacketChat {
-    @Shadow private ITextComponent chatComponent;
+    @Shadow
+    private ITextComponent chatComponent;
 
-    @Inject(method = "processPacket",  at = @At("RETURN"))
+    @Inject(method = "processPacket", at = @At("RETURN"))
     private void processPacket(CallbackInfo ci) {
         ClientInterop.handleSeedMessage(this.chatComponent);
     }
index 16505e392c2be97ef2fc9d1b655a60f6f572ec37..155015126b84cc3a9e4318cdd499f96e48edd712 100644 (file)
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(SCommandListPacket.class)
 public class MixinSPacketCommandList {
-    @Inject(method = "processPacket", at= @At("RETURN"))
+    @Inject(method = "processPacket", at = @At("RETURN"))
     private void processPacket(IClientPlayNetHandler netHandlerPlayClient, CallbackInfo ci) {
         TypeHelper.doIfType(netHandlerPlayClient, ClientPlayNetHandler.class, handler ->
                 ClientInterop.registerClientCommands(handler.func_195515_i()));
index 1586bec4fb10a99a259e90491eb0dbbdb83510e9..b39c83858658972d1949983d84524e58c6c1bea4 100644 (file)
@@ -1,7 +1,10 @@
 package com.irtimaled.bbor.mixin.network.play.server;
 
 import com.irtimaled.bbor.common.EventBus;
-import com.irtimaled.bbor.common.messages.*;
+import com.irtimaled.bbor.common.messages.AddBoundingBox;
+import com.irtimaled.bbor.common.messages.InitializeClient;
+import com.irtimaled.bbor.common.messages.PayloadReader;
+import com.irtimaled.bbor.common.messages.SubscribeToServer;
 import net.minecraft.client.network.play.ClientPlayNetHandler;
 import net.minecraft.client.network.play.IClientPlayNetHandler;
 import net.minecraft.network.PacketBuffer;