aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/detrav/items/behaviours
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/detrav/items/behaviours')
-rw-r--r--src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java58
-rw-r--r--src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java16
2 files changed, 27 insertions, 47 deletions
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
index 56f97ea862..04b1c47cf6 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
@@ -1,5 +1,7 @@
package detrav.items.behaviours;
+import static gregtech.api.enums.Mods.VisualProspecting;
+
import java.util.ArrayList;
import java.util.List;
@@ -22,7 +24,6 @@ import detrav.net.DetravNetwork;
import detrav.net.ProspectingPacket;
import detrav.utils.BartWorksHelper;
import detrav.utils.GTppHelper;
-import gregtech.api.enums.Mods;
import gregtech.api.items.MetaBaseItem;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GTLanguageManager;
@@ -47,29 +48,10 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
if (aPlayer.isSneaking()) {
data++;
if (data > 3) data = 0;
- switch (data) {
- case 0:
- aPlayer.addChatMessage(
- new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.0")));
- break;
- case 1:
- aPlayer.addChatMessage(
- new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1")));
- break;
- case 2:
- aPlayer.addChatMessage(
- new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2")));
- break;
- case 3:
- aPlayer.addChatMessage(
- new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3")));
- break;
- default:
- aPlayer.addChatMessage(
- new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error")));
- break;
- }
- DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, (long) data);
+ aPlayer.addChatMessage(
+ new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode." + data)));
+
+ DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, data);
return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
}
@@ -98,15 +80,14 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
final int ySize = c.getHeightValue(x, z);
for (int y = 1; y < ySize; y++) {
switch (data) {
- case 0:
- case 1:
+ case 0, 1 -> {
final Block tBlock = c.getBlock(x, y, z);
short tMetaID = (short) c.getBlockMetadata(x, y, z);
if (tBlock instanceof BlockOresAbstract) {
TileEntity tTileEntity = c.getTileEntityUnsafe(x, y, z);
if ((tTileEntity instanceof TileEntityOres)
&& ((TileEntityOres) tTileEntity).mNatural) {
- tMetaID = (short) ((TileEntityOres) tTileEntity).getMetaData();
+ tMetaID = ((TileEntityOres) tTileEntity).getMetaData();
try {
String name = GTLanguageManager
.getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name");
@@ -143,8 +124,8 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
(short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID);
}
}
- break;
- case 2:
+ }
+ case 2 -> {
if ((x == 0) || (z == 0)) { // Skip doing the locations with the grid on them.
break;
}
@@ -160,9 +141,9 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
packet
.addBlock(c.xPosition * 16 + x, 2, c.zPosition * 16 + z, (short) fStack.amount);
}
- break;
- case 3:
- float polution = (float) getPolution(
+ }
+ case 3 -> {
+ float polution = (float) getPollution(
aWorld,
c.xPosition * 16 + x,
c.zPosition * 16 + z);
@@ -171,17 +152,17 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
if (polution > 0xFF) polution = 0xFF;
polution = 0xFF - polution;
packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution);
- break;
+ }
}
if (data > 1) break;
}
}
}
- packet.level = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, "");
+ packet.level = aItem.getHarvestLevel(aStack, "");
DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer);
if (!aPlayer.capabilities.isCreativeMode) tool.doDamage(aStack, this.mCosts * chunks.size());
- if (Mods.VisualProspecting.isModLoaded()) {
+ if (VisualProspecting.isModLoaded()) {
if (data == 0 || data == 1) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
@@ -228,13 +209,12 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
if (!aPlayer.capabilities.isCreativeMode)
((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts);
}
- return true;
} else {
if (!aWorld.isRemote) {
- prospectSingleChunk((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ);
+ prospectSingleChunk(aItem, aStack, aPlayer, aWorld, aX, aY, aZ);
}
- return true;
}
+ return true;
}
if (data < 3) if (!aWorld.isRemote) {
FluidStack fStack = UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1);
@@ -243,7 +223,7 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
return true;
}
if (!aWorld.isRemote) {
- int polution = getPolution(aWorld, aX, aZ);
+ int polution = getPollution(aWorld, aX, aZ);
addChatMassageByValue(aPlayer, polution, "Pollution");
}
return true;
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
index 45b4c7fb29..7038d42817 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
@@ -1,5 +1,7 @@
package detrav.items.behaviours;
+import static gregtech.api.enums.Mods.VisualProspecting;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -30,7 +32,6 @@ import detrav.utils.BartWorksHelper;
import detrav.utils.GTppHelper;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.Materials;
-import gregtech.api.enums.Mods;
import gregtech.api.items.MetaBaseItem;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GTLanguageManager;
@@ -64,7 +65,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
int aZ, int aSide, float hitX, float hitY, float hitZ) {
SplittableRandom aRandom = new SplittableRandom();
- int chance = ((1 + aStack.getItemDamage()) * 8) > 100 ? 100 : (1 + aStack.getItemDamage()) * 8;
+ int chance = Math.min(((1 + aStack.getItemDamage()) * 8), 100);
if (aWorld.isRemote) return false;
@@ -82,7 +83,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
if (!aPlayer.capabilities.isCreativeMode)
((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts);
- if (Mods.VisualProspecting.isModLoaded()) {
+ if (VisualProspecting.isModLoaded()) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
new ArrayList<>(),
@@ -213,7 +214,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
aPlayer.addChatMessage(msg);
}
- if (Mods.VisualProspecting.isModLoaded()) {
+ if (VisualProspecting.isModLoaded()) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(
@@ -249,7 +250,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
addChatMassageByValue(aPlayer, value, key);
}
- if (Mods.VisualProspecting.isModLoaded()) {
+ if (VisualProspecting.isModLoaded()) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(
@@ -266,8 +267,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
// aTileEntity)
{
if (aTileEntity != null) {
- if (aTileEntity instanceof TileEntityOres) {
- TileEntityOres gt_entity = (TileEntityOres) aTileEntity;
+ if (aTileEntity instanceof TileEntityOres gt_entity) {
short meta = gt_entity.getMetaData();
String format = LanguageRegistry.instance()
.getStringLocalization("gt.blockores." + meta + ".name");
@@ -414,7 +414,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
.add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.5")));
}
- public static int getPolution(World aWorld, int aX, int aZ) {
+ public static int getPollution(World aWorld, int aX, int aZ) {
return Pollution.getPollution(aWorld.getChunkFromBlockCoords(aX, aZ));
}
}
generated by cgit (git 2.46.0) at 2025-11-20 23:19:27 +0000