From 4b75a2f6a2a5df3a8ac8c22c9832a1bb29116bf0 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 7 Jan 2015 23:13:10 +0000 Subject: [PATCH 01/12] Hopefully improve the synchronization of the networks' transmitter sets --- .../java/mekanism/api/gas/GasNetwork.java | 40 ++------ .../api/transmitters/DynamicNetwork.java | 91 +++++++++++++------ .../java/mekanism/common/EnergyNetwork.java | 58 ++++-------- .../java/mekanism/common/FluidNetwork.java | 49 +++------- 4 files changed, 100 insertions(+), 138 deletions(-) diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 35b651722..4d616804b 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -135,12 +135,12 @@ public class GasNetwork extends DynamicNetwork gasStored = null; } - public synchronized int getGasNeeded() + public int getGasNeeded() { return getCapacity()-(gasStored != null ? gasStored.amount : 0); } - public synchronized int tickEmit(GasStack stack) + public int tickEmit(GasStack stack) { List availableAcceptors = Arrays.asList(getAcceptors(stack.getGas()).toArray()); @@ -185,7 +185,7 @@ public class GasNetwork extends DynamicNetwork return sent; } - public synchronized int emit(GasStack stack) + public int emit(GasStack stack) { if(gasStored != null && gasStored.getGas() != stack.getGas()) { @@ -276,12 +276,12 @@ public class GasNetwork extends DynamicNetwork } @Override - public synchronized Set getAcceptors(Object... data) + public Set getAcceptors(Object... data) { Gas type = (Gas)data[0]; Set toReturn = new HashSet(); - for(IGasHandler acceptor : ((Map)possibleAcceptors.clone()).values()) + for(IGasHandler acceptor : possibleAcceptors.values()) { if(acceptorDirections.get(acceptor) == null) { @@ -298,35 +298,7 @@ public class GasNetwork extends DynamicNetwork } @Override - public synchronized void refresh() - { - Set> iterTubes = (Set>)transmitters.clone(); - Iterator> it = iterTubes.iterator(); - boolean networkChanged = false; - - while(it.hasNext()) - { - IGridTransmitter conductor = (IGridTransmitter)it.next(); - - if(conductor == null || conductor.getTile().isInvalid()) - { - it.remove(); - networkChanged = true; - transmitters.remove(conductor); - } - else { - conductor.setTransmitterNetwork(this); - } - } - - if(networkChanged) - { - updateCapacity(); - } - } - - @Override - public synchronized void refresh(IGridTransmitter transmitter) + public void refresh(IGridTransmitter transmitter) { IGasHandler[] acceptors = GasTransmission.getConnectedAcceptors(transmitter.getTile()); diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 27194fa97..69e15ac30 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -2,6 +2,7 @@ package mekanism.api.transmitters; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -24,7 +25,7 @@ import cpw.mods.fml.common.eventhandler.Event; public abstract class DynamicNetwork> implements ITransmitterNetwork, IClientTicker, INetworkDataHandler { - public LinkedHashSet> transmitters = new LinkedHashSet>(); + public final Set> transmitters = Collections.synchronizedSet(new LinkedHashSet>()); public HashMap possibleAcceptors = new HashMap(); public HashMap acceptorDirections = new HashMap(); @@ -91,15 +92,46 @@ public abstract class DynamicNetwork> implemen { possibleAcceptors.clear(); acceptorDirections.clear(); - - for(IGridTransmitter transmitter : transmitters) + + synchronized(transmitters) { - refresh(transmitter); + for(IGridTransmitter transmitter : transmitters) + { + refresh(transmitter); + } } - + refresh(); } - + + @Override + public void refresh() + { + boolean networkChanged = false; + + synchronized(transmitters) + { + for(Iterator> it = transmitters.iterator(); it.hasNext();) + { + IGridTransmitter conductor = it.next(); + + if(conductor == null || conductor.getTile().isInvalid()) + { + it.remove(); + networkChanged = true; + } else + { + conductor.setTransmitterNetwork((N)this); + } + } + } + + if(networkChanged) + { + updateCapacity(); + } + } + public Range4D getPacketRange() { if(packetRange == null) @@ -116,7 +148,7 @@ public abstract class DynamicNetwork> implemen { return null; } - + return transmitters.iterator().next().getTile().getWorldObj(); } @@ -127,26 +159,31 @@ public abstract class DynamicNetwork> implemen deregister(); return null; } - - Coord4D initCoord = Coord4D.get(transmitters.iterator().next().getTile()); - + + Coord4D initCoord; + + initCoord = Coord4D.get(transmitters.iterator().next().getTile()); + int minX = initCoord.xCoord; int minY = initCoord.yCoord; int minZ = initCoord.zCoord; int maxX = initCoord.xCoord; int maxY = initCoord.yCoord; int maxZ = initCoord.zCoord; - - for(IGridTransmitter transmitter : transmitters) + + synchronized(transmitters) { - Coord4D coord = Coord4D.get(transmitter.getTile()); - - if(coord.xCoord < minX) minX = coord.xCoord; - if(coord.yCoord < minY) minY = coord.yCoord; - if(coord.zCoord < minZ) minZ = coord.zCoord; - if(coord.xCoord > maxX) maxX = coord.xCoord; - if(coord.yCoord > maxY) maxY = coord.yCoord; - if(coord.zCoord > maxZ) maxZ = coord.zCoord; + for(IGridTransmitter transmitter : transmitters) + { + Coord4D coord = Coord4D.get(transmitter.getTile()); + + if(coord.xCoord < minX) minX = coord.xCoord; + if(coord.yCoord < minY) minY = coord.yCoord; + if(coord.zCoord < minZ) minZ = coord.zCoord; + if(coord.xCoord > maxX) maxX = coord.xCoord; + if(coord.yCoord > maxY) maxY = coord.yCoord; + if(coord.zCoord > maxZ) maxZ = coord.zCoord; + } } return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, getWorld().provider.dimensionId); @@ -175,8 +212,8 @@ public abstract class DynamicNetwork> implemen if(!((TileEntity)aTransmitter).getWorldObj().isRemote) { TransmitterNetworkRegistry.getInstance().registerNetwork(this); - } - else { + } else + { MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)1)); } } @@ -209,7 +246,7 @@ public abstract class DynamicNetwork> implemen return possibleAcceptors.size(); } - public synchronized void updateCapacity() + public void updateCapacity() { updateMeanCapacity(); capacity = (int)meanCapacity * transmitters.size(); @@ -219,12 +256,12 @@ public abstract class DynamicNetwork> implemen * Override this if things can have variable capacity along the network. * @return An 'average' value of capacity. Calculate it how you will. */ - protected synchronized void updateMeanCapacity() + protected void updateMeanCapacity() { if(transmitters.size() > 0) { meanCapacity = transmitters.iterator().next().getCapacity(); - } + } else { meanCapacity = 0; } @@ -294,7 +331,7 @@ public abstract class DynamicNetwork> implemen } @Override - public synchronized void fixMessedUpNetwork(IGridTransmitter transmitter) + public void fixMessedUpNetwork(IGridTransmitter transmitter) { if(transmitter instanceof TileEntity) { @@ -321,7 +358,7 @@ public abstract class DynamicNetwork> implemen } @Override - public synchronized void split(IGridTransmitter splitPoint) + public void split(IGridTransmitter splitPoint) { if(splitPoint instanceof TileEntity) { diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index f12524520..97a3fcb66 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -80,15 +80,18 @@ public class EnergyNetwork extends DynamicNetwork } @Override - protected synchronized void updateMeanCapacity() + protected void updateMeanCapacity() { int numCables = transmitters.size(); double reciprocalSum = 0; - - for(IGridTransmitter cable : transmitters) - { - reciprocalSum += 1.0/(double)cable.getCapacity(); - } + + synchronized(transmitters) + { + for(IGridTransmitter cable : transmitters) + { + reciprocalSum += 1.0 / (double)cable.getCapacity(); + } + } meanCapacity = (double)numCables / reciprocalSum; } @@ -119,7 +122,7 @@ public class EnergyNetwork extends DynamicNetwork } } - public synchronized double getEnergyNeeded() + public double getEnergyNeeded() { if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { @@ -129,7 +132,7 @@ public class EnergyNetwork extends DynamicNetwork return getCapacity()-electricityStored; } - public synchronized double tickEmit(double energyToSend) + public double tickEmit(double energyToSend) { if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { @@ -153,7 +156,7 @@ public class EnergyNetwork extends DynamicNetwork return sent; } - public synchronized double emit(double energyToSend, boolean doEmit) + public double emit(double energyToSend, boolean doEmit) { double toUse = Math.min(getEnergyNeeded(), energyToSend); if(doEmit) @@ -166,7 +169,7 @@ public class EnergyNetwork extends DynamicNetwork /** * @return sent */ - public synchronized double doEmit(double energyToSend, boolean tryAgain) + public double doEmit(double energyToSend, boolean tryAgain) { double sent = 0; @@ -219,7 +222,7 @@ public class EnergyNetwork extends DynamicNetwork } @Override - public synchronized Set getAcceptors(Object... data) + public Set getAcceptors(Object... data) { Set toReturn = new HashSet(); @@ -228,7 +231,7 @@ public class EnergyNetwork extends DynamicNetwork return toReturn; } - for(TileEntity acceptor : ((Map)possibleAcceptors.clone()).values()) + for(TileEntity acceptor : possibleAcceptors.values()) { ForgeDirection side = acceptorDirections.get(acceptor); @@ -246,7 +249,6 @@ public class EnergyNetwork extends DynamicNetwork if(handler.getMaxEnergy() - handler.getEnergy() > 0) { toReturn.add(acceptor); - continue; } } } @@ -259,7 +261,6 @@ public class EnergyNetwork extends DynamicNetwork if(handler.receiveEnergy(side.getOpposite(), 1, true) > 0) { toReturn.add(acceptor); - continue; } } } @@ -276,7 +277,6 @@ public class EnergyNetwork extends DynamicNetwork if(Math.min(demanded, max) > 0) { toReturn.add(acceptor); - continue; } } } @@ -286,37 +286,15 @@ public class EnergyNetwork extends DynamicNetwork } @Override - public synchronized void refresh() + public void refresh() { - Set> iterCables = (Set>)transmitters.clone(); - Iterator> it = iterCables.iterator(); - boolean networkChanged = false; - - while(it.hasNext()) - { - IGridTransmitter conductor = (IGridTransmitter)it.next(); - - if(conductor == null || conductor.getTile().isInvalid()) - { - it.remove(); - transmitters.remove(conductor); - networkChanged = true; - } - else { - conductor.setTransmitterNetwork(this); - } - } - - if(networkChanged) - { - updateCapacity(); - } + super.refresh(); needsUpdate = true; } @Override - public synchronized void refresh(IGridTransmitter transmitter) + public void refresh(IGridTransmitter transmitter) { TileEntity[] acceptors = CableUtils.getConnectedEnergyAcceptors(transmitter.getTile()); diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 8612e15c8..cad8d6b00 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -99,14 +99,17 @@ public class FluidNetwork extends DynamicNetwork } @Override - protected synchronized void updateMeanCapacity() + protected void updateMeanCapacity() { int numCables = transmitters.size(); double sum = 0; - for(IGridTransmitter pipe : transmitters) + synchronized(transmitters) { - sum += pipe.getCapacity(); + for(IGridTransmitter pipe : transmitters) + { + sum += pipe.getCapacity(); + } } meanCapacity = sum / (double)numCables; @@ -148,12 +151,12 @@ public class FluidNetwork extends DynamicNetwork refFluid = null; } - public synchronized int getFluidNeeded() + public int getFluidNeeded() { return getCapacity()-(fluidStored != null ? fluidStored.amount : 0); } - public synchronized int tickEmit(FluidStack fluidToSend, boolean doTransfer) + public int tickEmit(FluidStack fluidToSend, boolean doTransfer) { List availableAcceptors = Arrays.asList(getAcceptors(fluidToSend).toArray()); @@ -197,7 +200,7 @@ public class FluidNetwork extends DynamicNetwork return fluidSent; } - public synchronized int emit(FluidStack fluidToSend, boolean doTransfer) + public int emit(FluidStack fluidToSend, boolean doTransfer) { if(fluidToSend == null || (fluidStored != null && fluidStored.getFluid() != fluidToSend.getFluid())) { @@ -294,12 +297,12 @@ public class FluidNetwork extends DynamicNetwork } @Override - public synchronized Set getAcceptors(Object... data) + public Set getAcceptors(Object... data) { FluidStack fluidToSend = (FluidStack)data[0]; Set toReturn = new HashSet(); - for(IFluidHandler acceptor : ((Map)possibleAcceptors.clone()).values()) + for(IFluidHandler acceptor : possibleAcceptors.values()) { if(acceptorDirections.get(acceptor) == null) { @@ -314,37 +317,9 @@ public class FluidNetwork extends DynamicNetwork return toReturn; } - - @Override - public synchronized void refresh() - { - Set> iterPipes = (Set>)transmitters.clone(); - Iterator it = iterPipes.iterator(); - boolean networkChanged = false; - - while(it.hasNext()) - { - IGridTransmitter conductor = (IGridTransmitter)it.next(); - - if(conductor == null || conductor.getTile().isInvalid()) - { - it.remove(); - networkChanged = true; - transmitters.remove(conductor); - } - else { - conductor.setTransmitterNetwork(this); - } - } - - if(networkChanged) - { - updateCapacity(); - } - } @Override - public synchronized void refresh(IGridTransmitter transmitter) + public void refresh(IGridTransmitter transmitter) { IFluidHandler[] acceptors = PipeUtils.getConnectedAcceptors(transmitter.getTile()); From 41cf1a24374769524a255df4eb2ff17efd2403e8 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 7 Jan 2015 23:13:45 +0000 Subject: [PATCH 02/12] Move a bunch of registrations to PreInit. I believe they should be happening there in the first place. --- src/main/java/mekanism/common/Mekanism.java | 62 ++++++++++----------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a61b083ef..04cb0e298 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1339,60 +1339,60 @@ public class Mekanism InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 20, 0).setUnlocalizedName("infuse.fungi")); InfuseRegistry.registerInfuseType(new InfuseType("BIO", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 12, 0).setUnlocalizedName("infuse.bio")); InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 24, 0).setUnlocalizedName("infuse.obsidian")); + + //Load configuration + proxy.loadConfiguration(); + + //Register the mod's world generators + GameRegistry.registerWorldGenerator(genHandler, 1); + + //Register player tracker + FMLCommonHandler.instance().bus().register(new CommonPlayerTracker()); + FMLCommonHandler.instance().bus().register(new CommonPlayerTickHandler()); + + //Register to receive subscribed events + FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); + + //Register with TransmitterNetworkRegistry + TransmitterNetworkRegistry.initiate(); + + //Load this module + addItems(); + addBlocks(); + addRecipes(); + addEntities(); + + registerOreDict(); + + new MultipartMekanism(); + + //Load proxy + proxy.registerRenderInformation(); + proxy.loadUtilities(); } @EventHandler public void init(FMLInitializationEvent event) { - //Register the mod's world generators - GameRegistry.registerWorldGenerator(genHandler, 1); - //Register the mod's GUI handler NetworkRegistry.INSTANCE.registerGuiHandler(this, new CoreGuiHandler()); - //Register player tracker - FMLCommonHandler.instance().bus().register(new CommonPlayerTracker()); - FMLCommonHandler.instance().bus().register(new CommonPlayerTickHandler()); - //Initialization notification logger.info("Version " + versionNumber + " initializing..."); //Get data from server. new ThreadGetData(); - //Register to receive subscribed events - FMLCommonHandler.instance().bus().register(this); - MinecraftForge.EVENT_BUS.register(this); - //Set up VoiceServerManager if(voiceServerEnabled) { voiceManager = new VoiceServerManager(); } - - //Register with TransmitterNetworkRegistry - TransmitterNetworkRegistry.initiate(); - - //Load configuration - proxy.loadConfiguration(); - - //Load this module - addItems(); - addBlocks(); - addRecipes(); - addEntities(); - - registerOreDict(); - - new MultipartMekanism(); //Packet registrations packetHandler.initialize(); - //Load proxy - proxy.registerRenderInformation(); - proxy.loadUtilities(); - //Completion notification logger.info("Loading complete."); From c0db6b7eb5e5a8c3c71cbd03b78ccd359c9ecd30 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 7 Jan 2015 23:58:23 +0000 Subject: [PATCH 03/12] Fix #2075, hopefully. --- src/main/java/mekanism/common/recipe/RecipeHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index 2296c88a7..01d021860 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -416,7 +416,7 @@ public final class RecipeHandler { for(Map.Entry entry : recipes.entrySet()) { - if(entry.getKey().matches(input)) + if(entry.getKey().matches(input) && entry.getKey().gasType == input.gasType) { if(stackDecrease) { From 143c968a8a7acb4d0ff54b4018cc6b6c7b2171c3 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 10 Jan 2015 03:19:31 +0000 Subject: [PATCH 04/12] Update some deps to see if the buildserver's fixed yet --- build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index 2b9ff3ab7..74d0e22e4 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.7.10 -forge_version=10.13.0.1208 -FMP_version=1.1.0.314 -CCLIB_version=1.1.1.106 -NEI_version=1.0.3.67 +forge_version=10.13.2.1277 +FMP_version=1.1.1.320 +CCLIB_version=1.1.1.110 +NEI_version=1.0.4.83 mod_version=7.1.1 From 1a6a2e953085ebff43ff51a196657c7832f84746 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 10 Jan 2015 17:13:35 +0000 Subject: [PATCH 05/12] Update version number. I'm going to use GitHub's release feature until the build server's fixed. --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index 74d0e22e4..e1386f7ab 100644 --- a/build.properties +++ b/build.properties @@ -3,4 +3,4 @@ forge_version=10.13.2.1277 FMP_version=1.1.1.320 CCLIB_version=1.1.1.110 NEI_version=1.0.4.83 -mod_version=7.1.1 +mod_version=7.1.2 From 89be8b448294db5be216df7a3fcd3ec939dc0447 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 10 Jan 2015 17:47:16 +0000 Subject: [PATCH 06/12] Fix using localised names for overlay textures. --- .../mekanism/client/render/MekanismRenderer.java | 2 +- .../overlay/{OverlayAqua.png => overlay_aqua.png} | Bin .../overlay/{OverlayBlack.png => overlay_black.png} | Bin ...erlayBrightGreen.png => overlay_brightGreen.png} | Bin ...OverlayBrightPink.png => overlay_brightPink.png} | Bin .../overlay/{OverlayBrown.png => overlay_brown.png} | Bin .../{OverlayDarkAqua.png => overlay_darkAqua.png} | Bin .../{OverlayDarkBlue.png => overlay_darkBlue.png} | Bin .../{OverlayDarkGreen.png => overlay_darkGreen.png} | Bin .../{OverlayDarkGrey.png => overlay_darkGrey.png} | Bin .../{OverlayDarkRed.png => overlay_darkRed.png} | Bin .../overlay/{OverlayGrey.png => overlay_grey.png} | Bin .../{OverlayIndigo.png => overlay_indigo.png} | Bin .../{OverlayOrange.png => overlay_orange.png} | Bin .../overlay/{OverlayPink.png => overlay_pink.png} | Bin .../{OverlayPurple.png => overlay_purple.png} | Bin .../overlay/{OverlayRed.png => overlay_red.png} | Bin .../overlay/{OverlayWhite.png => overlay_white.png} | Bin .../{OverlayYellow.png => overlay_yellow.png} | Bin 19 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayAqua.png => overlay_aqua.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayBlack.png => overlay_black.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayBrightGreen.png => overlay_brightGreen.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayBrightPink.png => overlay_brightPink.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayBrown.png => overlay_brown.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayDarkAqua.png => overlay_darkAqua.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayDarkBlue.png => overlay_darkBlue.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayDarkGreen.png => overlay_darkGreen.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayDarkGrey.png => overlay_darkGrey.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayDarkRed.png => overlay_darkRed.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayGrey.png => overlay_grey.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayIndigo.png => overlay_indigo.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayOrange.png => overlay_orange.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayPink.png => overlay_pink.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayPurple.png => overlay_purple.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayRed.png => overlay_red.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayWhite.png => overlay_white.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/overlay/{OverlayYellow.png => overlay_yellow.png} (100%) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index da22157ab..c42f56011 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -66,7 +66,7 @@ public class MekanismRenderer { for(EnumColor color : EnumColor.values()) { - colors[color.ordinal()] = event.map.registerIcon("mekanism:overlay/Overlay" + color.getLocalizedName().replace(" ", "")); + colors[color.ordinal()] = event.map.registerIcon("mekanism:overlay/overlay_" + color.unlocalizedName); } energyIcon = event.map.registerIcon("mekanism:LiquidEnergy"); diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_aqua.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_aqua.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_black.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_black.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_brightGreen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_brightGreen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_brightPink.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_brightPink.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_brown.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_brown.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkAqua.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkAqua.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkBlue.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkBlue.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkGreen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkGreen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkGrey.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkGrey.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkRed.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_darkRed.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_grey.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_grey.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_indigo.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_indigo.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_orange.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_orange.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_pink.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_pink.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_purple.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_purple.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_red.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_red.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_white.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_white.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_yellow.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png rename to src/main/resources/assets/mekanism/textures/blocks/overlay/overlay_yellow.png From 1f9185dd010f918388609051d37df3afcd577572 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 10 Jan 2015 18:17:17 +0000 Subject: [PATCH 07/12] Make the gas mask and jetpack maps synchronized --- .../mekanism/client/ClientTickHandler.java | 22 ++-- .../client/render/RenderTickHandler.java | 115 +++++++++--------- src/main/java/mekanism/common/Mekanism.java | 8 +- .../common/network/PacketJetpackData.java | 9 +- .../common/network/PacketScubaTankData.java | 9 +- 5 files changed, 89 insertions(+), 74 deletions(-) diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index ad222d4d5..531ca0783 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -392,24 +392,30 @@ public class ClientTickHandler if(MekanismClient.audioHandler != null) { - for(String username : Mekanism.jetpackOn) + synchronized(Mekanism.jetpackOn) { - if(mc.theWorld.getPlayerEntityByName(username) != null) + for (String username : Mekanism.jetpackOn) { - if(MekanismClient.audioHandler.getFrom(mc.theWorld.getPlayerEntityByName(username)) == null) + if (mc.theWorld.getPlayerEntityByName(username) != null) { - new JetpackSound(MekanismClient.audioHandler.getIdentifier(), mc.theWorld.getPlayerEntityByName(username)); + if (MekanismClient.audioHandler.getFrom(mc.theWorld.getPlayerEntityByName(username)) == null) + { + new JetpackSound(MekanismClient.audioHandler.getIdentifier(), mc.theWorld.getPlayerEntityByName(username)); + } } } } - for(String username : Mekanism.gasmaskOn) + synchronized(Mekanism.gasmaskOn) { - if(mc.theWorld.getPlayerEntityByName(username) != null) + for (String username : Mekanism.gasmaskOn) { - if(MekanismClient.audioHandler.getFrom(mc.theWorld.getPlayerEntityByName(username)) == null) + if (mc.theWorld.getPlayerEntityByName(username) != null) { - new GasMaskSound(MekanismClient.audioHandler.getIdentifier(), mc.theWorld.getPlayerEntityByName(username)); + if (MekanismClient.audioHandler.getFrom(mc.theWorld.getPlayerEntityByName(username)) == null) + { + new GasMaskSound(MekanismClient.audioHandler.getIdentifier(), mc.theWorld.getPlayerEntityByName(username)); + } } } } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 4933d7489..4dfe424cb 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -102,66 +102,67 @@ public class RenderTickHandler font.drawStringWithShadow("Oxygen: " + scubaTank.getStored(stack), 1, y - 11, 0x404040); } } - - Set copy = (Set)((HashSet)Mekanism.jetpackOn).clone(); - - for(String s : copy) + + synchronized(Mekanism.jetpackOn) { - EntityPlayer p = mc.theWorld.getPlayerEntityByName(s); - - if(p == null) + for(String s : Mekanism.jetpackOn) { - continue; + EntityPlayer p = mc.theWorld.getPlayerEntityByName(s); + + if(p == null) + { + continue; + } + + Pos3D playerPos = new Pos3D(p); + + if(p != mc.thePlayer) + { + playerPos.translate(0, 1.7, 0); + } + + float random = (rand.nextFloat() - 0.5F) * 0.1F; + + Pos3D vLeft = new Pos3D(); + vLeft.xPos -= 0.43; + vLeft.yPos -= 0.55; + vLeft.zPos -= 0.54; + vLeft.rotateYaw(p.renderYawOffset); + + Pos3D vRight = new Pos3D(); + vRight.xPos += 0.43; + vRight.yPos -= 0.55; + vRight.zPos -= 0.54; + vRight.rotateYaw(p.renderYawOffset); + + Pos3D vCenter = new Pos3D(); + vCenter.xPos = (rand.nextFloat() - 0.5F) * 0.4F; + vCenter.yPos -= 0.86; + vCenter.zPos -= 0.30; + vCenter.rotateYaw(p.renderYawOffset); + + Pos3D rLeft = vLeft.clone().scale(random); + Pos3D rRight = vRight.clone().scale(random); + + Pos3D mLeft = vLeft.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + Pos3D mRight = vRight.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + Pos3D mCenter = vCenter.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + + mLeft.translate(rLeft); + mRight.translate(rRight); + + Pos3D v = playerPos.clone().translate(vLeft); + spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mLeft.xPos, mLeft.yPos, mLeft.zPos); + spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mLeft.xPos, mLeft.yPos, mLeft.zPos); + + v = playerPos.clone().translate(vRight); + spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mRight.xPos, mRight.yPos, mRight.zPos); + spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mRight.xPos, mRight.yPos, mRight.zPos); + + v = playerPos.clone().translate(vCenter); + spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mCenter.xPos, mCenter.yPos, mCenter.zPos); + spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mCenter.xPos, mCenter.yPos, mCenter.zPos); } - - Pos3D playerPos = new Pos3D(p); - - if(p != mc.thePlayer) - { - playerPos.translate(0, 1.7, 0); - } - - float random = (rand.nextFloat()-0.5F)*0.1F; - - Pos3D vLeft = new Pos3D(); - vLeft.xPos -= 0.43; - vLeft.yPos -= 0.55; - vLeft.zPos -= 0.54; - vLeft.rotateYaw(p.renderYawOffset); - - Pos3D vRight = new Pos3D(); - vRight.xPos += 0.43; - vRight.yPos -= 0.55; - vRight.zPos -= 0.54; - vRight.rotateYaw(p.renderYawOffset); - - Pos3D vCenter = new Pos3D(); - vCenter.xPos = (rand.nextFloat()-0.5F)*0.4F; - vCenter.yPos -= 0.86; - vCenter.zPos -= 0.30; - vCenter.rotateYaw(p.renderYawOffset); - - Pos3D rLeft = vLeft.clone().scale(random); - Pos3D rRight = vRight.clone().scale(random); - - Pos3D mLeft = vLeft.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); - Pos3D mRight = vRight.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); - Pos3D mCenter = vCenter.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); - - mLeft.translate(rLeft); - mRight.translate(rRight); - - Pos3D v = playerPos.clone().translate(vLeft); - spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mLeft.xPos, mLeft.yPos, mLeft.zPos); - spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mLeft.xPos, mLeft.yPos, mLeft.zPos); - - v = playerPos.clone().translate(vRight); - spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mRight.xPos, mRight.yPos, mRight.zPos); - spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mRight.xPos, mRight.yPos, mRight.zPos); - - v = playerPos.clone().translate(vCenter); - spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mCenter.xPos, mCenter.yPos, mCenter.zPos); - spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mCenter.xPos, mCenter.yPos, mCenter.zPos); } } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 04cb0e298..cbbb1daaa 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -2,6 +2,7 @@ package mekanism.common; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -35,6 +36,7 @@ import mekanism.common.EnergyDisplay.EnergyType; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.IFactory.RecipeType; +import mekanism.common.Teleporter.Code; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockBasic; @@ -191,7 +193,7 @@ public class Mekanism public static Version versionNumber = new Version(7, 1, 1); /** Map of Teleporters */ - public static Map> teleporters = new HashMap>(); + public static Map> teleporters = new HashMap>(); /** A map containing references to all dynamic tank inventory caches. */ public static Map dynamicInventories = new HashMap(); @@ -225,8 +227,8 @@ public class Mekanism public static KeySync keyMap = new KeySync(); - public static Set jetpackOn = new HashSet(); - public static Set gasmaskOn = new HashSet(); + public static final Set jetpackOn = Collections.synchronizedSet(new HashSet()); + public static final Set gasmaskOn = Collections.synchronizedSet(new HashSet()); public static Set activeVibrators = new HashSet(); diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index ccd5cf1cc..f8e376d90 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -92,10 +92,13 @@ public class PacketJetpackData implements IMessageHandler Date: Mon, 19 Jan 2015 12:07:54 +0000 Subject: [PATCH 08/12] Fix the bad implementation of the ambient lighting toggle --- .../generators/client/GeneratorsClientProxy.java | 13 +------------ .../client/MekanismGeneratorsClient.java | 16 ---------------- .../generators/common/GeneratorsCommonProxy.java | 3 +++ .../generators/common/MekanismGenerators.java | 7 +++++++ .../generators/common/block/BlockGenerator.java | 5 ++--- 5 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 6e5731c75..88f825a0d 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -13,6 +13,7 @@ import mekanism.generators.client.render.RenderHeatGenerator; import mekanism.generators.client.render.RenderSolarGenerator; import mekanism.generators.client.render.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; +import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; @@ -45,18 +46,6 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy ClientRegistry.registerTileEntity(TileEntityWindTurbine.class, "WindTurbine", new RenderWindTurbine()); } - @Override - public void loadConfiguration() - { - super.loadConfiguration(); - - MekanismGeneratorsClient.enableAmbientLighting = Mekanism.configuration.get("generation", "EnableAmbientLighting", true).getBoolean(true); - MekanismGeneratorsClient.ambientLightingLevel = Mekanism.configuration.get("generation", "AmbientLightingLevel", 15, "", 0, 15).getInt(15); - - if(Mekanism.configuration.hasChanged()) - Mekanism.configuration.save(); - } - @Override public void registerRenderInformation() { diff --git a/src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java b/src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java deleted file mode 100644 index 1f24f382f..000000000 --- a/src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java +++ /dev/null @@ -1,16 +0,0 @@ -package mekanism.generators.client; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import mekanism.generators.common.MekanismGenerators; - -public class MekanismGeneratorsClient extends MekanismGenerators -{ - - @SideOnly(Side.CLIENT) - - //General Configuration - public static boolean enableAmbientLighting; - public static int ambientLightingLevel; - -} diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 5d95fa8ab..800d5d179 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -49,6 +49,9 @@ public class GeneratorsCommonProxy */ public void loadConfiguration() { + MekanismGenerators.enableAmbientLighting = Mekanism.configuration.get("general", "EnableAmbientLighting", true).getBoolean(true); + MekanismGenerators.ambientLightingLevel = Mekanism.configuration.get("general", "AmbientLightingLevel", 15, "", 0, 15).getInt(15); + MekanismGenerators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D); MekanismGenerators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(350D); MekanismGenerators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index f69898a41..5e4a9e2cd 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -34,6 +34,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; @@ -71,6 +73,11 @@ public class MekanismGenerators implements IModule public static int windGenerationMinY; public static int windGenerationMaxY; + @SideOnly(Side.CLIENT) + + //General Configuration + public static boolean enableAmbientLighting; + public static int ambientLightingLevel; @EventHandler public void postInit(FMLPostInitializationEvent event) diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 7ff49d6cd..1bbe6e937 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -16,7 +16,6 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.client.GeneratorsClientProxy; -import mekanism.generators.client.MekanismGeneratorsClient; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; @@ -136,7 +135,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - if(MekanismGeneratorsClient.enableAmbientLighting) + if(MekanismGenerators.enableAmbientLighting) { TileEntity tileEntity = world.getTileEntity(x, y, z); @@ -144,7 +143,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) { - return MekanismGeneratorsClient.ambientLightingLevel; + return MekanismGenerators.ambientLightingLevel; } } } From 3e38ac37f4a0b4f75095facee0188aa67db19e58 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 19 Jan 2015 12:16:04 +0000 Subject: [PATCH 09/12] This feature request has been more trouble than it's worth. --- .../java/mekanism/generators/common/MekanismGenerators.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 5e4a9e2cd..f1490815d 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -73,9 +73,7 @@ public class MekanismGenerators implements IModule public static int windGenerationMinY; public static int windGenerationMaxY; - @SideOnly(Side.CLIENT) - //General Configuration public static boolean enableAmbientLighting; public static int ambientLightingLevel; From a2d79d5ca5de415361022c015b1aa383966b9616 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 21 Jan 2015 09:37:08 -0300 Subject: [PATCH 10/12] Update pt_BR.lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed: "Paxel" Minecraft vanilla: item.leggingsCloth.name=Leather Pants item.leggingsCloth.name=Calça de Couro (pt_BR) --- .../resources/assets/mekanism/lang/pt_BR.lang | 198 ++++++++++-------- 1 file changed, 116 insertions(+), 82 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/pt_BR.lang b/src/main/resources/assets/mekanism/lang/pt_BR.lang index 0ba8b0670..7be10adf8 100644 --- a/src/main/resources/assets/mekanism/lang/pt_BR.lang +++ b/src/main/resources/assets/mekanism/lang/pt_BR.lang @@ -2,19 +2,22 @@ //MEKANISM// //********// -//Items +//Itens tile.ObsidianTNT.name=TNT de Obsidiana item.EnrichedAlloy.name=Liga Enriquecida +item.ReinforcedAlloy.name=Liga Reforçada +item.AtomicAlloy.name=Liga Atômica item.EnergyTablet.name=Tablete de Energia -item.SpeedUpgrade.name=Upgrade de Velocidade -item.EnergyUpgrade.name=Upgrade de Energia +item.SpeedUpgrade.name=Atualização de Velocidade +item.EnergyUpgrade.name=Atualização de Energia item.Robit.name=Robit item.AtomicDisassembler.name=Desintegrador Atômico -item.AtomicCore.name=Núcleo Atômico item.ElectricBow.name=Arco Elétrico -item.ControlCircuit.name=Circuito de Controle item.EnrichedIron.name=Ferro Enriquecido -item.CompressedCarbon.name=Carbono Compactado +item.CompressedCarbon.name=Carbono Comprimido +item.CompressedRedstone.name=Redstone Comprimida +item.CompressedDiamond.name=Diamente Comprimido +item.CompressedObsidian.name=Obsidiana Comprimida item.PortableTeleporter.name=Teletransportador Portátil item.TeleportationCore.name=Núcleo de Teletransporte item.Configurator.name=Configurador @@ -25,7 +28,6 @@ item.ScubaTank.name=Tanque de Mergulho item.GasMask.name=Máscara de Gás item.Dictionary.name=Dicionário item.ElectrolyticCore.name=Núcleo Eletrolítico -item.CompressedRedstone.name=Redstone Compactado item.Sawdust.name=Serragem item.Salt.name=Sal item.BrineBucket.name=Balde de Salmoura @@ -39,7 +41,13 @@ item.HDPESheet.name=Folha de HDPE item.PlaStick.name=Plástico item.Substrate.name=Substrato -//Gas Tank +//Control Circuits +item.BasicControlCircuit.name=Circuito de Controle Básico +item.AdvancedControlCircuit.name=Circuito de Controle Avançado +item.EliteControlCircuit.name=Circuito de Controle de Elite +item.UltimateControlCircuit.name=Circuito de Controle Definitivo + +//Tanque de Gás tile.GasTank.GasTank.name=Tanque de Gás //Cardboard Box @@ -48,12 +56,15 @@ tile.CardboardBox.name=Caixa de Papelão //Bounding Block tile.BoundingBlock.name=Delimitadora de Bloco -//Basic Block +//Salt +tile.SaltBlock.name=Bloco de Sal + +//Bloco Básico tile.BasicBlock.OsmiumBlock.name=Bloco de Ósmio tile.BasicBlock.BronzeBlock.name=Bloco de Bronze tile.BasicBlock.RefinedObsidian.name=Obsidiana Refinada tile.BasicBlock.CharcoalBlock.name=Bloco de Carvão Vegetal -tile.BasicBlock.RefinedGlowstone.name=Glowstone Refinada +tile.BasicBlock.RefinedGlowstone.name=Pedra Luminosa Refinada tile.BasicBlock.SteelBlock.name=Bloco de Aço tile.BasicBlock.Bin.name=Silo tile.BasicBlock.TeleporterFrame.name=Moldura do Teletransportador @@ -66,10 +77,10 @@ tile.BasicBlock.TinBlock.name=Bloco de Estanho tile.BasicBlock.SalinationController.name=Controlador de Salinização tile.BasicBlock.SalinationValve.name=Válvula de Salinização -//Basic Block 2 (second ID iteration) +//Bloco Básico 2 (second ID iteration) tile.BasicBlock2.SalinationBlock.name=Bloco de Salinização -//Machine Block +//Bloco de Máquina tile.MachineBlock.EnrichmentChamber.name=Câmara de Enriquecimento tile.MachineBlock.OsmiumCompressor.name=Compressor de Ósmio tile.MachineBlock.Combiner.name=Combinador @@ -87,7 +98,7 @@ tile.MachineBlock.Chargepad.name=Plataforma Recarregadora tile.MachineBlock.LogisticalSorter.name=Classificador Logístico tile.MachineBlock.DigitalMiner.name=Minerador Digital -//Machine Block 2 (second ID iteration) +//Bloco de Máquina 2 (second ID iteration) tile.MachineBlock2.RotaryCondensentrator.name=Condensentrator Rotatório tile.MachineBlock2.ChemicalOxidizer.name=Oxidador Químico tile.MachineBlock2.ChemicalInfuser.name=Infusor Químico @@ -102,7 +113,7 @@ tile.MachineBlock2.SeismicVibrator.name=Vibrador Sísmico tile.MachineBlock2.PressurizedReactionChamber.name=Câmara de Reação Pressurizada tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC tile.MachineBlock2.PortableTank.name=Tanque Portátil -tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher +tile.MachineBlock2.FluidicPlenisher.name=Preenchedor Flúdico //Plastic tile.PlasticBlock.name=Bloco de Plástico @@ -118,28 +129,30 @@ infuse.carbon=Carbono infuse.tin=Estanho infuse.diamond=Diamante infuse.redstone=Redstone -infuse.fungi=Fungos +infuse.fungi=Fungo +infuse.obsidian=Obsidiana //Ore Block tile.OreBlock.OsmiumOre.name=Minério de Ósmio tile.OreBlock.CopperOre.name=Minério de Cobre tile.OreBlock.TinOre.name=Minério de Estanho +//Transmitters item.MultipartTransmitter.PressurizedTube.name=Tubo Pressurizado item.MultipartTransmitter.BasicUniversalCable.name=Cabo Universal Básico item.MultipartTransmitter.AdvancedUniversalCable.name=Cabo Universal Avançado item.MultipartTransmitter.EliteUniversalCable.name=Cabo Universal Elite -item.MultipartTransmitter.UltimateUniversalCable.name=Cabo Universal Ultimate +item.MultipartTransmitter.UltimateUniversalCable.name=Cabo Universal Definitivo item.MultipartTransmitter.BasicMechanicalPipe.name=Tubo Mecânico Básico item.MultipartTransmitter.AdvancedMechanicalPipe.name=Tubo Mecânico Avançado item.MultipartTransmitter.EliteMechanicalPipe.name=Tubo Mecânico Elite -item.MultipartTransmitter.UltimateMechanicalPipe.name=Tubo Mecânico Ultimate +item.MultipartTransmitter.UltimateMechanicalPipe.name=Tubo Mecânico Definitivo item.MultipartTransmitter.LogisticalTransporter.name=Transportador Logístico item.MultipartTransmitter.RestrictiveTransporter.name=Transportador Restritivo item.MultipartTransmitter.DiversionTransporter.name=Transportador Redirecionador //Glow Panel -item.GlowPanel.name=Painel de Glowstone +item.GlowPanel.name=Painel de Pedra Luminosa //Energy Cubes tile.EnergyCube.Basic.name=Cubo de Energia Básico @@ -151,7 +164,7 @@ tile.EnergyCube.Ultimate.name=Cubo de Energia Definitivo item.ironDust.name=Pó de Ferro item.goldDust.name=Pó de Ouro item.osmiumDust.name=Pó de Ósmio -item.obsidianDust.name=Pó de Obsidiana Refinado +item.obsidianDust.name=Pó de Obsidiana Refinada item.diamondDust.name=Pó de Diamante item.steelDust.name=Pó de Aço item.copperDust.name=Pó de Cobre @@ -204,7 +217,7 @@ item.dirtyLeadDust.name=Pó de Chumbo Sujo item.obsidianIngot.name=Lingote de Obsidiana item.osmiumIngot.name=Lingote de Ósmio item.bronzeIngot.name=Lingote de Bronze -item.glowstoneIngot.name=Lingote de Glowstone +item.glowstoneIngot.name=Lingote de Pedra Luminosa item.steelIngot.name=Lingote de Aço item.copperIngot.name=Lingote de Cobre item.tinIngot.name=Lingote de Estanho @@ -212,7 +225,7 @@ item.tinIngot.name=Lingote de Estanho //Gasses gas.hydrogen=Hidrogênio gas.oxygen=Oxigênio -gas.water=Vapor de Água +gas.water=Vapor D'água gas.chlorine=Cloro gas.sulfurDioxideGas=Dióxido de Enxofre gas.sulfurTrioxideGas=Trióxido de Enxofre @@ -221,6 +234,8 @@ gas.hydrogenChloride=Cloreto de Hidrogênio gas.liquidOsmium=Ósmio Líquido gas.liquidStone=Pedra Líquida gas.ethene=Etileno +gas.sodium=Sódio +gas.brine=Salmoura Gasosa gas.iron=Lodo de Ferro gas.gold=Lodo de Ouro @@ -254,6 +269,7 @@ fluid.sulfuricAcid=Ácido Sulfúrico Líquido fluid.hydrogenChloride=Cloreto de Hidrogênio Líquido fluid.brine=Salmoura fluid.ethene=Etileno Líquido +fluid.sodium=Sódio Líquido //OreGas names oregas.iron=Minério de Ferro @@ -277,11 +293,15 @@ update.outdated=Usando a versão desatualizada em um ou mais módulos key.mode=Modo Interruptor key.voice=Voz +//Config Gui +mekanism.configgui.ctgy.general.tooltip=Configurações gerais sobre Mekanism e todos os seus módulos +mekanism.configgui.ctgy.usage.tooltip=Configurações de máquinas e seu consumo de energia + //Gui text -gui.removeSpeedUpgrade=Remover upgrade de velocidade -gui.removeEnergyUpgrade=Remover upgrade de energia +gui.removeSpeedUpgrade=Remover atualização de velocidade +gui.removeEnergyUpgrade=Remover atualização de energia gui.condensentrating=Condensentrando -gui.decondensentrating=Decondensentrando +gui.decondensentrating=Descondensentrando gui.power=Energia gui.confirm=Confirmar gui.open=Abrir @@ -292,9 +312,9 @@ gui.edit=Editar gui.save=Salvar gui.output=Saída gui.delete=Deletar -gui.status=Estatus +gui.status=Estado gui.autoEject=Auto-ejetar -gui.itemstack=PilhaDeItems +gui.itemstack=PilhaDeItens gui.oredict=OreDict gui.material=Material gui.out=Saída @@ -318,6 +338,7 @@ gui.newFilter=Novo Filtro gui.energy=Energia gui.gas=Gás gui.dumping=Despejar +gui.dumping_excess=Despejando Excesso gui.modID=Mod ID gui.key=Chave gui.id=ID @@ -355,12 +376,12 @@ gui.oredictFilter.noKey=Nenhuma entrada digitada gui.oredictFilter.sameKey=Mesma entrada gui.modIDFilter=Mod ID Filtro -gui.modIDFilter.noID=Nenhuma ID inserido +gui.modIDFilter.noID=Nenhuma ID inserida gui.modIDFilter.sameID=O mesmo ID gui.itemFilter=Filtro de Itens gui.itemFilter.noItem=Sem Itens -gui.itemFilter.details=Detalhes da Pilha De Itens +gui.itemFilter.details=Detalhes da Pilha de Itens gui.itemFilter.min=Min gui.itemFilter.max=Máx @@ -369,12 +390,6 @@ gui.materialFilter.details=Utilizando material de gui.portableTeleporter=Teletransportador Portátil -gui.teleporter.notReady=Não Pronto -gui.teleporter.ready=Pronto -gui.teleporter.needsEnergy=Requer Energia -gui.teleporter.linksCapacity=Conexões > 2 -gui.teleporter.noLink=Nenhuma conexão localizada - gui.robit=Robit entity.Robit.name=Robit gui.robit.smelting=Fundição Robit @@ -403,7 +418,14 @@ gui.logisticalSorter.roundRobin=Rodízio gui.electricChest.editPassword=Editar Senha -gui.digitalMinerConfig=Config Minerador Digital +gui.teleporter.notReady=Não Está Pronto +gui.teleporter.ready=Pronto +gui.teleporter.noFrame=Sem quadro +gui.teleporter.noLink=Nenhuma conexão +gui.teleporter.linksCapacity=Conexões > 2 +gui.teleporter.needsEnergy=Requer Energia + +gui.digitalMinerConfig=Configuração Minerador Digital gui.digitalMiner.autoPull=Auto-puxar gui.digitalMiner.replaceBlock=Substituir bloco @@ -480,7 +502,7 @@ tooltip.portableTank.bucketMode=Modo Balde tooltip.disassembler.normal=normal tooltip.disassembler.slow=lento tooltip.disassembler.fast=rápido -tooltip.disassembler.vein=vein +tooltip.disassembler.vein=veio tooltip.disassembler.off=desligado tooltip.filterCard.got=Filtrar dados recuperados de %s @@ -521,6 +543,8 @@ tooltip.PrecisionSawmill=Uma máquina usada para processar lenha e outros itens tooltip.ChemicalDissolutionChamber=Uma máquina definitiva usada para !nquimicamente dissolver quaisquer impurezas de um !nminério, deixando um lodo!nnão-processado atrás. tooltip.ChemicalWasher=Uma máquina definitiva que limpar lodo !nnão-processado e o prepara para cristalização. tooltip.ChemicalCrystallizer=Uma máquina definitiva usada para cristalizar lodo !nde minério purificado em cristais de minério. +tooltip.ChemicalOxidizer=Uma máquina capaz de oxidar!n materiais sólidos em sua fase gasosa. +tooltip.ChemicalInfuser=Uma máquina que produz um novo!ngás através da infusão de outros dois. tooltip.SeismicVibrator=Uma máquina que usa vibrações sísmicas para !nprovideciar informações de diversas camadas !ndo mundo. tooltip.PressurizedReactionChamber=Uma máquina avançada que processa uma mistura líquida, gasosa e sólida e cria ambos um produto gasoso e um sólido. tooltip.PortableTank=Um tanque portátil útil que te deixa carregar 14 !nbaldes de fluido para onde !nquiser. Também serve como balde! @@ -545,43 +569,48 @@ control.disabled.desc=Sempre ativo control.high.desc=Ativo com sinal control.low.desc=Ativo sem sinal +//Container edit modes +fluidedit.both=Ambos +fluidedit.fill=Preencher +fluidedit.empty=Esvaziar + //Colors color.black=Preto -color.darkBlue=Azul Escuro -color.darkGreen=Verde Escuro +color.darkBlue=Azul +color.darkGreen=Verde color.darkAqua=Ciano Escuro color.darkRed=Vermelho Escuro -color.purple=Roxo +color.purple=Lilás color.orange=Laranja -color.grey=Cinza -color.darkGrey=Cinza Escuro +color.grey=Cinza Claro +color.darkGrey=Cinza color.indigo=Índigo color.brightGreen=Verde Claro color.aqua=Ciano color.red=Vermelho -color.pink=Magenta +color.pink=Rosa color.yellow=Amarelo color.white=Branco color.brown=Marrom -color.brightPink=Rosa +color.brightPink=Rosa Claro //Dyes dye.black=Preto -dye.darkBlue=Azul Escuro +dye.darkBlue=Azul dye.brown=Marrom -dye.darkGreen=Verde Escuro +dye.darkGreen=Verde dye.darkAqua=Ciano Escuro dye.darkRed=Vermelho Escuro -dye.purple=Roxo +dye.purple=Lilás dye.orange=Laranja -dye.grey=Cinza +dye.grey=Cinza Claro dye.darkGrey=Cinza dye.indigo=Índigo dye.brightGreen=Verde Claro dye.aqua=Ciano dye.red=Vermelho -dye.brightPink=Rosa -dye.pink=Magenta +dye.brightPink=Rosa Claro +dye.pink=Rosa dye.yellow=Amarelo dye.white=Branco @@ -604,11 +633,11 @@ item.SolarPanel.name=Painel Solar infuse.bio=Biomassa //Generators -tile.Generator.HeatGenerator.name=Gerador à Calor -tile.Generator.SolarGenerator.name=Gerador à Energia Solar +tile.Generator.HeatGenerator.name=Gerador Térmico +tile.Generator.SolarGenerator.name=Gerador Solar tile.Generator.HydrogenGenerator.name=Gerador à Hidrogênio tile.Generator.BioGenerator.name=Bio-Gerador -tile.Generator.AdvancedSolarGenerator.name=Gerador à Energia Solar Avançado +tile.Generator.AdvancedSolarGenerator.name=Gerador Solar Avançado tile.Generator.WindTurbine.name=Turbina Eólica //Gui text @@ -622,42 +651,42 @@ gui.electrolyticSeparator.dump=Despejar //*****// //Vanilla Paxels -item.WoodPaxel.name=Pacachado de Madeira -item.StonePaxel.name=Pacachado de Pedra -item.IronPaxel.name=Pacachado de Ferro -item.DiamondPaxel.name=Pacachado de Diamante -item.GoldPaxel.name=Pacachado de Ouro +item.WoodPaxel.name=Paxel de Madeira +item.StonePaxel.name=Paxel de Pedra +item.IronPaxel.name=Paxel de Ferro +item.DiamondPaxel.name=Paxel de Diamante +item.GoldPaxel.name=Paxel de Ouro -//Obsidian +//Obsidiana item.ObsidianHelmet.name=Elmo de Obsidiana item.ObsidianChestplate.name=Peitoral de Obsidiana -item.ObsidianLeggings.name=Calças de Obsidiana +item.ObsidianLeggings.name=Calça de Obsidiana item.ObsidianBoots.name=Botas de Obsidiana -item.ObsidianPaxel.name=Pacachado de Obsidiana +item.ObsidianPaxel.name=Paxel de Obsidiana item.ObsidianPickaxe.name=Picareta de Obsidiana item.ObsidianAxe.name=Machado de Obsidiana item.ObsidianShovel.name=Pá de Obsidiana item.ObsidianHoe.name=Enxada de Obsidiana item.ObsidianSword.name=Espada de Obsidiana -//Lapis Lazuli +//Lápis-Lazúli item.LazuliHelmet.name=Elmo de Lápis-Lazúli item.LazuliChestplate.name=Peitoral de Lápis-Lazúli -item.LazuliLeggings.name=Calças de Lápis-Lazúli +item.LazuliLeggings.name=Calça de Lápis-Lazúli item.LazuliBoots.name=Botas de Lápis-Lazúli -item.LazuliPaxel.name=Pacachado de Lápis-Lazúli +item.LazuliPaxel.name=Paxel de Lápis-Lazúli item.LazuliPickaxe.name=Picareta de Lápis-Lazúli item.LazuliAxe.name=Machado de Lápis-Lazúli item.LazuliShovel.name=Pá de Lápis-Lazúli item.LazuliHoe.name=Enxada de Lápis-Lazúli item.LazuliSword.name=Espada de Lápis-Lazúli -//Osmium +//Ósmio item.OsmiumHelmet.name=Elmo de Ósmio item.OsmiumChestplate.name=Peitoral de Ósmio -item.OsmiumLeggings.name=Calças de Ósmio +item.OsmiumLeggings.name=Calça de Ósmio item.OsmiumBoots.name=Botas de Ósmio -item.OsmiumPaxel.name=Pacachado de Ósmio +item.OsmiumPaxel.name=Paxel de Ósmio item.OsmiumPickaxe.name=Picareta de Ósmio item.OsmiumAxe.name=Machado de Ósmio item.OsmiumShovel.name=Pá de Ósmio @@ -667,35 +696,40 @@ item.OsmiumSword.name=Espada de Ósmio //Bronze item.BronzeHelmet.name=Elmo de Bronze item.BronzeChestplate.name=Peitoral de Bronze -item.BronzeLeggings.name=Calças de Bronze +item.BronzeLeggings.name=Calça de Bronze item.BronzeBoots.name=Botas de Bronze -item.BronzePaxel.name=Pacachado de Bronze +item.BronzePaxel.name=Paxel de Bronze item.BronzePickaxe.name=Picareta de Bronze item.BronzeAxe.name=Machado de Bronze item.BronzeShovel.name=Pá de Bronze item.BronzeHoe.name=Enxada de Bronze item.BronzeSword.name=Espada de Bronze -//Glow -item.GlowstoneHelmet.name=Elmo de Glowstone -item.GlowstoneChestplate.name=Peitoral de Glowstone -item.GlowstoneLeggings.name=Calças de Glowstone -item.GlowstoneBoots.name=Botas de Glowstone -item.GlowstonePaxel.name=Pacachado de Glowstone -item.GlowstonePickaxe.name=Picareta de Glowstone -item.GlowstoneAxe.name=Machado de Glowstone -item.GlowstoneShovel.name=Pá de Glowstone -item.GlowstoneHoe.name=Enxada de Glowstone -item.GlowstoneSword.name=Espada de Glowstone +//Pedra Luminosa +item.GlowstoneHelmet.name=Elmo de Pedra Luminosa +item.GlowstoneChestplate.name=Peitoral de Pedra Luminosa +item.GlowstoneLeggings.name=Calça de Pedra Luminosa +item.GlowstoneBoots.name=Botas de Pedra Luminosa +item.GlowstonePaxel.name=Paxel de Pedra Luminosa +item.GlowstonePickaxe.name=Picareta de Pedra Luminosa +item.GlowstoneAxe.name=Machado de Pedra Luminosa +item.GlowstoneShovel.name=Pá de Pedra Luminosa +item.GlowstoneHoe.name=Enxada de Pedra Luminosa +item.GlowstoneSword.name=Espada de Pedra Luminosa -//Steel +//Aço item.SteelHelmet.name=Elmo de Aço item.SteelChestplate.name=Peitoral de Aço -item.SteelLeggings.name=Calças de Aço +item.SteelLeggings.name=Calça de Aço item.SteelBoots.name=Botas de Aço -item.SteelPaxel.name=Pacachado de Aço +item.SteelPaxel.name=Paxel de Aço item.SteelPickaxe.name=Picareta de Aço item.SteelAxe.name=Machado de Aço item.SteelShovel.name=Pá de Aço item.SteelHoe.name=Enxada de Aço item.SteelSword.name=Espada de Aço + +//Config Gui +mekanism.configgui.ctgy.tools.general.tooltip=Definições sobre a configuração geral do 'MekanismTools' +mekanism.configgui.ctgy.tools.armor.tooltip=Configurações em relação aos valores de proteção e equilíbrio de equipamentos protetores do 'MekanismTools' +mekanism.configgui.ctgy.tools.tools.tooltip=Configurações em relação aos valores de eficiência e equilíbrio de conjuntos de ferramentas do 'MekanismTools' From a9e71c985c4b9f736f39b15ff70182847458b9d3 Mon Sep 17 00:00:00 2001 From: Rich Jeanes Date: Thu, 22 Jan 2015 09:24:17 -0700 Subject: [PATCH 11/12] Update README.md Grammar --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e5d534ac0..1715eb911 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Source code. More information can be found on the [mod's forum post](http://www # About # -Mekanism is a Minecraft add-on featuring special machinery that can be used to create powerful tools, armor and weapons. It also includes an gas network that can be implemented by different mods. +Mekanism is a Minecraft add-on featuring special machinery that can be used to create powerful tools, armor, and weapons. It also includes a gas network that can be implemented by other mods. # Modpacks, websites, reviews, or anything else # From cde1ab3967255b0c27b29fe484afdcae68f9499c Mon Sep 17 00:00:00 2001 From: Sakarias Longhorn Date: Thu, 29 Jan 2015 17:24:43 +0100 Subject: [PATCH 12/12] Update fr_FR.lang --- .../resources/assets/mekanism/lang/fr_FR.lang | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/fr_FR.lang b/src/main/resources/assets/mekanism/lang/fr_FR.lang index 91e347d74..9991efd5a 100644 --- a/src/main/resources/assets/mekanism/lang/fr_FR.lang +++ b/src/main/resources/assets/mekanism/lang/fr_FR.lang @@ -24,7 +24,7 @@ item.Configurator.name=Configurateur item.NetworkReader.name=Analyseur de réseaux item.WalkieTalkie.name=Talkie-walkie item.Jetpack.name=Propulseur à réaction -item.ScubaTank.name=Réservoire de scaphandre +item.ScubaTank.name=Réservoir de scaphandre item.GasMask.name=Masque à gaz item.Dictionary.name=Dictionnaire item.ElectrolyticCore.name=Noyau électrolytique @@ -62,9 +62,9 @@ tile.SaltBlock.name=Bloc de sel //Basic Block tile.BasicBlock.OsmiumBlock.name=Bloc d'osmium tile.BasicBlock.BronzeBlock.name=Bloc de bronze -tile.BasicBlock.RefinedObsidian.name=Obsidienne rafinée +tile.BasicBlock.RefinedObsidian.name=Obsidienne raffinée tile.BasicBlock.CoalBlock.name=Bloc de charbon -tile.BasicBlock.RefinedGlowstone.name=Pierre lumineuse rafinée +tile.BasicBlock.RefinedGlowstone.name=Pierre lumineuse raffinée tile.BasicBlock.SteelBlock.name=Bloc d'acier tile.BasicBlock.Bin.name=Silo tile.BasicBlock.TeleporterFrame.name=Cadre de téléporteur @@ -126,10 +126,10 @@ tile.PlasticFence.name=Barrière en plastique //Infuse types infuse.carbon=Charbon -infuse.tin=Etain +infuse.tin=Étain infuse.diamond=Diamant infuse.redstone=Redstone -infuse.fungi=Moissisure +infuse.fungi=Moisissure infuse.obsidian=Obsidienne //Ore Block @@ -184,14 +184,14 @@ item.obsidianClump.name=Bouquet d'obsidienne item.leadClump.name=Bouquet de plomb //Shards -item.ironShard.name=Eclat de fer -item.goldShard.name=Eclat d'or -item.osmiumShard.name=Eclat d'osmium -item.copperShard.name=Eclat de cuivre -item.tinShard.name=Eclat d'étain -item.silverShard.name=Eclat d'argent -item.obsidianShard.name=Eclat d'obsidienne -item.leadShard.name=Eclat de plomb +item.ironShard.name=Éclat de fer +item.goldShard.name=Éclat d'or +item.osmiumShard.name=Éclat d'osmium +item.copperShard.name=Éclat de cuivre +item.tinShard.name=Éclat d'étain +item.silverShard.name=Éclat d'argent +item.obsidianShard.name=Éclat d'obsidienne +item.leadShard.name=Éclat de plomb //Crystals item.ironCrystal.name=Cristal de fer @@ -227,10 +227,10 @@ gas.hydrogen=Hydrogène gas.oxygen=Oxygène gas.water=Vapeur d'eau gas.chlorine=Chlore -gas.sulfurDioxideGas=Dioxide de souffre -gas.sulfurTrioxideGas=Trioxide de souffre +gas.sulfurDioxideGas=Dioxyde de souffre +gas.sulfurTrioxideGas=Trioxyde de souffre gas.sulfuricAcid=Acide sulfurique gazeux -gas.hydrogenChloride=Chlorure d'hydrogène gaseux +gas.hydrogenChloride=Chlorure d'hydrogène gazeux gas.liquidOsmium=Osmium liquide gas.liquidStone=Pierre liquide gas.ethene=Ethylène @@ -268,7 +268,8 @@ fluid.sulfurTrioxideGas=Trioxide de souffre liquide fluid.sulfuricAcid=Acide sulfurique fluid.hydrogenChloride=Chlorure d'hydrogène fluid.brine=Saumure -fluid.ethene=Ethylène liquide +fluid.ethene=Éthylène + liquide fluid.sodium=Sodium liquide //OreGas names @@ -286,8 +287,8 @@ update.consider=Envisagez de mettre à jour à la version update.newFeatures=Nouvelles fonctionnalités update.visit=Visitez update.toDownload=Pour télécharger -update.devBuild=Vous utilisez developer build -update.outdated=Vous utilisez d'ancienne version d'un ou plusieurs modules +update.devBuild=Vous utilisez la version développeur +update.outdated=Vous utilisez d'anciennes versions d'un ou plusieurs modules //Key description text key.mode=Bascule de mode @@ -308,7 +309,7 @@ gui.open=Ouvrir gui.allOK=Tout est OK gui.none=Rien gui.new=Créer -gui.edit=Editer +gui.edit=Éditer gui.save=Sauver gui.output=Sortie gui.delete=Effacer @@ -325,17 +326,17 @@ gui.start=Départ gui.stop=Arrêt gui.config=Configurer gui.teleport=Téléporter -gui.eject=Ejecter +gui.eject=Éjecter gui.input=Entrée gui.slots=Emplacements -gui.state=Etat +gui.state=État gui.on=Marche gui.off=Arrêt gui.filters=Filtres -gui.idle=Idle +gui.idle=En attente gui.data=Données gui.newFilter=Créer Filtre -gui.energy=Energie +gui.energy=Énergie gui.gas=Gaz gui.dumping=Décharger gui.dumping_excess=Décharger surplus @@ -354,7 +355,7 @@ gui.configuration.strictInput=Entrée stricte gui.rotaryCondensentrator.toggleOperation=Changer d'opération -gui.factory.secondaryEnergy=Energie secondaire +gui.factory.secondaryEnergy=Énergie secondaire gui.factory.smelting=Fonte gui.factory.enriching=Enrichissement gui.factory.crushing=Broyage @@ -386,7 +387,7 @@ gui.itemFilter.min=Mini gui.itemFilter.max=Maxi gui.materialFilter=Filtre Matériaux -gui.materialFilter.details=Utilisant de materiel de +gui.materialFilter.details=Utilisant de matériel de gui.portableTeleporter=Téléporteur portable @@ -416,7 +417,7 @@ gui.logisticalSorter.default=Défaut gui.logisticalSorter.auto=Auto gui.logisticalSorter.roundRobin=Cyclique -gui.electricChest.editPassword=Editer le mot de passe +gui.electricChest.editPassword=Éditer le mot de passe gui.teleporter.notReady=pas prêt gui.teleporter.ready=Prêt @@ -425,7 +426,7 @@ gui.teleporter.noLink=Pas de lien gui.teleporter.exceeds=Liens > 2 gui.teleporter.needsEnergy=demande de l'énergie -gui.digitalMinerConfig=Configutaion du mineur digital +gui.digitalMinerConfig=Configuration du mineur digital gui.digitalMiner.autoPull=Tire-auto gui.digitalMiner.replaceBlock=Bloc de remplacement @@ -451,7 +452,7 @@ tooltip.configurator.toggleColor=Couleur heurtée à tooltip.configurator.viewColor=Couleur courante tooltip.configurator.unauth=Ce coffre est verrouillé tooltip.configurator.noLink=Pas de lien -tooltip.configurator.linkMsg=Bound to +tooltip.configurator.linkMsg=Lié à tooltip.configurator.dim=dimension tooltip.configurator.setLink=Mettre le lien au bloc tooltip.configurator.plenisherReset=Mise à zéro du calcul du remplisseur fluidique @@ -460,7 +461,7 @@ tooltip.upgrade.speed=Vitesse tooltip.upgrade.energy=Energie tooltip.inventory=Inventaire -tooltip.storedEnergy=Energie stockée +tooltip.storedEnergy=Énergie stockée tooltip.auth=Authentifié tooltip.locked=Verrouillé tooltip.recipeType=type de recette @@ -470,7 +471,7 @@ tooltip.forDetails=pour les détails tooltip.fireMode=Mode lancement tooltip.capacity=Capacité tooltip.pumpRate=Taux de pompe -tooltip.items=Eléments +tooltip.items=Éléments tooltip.blocks=Blocs tooltip.universal=universel tooltip.fluids=Fluides @@ -482,7 +483,7 @@ tooltip.noGas=Pas de gaz stocké tooltip.stored=Stocké tooltip.channel=Cannal tooltip.mode=Mode -tooltip.efficiency=Efficasité +tooltip.efficiency=Efficacité tooltip.modeToggle=Mode basculé en tooltip.flowing=Courant tooltip.yes=oui @@ -540,7 +541,8 @@ tooltip.RotaryCondensentrator=A machine capable of converting gasses into !nthei tooltip.ChemicalInjectionChamber=An elite machine capable of processing !nores into four shards, serving as the initial !nstage of 400% ore processing. tooltip.ElectrolyticSeparator=A machine that uses the process of !nelectrolysis to split apart a certain !ngas into two different gasses. tooltip.PrecisionSawmill=A machine used to process logs and other !nwood-based items more efficiently, as well !nas to obtain sawdust. -tooltip.ChemicalDissolutionChamber=An ultimate machine used to chemically !ndissolve all impurities of an ore, !nleaving an unprocessed slurry behind. +tooltip.ChemicalDissolutionChamber=An + ultimate machine used to chemically !ndissolve all impurities of an ore, !nleaving an unprocessed slurry behind. tooltip.ChemicalWasher=An ultimate machine that cleans unprocessed !nslurry and prepares it for crystallization. tooltip.ChemicalCrystallizer=An ultimate machine used to crystallize !npurified ore slurry into ore crystals. tooltip.ChemicalOxidizer=A machine capable of oxidizing !nsolid materials into gas phase. @@ -639,7 +641,7 @@ tile.Generator.SolarGenerator.name=Générateur solaire tile.Generator.HydrogenGenerator.name=Générateur à hydrogène tile.Generator.BioGenerator.name=Bio-Générateur tile.Generator.AdvancedSolarGenerator.name=Générateur solaire avancé -tile.Generator.WindTurbine.name=Eolienne +tile.Generator.WindTurbine.name=Éolienne //Gui text gui.heatGenerator.fuel=Carburant @@ -668,7 +670,7 @@ item.ObsidianPickaxe.name=Pioche en obsidienne item.ObsidianAxe.name=Hache en obsidienne item.ObsidianShovel.name=Pelle en obsidienne item.ObsidianHoe.name=Houe en obsidienne -item.ObsidianSword.name=Epée en obsidienne +item.ObsidianSword.name=Épée en obsidienne //Lapis Lazuli item.LazuliHelmet.name=Casque en lapis lazuli @@ -680,7 +682,7 @@ item.LazuliPickaxe.name=Pioche en lapis lazuli item.LazuliAxe.name=Hache en lapis lazuli item.LazuliShovel.name=Pelle en lapis lazuli item.LazuliHoe.name=Houe en lapis lazuli -item.LazuliSword.name=Epée en lapis lazuli +item.LazuliSword.name=Épée en lapis lazuli //Osmium item.OsmiumHelmet.name=Casque en osmium @@ -692,7 +694,7 @@ item.OsmiumPickaxe.name=Pioche en osmium item.OsmiumAxe.name=Hache en osmium item.OsmiumShovel.name=Pelle en osmium item.OsmiumHoe.name=Houe en osmium -item.OsmiumSword.name=Epée en osmium +item.OsmiumSword.name=Épée en osmium //Bronze item.BronzeHelmet.name=Casque en bronze @@ -704,7 +706,7 @@ item.BronzePickaxe.name=Pioche en bronze item.BronzeAxe.name=Hache en bronze item.BronzeShovel.name=Pelle en bronze item.BronzeHoe.name=Houe en bronze -item.BronzeSword.name=Epée en bronze +item.BronzeSword.name=Épée en bronze //Glow item.GlowstoneHelmet.name=Casque en pierre lumineuse @@ -716,7 +718,7 @@ item.GlowstonePickaxe.name=Pioche en pierre lumineuse item.GlowstoneAxe.name=Hache en pierre lumineuse item.GlowstoneShovel.name=Pelle en pierre lumineuse item.GlowstoneHoe.name=Houe en pierre lumineuse -item.GlowstoneSword.name=Epée en pierre lumineuse +item.GlowstoneSword.name=Épée en pierre lumineuse //Steel item.SteelHelmet.name=Casque en acier @@ -728,7 +730,7 @@ item.SteelPickaxe.name=Pioche en acier item.SteelAxe.name=Hache en acier item.SteelShovel.name=Pelle en acier item.SteelHoe.name=Houe en acier -item.SteelSword.name=Epée en acier +item.SteelSword.name=Épée en acier //Config Gui mekanism.configgui.ctgy.tools.general.tooltip=Options concernant la configuration générale des 'MekanismTools'