From f420f6e63d4a2dcb6f460f34349354e34fa678fa Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Mon, 11 Apr 2022 16:50:35 -0500 Subject: [PATCH] things --- port.MD | 2 +- .../mod/inventory/gui/EnergyDisplay.java | 2 +- .../mod/items/ActuallyItems.java | 26 ------------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/port.MD b/port.MD index 38c59c2a2..93fcf06a6 100644 --- a/port.MD +++ b/port.MD @@ -34,7 +34,7 @@ - [ ] Change the recipe for the XP solidifier so that it's craftable even with solidified XP removed from mobs - [ ] Add off-hand slots to energizer and enervator - [ ] Change the recipe of casings (the lava factory ones) to give only 4, and rename them to "Lava Factory Casing" -- [ ] Make coal generator create half as much CF, we don't want this to be a main power source for people +- [x] Make coal generator create half as much CF, we don't want this to be a main power source for people( Flanks: already dropped to 20fe/t) - [ ] Make black quartz drop the items directly, unless silk-touched - [ ] Make storage crates work as follows, recipes unchanged: - [ ] Lowest tier can hold 8192 of a single item diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java index 778a360d9..aefbd46e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java @@ -100,6 +100,6 @@ public class EnergyDisplay extends AbstractGui { private String getOverlayText() { NumberFormat format = NumberFormat.getInstance(); - return String.format("%s/%s %s", format.format(this.rfReference.getEnergyStored()), format.format(this.rfReference.getMaxEnergyStored()), I18n.get("actuallyadditions.fe")); + return String.format("%s/%s %s", format.format(this.rfReference.getEnergyStored()), format.format(this.rfReference.getMaxEnergyStored()), I18n.get("misc.actuallyadditions.energy_name")); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java index 0e4c445ed..150cdf2e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -166,27 +166,6 @@ public final class ActuallyItems { public static final RegistryObject LEAF_BLOWER = ITEMS.register("leaf_blower", () -> new ItemLeafBlower(false)); public static final RegistryObject ADVANCED_LEAF_BLOWER = ITEMS.register("advanced_leaf_blower", () -> new ItemLeafBlower(true)); - public static final RegistryObject RING_OF_SPEED = ITEMS.register("ring_of_speed", basicItem()); - public static final RegistryObject RING_OF_HASTE = ITEMS.register("ring_of_haste", basicItem()); - public static final RegistryObject RING_OF_STRENGTH = ITEMS.register("ring_of_strength", basicItem()); - public static final RegistryObject RING_OF_JUMP_BOOST = ITEMS.register("ring_of_jump_boost", basicItem()); - public static final RegistryObject RING_OF_REGENERATION = ITEMS.register("ring_of_regeneration", basicItem()); - public static final RegistryObject RING_OF_RESISTANCE = ITEMS.register("ring_of_resistance", basicItem()); - public static final RegistryObject RING_OF_FIRE_RESISTANCE = ITEMS.register("ring_of_fire_resistance", basicItem()); - public static final RegistryObject RING_OF_WATER_BREATHING = ITEMS.register("ring_of_water_breathing", basicItem()); - public static final RegistryObject RING_OF_INVISIBILITY = ITEMS.register("ring_of_invisibility", basicItem()); - public static final RegistryObject RING_OF_NIGHT_VISION = ITEMS.register("ring_of_night_vision", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_SPEED = ITEMS.register("advanced_ring_of_speed", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_HASTE = ITEMS.register("advanced_ring_of_haste", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_STRENGTH = ITEMS.register("advanced_ring_of_strength", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_JUMP_BOOST = ITEMS.register("advanced_ring_of_jump_boost", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_REGENERATION = ITEMS.register("advanced_ring_of_regeneration", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_RESISTANCE = ITEMS.register("advanced_ring_of_resistance", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_FIRE_RESISTANCE = ITEMS.register("advanced_ring_of_fire_resistance", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_WATER_BREATHING = ITEMS.register("advanced_ring_of_water_breathing", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_INVISIBILITY = ITEMS.register("advanced_ring_of_invisibility", basicItem()); - public static final RegistryObject ADVANCED_RING_OF_NIGHT_VISION = ITEMS.register("advanced_ring_of_night_vision", basicItem()); - public static final RegistryObject COFFEE_BEANS = ITEMS.register("coffee_beans", ItemCoffeeBean::new); public static final RegistryObject FLAX = ITEMS.register("flax", ItemBase::new); @@ -233,11 +212,6 @@ public final class ActuallyItems { CRUSHED_QUARTZ, CRUSHED_COAL, CRUSHED_BLACK_QUARTZ, */ SOLIDIFIED_EXPERIENCE, LEAF_BLOWER, ADVANCED_LEAF_BLOWER, RING_OF_GROWTH, RING_OF_MAGNETIZING, - RING_OF_SPEED, RING_OF_HASTE, RING_OF_STRENGTH, RING_OF_JUMP_BOOST, - RING_OF_REGENERATION, RING_OF_RESISTANCE, RING_OF_FIRE_RESISTANCE, RING_OF_WATER_BREATHING, RING_OF_INVISIBILITY, - RING_OF_NIGHT_VISION, ADVANCED_RING_OF_SPEED, ADVANCED_RING_OF_HASTE, ADVANCED_RING_OF_STRENGTH, - ADVANCED_RING_OF_JUMP_BOOST, ADVANCED_RING_OF_REGENERATION, ADVANCED_RING_OF_RESISTANCE, ADVANCED_RING_OF_FIRE_RESISTANCE, - ADVANCED_RING_OF_WATER_BREATHING, ADVANCED_RING_OF_INVISIBILITY, ADVANCED_RING_OF_NIGHT_VISION, COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, COFFEE_SEEDS , WOODEN_AIOT, STONE_AIOT, IRON_AIOT, GOLD_AIOT, DIAMOND_AIOT, NETHERITE_AIOT );