Skip to content

Commit

Permalink
NEI titles translation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Foghrye4
Foghrye4 committed Apr 22, 2017
1 parent aa42aed commit b67ac61
Show file tree
Hide file tree
Showing 48 changed files with 75 additions and 2,306 deletions.
24 changes: 24 additions & 0 deletions assets/ihl/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,30 @@ language.name=HAYO
language.region=US
language.code=en_US

ihl.achesonFurnace=Acheson furnace
ihl.chemicalReactor=Chemical reactor
ihl.crucible=Crucible
ihl.cryogenicDistiller=Cryogenic distiller
ihl.detonationSprayingMachine=Detonation spraying machine
ihl.electricEvaporator=Electric evaporator
ihl.electrolysisBath=Electrolysis bath
ihl.evaporator=Evaporator
ihl.extruder=Extruder
ihl.fluidizedBedReactor=Fluidized bed reactor
ihl.fractionator=Fractionation column
ihl.gasWeldingStationGas=Gas wielding station
ihl.impregnatingMachine=Bronze tub
ihl.injectionMold=Injection mold
ihl.ironWorkbench=Iron workbench
ihl.labElectrolyzer=Lab electrolyzer
ihl.leadOven=Chemical oven
ihl.loom=Loom
ihl.muffleFurnace=Muffle furnace
ihl.paperMachine=Paper machine
ihl.rollingMachine=Rolling machine
ihl.woodenRollingMachine=Wooden rolling machine
ihl.wireMill=Wire mill
ihl.vulcanizationExtrudingMold=Vulcanization extruding mold
ihl.dosingPump.tip=Type desired amount of fluids /n to be injected to fluid tank near /n dosing pump. Use redstone impulse /n signal to perform injection. /n Press [enter] to accept number.
ihl.detonatorHint=RMB while crafting this to set detonator delay
ihl.setOfDiesHint=RMB while crafting this to set transverse section
Expand Down
47 changes: 0 additions & 47 deletions ihl/ClientProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,8 @@
import ihl.crop_harvestors.BlobRenderFX;
import ihl.crop_harvestors.SackRender;
import ihl.crop_harvestors.SackTileEntity;
import ihl.enviroment.LightBulbModel;
import ihl.enviroment.LightBulbRender;
import ihl.enviroment.LightBulbTileEntity;
import ihl.enviroment.LightHandler;
import ihl.enviroment.LightSource;
import ihl.enviroment.MirrorRender;
import ihl.enviroment.MirrorTileEntity;
import ihl.enviroment.SpotlightModel;
import ihl.enviroment.SpotlightRender;
import ihl.enviroment.SpotlightTileEntity;
import ihl.explosion.ExplosionEntityFX;
import ihl.explosion.ExplosionRenderFX;
import ihl.explosion.IHLEntityFallingPile;
Expand Down Expand Up @@ -132,28 +124,18 @@ public class ClientProxy extends ServerProxy {
public IHLRenderUtils renderUtils;
public Map<MachineType, Integer> sharedBlockRenders = new HashMap<MachineType, Integer>();
public Map<Class<? extends TileEntity>, ISelectionBoxSpecialRenderer> selectionBoxSpecialRendererRegistry = new HashMap<Class<? extends TileEntity>, ISelectionBoxSpecialRenderer>();
public LightHandler lightHandler;

public ClientProxy() {
}

public LightHandler getLightHandler() {

return this.lightHandler;
}

@Override
public void load() throws ParserConfigurationException {
if (lightHandler == null) {
lightHandler = new LightHandler();
}
if (channel == null) {
channel = NetworkRegistry.INSTANCE.newEventDrivenChannel(IHLModInfo.MODID);
channel.register(this);
}
this.renderUtils = new IHLRenderUtils();
MinecraftForge.EVENT_BUS.register(this.renderUtils);
TileEntityRendererDispatcher.instance = new TileEntityRendererDispatcherExt();
registerBlockHandler(new ImpregnatingMachineBlockRender(), MachineType.BronzeTub);
registerBlockHandler(new RefluxCondenserBlockRender(), MachineType.RefluxCondenser);
registerBlockHandler(new RectifierTransformerUnitBlockRender(), MachineType.RectifierTransformerUnit);
Expand Down Expand Up @@ -217,8 +199,6 @@ public void load() throws ParserConfigurationException {
if (loadMirrorRender && IHLMod.config.mirrorReflectionRange > 0) {
ClientRegistry.bindTileEntitySpecialRenderer(MirrorTileEntity.class, new MirrorRender());
}
ClientRegistry.bindTileEntitySpecialRenderer(LightBulbTileEntity.class, new LightBulbRender());
ClientRegistry.bindTileEntitySpecialRenderer(SpotlightTileEntity.class, new SpotlightRender());
selectionBoxSpecialRendererRegistry.put(AnchorTileEntity.class, new CableHolderSelectionBoxSpecialRenderer());
selectionBoxSpecialRendererRegistry.put(RectifierTransformerUnitTileEntity.class,
new RectifierTransformerUnitSelectionBoxSpecialRenderer());
Expand Down Expand Up @@ -291,13 +271,6 @@ public void load() throws ParserConfigurationException {
new BlockItemRender(new ElectrolysisBathModel(),
new ResourceLocation(IHLModInfo.MODID + ":textures/blocks/electrolysisBath.png"), 0, 0, 0.0F,
0.0F));
MinecraftForgeClient.registerItemRenderer(IHLUtils.getThisModItem("lightBulb"),
new BlockItemRender(new LightBulbModel(),
new ResourceLocation(IHLModInfo.MODID + ":textures/blocks/lightBulb.png"), 0, 1, 0.0F, 0.0F,
true));
MinecraftForgeClient.registerItemRenderer(IHLUtils.getThisModItem("spotlight"),
new BlockItemRender(new SpotlightModel(),
new ResourceLocation(IHLModInfo.MODID + ":textures/blocks/spotlight.png"), 0, 1, 0.0F, 0.0F));
MinecraftForgeClient.registerItemRenderer(IHLTool.instance, new IHLToolRenderer());
MinecraftForgeClient.registerItemRenderer(FlexibleCableItem.instance, new FlexibleCableItemRender());
RenderingRegistry.registerEntityRenderingHandler(LostHeadEntity.class, new LostHeadRender());
Expand Down Expand Up @@ -433,26 +406,6 @@ public void onPacketFromServerToClient(FMLNetworkEvent.ClientCustomPacketEvent e
float pitch = byteBufInputStream.readFloat();
this.playSound(world, soundId, x, y, z, volume, pitch);
break;
case 4:
posX = byteBufInputStream.readInt();
posY = byteBufInputStream.readInt();
posZ = byteBufInputStream.readInt();
for (LightSource lightSource : ((ClientProxy) IHLMod.proxy).getLightHandler().lightSources) {
if (lightSource.isBlockIlluminated(posX, posY, posZ)) {
lightSource.provideLight(world, posX, posY, posZ);
}
}
break;
case 5:
posX = byteBufInputStream.readInt();
posY = byteBufInputStream.readInt();
posZ = byteBufInputStream.readInt();
for (LightSource lightSource : ((ClientProxy) IHLMod.proxy).getLightHandler().lightSources) {
if (lightSource.isBlockIlluminated(posX, posY, posZ)) {
lightSource.castShadow(world, posX, posY, posZ);
}
}
break;
}
byteBufInputStream.close();
}
Expand Down
108 changes: 6 additions & 102 deletions ihl/IHLMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import ic2.core.Ic2Items;
import ic2.core.util.StackUtil;
import ihl.enviroment.LaserHitMirrorEventHandler;
import ihl.enviroment.LightBulbBlock;
import ihl.enviroment.MirrorBlock;
import ihl.explosion.ChunkAndWorldLoadEventHandler;
import ihl.explosion.ExplosionVectorBlockV2;
Expand Down Expand Up @@ -198,7 +197,6 @@ public void preInit(FMLPreInitializationEvent evt) throws IOException, ParserCon
BatteryItem.init();
IHLTool.init();
MirrorBlock.init();
LightBulbBlock.init();
MachineBaseBlock.init();// must be first
IHLMod.enet = new IHLENet();
MinecraftForge.EVENT_BUS.register(new EntityDropEventHandler());
Expand Down Expand Up @@ -1171,100 +1169,6 @@ public void postInit(FMLPostInitializationEvent evt) throws IOException {
new RecipeInputItemStack(new ItemStack(Blocks.wool)) }),
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStackWithSize("mirror", 16) })));
}
Map<String, Integer> dyeMap = new HashMap<String, Integer>();
dyeMap.put("dyePurple", 0xff00ff);
dyeMap.put("dyeCyan", 0x00ffff);
dyeMap.put("dyeLightGray", 0xaaaaaa);
dyeMap.put("dyeGray", 0x888888);
dyeMap.put("dyePink", 0xff8888);
dyeMap.put("dyeLime", 0x88ff88);
dyeMap.put("dyeLightBlue", 0x8888ff);
dyeMap.put("dyeBlue", 0x0000ff);
dyeMap.put("dyeGreen", 0x00ff00);
dyeMap.put("dyeRed", 0xff0000);
dyeMap.put("dyeBlack", 0x000000);
dyeMap.put("dyeMagenta", 0xff88ff);
dyeMap.put("dyeOrange", 0xff8800);
dyeMap.put("dyeWhite", 0xffffff);
dyeMap.put("dyeBrown", 0x804000);
dyeMap.put("dyeYellow", 0xffff00);
Map<String, Integer> paneGlassMap = new HashMap<String, Integer>();
paneGlassMap.put("paneGlassPurple", 0xff00ff);
paneGlassMap.put("paneGlassCyan", 0x00ffff);
paneGlassMap.put("paneGlassLightGray", 0xaaaaaa);
paneGlassMap.put("paneGlassGray", 0x888888);
paneGlassMap.put("paneGlassPink", 0xff8888);
paneGlassMap.put("paneGlassLime", 0x88ff88);
paneGlassMap.put("paneGlassLightBlue", 0x8888ff);
paneGlassMap.put("paneGlassBlue", 0x0000ff);
paneGlassMap.put("paneGlassGreen", 0x00ff00);
paneGlassMap.put("paneGlassRed", 0xff0000);
paneGlassMap.put("paneGlassBlack", 0x000000);
paneGlassMap.put("paneGlassMagenta", 0xff88ff);
paneGlassMap.put("paneGlassOrange", 0xff8800);
paneGlassMap.put("paneGlassWhite", 0xffffff);
paneGlassMap.put("paneGlassBrown", 0x804000);
paneGlassMap.put("paneGlassYellow", 0xffff00);
IronWorkbenchTileEntity.addRecipe(
new IronWorkbenchRecipe(
Arrays.asList(
new ItemStack[] { IHLUtils.getThisModItemStack("tinSnipsSteel"),
IHLUtils.getThisModItemStack("glassBlowingTubeSteel"),
IHLUtils.getThisModItemStack("hackSawSteel") }),
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("foilTungsten"),
IHLUtils.getThisModItemStack("foilCopper"),
IHLUtils.getThisModItemStackWithSize("lampHolderPorcelain", 16),
IHLUtils.getOreDictItemStack("dustGlass") }),
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStackWithSize("lightBulb", 16) }),
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("gasWeldingStation"),
IHLUtils.getThisModItemStack("gaedesMercuryRotaryPump") })));
for (Map.Entry<String, Integer> dyeEntry : dyeMap.entrySet()) {
ItemStack lightBulb = IHLUtils.getThisModItemStackWithSize("lightBulb", 16);
lightBulb.stackTagCompound = new NBTTagCompound();
lightBulb.stackTagCompound.setInteger("colour", dyeEntry.getValue());
IronWorkbenchTileEntity.addRecipe(new IronWorkbenchRecipe(
Arrays.asList(
new ItemStack[] { IHLUtils.getThisModItemStack("tinSnipsSteel"),
IHLUtils.getThisModItemStack("glassBlowingTubeSteel"),
IHLUtils.getThisModItemStack("hackSawSteel") }),
Arrays.asList(new IRecipeInput[] { new RecipeInputOreDict("foilTungsten"),
new RecipeInputOreDict("foilCopper"),
new RecipeInputItemStack(
IHLUtils.getThisModItemStackWithSize("lampHolderPorcelain", 16)),
new RecipeInputOreDict("dustGlass"), new RecipeInputOreDict(dyeEntry.getKey()) }),
Arrays.asList(new ItemStack[] { lightBulb }),
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("gasWeldingStation"),
IHLUtils.getThisModItemStack("gaedesMercuryRotaryPump") })));
}

