Merge remote-tracking branch 'origin/1.16' into 1.16

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/TRArmorMaterials.java
This commit is contained in:
modmuss50 2020-03-12 20:32:39 +00:00
commit f60daa7376
3 changed files with 4 additions and 4 deletions

View file

@ -97,7 +97,7 @@ public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCate
Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy()); Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy());
LabelWidget costLabel; LabelWidget costLabel;
widgets.add(costLabel = new LabelWidget(startPoint.x + 1, startPoint.y + 1 + (i++ * 20), energyPerTick.asFormattedString())); widgets.add(costLabel = new LabelWidget(new Point(startPoint.x + 1, startPoint.y + 1 + (i++ * 20)), energyPerTick.asFormattedString()));
costLabel.setHasShadows(false); costLabel.setHasShadows(false);
costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);
@ -110,7 +110,7 @@ public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCate
if (heat > 0) { if (heat > 0) {
String neededHeat = heat + " " + StringUtils.t("techreborn.jei.recipe.heat"); String neededHeat = heat + " " + StringUtils.t("techreborn.jei.recipe.heat");
LabelWidget heatLabel; LabelWidget heatLabel;
widgets.add(heatLabel = new LabelWidget(startPoint.x + 61, startPoint.y + 1 + (i++ * 20), neededHeat)); widgets.add(heatLabel = new LabelWidget(new Point(startPoint.x + 61, startPoint.y + 1 + (i++ * 20)), neededHeat));
heatLabel.setHasShadows(false); heatLabel.setHasShadows(false);
heatLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); heatLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);
} }

View file

@ -83,7 +83,7 @@ public class FluidGeneratorRecipeCategory implements RecipeCategory<FluidGenerat
Text energyPerTick = new TranslatableText("techreborn.jei.recipe.generator.total", machineRecipe.getTotalEnergy()); Text energyPerTick = new TranslatableText("techreborn.jei.recipe.generator.total", machineRecipe.getTotalEnergy());
LabelWidget costLabel; LabelWidget costLabel;
widgets.add(costLabel = new LabelWidget(bounds.getCenterX(), startPoint.y + 20, energyPerTick.asFormattedString())); widgets.add(costLabel = new LabelWidget(new Point(bounds.getCenterX(), startPoint.y + 20), energyPerTick.asFormattedString()));
costLabel.setHasShadows(false); costLabel.setHasShadows(false);
costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);

View file

@ -85,7 +85,7 @@ public class FluidReplicatorRecipeCategory implements RecipeCategory<FluidReplic
Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy()); Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy());
LabelWidget costLabel; LabelWidget costLabel;
widgets.add(costLabel = new LabelWidget(startPoint.x + 1, startPoint.y + 1 + (i++ * 20), energyPerTick.asFormattedString())); widgets.add(costLabel = new LabelWidget(new Point(startPoint.x + 1, startPoint.y + 1 + (i++ * 20)), energyPerTick.asFormattedString()));
costLabel.setHasShadows(false); costLabel.setHasShadows(false);
costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);