Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-05-15 22:38:45 +02:00
Code Issues Projects Releases Wiki Activity

Partially address #1067

Browse source 
I'll deal with the rest of them when eclipse text search works
This commit is contained in:
Shadows_of_Fire 2019-02-27 14:51:41 -05:00
parent a8371154ec
commit d4f98090d1
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java
View file

@ -15,6 +15,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -64,7 +65,7 @@ public class GuiBioReactor extends GuiWtfMojang{
} }
if(this.tile.producePerTick > 0){ if(this.tile.producePerTick > 0){
this.drawCenteredString(this.fontRenderer, this.tile.producePerTick+" CF/t", this.guiLeft+87, this.guiTop+86, 0xFFFFFF); this.drawCenteredString(this.fontRenderer, this.tile.producePerTick+" "+I18n.format("actuallyadditions.cft"), this.guiLeft+87, this.guiTop+86, 0xFFFFFF);
} }
this.energy.draw(); this.energy.draw();

3
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java
View file

@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@ -72,7 +73,7 @@ public class GuiOilGenerator extends GuiWtfMojang{
} }
if(this.generator.maxBurnTime > 0 && this.generator.currentEnergyProduce > 0){ if(this.generator.maxBurnTime > 0 && this.generator.currentEnergyProduce > 0){
this.drawCenteredString(this.fontRenderer, this.generator.currentEnergyProduce + " CF/t", this.guiLeft + 87, this.guiTop + 65, 0xFFFFFF); this.drawCenteredString(this.fontRenderer, this.generator.currentEnergyProduce + " "+I18n.format("actuallyadditions.cft"), this.guiLeft + 87, this.guiTop + 65, 0xFFFFFF);
this.drawCenteredString(this.fontRenderer, "for "+ this.generator.maxBurnTime + " t", this.guiLeft + 87, this.guiTop + 75, 0xFFFFFF); this.drawCenteredString(this.fontRenderer, "for "+ this.generator.maxBurnTime + " t", this.guiLeft + 87, this.guiTop + 75, 0xFFFFFF);
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.scale(0.75, 0.75, 1); GlStateManager.scale(0.75, 0.75, 1);

3
src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java
View file

@ -22,6 +22,7 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.ingredients.VanillaTypes;
import mezz.jei.api.recipe.IRecipeWrapperFactory; import mezz.jei.api.recipe.IRecipeWrapperFactory;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -49,7 +50,7 @@ public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton {
@Override @Override
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
minecraft.fontRenderer.drawString(this.theRecipe.getEnergyUsed() + " CF", 55, 0, 0xFFFFFF, true); minecraft.fontRenderer.drawString(this.theRecipe.getEnergyUsed() + " "+I18n.format("actuallyadditions.cf"), 55, 0, 0xFFFFFF, true);
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
} }

3
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -3,6 +3,9 @@ itemGroup.actuallyadditions=Actually Additions
achievement.page.actuallyadditions=Actually Additions achievement.page.actuallyadditions=Actually Additions
actuallyadditions.lolWutHowUDoDis.name=This is bugged. Throw it away. Please. actuallyadditions.lolWutHowUDoDis.name=This is bugged. Throw it away. Please.
tooltip.actuallyadditions.disabled=Disabled Object tooltip.actuallyadditions.disabled=Disabled Object
actuallyadditions.cft=CF/t
actuallyadditions.cf=CF
actuallyadditions.cflong=Crystal Flux
#Fluids #Fluids
fluid.actuallyadditions.refinedcanolaoil=Refined Canola Oil fluid.actuallyadditions.refinedcanolaoil=Refined Canola Oil