diff --git a/port.MD b/port.MD index a6efb3c34..d8ecd493d 100644 --- a/port.MD +++ b/port.MD @@ -33,7 +33,7 @@ - [ ] Change "whitelist" and "blacklist" in item filters to "allow" and "deny" or something similar - [ ] 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" +- [x] Change the recipe of casings (the lava factory ones) to give only 4, and rename them to "Lava Factory Casing" - [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) - [x] Make black quartz drop the items directly, unless silk-touched - [ ] Make storage crates work as follows, recipes unchanged: @@ -43,32 +43,32 @@ - [ ] Rename powered furnace to double powered furnace and add a second block which is a single powered furnace, make recipes work similarly to crusher and double crusher - [ ] Make greenhouse glass less OP and potentially more difficult to craft - [ ] Improve the coffee maker's ui by putting the water meter actually into the ui -- [ ] Rename phantom boosters to range boosters (since they work for other stuff too) -- [ ] Make worms use that new forge event/hook to keep the ground watered instead of trying to re-water it every few ticks +- [x] Rename phantom boosters to range boosters (since they work for other stuff too) +- [x] Make worms use that new forge event/hook to keep the ground watered instead of trying to re-water it every few ticks - [x] Give ender star an enchantment glint - [ ] Make miner lens far more expensive to use, mmm power creep - [x] Make coffee beans and seeds be the same item or I might get killed by someone finally # Keep As Is - [X] Battery box -- [ ] Item interfaces and item laser system +- [x] Item interfaces and item laser system - [x] Farmer - [x] Empowerer and display stands - [x] Tiny torch -- [ ] Shock absorber +- [x] Shock absorber - [x] Player interface -- [ ] Vertical digger +- [x] Vertical digger - [x] Atomic reconstructor - [x] Ranged collector -- [ ] Breakers, placers and long-range breakers, as well as fluid variants -- [ ] Leaf-eating generator +- [x] Breakers, placers and long-range breakers, as well as fluid variants +- [x] Leaf-eating generator - [ ] Lamps and lamp controller -- [ ] Lava factory controller +- [x] Lava factory controller - [x] The entire canola system - [x] Phantomfaces and their variants -- [ ] Feeder -- [ ] Crusher and double crusher -- [ ] Heat collectors +- [x] Feeder +- [x] Crusher and double crusher +- [x] Heat collectors - [x] Precision dropper - [x] Engineer's goggles - [ ] Laser relay modifiers and wrench @@ -76,13 +76,13 @@ - [x] Sacks - [x] Player probe - [x] Item filter -- [ ] Water bowl +- [x] Water bowl - [x] Tiny coal and charcoal - [x] Rice slimeballs - [ ] Storage crate keeper - [x] Color, detonation, certain death, killer and disenchanting lenses - [ ] Storage crate upgrades, except for the "chest to storage crate" one -- [ ] Ring of growth +- [x] Ring of growth - [x] Ring of magnetization - [x] Teleport staff - [ ] Wings of the Bats and wing items dropped from bats diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index e0e8d030b..a2ec15d79 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.4 2024-04-28T16:44:33.1452594 Recipes +// 1.20.4 2024-06-10T15:07:52.0533266 Recipes 4d3128b37a7153882a9324cda49b5069207561c5 data/actuallyadditions/recipes/atomic_reconstructor.json b0367f5012651764931e8b8fd0c5bcca4e8614c0 data/actuallyadditions/recipes/battery_box.json dba5d4a1a79489d5766fad32f912ab1a64618854 data/actuallyadditions/recipes/bio_reactor.json @@ -50,7 +50,7 @@ ff81da8a0f6632779414c0512100696a11771814 data/actuallyadditions/recipes/hopping_ 92323ba7b5459abe64c06fff502d44384f64f361 data/actuallyadditions/recipes/laser_relay_advanced.json 31a2978ae8260ead579c6c920be0e40c6036498d data/actuallyadditions/recipes/laser_relay_extreme.json 4acb117a6727554073a78ed81bcd2b0b1af53bec data/actuallyadditions/recipes/laser_relay_item_advanced.json -2c37821d291542d4821842501e07bfad38181553 data/actuallyadditions/recipes/lava_factory_casing.json +65e62221d2e703218b3eb63ccd9499644e5851c4 data/actuallyadditions/recipes/lava_factory_casing.json 76f9eb2b859198eec4c50d992c3715633d5109a8 data/actuallyadditions/recipes/lava_factory_controller.json 1e3936f80be1540cd3d6ed570c1ed6381227db7d data/actuallyadditions/recipes/leaf_generator.json 11a57ce2eea04fed226a817a3995acd406bb2efb data/actuallyadditions/recipes/long_range_breaker.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/lava_factory_casing.json b/src/generated/resources/data/actuallyadditions/recipes/lava_factory_casing.json index abc1d39e0..2f7fcf9c7 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/lava_factory_casing.json +++ b/src/generated/resources/data/actuallyadditions/recipes/lava_factory_casing.json @@ -13,7 +13,7 @@ "ECE" ], "result": { - "count": 32, + "count": 4, "item": "actuallyadditions:lava_factory_casing" } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index a4fe34049..cd530e959 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -373,7 +373,7 @@ public class BlockRecipeGenerator extends RecipeProvider { .save(recipeOutput); // Lava Casing - Recipe.shaped(ActuallyBlocks.LAVA_FACTORY_CASING.getItem(), 32) + Recipe.shaped(ActuallyBlocks.LAVA_FACTORY_CASING.getItem(), 4) .pattern("ECE") .define('E', ActuallyBlocks.ENORI_CRYSTAL.get()) .define('C', ActuallyBlocks.IRON_CASING.get()) diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 446ff9aca..2093a0bd1 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -109,9 +109,7 @@ "block.actuallyadditions.crusher": "Crusher", "block.actuallyadditions.crusher_double": "Double Crusher", "block.actuallyadditions.powered_furnace": "Powered Furnace", - "block.actuallyadditions.fishing_net": "Fishing Net (WIP)", "block.actuallyadditions.heat_collector": "Heat Collector", - "block.actuallyadditions.item_repairer": "Item Repairer (WIP)", "block.actuallyadditions.wood_casing": "Wood Casing", "block.actuallyadditions.greenhouse_glass": "Greenhouse Glass", "block.actuallyadditions.energizer": "Energizer", @@ -143,10 +141,10 @@ "block.actuallyadditions.phantom_placer": "Phantom Placer", "block.actuallyadditions.phantom_breaker": "Phantom Breaker", "block.actuallyadditions.lava_factory_controller": "Lava Factory Controller", - "block.actuallyadditions.lava_factory_casing": "Lava Casing", + "block.actuallyadditions.lava_factory_casing": "Lava Factory Casing", "block.actuallyadditions.fluid_placer": "Fluid Placer", "block.actuallyadditions.fluid_collector": "Fluid Collector", - "block.actuallyadditions.phantom_booster": "Phantom Booster", + "block.actuallyadditions.phantom_booster": "Range Booster", "block.actuallyadditions.coffee": "Coffee Plant", "block.actuallyadditions.ethetic_green_block": "Ethetic Green Quartz", "block.actuallyadditions.ethetic_white_block": "Ethetic Quartz", @@ -155,7 +153,6 @@ "block.actuallyadditions.ethetic_green_slab": "Ethetic Green Quartz Slab", "block.actuallyadditions.ethetic_white_slab": "Ethetic Quartz Slab", "block.actuallyadditions.canola": "Canola Plant", - "block.actuallyadditions.treasure_chest": "Treasure Chest (WIP)", "block.actuallyadditions.canola_press": "Canola Press", "block.actuallyadditions.fermenting_barrel": "Fermenting Barrel", "block.actuallyadditions.canola_oil": "Canola Oil", @@ -176,7 +173,7 @@ "block.actuallyadditions.laser_relay": "Energy Laser Relay", "block.actuallyadditions.laser_relay_advanced": "Advanced Energy Laser Relay", "block.actuallyadditions.laser_relay_extreme": "Extreme Energy Laser Relay", - "block.actuallyadditions.laser_relay_fluids": "Fluid Laser Relay (WIP)", + "block.actuallyadditions.laser_relay_fluids": "Fluid Laser Relay", "block.actuallyadditions.iron_casing": "Iron Casing", "block.actuallyadditions.black_lotus": "Black Lotus", "block.actuallyadditions.ethetic_white_wall": "Ethetic Quartz Wall", @@ -210,10 +207,10 @@ "block.actuallyadditions.black_quartz_pillar_wall": "Black Quartz Pillar Wall", "block.actuallyadditions.black_quartz_pillar_stair": "Black Quartz Pillar Stairs", "block.actuallyadditions.black_quartz_pillar_slab": "Black Quartz Pillar Slab", - "block.actuallyadditions.laser_relay_item": "Item Laser Relay (WIP)", - "block.actuallyadditions.laser_relay_item_advanced": "Advanced Item Laser Relay (WIP)", - "block.actuallyadditions.item_interface": "Item Interface (WIP)", - "block.actuallyadditions.hopping_item_interface": "Hopping Item Interface (WIP)", + "block.actuallyadditions.laser_relay_item": "Item Laser Relay", + "block.actuallyadditions.laser_relay_item_advanced": "Advanced Item Laser Relay", + "block.actuallyadditions.item_interface": "Item Interface", + "block.actuallyadditions.hopping_item_interface": "Hopping Item Interface", "block.actuallyadditions.booklet_stand": "Wall-Mount Manual (WIP)", "block.actuallyadditions.display_stand": "Display Stand", "block.actuallyadditions.shock_suppressor": "Shock Absorber", @@ -288,7 +285,7 @@ "item.actuallyadditions.triple_battery": "Triple Battery", "item.actuallyadditions.quadruple_battery": "Quadruple Battery", "item.actuallyadditions.quintuple_battery": "Quintuple Battery", - "item.actuallyadditions.ring_of_growth": "Ring of Growth (WIP)", + "item.actuallyadditions.ring_of_growth": "Ring of Growth", "item.actuallyadditions.ring_of_magnetizing": "Ring of Magnetizing", "item.actuallyadditions.canola_oil_bucket": "Canola Oil Bucket", "item.actuallyadditions.refined_canola_oil_bucket": "Refined Canola Oil Bucket", @@ -371,8 +368,6 @@ "item.actuallyadditions.minecart_firework_box": "Firework Box Cart (WIP)", "item.actuallyadditions.water_bowl": "Bowl of Water", "item.actuallyadditions.filter": "Item Filter", - "item.actuallyadditions.biomass": "Biomass (WIP)", - "item.actuallyadditions.biocoal": "Bio Coal (WIP)", "item.actuallyadditions.player_probe": "Player Probe", "item.actuallyadditions.worm": "Worm", "item.actuallyadditions.travelers_sack": "Traveler's Sack",