aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/misc
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/misc')
-rw-r--r--src/main/java/gregtech/common/misc/DrillingLogicDelegate.java (renamed from src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java)44
-rw-r--r--src/main/java/gregtech/common/misc/GTClientPollutionMap.java (renamed from src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java)4
-rw-r--r--src/main/java/gregtech/common/misc/GTCommand.java (renamed from src/main/java/gregtech/common/misc/GT_Command.java)35
-rw-r--r--src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java20
-rw-r--r--src/main/java/gregtech/common/misc/IDrillingLogicDelegateOwner.java (renamed from src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java)2
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java4
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/base/SPRequirements.java (renamed from src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java)10
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/base/SPUpgrade.java (renamed from src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java)28
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java2
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/commands/SPCommand.java (renamed from src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java)12
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/commands/SPMCommand.java (renamed from src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java)2
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProjectCommand.java (renamed from src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProject_Command.java)2
12 files changed, 82 insertions, 83 deletions
diff --git a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java b/src/main/java/gregtech/common/misc/DrillingLogicDelegate.java
index 9cf7fd7cf8..c52141f9bc 100644
--- a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java
+++ b/src/main/java/gregtech/common/misc/DrillingLogicDelegate.java
@@ -1,6 +1,6 @@
package gregtech.common.misc;
-import static gregtech.api.enums.GT_Values.debugBlockMiner;
+import static gregtech.api.enums.GTValues.debugBlockMiner;
import java.util.List;
@@ -11,22 +11,22 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.FakePlayer;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
+import gregtech.common.blocks.TileEntityOres;
/** @author Relvl on 27.01.2022 */
@SuppressWarnings("ObjectEquality")
-public class GT_DrillingLogicDelegate {
+public class DrillingLogicDelegate {
- public static final ItemStack MINING_PIPE_STACK = GT_ModHandler.getIC2Item("miningPipe", 0);
- public static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE_STACK);
- public static final Block MINING_PIPE_TIP_BLOCK = GT_Utility
- .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0));
+ public static final ItemStack MINING_PIPE_STACK = GTModHandler.getIC2Item("miningPipe", 0);
+ public static final Block MINING_PIPE_BLOCK = GTUtility.getBlockFromStack(MINING_PIPE_STACK);
+ public static final Block MINING_PIPE_TIP_BLOCK = GTUtility
+ .getBlockFromStack(GTModHandler.getIC2Item("miningPipeTip", 0));
/** The owner machine pointer */
- private final GT_IDrillingLogicDelegateOwner owner;
+ private final IDrillingLogicDelegateOwner owner;
/** Is pipe retracting process done and halts? */
private boolean isRetractDone;
@@ -37,7 +37,7 @@ public class GT_DrillingLogicDelegate {
/** Cached fake player */
private FakePlayer mFakePlayer;
- public GT_DrillingLogicDelegate(GT_IDrillingLogicDelegateOwner owner) {
+ public DrillingLogicDelegate(IDrillingLogicDelegateOwner owner) {
this.owner = owner;
}
@@ -52,7 +52,7 @@ public class GT_DrillingLogicDelegate {
int yCoord = te.getYCoord();
int checkY = yCoord + tipDepth - 1;
boolean isHitsTheVoid = checkY < 0;
- boolean isHitsBedrock = GT_Utility.getBlockHardnessAt(te.getWorld(), xCoord, checkY, zCoord) < 0;
+ boolean isHitsBedrock = GTUtility.getBlockHardnessAt(te.getWorld(), xCoord, checkY, zCoord) < 0;
boolean isFakePlayerAllowed = canFakePlayerInteract(te, xCoord, checkY, zCoord);
if (isHitsTheVoid || isHitsBedrock || !isFakePlayerAllowed) {
@@ -60,13 +60,13 @@ public class GT_DrillingLogicDelegate {
te.disableWorking();
if (debugBlockMiner) {
if (isHitsTheVoid) {
- GT_Log.out.println("MINER: Hit bottom");
+ GTLog.out.println("MINER: Hit bottom");
}
if (isHitsBedrock) {
- GT_Log.out.println("MINER: Hit block with -1 hardness");
+ GTLog.out.println("MINER: Hit block with -1 hardness");
}
if (!isFakePlayerAllowed) {
- GT_Log.out.println("MINER: Unable to set mining pipe tip");
+ GTLog.out.println("MINER: Unable to set mining pipe tip");
}
}
return false;
@@ -158,7 +158,7 @@ public class GT_DrillingLogicDelegate {
/** Minings the block if it is possible. */
public void mineBlock(IGregTechTileEntity te, Block block, int x, int y, int z) {
- if (!GT_Utility.eraseBlockByFakePlayer(getFakePlayer(te), x, y, z, true)) {
+ if (!GTUtility.eraseBlockByFakePlayer(getFakePlayer(te), x, y, z, true)) {
return;
}
@@ -178,11 +178,11 @@ public class GT_DrillingLogicDelegate {
short metaData = 0;
TileEntity tTileEntity = owner.getBaseMetaTileEntity()
.getTileEntity(x, y, z);
- if (tTileEntity instanceof GT_TileEntity_Ores) {
- metaData = ((GT_TileEntity_Ores) tTileEntity).mMetaData;
+ if (tTileEntity instanceof TileEntityOres) {
+ metaData = ((TileEntityOres) tTileEntity).mMetaData;
}
- ItemStack cobble = GT_Utility.getCobbleForOre(block, metaData);
+ ItemStack cobble = GTUtility.getCobbleForOre(block, metaData);
te.getWorld()
.setBlock(
x,
@@ -222,7 +222,7 @@ public class GT_DrillingLogicDelegate {
*/
public FakePlayer getFakePlayer(IGregTechTileEntity te) {
if (mFakePlayer == null) {
- mFakePlayer = GT_Utility.getFakePlayer(te);
+ mFakePlayer = GTUtility.getFakePlayer(te);
}
if (mFakePlayer != null) {
mFakePlayer.setWorld(te.getWorld());
@@ -232,7 +232,7 @@ public class GT_DrillingLogicDelegate {
}
public boolean canFakePlayerInteract(IGregTechTileEntity te, int xCoord, int yCoord, int zCoord) {
- return GT_Utility
+ return GTUtility
.setBlockByFakePlayer(getFakePlayer(te), xCoord, yCoord, zCoord, MINING_PIPE_TIP_BLOCK, 0, true);
}
diff --git a/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java b/src/main/java/gregtech/common/misc/GTClientPollutionMap.java
index 6e40e5860c..546f8e8d12 100644
--- a/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java
+++ b/src/main/java/gregtech/common/misc/GTClientPollutionMap.java
@@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.util.MathHelper;
-public class GT_ClientPollutionMap {
+public class GTClientPollutionMap {
private static final byte RADIUS = 24;
private static final byte DISTANCE_RELOAD_MAP = 5; // When player moved x chunks, shift the map to new center.
@@ -17,7 +17,7 @@ public class GT_ClientPollutionMap {
private static short[][] chunkMatrix; // short because reasons.
- public GT_ClientPollutionMap() {}
+ public GTClientPollutionMap() {}
public void reset() {
initialized = false;
diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GTCommand.java
index 8e342aa928..f1590ec792 100644
--- a/src/main/java/gregtech/common/misc/GT_Command.java
+++ b/src/main/java/gregtech/common/misc/GTCommand.java
@@ -20,15 +20,15 @@ import net.minecraft.util.EnumChatFormatting;
import com.gtnewhorizon.structurelib.StructureLib;
import cpw.mods.fml.relauncher.FMLLaunchHandler;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.objects.GT_ChunkManager;
-import gregtech.api.util.GT_MusicSystem;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Pollution;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
+import gregtech.api.objects.GTChunkManager;
+import gregtech.api.util.GTMusicSystem;
+import gregtech.api.util.GTUtility;
+import gregtech.common.Pollution;
import gregtech.common.misc.spaceprojects.SpaceProjectManager;
-public final class GT_Command extends CommandBase {
+public final class GTCommand extends CommandBase {
@Override
public String getCommandName() {
@@ -63,7 +63,7 @@ public final class GT_Command extends CommandBase {
new ChatComponentText(
"\"pollution <amount>\" - adds the <amount> of the pollution to the current chunk, "
+ "\n if <amount> isnt specified, will add"
- + GT_Mod.gregtechproxy.mPollutionSmogLimit
+ + GTMod.gregtechproxy.mPollutionSmogLimit
+ "gibbl."));
sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + " --- Global wireless EU controls ---"));
sender.addChatMessage(new ChatComponentText("Allows you to set the amount of EU in a users wireless network."));
@@ -173,7 +173,7 @@ public final class GT_Command extends CommandBase {
return;
}
try {
- Field field = GT_Values.class.getDeclaredField(strings[1]);
+ Field field = GTValues.class.getDeclaredField(strings[1]);
if (field.getType() != boolean.class) {
sender.addChatMessage(new ChatComponentText("Wrong variable: " + strings[1]));
return;
@@ -186,14 +186,14 @@ public final class GT_Command extends CommandBase {
}
}
case "chunks" -> {
- GT_ChunkManager.printTickets();
+ GTChunkManager.printTickets();
sender.addChatMessage(new ChatComponentText("Forced chunks logged to GregTech.log"));
}
case "pollution" -> {
ChunkCoordinates coordinates = sender.getPlayerCoordinates();
- int amount = (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit
+ int amount = (strings.length < 2) ? GTMod.gregtechproxy.mPollutionSmogLimit
: Integer.parseInt(strings[1]);
- GT_Pollution.addPollution(
+ Pollution.addPollution(
sender.getEntityWorld()
.getChunkFromBlockCoords(coordinates.posX, coordinates.posZ),
amount);
@@ -207,8 +207,7 @@ public final class GT_Command extends CommandBase {
// Usage is /gt global_energy_add username EU
- String EU_string_formatted = EnumChatFormatting.RED
- + GT_Utility.formatNumbers(new BigInteger(EU_String))
+ String EU_string_formatted = EnumChatFormatting.RED + GTUtility.formatNumbers(new BigInteger(EU_String))
+ EnumChatFormatting.RESET;
if (addEUToGlobalEnergyMap(uuid, new BigInteger(EU_String))) sender.addChatMessage(
@@ -228,7 +227,7 @@ public final class GT_Command extends CommandBase {
new ChatComponentText(
formatted_username + " currently has "
+ EnumChatFormatting.RED
- + GT_Utility.formatNumbers(new BigInteger(getUserEU(uuid).toString()))
+ + GTUtility.formatNumbers(new BigInteger(getUserEU(uuid).toString()))
+ EnumChatFormatting.RESET
+ "EU in their network."));
@@ -256,7 +255,7 @@ public final class GT_Command extends CommandBase {
"Successfully set " + formatted_username
+ "'s global energy network to "
+ EnumChatFormatting.RED
- + GT_Utility.formatNumbers(new BigInteger(EU_String_0))
+ + GTUtility.formatNumbers(new BigInteger(EU_String_0))
+ EnumChatFormatting.RESET
+ "EU."));
@@ -324,7 +323,7 @@ public final class GT_Command extends CommandBase {
"User " + formatted_username
+ " has "
+ EnumChatFormatting.RED
- + GT_Utility.formatNumbers(getUserEU(userUUID))
+ + GTUtility.formatNumbers(getUserEU(userUUID))
+ EnumChatFormatting.RESET
+ "EU in their network."));
if (!userUUID.equals(teamUUID)) sender.addChatMessage(
@@ -343,7 +342,7 @@ public final class GT_Command extends CommandBase {
sender
.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "This command is client-only."));
}
- GT_MusicSystem.ClientSystem.dumpAllRecordDurations();
+ GTMusicSystem.ClientSystem.dumpAllRecordDurations();
}
default -> {
sender
diff --git a/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java b/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java
index 33e8198bd6..f3efceafeb 100644
--- a/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java
+++ b/src/main/java/gregtech/common/misc/GlobalMetricsCoverDatabase.java
@@ -37,10 +37,10 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTUtility;
import gregtech.common.covers.CoverInfo;
-import gregtech.common.covers.GT_Cover_Metrics_Transmitter;
+import gregtech.common.covers.CoverMetricsTransmitter;
import gregtech.common.events.MetricsCoverDataEvent;
import gregtech.common.events.MetricsCoverHostDeconstructedEvent;
import gregtech.common.events.MetricsCoverSelfDestructEvent;
@@ -302,15 +302,15 @@ public class GlobalMetricsCoverDatabase extends WorldSavedData {
private static Stream<UUID> getCoverUUIDsFromItemStack(final ItemStack stack) {
if (stack.hasTagCompound() && stack.getTagCompound()
- .hasKey(GT_Values.NBT.COVERS, TAG_COMPOUND)) {
+ .hasKey(GTValues.NBT.COVERS, TAG_COMPOUND)) {
final NBTTagList tagList = stack.getTagCompound()
- .getTagList(GT_Values.NBT.COVERS, TAG_COMPOUND);
+ .getTagList(GTValues.NBT.COVERS, TAG_COMPOUND);
return IntStream.range(0, tagList.tagCount())
.mapToObj(tagList::getCompoundTagAt)
.map(nbt -> new CoverInfo(null, nbt).getCoverData())
.filter(
- serializableObject -> serializableObject instanceof GT_Cover_Metrics_Transmitter.MetricsTransmitterData)
- .map(data -> ((GT_Cover_Metrics_Transmitter.MetricsTransmitterData) data).getFrequency());
+ serializableObject -> serializableObject instanceof CoverMetricsTransmitter.MetricsTransmitterData)
+ .map(data -> ((CoverMetricsTransmitter.MetricsTransmitterData) data).getFrequency());
}
return Stream.empty();
}
@@ -433,9 +433,9 @@ public class GlobalMetricsCoverDatabase extends WorldSavedData {
public String getLocalizedCoordinates() {
return StatCollector.translateToLocalFormatted(
"gt.db.metrics_cover.coords",
- GT_Utility.formatNumbers(x),
- GT_Utility.formatNumbers(y),
- GT_Utility.formatNumbers(z));
+ GTUtility.formatNumbers(x),
+ GTUtility.formatNumbers(y),
+ GTUtility.formatNumbers(z));
}
@Override
diff --git a/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java b/src/main/java/gregtech/common/misc/IDrillingLogicDelegateOwner.java
index 9b10b6fcf0..cd9a5f1621 100644
--- a/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java
+++ b/src/main/java/gregtech/common/misc/IDrillingLogicDelegateOwner.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
/** @author Relvl on 27.01.2022 */
-public interface GT_IDrillingLogicDelegateOwner extends IMetaTileEntity {
+public interface IDrillingLogicDelegateOwner extends IMetaTileEntity {
/** Returns the machine actual tier. */
int getMachineTier();
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
index 323b22e20a..a076a05c9a 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
@@ -12,7 +12,7 @@ import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.tuple.Pair;
import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
import gregtech.common.misc.spaceprojects.interfaces.ISpaceBody;
import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
@@ -187,7 +187,7 @@ public class SpaceProjectManager {
// #region Project Helper methods
- public static class FakeSpaceProjectRecipe extends GT_Recipe {
+ public static class FakeSpaceProjectRecipe extends GTRecipe {
public final String projectName;
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SPRequirements.java
index b910b5e344..dc92d8bebf 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SPRequirements.java
@@ -13,7 +13,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject.ISP_Upgrade;
/**
* @author BlueWeabo
*/
-public class SP_Requirements implements ISP_Requirements {
+public class SPRequirements implements ISP_Requirements {
// #region Variables
@@ -50,22 +50,22 @@ public class SP_Requirements implements ISP_Requirements {
// #region Setters/Builder
- public SP_Requirements setSpaceBodyType(SpaceBodyType spaceBodyType) {
+ public SPRequirements setSpaceBodyType(SpaceBodyType spaceBodyType) {
spaceBody = spaceBodyType;
return this;
}
- public SP_Requirements setStarType(StarType starType) {
+ public SPRequirements setStarType(StarType starType) {
star = starType;
return this;
}
- public SP_Requirements setUpgrades(ISP_Upgrade... requirementUpgrades) {
+ public SPRequirements setUpgrades(ISP_Upgrade... requirementUpgrades) {
upgrades.addAll(Arrays.asList(requirementUpgrades));
return this;
}
- public SP_Requirements setSpaceProjects(ISpaceProject... requirementProjects) {
+ public SPRequirements setSpaceProjects(ISpaceProject... requirementProjects) {
spaceProjects.addAll(Arrays.asList(requirementProjects));
return this;
}
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SPUpgrade.java
index 835a57f277..b07ff7905a 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SPUpgrade.java
@@ -15,7 +15,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject.ISP_Upgrade;
/**
* @author BlueWeabo
*/
-public class SP_Upgrade implements ISP_Upgrade {
+public class SPUpgrade implements ISP_Upgrade {
// #region Variables
@@ -27,7 +27,7 @@ public class SP_Upgrade implements ISP_Upgrade {
protected int currentStage;
protected int buildTime;
protected long voltage;
- protected SP_Requirements requirements;
+ protected SPRequirements requirements;
protected ISpaceProject projectBelongingTo;
// #endregion
@@ -219,7 +219,7 @@ public class SP_Upgrade implements ISP_Upgrade {
}
@Override
- public SP_Requirements getUpgradeRequirements() {
+ public SPRequirements getUpgradeRequirements() {
return requirements;
}
@@ -232,44 +232,44 @@ public class SP_Upgrade implements ISP_Upgrade {
// #region Setter/Builder
- public SP_Upgrade() {}
+ public SPUpgrade() {}
- public SP_Upgrade setUpgradeName(String upgradeName) {
+ public SPUpgrade setUpgradeName(String upgradeName) {
name = upgradeName;
return this;
}
- public SP_Upgrade setUpgradeUnlocalizedName(String upgradeUnlocalizedName) {
+ public SPUpgrade setUpgradeUnlocalizedName(String upgradeUnlocalizedName) {
unlocalizedName = upgradeUnlocalizedName;
return this;
}
- public SP_Upgrade setUpgradeItemsCost(ItemStack... upgradeItemsCost) {
+ public SPUpgrade setUpgradeItemsCost(ItemStack... upgradeItemsCost) {
itemsCost = upgradeItemsCost;
return this;
}
- public SP_Upgrade setUpgradeFluidsCost(FluidStack... upgradeFluidsCost) {
+ public SPUpgrade setUpgradeFluidsCost(FluidStack... upgradeFluidsCost) {
fluidsCost = upgradeFluidsCost;
return this;
}
- public SP_Upgrade setUpgradeRequirements(SP_Requirements upgradeRequirements) {
+ public SPUpgrade setUpgradeRequirements(SPRequirements upgradeRequirements) {
requirements = upgradeRequirements;
return this;
}
- public SP_Upgrade setUpgradeTotalStages(int upgradeTotalStages) {
+ public SPUpgrade setUpgradeTotalStages(int upgradeTotalStages) {
totalStages = upgradeTotalStages;
return this;
}
- public SP_Upgrade setUpgradeBuildTime(int upgradeBuildTime) {
+ public SPUpgrade setUpgradeBuildTime(int upgradeBuildTime) {
buildTime = upgradeBuildTime;
return this;
}
- public SP_Upgrade setUpgradeVoltage(long upgradeVoltage) {
+ public SPUpgrade setUpgradeVoltage(long upgradeVoltage) {
voltage = upgradeVoltage;
return this;
}
@@ -333,8 +333,8 @@ public class SP_Upgrade implements ISP_Upgrade {
}
@Override
- public SP_Upgrade copy() {
- return new SP_Upgrade().setUpgradeName(name)
+ public SPUpgrade copy() {
+ return new SPUpgrade().setUpgradeName(name)
.setUpgradeUnlocalizedName(unlocalizedName)
.setUpgradeBuildTime(buildTime)
.setUpgradeFluidsCost(fluidsCost)
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
index 201b7c27a9..d682dd6c01 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
@@ -378,7 +378,7 @@ public class SpaceProject implements ISpaceProject {
.setProjectTexture(texture)
.setProjectRequirements(requirements);
if (upgradesAvailable != null) {
- ISP_Upgrade[] upgrades = new SP_Upgrade[upgradesAvailable.size()];
+ ISP_Upgrade[] upgrades = new SPUpgrade[upgradesAvailable.size()];
int index = 0;
for (ISP_Upgrade upgrade : upgradesAvailable.values()) {
upgrades[index++] = upgrade.copy();
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPCommand.java
index 3c4ad00932..39332818fe 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPCommand.java
@@ -17,13 +17,13 @@ import net.minecraft.util.EnumChatFormatting;
import org.apache.commons.lang3.tuple.Pair;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
import gregtech.common.misc.spaceprojects.SpaceProjectManager;
/**
* @author BlueWeabo
*/
-public class SP_Command extends CommandBase {
+public class SPCommand extends CommandBase {
private static final Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections
.newSetFromMap(new WeakHashMap<>());
@@ -82,7 +82,7 @@ public class SP_Command extends CommandBase {
+ EnumChatFormatting.GOLD
+ " /sp accept "
+ teamLeader.getCommandSenderName();
- GT_Utility.sendChatToPlayer(teamMember, message);
+ GTUtility.sendChatToPlayer(teamMember, message);
}
private void processAccept(ICommandSender sender, String playerInviter) {
@@ -93,7 +93,7 @@ public class SP_Command extends CommandBase {
+ EnumChatFormatting.RESET
+ " has accepted the invite.";
SpaceProjectManager.putInTeam(teamMember.getUniqueID(), teamLeader.getUniqueID());
- GT_Utility.sendChatToPlayer(teamLeader, message);
+ GTUtility.sendChatToPlayer(teamLeader, message);
invite.remove(Pair.of(teamMember, teamLeader));
}
}
@@ -105,7 +105,7 @@ public class SP_Command extends CommandBase {
+ "/sp confirm"
+ EnumChatFormatting.RESET
+ " to confirm this. This does nothing if you are the team leader.";
- GT_Utility.sendChatToPlayer(player, message);
+ GTUtility.sendChatToPlayer(player, message);
confirm.add(player);
}
@@ -114,7 +114,7 @@ public class SP_Command extends CommandBase {
if (confirm.contains(player)) {
String message = "Successfully left the team.";
SpaceProjectManager.putInTeam(player.getUniqueID(), player.getUniqueID());
- GT_Utility.sendChatToPlayer(player, message);
+ GTUtility.sendChatToPlayer(player, message);
confirm.remove(player);
}
}
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPMCommand.java
index 896c7e1052..8379162f84 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPMCommand.java
@@ -20,7 +20,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
/**
* @author BlueWeabo
*/
-public class SPM_Command extends CommandBase {
+public class SPMCommand extends CommandBase {
private static final String RESET = "reset";
private static final String UNLOCK = "unlock";
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProject_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProjectCommand.java
index 2f36175069..bd1408d80e 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProject_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProjectCommand.java
@@ -1,6 +1,6 @@
package gregtech.common.misc.spaceprojects.commands;
-public class SpaceProject_Command extends SP_Command {
+public class SpaceProjectCommand extends SPCommand {
@Override
public String getCommandName() {
generated by cgit (git 2.46.0) at 2025-03-04 14:47:56 +0000