IronWorkbenchTileEntity.addRecipe(new IronWorkbenchRecipe(
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("hammer"),
IHLUtils.getThisModItemStack("tinSnipsSteel"), IHLUtils.getThisModItemStack("hackSawSteel"),
IHLUtils.getThisModItemStack("setOfFilesSteel"),
IHLUtils.getThisModItemStack("viseSteel") }),
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("lightBulb"),
IHLUtils.getThisModItemStack("foilSteel"),
IHLUtils.getInsulatedWire("Copper", 1, 15, "Rubber", 100),
IHLUtils.getOreDictItemStack("plateSteel"), new ItemStack(Blocks.glass_pane) }),
Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("spotlight") })));

for (Map.Entry<String, Integer> paneGlassEntry : paneGlassMap.entrySet()) {
ItemStack spotlight = IHLUtils.getThisModItemStack("spotlight");
spotlight.stackTagCompound = new NBTTagCompound();
spotlight.stackTagCompound.setInteger("colour", paneGlassEntry.getValue());
IronWorkbenchTileEntity.addRecipe(new IronWorkbenchRecipe(Arrays.asList(new ItemStack[] {
IHLUtils.getThisModItemStack("hammer"), IHLUtils.getThisModItemStack("tinSnipsSteel"),
IHLUtils.getThisModItemStack("hackSawSteel"), IHLUtils.getThisModItemStack("setOfFilesSteel"),
IHLUtils.getThisModItemStack("viseSteel") }),
Arrays.asList(new IRecipeInput[] {
new RecipeInputItemStack(IHLUtils.getThisModItemStack("lightBulb")),
new RecipeInputOreDict("foilSteel"),
new RecipeInputWire(IHLUtils.getInsulatedWire("Copper", 1, 15, "Rubber", 100)),
new RecipeInputOreDict("plateSteel"),
new RecipeInputOreDict(paneGlassEntry.getKey()) }),
Arrays.asList(new ItemStack[] { spotlight })));

}
IronWorkbenchTileEntity.addRecipe(new IronWorkbenchRecipe(Arrays.asList(
new IRecipeInput[] { RecipeInputs.cutter, RecipeInputs.saw, RecipeInputs.vise, RecipeInputs.file }),
Arrays.asList(new IRecipeInput[] { new RecipeInputOreDict("plateSteel", 2),
Expand Down Expand Up @@ -1756,28 +1660,28 @@ public void postInit(FMLPostInitializationEvent evt) throws IOException {
if (IHLUtils.hasOreDictionaryEntry("dustSilicon"))
FluidizedBedReactorTileEntity.addRecipe(IHLUtils.getFluidStackWithSize("hydrogen", 1333),
IHLUtils.getOreDictItemStackWithSize("dustSiliconDioxide", 1),
IHLUtils.getFluidStackWithSize("ic2distilledwater", 2000),
IHLUtils.getFluidStackWithSize("water", 2000),
IHLUtils.getOreDictItemStackWithSize("dustTinySilicon", 3));
if (IHLUtils.hasOreDictionaryEntry("dustManganese"))
FluidizedBedReactorTileEntity.addRecipe(IHLUtils.getFluidStackWithSize("hydrogen", 2000),
IHLUtils.getOreDictItemStackWithSize("dustManganeseOxide", 2),
IHLUtils.getFluidStackWithSize("ic2distilledwater", 3000),
IHLUtils.getFluidStackWithSize("water", 3000),
IHLUtils.getOreDictItemStack("dustManganese"));
FluidizedBedReactorTileEntity.addRecipe(IHLUtils.getFluidStackWithSize("hydrogen", 1200),
IHLUtils.getOreDictItemStack("dustIronOxide"),
IHLUtils.getFluidStackWithSize("ic2distilledwater", 1800),
IHLUtils.getFluidStackWithSize("water", 1800),
new RecipeOutputItemStack(IHLUtils.getOreDictItemStack("dustTinyIron"), 3.6f));
FluidizedBedReactorTileEntity.addRecipe(IHLUtils.getFluidStackWithSize("hydrogen", 1500),
IHLUtils.getOreDictItemStack("dustTungstenOxide"),
IHLUtils.getFluidStackWithSize("ic2distilledwater", 2250),
IHLUtils.getFluidStackWithSize("water", 2250),
new RecipeOutputItemStack(IHLUtils.getOreDictItemStack("dustTinyTungsten"), 2.25f));
FluidizedBedReactorTileEntity.addRecipe(IHLUtils.getFluidStackWithSize("hydrogen", 4000),
IHLUtils.getOreDictItemStackWithSize("dustSodiumSulfate", 3),
IHLUtils.getFluidStackWithSize("ic2distilledwater", 6000),
IHLUtils.getFluidStackWithSize("water", 6000),
IHLUtils.getOreDictItemStack("dustSodiumSulfide"));
FluidizedBedReactorTileEntity.addRecipe(IHLUtils.getFluidStackWithSize("hydrogen", 1200),
IHLUtils.getOreDictItemStack("dustAntimonyOxide"),
IHLUtils.getFluidStackWithSize("ic2distilledwater", 1800),
IHLUtils.getFluidStackWithSize("water", 1800),
new RecipeOutputItemStack(IHLUtils.getOreDictItemStack("dustTinyAntimony"), 3.6f));
FluidizedBedReactorTileEntity.addRecipe(IHLUtils.getFluidStackWithSize("oxygen", 1500),
IHLUtils.getOreDictItemStack("dustIron"), null,
Expand Down
2 changes: 1 addition & 1 deletion ihl/IHLModInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
public class IHLModInfo {
public static final String MODID = "ihl";
public static final String MODNAME = "IHL Tools & Machines for IC2V2";
public static final String MODVERSION = "0.630";
public static final String MODVERSION = "0.633";
}
Loading

0 comments on commit b67ac61

Please sign in to comment.