mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-20 12:19:44 +00:00
Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a750f76a5d | ||
|
|
cd587ee8ca | ||
|
|
987254caca | ||
|
|
ef5ff0c6ed | ||
|
|
e9947e3960 | ||
|
|
95bf99a24a | ||
|
|
be530da970 | ||
|
|
5d82ebf0d5 | ||
|
|
165cb1003c | ||
|
|
5388d1bea0 | ||
|
|
c40c032531 |
No files matched your search
@@ -107,7 +107,7 @@ option.thermalexpansion.tankmode=Zeige Tankmodus
|
||||
option.thermalexpansion.tesssendrecv=Tesseraktmodus
|
||||
option.thermalexpansion.tessfreq=Tesseraktfrequenz
|
||||
option.thermalexpansion.owner=Zeige Besitzer
|
||||
option.thermalexpansion.conditemmode=Zeige Itemducmodus
|
||||
option.thermalexpansion.conditemmode=Zeige Itemduktmodus
|
||||
option.vanilla.spawntype=Spawner-Typ
|
||||
option.vanilla.growthvalue=Wachstumswert
|
||||
option.vanilla.leverstate=Hebelstatus
|
||||
@@ -123,3 +123,5 @@ option.enderio.channel=Zeige Hypercube-Kanal
|
||||
option.bcapi.storage=Zeige gespeicherte MJ
|
||||
option.bcapi.consump=Zeige maximale Energie
|
||||
option.bcapi.trigger=Zeige Startenergie
|
||||
option.pr.showio=Zeige Gatter IO
|
||||
option.pr.showdata=Zeige Gatterdaten
|
||||
@@ -107,7 +107,7 @@ option.thermalexpansion.tankmode=Show tank mode
|
||||
option.thermalexpansion.tesssendrecv=Tesseract mode
|
||||
option.thermalexpansion.tessfreq=Tesseract frequency
|
||||
option.thermalexpansion.owner=Show owner
|
||||
option.thermalexpansion.conditemmode=Show itemduc mode
|
||||
option.thermalexpansion.conditemmode=Show Itemduct mode
|
||||
option.vanilla.spawntype=Spawner type
|
||||
option.vanilla.growthvalue=Growth value
|
||||
option.vanilla.leverstate=Lever state
|
||||
|
||||
@@ -107,7 +107,7 @@ option.thermalexpansion.tankmode=Afficher mode Réservoir
|
||||
option.thermalexpansion.tesssendrecv=Tesseract mode
|
||||
option.thermalexpansion.tessfreq=Tesseract fréquence
|
||||
option.thermalexpansion.owner=Afficher propriétaire
|
||||
option.thermalexpansion.conditemmode=Afficher itemduc mode
|
||||
option.thermalexpansion.conditemmode=Afficher Itemduct mode
|
||||
option.vanilla.spawntype=Spawner type
|
||||
option.vanilla.growthvalue=Niveau de croissance
|
||||
option.vanilla.leverstate=Etat Levier
|
||||
|
||||
@@ -28,6 +28,7 @@ public class HUDHandlerIC2IEnergySource implements IWailaDataProvider {
|
||||
//if (accessor.getTileEntity() != null && TEElectricBlock.isInstance(accessor.getTileEntity())){
|
||||
int output = -1;
|
||||
|
||||
/*
|
||||
try{
|
||||
if (IC2Module.IEnergySource.isInstance(accessor.getTileEntity()))
|
||||
output = (Integer)(IC2Module.IEnergySource_GetOutput.invoke(IC2Module.IEnergySource.cast(accessor.getTileEntity())));
|
||||
@@ -35,6 +36,7 @@ public class HUDHandlerIC2IEnergySource implements IWailaDataProvider {
|
||||
mod_Waila.log.log(Level.SEVERE, "[IC2] Unhandled exception trying to access an IEnergySource for display !.\n" + String.valueOf(e));
|
||||
return currenttip;
|
||||
}
|
||||
*/
|
||||
|
||||
if (ConfigHandler.instance().getConfig("ic2.outputeu") && (output != -1))
|
||||
currenttip.add(String.format("%s : %s EU/t", LangUtil.translateG("hud.msg.output"), output));
|
||||
|
||||
@@ -18,7 +18,7 @@ public class IC2Module {
|
||||
/* Methods interfaces */
|
||||
public static Method IEnergyStorage_GetCapacity = null;
|
||||
public static Method IEnergySink_GetInput = null;
|
||||
public static Method IEnergySource_GetOutput = null;
|
||||
//public static Method IEnergySource_GetOutput = null;
|
||||
|
||||
/* Some required items */
|
||||
public static Class IC2Items = null;
|
||||
@@ -50,7 +50,7 @@ public class IC2Module {
|
||||
IEnergySource = Class.forName("ic2.api.energy.tile.IEnergySource");
|
||||
|
||||
IEnergySink_GetInput = IEnergySink.getMethod("getMaxSafeInput");
|
||||
IEnergySource_GetOutput = IEnergySource.getMethod("getMaxEnergyOutput");
|
||||
//IEnergySource_GetOutput = IEnergySource.getMethod("getMaxEnergyOutput");
|
||||
IEnergyStorage_GetCapacity = IEnergyStorage.getMethod("getCapacity");
|
||||
|
||||
IC2Items = Class.forName("ic2.core.Ic2Items");
|
||||
|
||||
@@ -15,7 +15,7 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
|
||||
static byte[][] IOARRAY={
|
||||
{1,1,2,1} /* OR */, {1,1,2,1} /* NOR */, {1,2,2,2} /* NOT */, {1,1,2,1} /* AND */,
|
||||
{1,1,2,1} /* NAND */, {0,1,2,1} /* XOR */, {0,1,2,1} /* XNOR */, {1,2,2,2} /* Buf */,
|
||||
{3,4,2,5} /* Multi */, {1,0,2,0} /* Pulse */, {0,0,0,0} /* Repeat */, {1,2,2,2} /* Rand */,
|
||||
{3,4,2,5} /* Multi */, {1,0,2,0} /* Pulse */, {1,0,2,0} /* Repeat */, {1,2,2,2} /* Rand */,
|
||||
{2,1,2,1} /* Latch */, {2,1,2,1} /* Toggle*/, {6,1,2,2} /* Transp */, {2,0,0,0} /* Light */,
|
||||
{2,0,0,0} /* Rain */, {1,7,2,7} /* Timer */, {2,2,2,2} /* Sequen */, {2,9,2,8} /* Count */,
|
||||
{1,2,2,6} /* State */, {6,1,2,1} /* Sync */, {10,1,10,1} /* Bus */, {11,12,11,12} /* Null */,
|
||||
@@ -58,6 +58,15 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
|
||||
|
||||
//System.out.printf("%s\n", ForgeDirection.getOrientation(vOrient));
|
||||
|
||||
if (vOrient == ForgeDirection.EAST)
|
||||
hOrient -= 1;
|
||||
|
||||
if (vOrient == ForgeDirection.WEST)
|
||||
hOrient += 1;
|
||||
|
||||
if (hOrient == -1)
|
||||
hOrient = 3;
|
||||
|
||||
String[] IOStr = new String[4];
|
||||
for (int i = 0; i < 4; i++)
|
||||
IOStr[i] = IONAMES[IOARRAY[subID][i]];
|
||||
|
||||
@@ -46,7 +46,7 @@ import cpw.mods.fml.common.registry.GameData;
|
||||
import cpw.mods.fml.common.registry.ItemData;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
|
||||
@Mod(modid="Waila", name="Waila", version="1.4.0_dev")
|
||||
@Mod(modid="Waila", name="Waila", version="1.4.0")
|
||||
@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class,
|
||||
packetHandler = WailaPacketHandler.class, versionBounds="[1.3.0,)")
|
||||
|
||||
|
||||
@@ -46,9 +46,11 @@ public class ModIdentification {
|
||||
modSource_Name.put("1.6.2.jar", "Minecraft");
|
||||
modSource_Name.put("1.6.3.jar", "Minecraft");
|
||||
modSource_Name.put("1.6.4.jar", "Minecraft");
|
||||
modSource_Name.put("Forge", "Minecraft");
|
||||
modSource_ID.put("1.6.2.jar", "Minecraft");
|
||||
modSource_ID.put("1.6.3.jar", "Minecraft");
|
||||
modSource_ID.put("1.6.4.jar", "Minecraft");
|
||||
modSource_ID.put("Forge", "Minecraft");
|
||||
|
||||
|
||||
// for (String s : this.modSourceList.keySet())
|
||||
@@ -81,8 +83,10 @@ public class ModIdentification {
|
||||
|
||||
String modName = "<Unknown>";
|
||||
for (String s: modSource_Name.keySet())
|
||||
if (objPath.contains(s))
|
||||
if (objPath.contains(s)){
|
||||
modName = modSource_Name.get(s);
|
||||
break;
|
||||
}
|
||||
|
||||
if (modName.equals("Minecraft Coder Pack"))
|
||||
modName = "Minecraft";
|
||||
@@ -102,8 +106,10 @@ public class ModIdentification {
|
||||
|
||||
String modName = "<Unknown>";
|
||||
for (String s: modSource_ID.keySet())
|
||||
if (objPath.contains(s))
|
||||
if (objPath.contains(s)){
|
||||
modName = modSource_ID.get(s);
|
||||
break;
|
||||
}
|
||||
|
||||
if (modName.equals("Minecraft Coder Pack"))
|
||||
modName = "Minecraft";
|
||||
|
||||
Reference in new issue
Block a user