From a265085bd7742ebf1e2e95e4bf7397ba5bea01dc Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 9 Oct 2022 18:10:02 +0900 Subject: updateBuildScript & spotlessApply --- src/main/java/reactor/items/CoolantCell.java | 25 ++-- src/main/java/reactor/items/FuelRod.java | 153 +++++++++++----------- src/main/java/reactor/items/HeatExchanger.java | 37 ++---- src/main/java/reactor/items/HeatVent.java | 86 ++++++------ src/main/java/reactor/items/NeutronReflector.java | 25 ++-- 5 files changed, 151 insertions(+), 175 deletions(-) (limited to 'src/main/java/reactor/items') diff --git a/src/main/java/reactor/items/CoolantCell.java b/src/main/java/reactor/items/CoolantCell.java index abfc9ad88f..8b78881f48 100644 --- a/src/main/java/reactor/items/CoolantCell.java +++ b/src/main/java/reactor/items/CoolantCell.java @@ -1,15 +1,10 @@ -package reactor.items; - -public class CoolantCell { - - public static String TYPE = "CoolantCell"; - - public static String[] RESOURCE_NAME = { - "HeliumCoolantCell360k", "NaKCoolantCell360k" - }; - - public static int[] HEAT_CAPACITY = { - 360000, 360000 - }; - -} +package reactor.items; + +public class CoolantCell { + + public static String TYPE = "CoolantCell"; + + public static String[] RESOURCE_NAME = {"HeliumCoolantCell360k", "NaKCoolantCell360k"}; + + public static int[] HEAT_CAPACITY = {360000, 360000}; +} diff --git a/src/main/java/reactor/items/FuelRod.java b/src/main/java/reactor/items/FuelRod.java index 9642412f9d..0df756dfc2 100644 --- a/src/main/java/reactor/items/FuelRod.java +++ b/src/main/java/reactor/items/FuelRod.java @@ -1,78 +1,75 @@ -package reactor.items; - -public class FuelRod { - - public static final int METAOFFSET = 17; - public static final int METAOFFSET_DEPLETED = 29; - - public static final String TYPE = "FuelRod"; - public static final String TYPE_DEPLETED = "DepletedFuelRod"; - public static final String LIFETIME = "LIFETIME"; - public static final String PULSES = "PULSES"; - public static final String HEAT_PER_SECOND = "HEAT_PER_SECOND"; - public static final String HEAT_PER_PULSE = "HEAT_PER_PULSE"; - public static final String HEAT_BOOST_RATE = "HEAT_BOOST_RATE"; - public static final String EU_PER_TICK = "EU_PER_TICK"; - public static final String EU_PER_PULSE = "EU_PER_PULSE"; - - - public static final String[] RESOURCE_NAME = { - "UraniumFuelRod", "UraniumDualFuelRod", "UraniumQuadFuelRod", - "ThoriumFuelRod", "ThoriumDualFuelRod", "ThoriumQuadFuelRod", - "MOXFuelRod", "MOXDualFuelRod", "MOXQuadFuelRod", - "NaquadahFuelRod", "NaquadahDualFuelRod", "NaquadahQuadFuelRod", - "Th_MOXFuelRod", "Th_MOXDualFuelRod", "Th_MOXQuadFuelRod" - }; - - public static final String[] RESOURCE_NAME_DEPLETED = { - "DepletedUraniumFuelRod", "DepletedUraniumDualFuelRod", "DepletedUraniumQuadFuelRod", - "DepletedThoriumFuelRod", "DepletedThoriumDualFuelRod", "DepletedThoriumQuadFuelRod", - "DepletedMOXFuelRod", "DepletedMOXDualFuelRod", "DepletedMOXQuadFuelRod", - "DepletedNaquadahFuelRod", "DepletedNaquadahDualFuelRod", "DepletedNaquadahQuadFuelRod", - "Th_DepletedMOXFuelRod", "Th_DepletedMOXDualFuelRod", "Th_DepletedMOXQuadFuelRod" - }; - - public static final int[] VALUES_LIFETIME = { - 20000, 20000, 20000, 100000, 100000, 100000, - 10000, 10000, 10000, 100000, 100000, 100000, - 50000, 50000, 50000 - }; - - public static final int[] VALUES_PULSES = { - 1, 2, 4, 1, 2, 4, - 1, 2, 4, 1, 2, 4, - 1, 2, 4 - }; - - public static final int[] VALUES_HEAT_PER_SECOND = { - 4, 24, 96, 1, 6, 24, - 4, 24, 96, 80, 480, 1920, - 1, 6, 24 - }; - - public static final int[] VALUES_HEAT_PER_PULSE = { - 4, 4, 4, 1, 1, 1, - 4, 4, 4, 80, 80, 80, - 1, 1, 1 - - }; - - public static final double[] VALUES_HEAT_BOOST_RATE = { - 1, 1, 1, 1, 1, 1, - 5, 5, 5, 1, 1, 1, - 2, 2, 2 - }; - - public static final int[] VALUES_EU_PER_TICK = { - 50, 200, 600, 10, 40, 120, - 50, 200, 600, 100, 400, 1200, - 10, 40, 120 - }; - - public static final int[] VALUES_EU_PER_PULSE = { - 50, 50, 50, 10, 10, 10, - 50, 50, 50, 100, 100, 100, - 10, 10, 10 - }; - -} +package reactor.items; + +public class FuelRod { + + public static final int METAOFFSET = 17; + public static final int METAOFFSET_DEPLETED = 29; + + public static final String TYPE = "FuelRod"; + public static final String TYPE_DEPLETED = "DepletedFuelRod"; + public static final String LIFETIME = "LIFETIME"; + public static final String PULSES = "PULSES"; + public static final String HEAT_PER_SECOND = "HEAT_PER_SECOND"; + public static final String HEAT_PER_PULSE = "HEAT_PER_PULSE"; + public static final String HEAT_BOOST_RATE = "HEAT_BOOST_RATE"; + public static final String EU_PER_TICK = "EU_PER_TICK"; + public static final String EU_PER_PULSE = "EU_PER_PULSE"; + + public static final String[] RESOURCE_NAME = { + "UraniumFuelRod", "UraniumDualFuelRod", "UraniumQuadFuelRod", + "ThoriumFuelRod", "ThoriumDualFuelRod", "ThoriumQuadFuelRod", + "MOXFuelRod", "MOXDualFuelRod", "MOXQuadFuelRod", + "NaquadahFuelRod", "NaquadahDualFuelRod", "NaquadahQuadFuelRod", + "Th_MOXFuelRod", "Th_MOXDualFuelRod", "Th_MOXQuadFuelRod" + }; + + public static final String[] RESOURCE_NAME_DEPLETED = { + "DepletedUraniumFuelRod", "DepletedUraniumDualFuelRod", "DepletedUraniumQuadFuelRod", + "DepletedThoriumFuelRod", "DepletedThoriumDualFuelRod", "DepletedThoriumQuadFuelRod", + "DepletedMOXFuelRod", "DepletedMOXDualFuelRod", "DepletedMOXQuadFuelRod", + "DepletedNaquadahFuelRod", "DepletedNaquadahDualFuelRod", "DepletedNaquadahQuadFuelRod", + "Th_DepletedMOXFuelRod", "Th_DepletedMOXDualFuelRod", "Th_DepletedMOXQuadFuelRod" + }; + + public static final int[] VALUES_LIFETIME = { + 20000, 20000, 20000, 100000, 100000, 100000, + 10000, 10000, 10000, 100000, 100000, 100000, + 50000, 50000, 50000 + }; + + public static final int[] VALUES_PULSES = { + 1, 2, 4, 1, 2, 4, + 1, 2, 4, 1, 2, 4, + 1, 2, 4 + }; + + public static final int[] VALUES_HEAT_PER_SECOND = { + 4, 24, 96, 1, 6, 24, + 4, 24, 96, 80, 480, 1920, + 1, 6, 24 + }; + + public static final int[] VALUES_HEAT_PER_PULSE = { + 4, 4, 4, 1, 1, 1, + 4, 4, 4, 80, 80, 80, + 1, 1, 1 + }; + + public static final double[] VALUES_HEAT_BOOST_RATE = { + 1, 1, 1, 1, 1, 1, + 5, 5, 5, 1, 1, 1, + 2, 2, 2 + }; + + public static final int[] VALUES_EU_PER_TICK = { + 50, 200, 600, 10, 40, 120, + 50, 200, 600, 100, 400, 1200, + 10, 40, 120 + }; + + public static final int[] VALUES_EU_PER_PULSE = { + 50, 50, 50, 10, 10, 10, + 50, 50, 50, 100, 100, 100, + 10, 10, 10 + }; +} diff --git a/src/main/java/reactor/items/HeatExchanger.java b/src/main/java/reactor/items/HeatExchanger.java index d85ed325ca..ec4dbce8e7 100644 --- a/src/main/java/reactor/items/HeatExchanger.java +++ b/src/main/java/reactor/items/HeatExchanger.java @@ -1,23 +1,14 @@ -package reactor.items; - -public class HeatExchanger { - - public static String TYPE = "HeatExchanger"; - - public static String[] RESOURCE_NAME = { - "T1HeatExchanger", "T2HeatExchanger", "T3HeatExchanger", "T4HeatExchanger" - }; - - public static int[] HEAT_CAPACITY = { - 2000, 8000, 32000, 128000 - }; - - public static int[] COMPONENT_EXCHANGE_RATE = { - 12, 24, 96, 384 - }; - - public static int[] HULL_EXCHANGE_RATE = { - 4, 8, 32, 128 - }; - -} +package reactor.items; + +public class HeatExchanger { + + public static String TYPE = "HeatExchanger"; + + public static String[] RESOURCE_NAME = {"T1HeatExchanger", "T2HeatExchanger", "T3HeatExchanger", "T4HeatExchanger"}; + + public static int[] HEAT_CAPACITY = {2000, 8000, 32000, 128000}; + + public static int[] COMPONENT_EXCHANGE_RATE = {12, 24, 96, 384}; + + public static int[] HULL_EXCHANGE_RATE = {4, 8, 32, 128}; +} diff --git a/src/main/java/reactor/items/HeatVent.java b/src/main/java/reactor/items/HeatVent.java index 1ae0388de3..100de26d04 100644 --- a/src/main/java/reactor/items/HeatVent.java +++ b/src/main/java/reactor/items/HeatVent.java @@ -1,44 +1,42 @@ -package reactor.items; - -public class HeatVent { - - public static final String TYPE = "HeatVent"; - public static final String HEAT = "HEAT"; - public static final String RESOURCE_NAME = "RESOURCE_NAME"; - public static final String HEAT_CAPACITY = "HEAT_CAPACITY"; - public static final String COMPONENT_VENT_RATE = "COMPONENT_VENT_RATE"; - public static final String HULL_DRAW_RATE = "HULL_DRAW_RATE"; - public static final String SELF_COOL_RATE = "SELF_COOL_RATE"; - - - public static String[] RESOURCE_NAMES = { - "T1HeatVent", "T2HeatVent", "T3HeatVent", "T4HeatVent", - "T1ComponentHeatVent", "T2ComponentHeatVent", "T3ComponentHeatVent", "T4ComponentHeatVent", - "T1OverclockedHeatVent", "T2OverclockedHeatVent", "T3OverclockedHeatVent", "T4OverclockedHeatVent" - }; - - public static int[] HEAT_CAPACITIES = { - 1000, 4000, 8000, 32000, - 1000, 4000, 8000, 32000, - 1000, 4000, 8000, 32000 - }; - - public static int[] COMPONENT_VENT_RATES = { - 0, 0, 0, 0, - 6, 12, 48, 96, - 0, 0, 0, 0 - }; - - public static int[] HULL_DRAW_RATES = { - 0, 0, 0, 0, - 0, 0, 0, 0, - 18, 36, 144, 288 - }; - - public static int[] SELF_COOL_RATES = { - 6, 12, 48, 96, - 0, 0, 0, 0, - 10, 20, 80, 160 - }; - -} +package reactor.items; + +public class HeatVent { + + public static final String TYPE = "HeatVent"; + public static final String HEAT = "HEAT"; + public static final String RESOURCE_NAME = "RESOURCE_NAME"; + public static final String HEAT_CAPACITY = "HEAT_CAPACITY"; + public static final String COMPONENT_VENT_RATE = "COMPONENT_VENT_RATE"; + public static final String HULL_DRAW_RATE = "HULL_DRAW_RATE"; + public static final String SELF_COOL_RATE = "SELF_COOL_RATE"; + + public static String[] RESOURCE_NAMES = { + "T1HeatVent", "T2HeatVent", "T3HeatVent", "T4HeatVent", + "T1ComponentHeatVent", "T2ComponentHeatVent", "T3ComponentHeatVent", "T4ComponentHeatVent", + "T1OverclockedHeatVent", "T2OverclockedHeatVent", "T3OverclockedHeatVent", "T4OverclockedHeatVent" + }; + + public static int[] HEAT_CAPACITIES = { + 1000, 4000, 8000, 32000, + 1000, 4000, 8000, 32000, + 1000, 4000, 8000, 32000 + }; + + public static int[] COMPONENT_VENT_RATES = { + 0, 0, 0, 0, + 6, 12, 48, 96, + 0, 0, 0, 0 + }; + + public static int[] HULL_DRAW_RATES = { + 0, 0, 0, 0, + 0, 0, 0, 0, + 18, 36, 144, 288 + }; + + public static int[] SELF_COOL_RATES = { + 6, 12, 48, 96, + 0, 0, 0, 0, + 10, 20, 80, 160 + }; +} diff --git a/src/main/java/reactor/items/NeutronReflector.java b/src/main/java/reactor/items/NeutronReflector.java index 773f34ee49..3d18413104 100644 --- a/src/main/java/reactor/items/NeutronReflector.java +++ b/src/main/java/reactor/items/NeutronReflector.java @@ -1,15 +1,10 @@ -package reactor.items; - -public class NeutronReflector { - - public static String TYPE = "NeutronReflector"; - - public static String[] RESOURCE_NAME = { - "T1NeutronReflector", "T2NeutronReflector" - }; - - public static int[] DURABILITY = { - 512000, 2147483647 - }; - -} +package reactor.items; + +public class NeutronReflector { + + public static String TYPE = "NeutronReflector"; + + public static String[] RESOURCE_NAME = {"T1NeutronReflector", "T2NeutronReflector"}; + + public static int[] DURABILITY = {512000, 2147483647}; +} -- cgit