diff options
Diffstat (limited to 'src/main/java')
5 files changed, 45 insertions, 61 deletions
diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index dd693c0cd7..acf8ffec76 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -1,6 +1,5 @@ package com.detrav; -import com.detrav.net.DetravProPickPacket00; import com.detrav.utils.FluidColors; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index 6a80b7de0f..7144454b16 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -19,6 +19,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import static com.detrav.DetravScannerMod.DEBUGBUILD; @@ -67,18 +68,18 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { range += 1; } if (meta<100) { - aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + Long.toString(tMaxDamage - getToolDamage(aStack)) + " / " + Long.toString(tMaxDamage) + EnumChatFormatting.GRAY); - aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.GRAY); - aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Chunks: " + + aList.add(tOffset + 0, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability") + EnumChatFormatting.GREEN + Long.toString(tMaxDamage - getToolDamage(aStack)) + " / " + Long.toString(tMaxDamage) + EnumChatFormatting.GRAY); + aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY); + aList.add(tOffset + 2, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range") + Integer.toString(range) + "x"+ Integer.toString(range) + EnumChatFormatting.GRAY); - aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ "Right click on rock for prospecting current chunk!" + EnumChatFormatting.GRAY); - aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ "Right click on bedrock for prospecting oil!" + EnumChatFormatting.GRAY); - aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ "Chance of a successful scan: "+EnumChatFormatting.RESET+Integer.toString(((((1+meta)*8) <= 100)? ((1+meta)*8) : 100))+EnumChatFormatting.GRAY+"%"); - aList.add(tOffset + 6, EnumChatFormatting.ITALIC+ "next to you (0 chunks away), close to you (1-2)"); - aList.add(tOffset + 7, EnumChatFormatting.ITALIC+ "at medium range (3-5), at long range (6-8), far away (9+)"); + aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0") + EnumChatFormatting.GRAY); + aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1") + EnumChatFormatting.GRAY); + aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.success.chance")+EnumChatFormatting.RESET+Integer.toString(((((1+meta)*8) <= 100)? ((1+meta)*8) : 100))+EnumChatFormatting.GRAY+"%"); + aList.add(tOffset + 6, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.distance.0")); + aList.add(tOffset + 7, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.distance.1")); /*aList.add(tOffset + 4, "Traces: 1-9"); aList.add(tOffset + 5, "Small: 10-29"); @@ -86,12 +87,12 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { aList.add(tOffset + 7, "Large: 60-99"); aList.add(tOffset + 8, "Very large: 100-***");*/ }else if (meta >=100 && meta<200) { - aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); - aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.GRAY); - aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Chunks: " + EnumChatFormatting.YELLOW + (getHarvestLevel(aStack, "") * 2 + 1) + "x" + (getHarvestLevel(aStack, "") * 2 + 1) + EnumChatFormatting.GRAY); - aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ "Right click on rock for prospecting current chunk!"); - aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ "Right click on bedrock for prospecting oil!"); - aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ "Right click for scanning!"); + aList.add(tOffset + 0, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability") + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); + aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY); + aList.add(tOffset + 2, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range") + EnumChatFormatting.YELLOW + (getHarvestLevel(aStack, "") * 2 + 1) + "x" + (getHarvestLevel(aStack, "") * 2 + 1) + EnumChatFormatting.GRAY); + aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0")); + aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1")); + aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.2")); } /* unused diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 46c01af8ee..fecec059dc 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -23,6 +23,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; +import net.minecraft.util.StatCollector; import java.util.ArrayList; import java.util.List; @@ -44,19 +45,19 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi if (data > 3) data = 0; switch (data) { case 0: - aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore, Any Rock Block")); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.0"))); break; case 1: - aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore (with small), Any Rock Block")); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1"))); break; case 2: - aPlayer.addChatMessage(new ChatComponentText("Set Mode: Oil, Any Block")); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2"))); break; case 3: - aPlayer.addChatMessage(new ChatComponentText("Set Mode: Pollution, Any Block")); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3"))); break; default: - aPlayer.addChatMessage(new ChatComponentText("Set Mode: ERROR")); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error"))); break; } DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, (long) data); @@ -83,6 +84,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi packet.chunkX = cX; packet.chunkZ = cZ; packet.size = size; + String small_ore_keyword = StatCollector.translateToLocal("detrav.scanner.small_ore.keyword"); for (Chunk c : chunks) { for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) { @@ -103,7 +105,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi String name = GT_LanguageManager.getTranslation( tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); - if (name.startsWith("Small")) if (data != 1) continue; + if (name.startsWith(small_ore_keyword)) if (data != 1) continue; packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID); } catch (Exception e) { String name = tBlock.getUnlocalizedName() + "."; @@ -160,11 +162,11 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) { if (value < 0) { - aPlayer.addChatMessage(new ChatComponentText(foundTexts[6] + name)); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); } else if (value < 1) { - aPlayer.addChatMessage(new ChatComponentText(foundTexts[0])); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6"))); } else - aPlayer.addChatMessage(new ChatComponentText(foundTexts[6] + name + " " + value)); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name + " " + value)); } public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index 297266819b..19cbe655f5 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; @@ -36,24 +37,6 @@ import java.util.SplittableRandom; */ public class BehaviourDetravToolProPick extends Behaviour_None { - static final String[] foundTexts = new String[]{ - "Found nothing of interest", //0 - " traces.", //1-9 - " small sample.", //10-29 - " medium sample.", //30-59 - " large sample.", //60-99 - " very large sample.", //100-** - "Found " - }; - - static final String[] DISTANCETEXTS = new String[]{ - " next to you,", // 0 chunks away - " close to you,", // 1-2 chunks aways - " at medium range,", // 3 - 5 chunks away - " at long range,", // 6 -8 chunks away - " far away,", // 9 + chunks away - }; - static final int[] DISTANCEINTS = new int[] { 0, 4, @@ -117,7 +100,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None { } range = range/2; // Convert range from diameter to radius - aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD+"Prospecting at " + EnumChatFormatting.BLUE + "(" + bX + ", " + bZ + ")" )); + aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD+ GT_LanguageManager.sEnglishFile.get("LanguageFile", "gt.scanner.prospecting", "Prospecting at ").getString() + EnumChatFormatting.BLUE + "(" + bX + ", " + bZ + ")" )); for (int x = -(range); x<(range+1);++x){ aX=bX+(x*16); for (int z = -(range); z<(range+1);++z) { @@ -131,7 +114,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None { } } if (DetravScannerMod.DEBUGBUILD) - aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW+"Chunk at "+ aX +"|"+aZ+" to "+(aX+16)+"|"+(aZ+16) + DISTANCETEXTS[distTextIndex])); + aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW+"Chunk at "+ aX +"|"+aZ+" to "+(aX+16)+"|"+(aZ+16) + StatCollector.translateToLocal("detrav.scanner.distance.texts." + distTextIndex))); processOreProspecting((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld.getChunkFromBlockCoords(aX, aZ), aWorld.getTileEntity(aX, aY, aZ),GT_OreDictUnificator.getAssociation(new ItemStack(aWorld.getBlock(aX, aY, aZ), 1, aWorld.getBlockMetadata(aX, aY, aZ))), aRandom, chance); } } @@ -142,9 +125,9 @@ public class BehaviourDetravToolProPick extends Behaviour_None { } if( badluck == 0) { - aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.WHITE + "All chunks scanned successfully!")); + aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.WHITE + StatCollector.translateToLocal("detrav.scanner.success"))); } else { - aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.WHITE + "Failed on " + badluck + " chunks. Better luck next time!")); + aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.WHITE + StatCollector.translateToLocal("detrav.scanner.fail").replace("%badluck", Integer.toString(badluck)))); } } @@ -152,7 +135,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None { protected void prospectSingleChunk(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ ) { ores = new HashMap<String, Integer>(); - aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD+"Prospecting at " + EnumChatFormatting.BLUE + "(" + aX + ", " + aZ + ")" )); + aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD+ StatCollector.translateToLocal("detrav.scanner.prospecting") + EnumChatFormatting.BLUE + "(" + aX + ", " + aZ + ")" )); processOreProspecting((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld.getChunkFromBlockCoords(aX, aZ), aWorld.getTileEntity(aX, aY, aZ),GT_OreDictUnificator.getAssociation(new ItemStack(aWorld.getBlock(aX, aY, aZ), 1, aWorld.getBlockMetadata(aX, aY, aZ))), new SplittableRandom(), 1000); for (String key : ores.keySet()) { @@ -205,14 +188,12 @@ public class BehaviourDetravToolProPick extends Behaviour_None { try { String name = Materials.getLocalizedNameForItem( GT_LanguageManager.getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"), tMetaID%1000); - if (name.startsWith("Small")) if (data != 1) continue; - if (name.startsWith("Small")) if(data!=1) continue; + if (name.startsWith(StatCollector.translateToLocal("detrav.scanner.small_ore.keyword"))) if (data != 1) continue; addOreToHashMap(name, aPlayer); } catch(Exception e) { String name = tBlock.getUnlocalizedName() + "."; if (name.contains(".small.")) if (data != 1) continue; - if (name.startsWith("Small")) if(data!=1) continue; addOreToHashMap(name, aPlayer); } } @@ -265,7 +246,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None { } void addOreToHashMap(String orename, EntityPlayer aPlayer) { - String oreDistance = orename + DISTANCETEXTS[distTextIndex]; // orename + the textual distance of the ore + String oreDistance = orename + StatCollector.translateToLocal("detrav.scanner.distance.texts." + distTextIndex); // orename + the textual distance of the ore if (!ores.containsKey(oreDistance)) { if (DetravScannerMod.DEBUGBUILD) aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN+" Adding to oremap " + oreDistance)); @@ -278,19 +259,19 @@ public class BehaviourDetravToolProPick extends Behaviour_None { void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) { if (value < 0) { - aPlayer.addChatMessage(new ChatComponentText(foundTexts[6] + name)); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); } else if (value < 1) { - aPlayer.addChatMessage(new ChatComponentText(foundTexts[0])); + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.0"))); } else if (value < 10) - aPlayer.addChatMessage(new ChatComponentText(name + foundTexts[1])); + aPlayer.addChatMessage(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.1"))); else if (value < 30) - aPlayer.addChatMessage(new ChatComponentText(name + foundTexts[2])); + aPlayer.addChatMessage(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.2"))); else if (value < 60) - aPlayer.addChatMessage(new ChatComponentText(name + foundTexts[3])); + aPlayer.addChatMessage(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.3"))); else if (value < 100) - aPlayer.addChatMessage(new ChatComponentText(name + foundTexts[4])); + aPlayer.addChatMessage(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.4"))); else - aPlayer.addChatMessage(new ChatComponentText(name + foundTexts[5])); + aPlayer.addChatMessage(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.5"))); } public static int getPolution(World aWorld, int aX, int aZ) diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java index fc4555075a..0a50fbbeed 100644 --- a/src/main/java/com/detrav/net/DetravProPickPacket00.java +++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java @@ -11,6 +11,7 @@ import com.google.common.io.ByteStreams; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -165,7 +166,7 @@ public class DetravProPickPacket00 extends DetravPacket { rgba = tMaterial.getRGBA(); //ores.put(GT_Ore) - name = getLocalizedNameForItem(tMaterial.mDefaultLocalName, GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name")); + name = tMaterial.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name")); raster.setSample(i, j, 0, rgba[0]); raster.setSample(i, j, 1, rgba[1]); @@ -242,7 +243,7 @@ public class DetravProPickPacket00 extends DetravPacket { name = FluidRegistry.getFluid( metas[0] ).getLocalizedName(new FluidStack( FluidRegistry.getFluid( metas[0] ), 0) ); if (name == null) { - name = "Unknown Fluid name!"; + name = StatCollector.translateToLocal("gui.detrav.scanner.unknown_fluid"); } if (!ores.containsKey(name)) @@ -277,7 +278,7 @@ public class DetravProPickPacket00 extends DetravPacket { } break; case 3: - ores.put("Pollution", ((0 & 0xFF) << 16) + ((0 & 0xFF) << 8) + ((0 & 0xFF))); + ores.put(StatCollector.translateToLocal("gui.detrav.scanner.pollution"), ((0 & 0xFF) << 16) + ((0 & 0xFF) << 8) + ((0 & 0xFF))); for (int i = 0; i < wh; i++) for (int j = 0; j < wh; j++) { if (map[i][j] == null) { |