diff --git a/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java b/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java index d7f73605..c304659b 100644 --- a/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java +++ b/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java @@ -25,7 +25,7 @@ import ru.betterend.util.LangUtil; public class REIInfusionCategory implements TransferRecipeCategory { - private final static Identifier COMPASS_IMG = BetterEnd.makeID("textures/gui/compass.png"); + private final static Identifier BACKGROUND = BetterEnd.makeID("textures/gui/rei_infusion.png"); @Override public @NotNull Identifier getIdentifier() { @@ -49,23 +49,21 @@ public class REIInfusionCategory implements TransferRecipeCategory setupDisplay(REIInfusionDisplay display, Rectangle bounds) { - Point centerPoint = new Point(bounds.getCenterX() - 34, bounds.getCenterY() - 6); + Point centerPoint = new Point(bounds.getCenterX() - 34, bounds.getCenterY() - 2); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); List> inputEntries = display.getInputEntries(); List> outputEntries = display.getResultingEntries(); - widgets.add(Widgets.createArrow(new Point(centerPoint.x + 48, centerPoint.y))); - widgets.add(Widgets.createTexturedWidget(COMPASS_IMG, centerPoint.x - 40, centerPoint.y - 40, 0.0F, 0.0F, 96, 96, 512, 512, 512, 512)); - widgets.add(Widgets.createSlot(centerPoint).entries(inputEntries.get(0)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y - 28)).entries(inputEntries.get(1)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x + 28, centerPoint.y)).entries(inputEntries.get(3)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y + 28)).entries(inputEntries.get(5)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x - 28, centerPoint.y)).entries(inputEntries.get(7)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y - 24)).entries(inputEntries.get(2)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y + 24)).entries(inputEntries.get(4)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y + 24)).entries(inputEntries.get(6)).markInput()); - widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y - 24)).entries(inputEntries.get(8)).markInput()); - widgets.add(Widgets.createResultSlotBackground(new Point(centerPoint.x + 80, centerPoint.y))); + widgets.add(Widgets.createTexturedWidget(BACKGROUND, bounds.x, bounds.y, 0, 0, 150, 104, 150, 104)); + widgets.add(Widgets.createSlot(centerPoint).entries(inputEntries.get(0)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y - 28)).entries(inputEntries.get(1)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x + 28, centerPoint.y)).entries(inputEntries.get(3)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y + 28)).entries(inputEntries.get(5)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x - 28, centerPoint.y)).entries(inputEntries.get(7)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y - 24)).entries(inputEntries.get(2)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y + 24)).entries(inputEntries.get(4)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y + 24)).entries(inputEntries.get(6)).disableBackground().markInput()); + widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y - 24)).entries(inputEntries.get(8)).disableBackground().markInput()); widgets.add(Widgets.createSlot(new Point(centerPoint.x + 80, centerPoint.y)).entries(outputEntries.get(0)).disableBackground().markOutput()); widgets.add(Widgets.createLabel(new Point(bounds.getMaxX() - 5, bounds.y + 6), new TranslatableText("category.rei.infusion.time&val", display.getInfusionTime())) .noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB)); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 7c66e6bd..8c544af4 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -2,7 +2,7 @@ "itemGroup.betterend.items": "Better End", "category.rei.damage.amount&dmg": "Tool damage: %s", - "category.rei.infusion.time&val": "Infusion Time: %s", + "category.rei.infusion.time&val": "Time: %s", "biome.betterend.foggy_mushroomland": "Foggy Mushroomland", "biome.betterend.dust_wastelands": "Dust Wastelands", @@ -285,9 +285,7 @@ "block.betterend.end_stone_lantern": "End Stone Lantern", "block.betterend.violecite_lantern": "Violecite Lantern", - "entity.betterend.dragonfly": "Dragonfly", "entity.betterend.end_fish": "End Fish", - "entity.betterend.end_slime": "End Slime", "entity.betterend.shadow_walker": "Shadow Walker", "item.betterend.spawn_egg_shadow_walker": "Shadow Walker Spawn Egg", diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 3462de8a..8464489a 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -2,7 +2,7 @@ "itemGroup.betterend.items": "Улучшенный Край", "category.rei.damage.amount&dmg": "Износ инструмента: %s", - "category.rei.infusion.time&val": "Время наполнения: %s", + "category.rei.infusion.time&val": "Время: %s", "biome.betterend.foggy_mushroomland": "Туманное гриболесье", "biome.betterend.dust_wastelands": "Пыльные пустоши", @@ -287,9 +287,7 @@ "block.betterend.end_stone_lantern": "Фонарь из камня Края", "block.betterend.violecite_lantern": "Виолецитовый фонарь", - "entity.betterend.dragonfly": "Стрекоза", "entity.betterend.end_fish": "Рыба Края", - "entity.betterend.end_slime": "Слизень Края", "entity.betterend.shadow_walker": "Теневой ходок", "item.betterend.spawn_egg_shadow_walker": "Яйцо призыва теневого ходока", diff --git a/src/main/resources/assets/betterend/textures/gui/compass.png b/src/main/resources/assets/betterend/textures/gui/compass.png deleted file mode 100644 index 89082a42..00000000 Binary files a/src/main/resources/assets/betterend/textures/gui/compass.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/gui/rei_infusion.png b/src/main/resources/assets/betterend/textures/gui/rei_infusion.png new file mode 100644 index 00000000..830dfca4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/gui/rei_infusion.png differ